From ceba01e641ac710cdfe813e43226cf693bf7e8cc Mon Sep 17 00:00:00 2001 From: Sam Jorna Date: Sun, 18 Dec 2016 10:08:45 +1100 Subject: sci-geosciences/mapserver: bump to 7.0.3 #602616 Version bump to 7.0.3. Resolves information leakage from OGR driver. Remove PHP5.5. Gentoo-bug: 602616 Package-Manager: Portage-2.3.3, Repoman-2.3.1 --- sci-geosciences/mapserver/Manifest | 2 +- .../mapserver/mapserver-7.0.1-r1.ebuild | 185 ------------------- sci-geosciences/mapserver/mapserver-7.0.3.ebuild | 195 +++++++++++++++++++++ 3 files changed, 196 insertions(+), 186 deletions(-) delete mode 100644 sci-geosciences/mapserver/mapserver-7.0.1-r1.ebuild create mode 100644 sci-geosciences/mapserver/mapserver-7.0.3.ebuild (limited to 'sci-geosciences/mapserver') diff --git a/sci-geosciences/mapserver/Manifest b/sci-geosciences/mapserver/Manifest index c4d472d04df5..c93b27c62cfd 100644 --- a/sci-geosciences/mapserver/Manifest +++ b/sci-geosciences/mapserver/Manifest @@ -1 +1 @@ -DIST mapserver-7.0.1.tar.gz 2606929 SHA256 2c9567e59ae3ebd99bb645740485be6a25798b8b57f93ca3413a3e0369a1bd8f SHA512 10cf58920a3083280a748efa087f105ed2e29650d10b56b7d457c46fd7fc4670a021db1aa27186997aaa3ea1b6a5b2772f2ffc5d8de48130f5ebed654215f2df WHIRLPOOL 0ef70bd312aba706c19ebc8d324e9ac2bc72bb400cbdb539c20ca0ea383744f363425dbc2dc1b70f8e133b0e84409645505a880f2e5689345e8c7bd7c5e952d5 +DIST mapserver-7.0.3.tar.gz 2621285 SHA256 dbec8f0ccdf506e7117cec5b704e8f9692451f72a07d9f4879d508ed96c55550 SHA512 7630461948e7b371c6d4d6d49cc596ad8fc6b076a8bbfdc88358fc076fa0d4ebaaab10663ec9c3c64e246b5735a07cef5cc28eba88b00dd09259048a49d2b81b WHIRLPOOL 4306a29758ae2b8f6acaf5f8c9157f0851a028f25fba4cd130022d37b5f31e35f486be49b4393351123f5e9923ab2c342430d33dc15e4b07c0904c3bcad7e259 diff --git a/sci-geosciences/mapserver/mapserver-7.0.1-r1.ebuild b/sci-geosciences/mapserver/mapserver-7.0.1-r1.ebuild deleted file mode 100644 index 0392bd6d9b5f..000000000000 --- a/sci-geosciences/mapserver/mapserver-7.0.1-r1.ebuild +++ /dev/null @@ -1,185 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -MY_P="${PN}-${PV/_/-}" - -PHP_EXT_OPTIONAL_USE="php" -PHP_EXT_NAME="php_mapscript" -PHP_EXT_S="${WORKDIR}/${MY_P}/mapscript/php/" -PHP_EXT_SKIP_PHPIZE="no" -USE_PHP="php5-6 php5-5" - -PYTHON_COMPAT=( python2_7 ) - -#USE_RUBY="ruby18 ruby19" -#RUBY_OPTIONAL="yes" - -WEBAPP_MANUAL_SLOT=yes - -inherit eutils depend.apache webapp distutils-r1 flag-o-matic perl-module php-ext-source-r2 multilib cmake-utils # ruby-ng - -DESCRIPTION="Development environment for building spatially enabled webapps" -HOMEPAGE="http://mapserver.org/" -SRC_URI="http://download.osgeo.org/mapserver/${MY_P}.tar.gz" - -LICENSE="MIT" -KEYWORDS="~amd64 ~x86" -SLOT="0" -IUSE="bidi cairo gdal geos mysql opengl perl php postgis proj python threads tiff xml xslt" # ruby php tcl - -REQUIRED_USE="php? ( ^^ ( php_targets_php5-6 php_targets_php5-5 ) ) - xslt? ( xml )" - -RDEPEND=" - dev-libs/expat - dev-libs/fcgi - >=media-libs/gd-2.0.12[truetype,jpeg,png,zlib] - media-libs/giflib - net-misc/curl - virtual/jpeg:= - virtual/libiconv - x11-libs/agg - bidi? ( dev-libs/fribidi - media-libs/harfbuzz ) - cairo? ( x11-libs/cairo ) - gdal? ( >=sci-libs/gdal-1.8.0 ) - geos? ( sci-libs/geos ) - mysql? ( virtual/mysql ) - opengl? ( - media-libs/ftgl - media-libs/mesa - ) - perl? ( dev-lang/perl:= ) - postgis? ( dev-db/postgis ) - proj? ( sci-libs/proj net-misc/curl ) - tiff? ( - media-libs/tiff:= - sci-libs/libgeotiff - ) - xml? ( dev-libs/libxml2:2 ) - xslt? ( dev-libs/libxslt[crypt] ) -" -DEPEND="${RDEPEND} - perl? ( >=dev-lang/swig-2.0 ) - python? ( >=dev-lang/swig-2.0 )" - -need_apache2 - -PATCHES=( - "${FILESDIR}/${PN}-7.0.0-sec-format.patch" # see https://github.com/mapserver/mapserver/pull/5248 - "${FILESDIR}/${PN}-7.0.0-no-applicable-code.patch" -) - -S=${WORKDIR}/${MY_P} - -pkg_setup() { - webapp_pkg_setup - use perl && perl_set_version - #use ruby && ruby-ng_pkg_setup -} - -src_unpack() { - # unpack A and then copy the php thingies into workdir/php-slot - php-ext-source-r2_src_unpack - # HACK: and then remove it and replace by symlink - local slot - for slot in $(php_get_slots); do - rm -rf "${WORKDIR}/${slot}" || die - ln -s "${PHP_EXT_S}" "${WORKDIR}/${slot}" || die - done -} - -src_prepare() { - local glibdir="${EPREFIX}/usr/include/glib-2.0" - local usrglibdir="${EPREFIX}/usr/$(get_libdir)/glib-2.0/include" - - sed -e "s:^include_directories(:&${glibdir})\ninclude_directories(:" \ - -i "${S}/CMakeLists.txt" || die - sed -e "s:include_directories(:&${usrglibdir})\ninclude_directories(:" \ - -i "${S}/CMakeLists.txt" || die - - cmake-utils_src_prepare -} - -src_configure() { - local mycmakeargs=( - "-DCMAKE_SKIP_RPATH=ON" - "-DWITH_ORACLESPATIAL=OFF" - "-DWITH_SDE=OFF" - "-DWITH_APACHE_MODULE=ON" - "-DWITH_ICONV=ON" - "-DWITH_GD=ON" - "-DWITH_GIF=ON" - "-DWITH_CURL=ON" - "-DWITH_FCGI=ON" - "-DINSTALL_LIB_DIR=${ROOT}usr/$(get_libdir)" - "-DWITH_PROJ=$(usex proj ON OFF)" - "-DWITH_WMS=$(usex proj ON OFF)" - "-DWITH_KML=$(usex xml ON OFF)" - "-DWITH_GEOS=$(usex geos ON OFF)" - "-DWITH_GDAL=$(usex gdal ON OFF)" - "-DWITH_OGR=$(usex gdal ON OFF)" - "-DWITH_POSTGIS=$(usex postgis ON OFF)" - "-DWITH_MYSQL=$(usex mysql ON OFF)" - "-DWITH_LIBXML2=$(usex xml ON OFF)" - "-DWITH_XMLMAPFILE=$(usex xslt ON OFF)" - "-DWITH_FRIBIDI=$(usex bidi ON OFF)" - "-DWITH_HARFBUZZ=$(usex bidi ON OFF)" - "-DWITH_CAIRO=$(usex cairo ON OFF)" - "-DWITH_PHP=$(usex php ON OFF)" - "-DWITH_PYTHON=$(usex python ON OFF)" - "-DWITH_PERL=$(usex perl ON OFF)" - ) - - if use gdal && use proj ; then - mycmakeargs+=( "-DWITH_WFS=ON" - "-DWITH_WCS=ON" - "-DWITH_CLIENT_WMS=ON" - "-DWITH_CLIENT_WFS=ON" - "-DWITH_SOS=$(usex xml ON OFF)" - ) - else - mycmakeargs+=( "-DWITH_WFS=OFF" - "-DWITH_WCS=OFF" - "-DWITH_CLIENT_WMS=OFF" - "-DWITH_CLIENT_WFS=OFF" - "-DWITH_SOS=OFF" - ) - fi - - if use php ; then - local slot - for slot in $(php_get_slots); do - mycmakeargs+=( -DPHP5_CONFIG_EXECUTABLE="${EPREFIX}/usr/$(get_libdir)/${slot}/bin/php-config" ) - done - fi - - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile -} - -src_install() { - cmake-utils_src_install - - if use php ; then - php-ext-source-r2_createinifiles - fi - webapp_src_preinst - exeinto "${MY_CGIBINDIR}" - doexe "${S}_build/mapserv" - webapp_src_install -} - -pkg_postinst() { - webapp_pkg_postinst -} - -pkg_prerm() { - webapp_pkg_prerm -} diff --git a/sci-geosciences/mapserver/mapserver-7.0.3.ebuild b/sci-geosciences/mapserver/mapserver-7.0.3.ebuild new file mode 100644 index 000000000000..4010edaf3c93 --- /dev/null +++ b/sci-geosciences/mapserver/mapserver-7.0.3.ebuild @@ -0,0 +1,195 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +MY_P="${PN}-${PV/_/-}" + +PHP_EXT_OPTIONAL_USE="php" +PHP_EXT_NAME="php_mapscript" +PHP_EXT_S="${WORKDIR}/${MY_P}/mapscript/php/" +PHP_EXT_SKIP_PHPIZE="no" +USE_PHP="php5-6" + +PYTHON_COMPAT=( python2_7 ) + +#USE_RUBY="ruby18 ruby19" +#RUBY_OPTIONAL="yes" + +WEBAPP_MANUAL_SLOT=yes + +inherit eutils depend.apache webapp distutils-r1 flag-o-matic perl-module php-ext-source-r2 multilib cmake-utils # ruby-ng + +DESCRIPTION="Development environment for building spatially enabled webapps" +HOMEPAGE="http://mapserver.org/" +SRC_URI="http://download.osgeo.org/mapserver/${MY_P}.tar.gz" + +LICENSE="MIT" +KEYWORDS="~amd64 ~x86" +SLOT="0" +IUSE="bidi cairo gdal geos mysql opengl perl php postgis proj python threads tiff xml xslt" # ruby php tcl + +REQUIRED_USE="php? ( php_targets_php5-6 ) + xslt? ( xml )" + +RDEPEND=" + dev-libs/expat + dev-libs/fcgi + >=media-libs/gd-2.0.12[truetype,jpeg,png,zlib] + media-libs/giflib + net-misc/curl + virtual/jpeg:= + virtual/libiconv + x11-libs/agg + bidi? ( dev-libs/fribidi + media-libs/harfbuzz ) + cairo? ( x11-libs/cairo ) + gdal? ( >=sci-libs/gdal-1.8.0 ) + geos? ( sci-libs/geos ) + mysql? ( virtual/mysql ) + opengl? ( + media-libs/ftgl + media-libs/mesa + ) + perl? ( dev-lang/perl:= ) + postgis? ( dev-db/postgis ) + proj? ( sci-libs/proj net-misc/curl ) + tiff? ( + media-libs/tiff:= + sci-libs/libgeotiff + ) + xml? ( dev-libs/libxml2:2 ) + xslt? ( dev-libs/libxslt[crypt] ) +" +DEPEND="${RDEPEND} + perl? ( >=dev-lang/swig-2.0 ) + python? ( >=dev-lang/swig-2.0 )" + +need_apache2 + +PATCHES=( + "${FILESDIR}/${PN}-7.0.0-sec-format.patch" # see https://github.com/mapserver/mapserver/pull/5248 + "${FILESDIR}/${PN}-7.0.0-no-applicable-code.patch" +) + +S=${WORKDIR}/${MY_P} + +pkg_setup() { + webapp_pkg_setup + use perl && perl_set_version + #use ruby && ruby-ng_pkg_setup +} + +src_unpack() { + # unpack A and then copy the php thingies into workdir/php-slot + php-ext-source-r2_src_unpack + # HACK: and then remove it and replace by symlink + local slot + for slot in $(php_get_slots); do + rm -rf "${WORKDIR}/${slot}" || die + ln -s "${PHP_EXT_S}" "${WORKDIR}/${slot}" || die + done +} + +src_prepare() { + local glibdir="${EPREFIX}/usr/include/glib-2.0" + local usrglibdir="${EPREFIX}/usr/$(get_libdir)/glib-2.0/include" + + sed -e "s:^include_directories(:&${glibdir})\ninclude_directories(:" \ + -i "${S}/CMakeLists.txt" || die + sed -e "s:include_directories(:&${usrglibdir})\ninclude_directories(:" \ + -i "${S}/CMakeLists.txt" || die + + cmake-utils_src_prepare +} + +src_configure() { + local mycmakeargs=( + "-DCMAKE_SKIP_RPATH=ON" + "-DWITH_ORACLESPATIAL=OFF" + "-DWITH_SDE=OFF" + "-DWITH_APACHE_MODULE=ON" + "-DWITH_ICONV=ON" + "-DWITH_GD=ON" + "-DWITH_GIF=ON" + "-DWITH_CURL=ON" + "-DWITH_FCGI=ON" + "-DINSTALL_LIB_DIR=${ROOT}usr/$(get_libdir)" + "-DWITH_PROJ=$(usex proj ON OFF)" + "-DWITH_WMS=$(usex proj ON OFF)" + "-DWITH_KML=$(usex xml ON OFF)" + "-DWITH_GEOS=$(usex geos ON OFF)" + "-DWITH_GDAL=$(usex gdal ON OFF)" + "-DWITH_OGR=$(usex gdal ON OFF)" + "-DWITH_POSTGIS=$(usex postgis ON OFF)" + "-DWITH_MYSQL=$(usex mysql ON OFF)" + "-DWITH_LIBXML2=$(usex xml ON OFF)" + "-DWITH_XMLMAPFILE=$(usex xslt ON OFF)" + "-DWITH_FRIBIDI=$(usex bidi ON OFF)" + "-DWITH_HARFBUZZ=$(usex bidi ON OFF)" + "-DWITH_CAIRO=$(usex cairo ON OFF)" + "-DWITH_PHP=$(usex php ON OFF)" + "-DWITH_PYTHON=$(usex python ON OFF)" + "-DWITH_PERL=$(usex perl ON OFF)" + ) + + if use gdal && use proj ; then + mycmakeargs+=( "-DWITH_WFS=ON" + "-DWITH_WCS=ON" + "-DWITH_CLIENT_WMS=ON" + "-DWITH_CLIENT_WFS=ON" + "-DWITH_SOS=$(usex xml ON OFF)" + ) + else + mycmakeargs+=( "-DWITH_WFS=OFF" + "-DWITH_WCS=OFF" + "-DWITH_CLIENT_WMS=OFF" + "-DWITH_CLIENT_WFS=OFF" + "-DWITH_SOS=OFF" + ) + fi + + if use php ; then + local slot + for slot in $(php_get_slots); do + local php_config="${EPREFIX}/usr/$(get_libdir)/${slot}/bin/php-config" + [[ -x ${php_config} ]] \ + || die "php-config '${php_config}' not valid or not executable" + + local php_include_dir=$(${php_config} --include-dir) + [[ -d ${php_include_dir} ]] || die "PHP Include dir not found or not valid" + + mycmakeargs+=( + -DPHP5_CONFIG_EXECUTABLE="${php_config}" + -DPHP5_INCLUDES="${php_include_dir}" + ) + done + fi + + cmake-utils_src_configure +} + +src_compile() { + cmake-utils_src_compile +} + +src_install() { + cmake-utils_src_install + + if use php ; then + php-ext-source-r2_createinifiles + fi + webapp_src_preinst + exeinto "${MY_CGIBINDIR}" + doexe "${S}_build/mapserv" + webapp_src_install +} + +pkg_postinst() { + webapp_pkg_postinst +} + +pkg_prerm() { + webapp_pkg_prerm +} -- cgit v1.2.3-18-g5258