From 1420db33e98ff4ce6d7a119452ad3a8962fb9664 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tiziano=20M=C3=BCller?= Date: Fri, 16 Mar 2007 11:02:42 +0000 Subject: [PATCH] Version bump (including some cleanup and added tests). Dropped old version with security issue (bug #169286). Package-Manager: portage-2.1.2.2 --- dev-python/mod_python/ChangeLog | 10 ++++- dev-python/mod_python/Manifest | 36 ++++++++---------- .../files/digest-mod_python-3.1.4-r1 | 3 -- .../mod_python/files/digest-mod_python-3.3.1 | 3 ++ .../mod_python-3.1.4-configure-bash-3.1.patch | 13 ------- ....1.4-r1.ebuild => mod_python-3.3.1.ebuild} | 37 ++++++++++++------- 6 files changed, 51 insertions(+), 51 deletions(-) delete mode 100644 dev-python/mod_python/files/digest-mod_python-3.1.4-r1 create mode 100644 dev-python/mod_python/files/digest-mod_python-3.3.1 delete mode 100644 dev-python/mod_python/files/mod_python-3.1.4-configure-bash-3.1.patch rename dev-python/mod_python/{mod_python-3.1.4-r1.ebuild => mod_python-3.3.1.ebuild} (58%) diff --git a/dev-python/mod_python/ChangeLog b/dev-python/mod_python/ChangeLog index 904766185666..2ccd127d635f 100644 --- a/dev-python/mod_python/ChangeLog +++ b/dev-python/mod_python/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for dev-python/mod_python # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/mod_python/ChangeLog,v 1.55 2007/03/10 21:49:38 kloeri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/mod_python/ChangeLog,v 1.56 2007/03/16 11:02:42 dev-zero Exp $ + +*mod_python-3.3.1 (16 Mar 2007) + + 16 Mar 2007; Tiziano Müller + -files/mod_python-3.1.4-configure-bash-3.1.patch, + -mod_python-3.1.4-r1.ebuild, +mod_python-3.3.1.ebuild: + Version bump (including some cleanup and added tests). Dropped old version + with security issue (bug #169286). 10 Mar 2007; Bryan Østergaard mod_python-3.2.10.ebuild: diff --git a/dev-python/mod_python/Manifest b/dev-python/mod_python/Manifest index 00f0052f9ff3..2fb9496f23da 100644 --- a/dev-python/mod_python/Manifest +++ b/dev-python/mod_python/Manifest @@ -5,29 +5,25 @@ AUX 16_mod_python.conf 1101 RMD160 7221a2a77cc1481855bfac75191d666c642861b8 SHA1 MD5 fc933df167083c6c8abc4d2e28c6274d files/16_mod_python.conf 1101 RMD160 7221a2a77cc1481855bfac75191d666c642861b8 files/16_mod_python.conf 1101 SHA256 fffa4ce78f0bbe242e88b19a23d1e69fcaa2cfad73954f72d78688ee3a9523d3 files/16_mod_python.conf 1101 -AUX mod_python-3.1.4-configure-bash-3.1.patch 473 RMD160 be33f1c882941d32b9c65224d12739ffe1d94319 SHA1 d6732c0f49bf109212e77e7200404231f2479568 SHA256 7d07b64ce193dd139c4e7ccb7fcb8ccc0ee7729202735b26e07307a52553b7fb -MD5 437d3b6af39626eb8dfb88127db3883c files/mod_python-3.1.4-configure-bash-3.1.patch 473 -RMD160 be33f1c882941d32b9c65224d12739ffe1d94319 files/mod_python-3.1.4-configure-bash-3.1.patch 473 -SHA256 7d07b64ce193dd139c4e7ccb7fcb8ccc0ee7729202735b26e07307a52553b7fb files/mod_python-3.1.4-configure-bash-3.1.patch 473 DIST mod_python-2.7.11.tgz 175763 RMD160 1b34de01b3fa4bb27bb5a39396a2497db66fabd5 SHA1 8c123359f98a7acf077e078226fccdb0ff51c4ce SHA256 d56f21b37a85c6f2464b669faf071676302d636037fccf818722291126e851cf -DIST mod_python-3.1.4.tgz 308510 RMD160 395fdf56a349717dadba418ce91cd5699cf0970f SHA1 d28022f6b14d0f7d01c6aed95a56e47f8df71f64 SHA256 f8e1925a0ade1adf4b5528e892eb347b013100d6c30b0e43209143b427c976a5 DIST mod_python-3.2.10.tgz 365768 RMD160 2afdd0a80c815f8b9a1b33258e04ae17a12b7dbd SHA1 d3949d71c718e84b7897e9ce62fed26dea4c9584 SHA256 ac404c02ee052dcfbd8e303fe9148866c561be9b9a8a12cffee25276e147f13c +DIST mod_python-3.3.1.tgz 447954 RMD160 f78f93172963317f4318f8f2455419743c8fb4f5 SHA1 e538170fd78e09408b6d8593da980b126a0fef93 SHA256 ad2331fd5fcfd720ef9e3482973fc2d06eff36ba0c44693cfa42056a62175a6b EBUILD mod_python-2.7.11.ebuild 1717 RMD160 7296be86d8e8887f1a95472e19e928c64c9ae44f SHA1 21f40572fc0cd11ad6464b40fb98d2d015f69d45 SHA256 18953cec5316465763d74c66c4724849d707b52e7c5d31740cb9298715a75a9d MD5 426f80696feef4b6bf9f8ce8f3e61ce9 mod_python-2.7.11.ebuild 1717 RMD160 7296be86d8e8887f1a95472e19e928c64c9ae44f mod_python-2.7.11.ebuild 1717 SHA256 18953cec5316465763d74c66c4724849d707b52e7c5d31740cb9298715a75a9d mod_python-2.7.11.ebuild 1717 -EBUILD mod_python-3.1.4-r1.ebuild 1547 RMD160 d933d78c6e541d2c4cbc53b204c3656813fb602e SHA1 e4a131e620044c3da80b82e711a4d70f5162ea08 SHA256 721516c9ad8424d17273baacfb80d2efaf3bcfa31e996084de8917a9046b7e39 -MD5 b90ff3022811d3ae162b17f142857669 mod_python-3.1.4-r1.ebuild 1547 -RMD160 d933d78c6e541d2c4cbc53b204c3656813fb602e mod_python-3.1.4-r1.ebuild 1547 -SHA256 721516c9ad8424d17273baacfb80d2efaf3bcfa31e996084de8917a9046b7e39 mod_python-3.1.4-r1.ebuild 1547 EBUILD mod_python-3.2.10.ebuild 1454 RMD160 4085c6543a08015ec004dfefcda184a4c07b02fa SHA1 a87fedb1bc84d6df73a3b7b7947106dd71c29a2c SHA256 59046743de2b4da6c5fd9c1313d862a3ba5b639f373a7055ec308ed0f1e10bd7 MD5 6b02985984e0729c5bcee3a6e7bf4344 mod_python-3.2.10.ebuild 1454 RMD160 4085c6543a08015ec004dfefcda184a4c07b02fa mod_python-3.2.10.ebuild 1454 SHA256 59046743de2b4da6c5fd9c1313d862a3ba5b639f373a7055ec308ed0f1e10bd7 mod_python-3.2.10.ebuild 1454 -MISC ChangeLog 8322 RMD160 18737b0370e995dc256ba445e434780986a931e6 SHA1 a9e339710e06552e6182aa7570230f6feb18e3e6 SHA256 1d6175a12b568dc4c01cb696028fafdd372d465614ea617fd0703c597f6232b9 -MD5 999b8ac4adb0fde15bb44260fc5ca68c ChangeLog 8322 -RMD160 18737b0370e995dc256ba445e434780986a931e6 ChangeLog 8322 -SHA256 1d6175a12b568dc4c01cb696028fafdd372d465614ea617fd0703c597f6232b9 ChangeLog 8322 +EBUILD mod_python-3.3.1.ebuild 1636 RMD160 6f8c815acbe8de83246abe6582e7b4ba04e73922 SHA1 4bc9e9e4c764d85bf59195a4de22a0daf3a3837a SHA256 77e6269c6cae984bed88db45d11765039e874ff265050f88a98ff9ce5a1ef2c3 +MD5 db6e8e060d5dfe37494b9bfd9dbd64b9 mod_python-3.3.1.ebuild 1636 +RMD160 6f8c815acbe8de83246abe6582e7b4ba04e73922 mod_python-3.3.1.ebuild 1636 +SHA256 77e6269c6cae984bed88db45d11765039e874ff265050f88a98ff9ce5a1ef2c3 mod_python-3.3.1.ebuild 1636 +MISC ChangeLog 8634 RMD160 d50ecf7d439d9055b7dcdb8949c1cda6a9c20de6 SHA1 1cff754911d89d761807aaf2ef00399c58289977 SHA256 a29369a0afb255c93f8657c2ba18ed1a461c05137d140781858da982ba237582 +MD5 f10466f0867a29d2fb9cfe6372843be0 ChangeLog 8634 +RMD160 d50ecf7d439d9055b7dcdb8949c1cda6a9c20de6 ChangeLog 8634 +SHA256 a29369a0afb255c93f8657c2ba18ed1a461c05137d140781858da982ba237582 ChangeLog 8634 MISC metadata.xml 1061 RMD160 25c2c919ef1bb3d6728a10b35ed303ea0c0abcfc SHA1 950d7976273bb74aedbe155cd24175acffd94069 SHA256 3a0625b325714705a742b2ecc5abaf9cad54fc68ca0c1cce392fd98e4df85615 MD5 d22a89499e67f85375ed58f369dfc69e metadata.xml 1061 RMD160 25c2c919ef1bb3d6728a10b35ed303ea0c0abcfc metadata.xml 1061 @@ -35,16 +31,16 @@ SHA256 3a0625b325714705a742b2ecc5abaf9cad54fc68ca0c1cce392fd98e4df85615 metadata MD5 0e30d37f66c9dd6ef0f6e13a23320c60 files/digest-mod_python-2.7.11 244 RMD160 db51645e95e03eb176a679f3822d74829c162397 files/digest-mod_python-2.7.11 244 SHA256 e392658a3a80a850b811a0cf5957760931d401b9c4c10aaa809269b4719f9782 files/digest-mod_python-2.7.11 244 -MD5 e1f65b354684d5987a647397114fd4db files/digest-mod_python-3.1.4-r1 241 -RMD160 b4e4b2dac0a148bd6eecd001e23bde78a522df68 files/digest-mod_python-3.1.4-r1 241 -SHA256 8284a8bd265034aa07543a96029164848192d3826d6a9939df29374e46c364b8 files/digest-mod_python-3.1.4-r1 241 MD5 7356bad2e0df6f2d04de41533b44a0f5 files/digest-mod_python-3.2.10 244 RMD160 ad8a915266a5c1e9983b75d060ec14e616c9f2dd files/digest-mod_python-3.2.10 244 SHA256 71ca744baad29cf4a061da86837b5ea7f31c11501008225018160c636be80de7 files/digest-mod_python-3.2.10 244 +MD5 5b8e0f12041549152b28d724f32acf72 files/digest-mod_python-3.3.1 241 +RMD160 975fc2da673fd54cc697ad00858f57213854527e files/digest-mod_python-3.3.1 241 +SHA256 1148b94f4afb88c2a4ef1c6836d2bfabc0bb4e307974ec050f7113997898c8d6 files/digest-mod_python-3.3.1 241 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.3 (GNU/Linux) +Version: GnuPG v2.0.2 (GNU/Linux) -iD8DBQFF8ygCugEuf3OQ0akRAop5AJ0YNNUnPD8y41rImuuGpai/CGgmtgCaA27n -/Zys4QjSruAkEveYrDnLH+E= -=wUSr +iD8DBQFF+nliGwVqY66cHjARAvJ2AJ9avGy1fApFp0c/XFJzDWIMzTAGxACfWoS+ +sWTATRgaST7Tl28Bwe4OAts= +=ZEdE -----END PGP SIGNATURE----- diff --git a/dev-python/mod_python/files/digest-mod_python-3.1.4-r1 b/dev-python/mod_python/files/digest-mod_python-3.1.4-r1 deleted file mode 100644 index e72694d0806b..000000000000 --- a/dev-python/mod_python/files/digest-mod_python-3.1.4-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 607175958137b06bcda91110414c82a1 mod_python-3.1.4.tgz 308510 -RMD160 395fdf56a349717dadba418ce91cd5699cf0970f mod_python-3.1.4.tgz 308510 -SHA256 f8e1925a0ade1adf4b5528e892eb347b013100d6c30b0e43209143b427c976a5 mod_python-3.1.4.tgz 308510 diff --git a/dev-python/mod_python/files/digest-mod_python-3.3.1 b/dev-python/mod_python/files/digest-mod_python-3.3.1 new file mode 100644 index 000000000000..aa3e51bc56e3 --- /dev/null +++ b/dev-python/mod_python/files/digest-mod_python-3.3.1 @@ -0,0 +1,3 @@ +MD5 a3b0150176b726bd2833dac3a7837dc5 mod_python-3.3.1.tgz 447954 +RMD160 f78f93172963317f4318f8f2455419743c8fb4f5 mod_python-3.3.1.tgz 447954 +SHA256 ad2331fd5fcfd720ef9e3482973fc2d06eff36ba0c44693cfa42056a62175a6b mod_python-3.3.1.tgz 447954 diff --git a/dev-python/mod_python/files/mod_python-3.1.4-configure-bash-3.1.patch b/dev-python/mod_python/files/mod_python-3.1.4-configure-bash-3.1.patch deleted file mode 100644 index f3b5071963b0..000000000000 --- a/dev-python/mod_python/files/mod_python-3.1.4-configure-bash-3.1.patch +++ /dev/null @@ -1,13 +0,0 @@ -=== modified file 'configure.in' ---- configure.in -+++ configure.in -@@ -275,7 +275,7 @@ - # get the mod_python version - AC_SUBST(MP_VERSION) - MP_VERSION=`awk '/MPV_STRING/ {print $3}' src/include/mpversion.h` --MP_VERSION=`echo $MP_VERSION | sed s/\\"//g` -+MP_VERSION=`echo $MP_VERSION | sed s/\"//g` - - AC_OUTPUT(Makefile src/Makefile Doc/Makefile test/testconf.py dist/setup.py dist/Makefile) - - diff --git a/dev-python/mod_python/mod_python-3.1.4-r1.ebuild b/dev-python/mod_python/mod_python-3.3.1.ebuild similarity index 58% rename from dev-python/mod_python/mod_python-3.1.4-r1.ebuild rename to dev-python/mod_python/mod_python-3.3.1.ebuild index d5985ed15b3b..1a80010aa254 100644 --- a/dev-python/mod_python/mod_python-3.1.4-r1.ebuild +++ b/dev-python/mod_python/mod_python-3.3.1.ebuild @@ -1,10 +1,13 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/mod_python/mod_python-3.1.4-r1.ebuild,v 1.12 2007/01/15 19:59:55 chtekk Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/mod_python/mod_python-3.3.1.ebuild,v 1.1 2007/03/16 11:02:42 dev-zero Exp $ -inherit python eutils apache-module multilib autotools +WANT_AUTOCONF=latest +WANT_AUTOMAKE=none -KEYWORDS="alpha amd64 ia64 ppc sparc x86" +inherit python apache-module multilib autotools + +KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86" DESCRIPTION="An Apache2 module providing an embedded Python interpreter." HOMEPAGE="http://www.modpython.org/" @@ -19,7 +22,7 @@ RDEPEND="${DEPEND}" APACHE2_MOD_CONF="16_${PN}" APACHE2_MOD_DEFINE="PYTHON" -DOCFILES="README NEWS CREDITS COPYRIGHT" +DOCFILES="README NEWS CREDITS" need_apache2 @@ -28,21 +31,16 @@ src_unpack() { cd "${S}" # Remove optimisations, we do that outside Portage - sed -ie 's:--optimize 2:--no-compile:' "dist/Makefile.in" - - # Fix compilation when using Python 2.3 or newer - if has_version ">=dev-lang/python-2.3" ; then - sed -ie 's:LONG_LONG:PY_LONG_LONG:g' "${S}/src/requestobject.c" - fi + sed -i \ + -e 's:--optimize 2:--no-compile:' \ + "dist/Makefile.in" - # Fix configure with Bash 3.1 - epatch "${FILESDIR}/${P}-configure-bash-3.1.patch" eautoconf } src_compile() { econf --with-apxs=${APXS2} || die "econf failed" - emake OPT="`apxs2 -q CFLAGS` -fPIC" || die "emake failed" + emake OPT="`apxs2 -q CFLAGS` -fPIC" || die "econf failed" } src_install() { @@ -51,6 +49,16 @@ src_install() { apache-module_src_install } +src_test() { + python_version + cd test + PYTHONPATH="$(ls -d ${S}/dist/build/lib.*)" + sed -i \ + -e "120ios.environ['PYTHONPATH']=\"${PYTHONPATH}\"" \ + test.py || die "sed failed" + "${python}" test.py || die "tests failed" +} + pkg_postinst() { python_version python_mod_optimize "/usr/$(get_libdir)/python${PYVER}/site-packages/mod_python" @@ -58,5 +66,6 @@ pkg_postinst() { } pkg_postrm() { - python_mod_cleanup + python_version + python_mod_cleanup "/usr/$(get_libdir)/python${PYVER}/site-packages/mod_python" } -- 2.26.2