Revision bump. Closes bug #230211. Thanks Cilly <cilly@cilly.mine.nu> for the patch

Package-Manager: portage-2.1.4.4

4 files changed, 91 insertions, 5 deletions

diff --git a/www-apache/mod_python/ChangeLog b/www-apache/mod_python/ChangeLog
index 2f641bb7c5b8..a182ff10625c 100644
--- a/www-apache/mod_python/ChangeLog
+++ b/www-apache/mod_python/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-apache/mod_python
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_python/ChangeLog,v 1.13 2008/05/29 18:12:41 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_python/ChangeLog,v 1.14 2008/08/25 01:42:55 neurogeek Exp $
+
+*mod_python-3.3.1-r1 (24 Aug 2008)
+
+  24 Aug 2008; Jesus Rivero <neurogeek@gentoo.org>
+  +files/mod_python-apr_brigade_sentinel.patch, +mod_python-3.3.1-r1.ebuild:
+  Revision bump. Closes bug #230211. Thanks Cilly <cilly@cilly.mine.nu> for
+  the patch
 
   29 May 2008; Ali Polatel <hawking@gentoo.org> mod_python-3.3.1.ebuild:
   python_mod_{cleanup,optimize} are ROOT aware.
diff --git a/www-apache/mod_python/Manifest b/www-apache/mod_python/Manifest
index 11b35db07110..e086b5d18d9e 100644
--- a/www-apache/mod_python/Manifest
+++ b/www-apache/mod_python/Manifest
@@ -2,14 +2,16 @@
 Hash: SHA1
 
 AUX 16_mod_python.conf 976 RMD160 41fc6205641f081e5fe8c73ce09dff3913dcf5dc SHA1 147236f89633d2a92efbeaaf1bd1f140d9f510ae SHA256 a04639a0e18fc7d3f503706d285bee4a14b007ef1faa2810cd6e7ca642f2f30e
+AUX mod_python-apr_brigade_sentinel.patch 520 RMD160 63527bf7374051ab1408a2c5df924f16caa4c9ed SHA1 4710248b4f02108bdc5cb6ee3ca8453175a54cdb SHA256 d2cf3ed0d8261dbe8262a394e9723601bc6d87ec24ea8dbcb1b3bc5c58eaa67b
 DIST mod_python-3.3.1.tgz 447954 RMD160 f78f93172963317f4318f8f2455419743c8fb4f5 SHA1 e538170fd78e09408b6d8593da980b126a0fef93 SHA256 ad2331fd5fcfd720ef9e3482973fc2d06eff36ba0c44693cfa42056a62175a6b
+EBUILD mod_python-3.3.1-r1.ebuild 1632 RMD160 d1097608b63bb1afe4cfad88ff810318abed1852 SHA1 6992183f6476c343a64d2163ba3f09837ed6945b SHA256 0c0a903ba92c4a9379c909c7a85f59004f1494be1a424753e1073f5a2e88c72d
 EBUILD mod_python-3.3.1.ebuild 1586 RMD160 5dd0f0423ee86b5b1e7baab7b95afc9988f06e46 SHA1 e78b8258012b2acdad651940bc34ebcdc5278290 SHA256 292b92f76e51ddff30655f07222e0c932bf69a749d86b8d7ed02123b07146171
-MISC ChangeLog 10131 RMD160 34f692f4c869617e3274d51f3a895b36b706f450 SHA1 dd597ffcfe9038651dcddc1152afffe0b2a210d1 SHA256 e03397296715667c03f8b8eb09cfcf8ed12c024d9f2bc8c6887c8fd3b750f244
+MISC ChangeLog 10386 RMD160 18107f55623ecb5fcccae9f75526c2f8bf065018 SHA1 c0e729eea93166b1e480f08bd3dc8c945045d3dd SHA256 17539feb8cae3d31d5ccfa84c8a824c35947b6ad5837106eae102d7db9ae73f0
 MISC metadata.xml 1085 RMD160 310896be489387af5fa6ddd0ff71e76e937046f5 SHA1 7d85ace0fdbdb904078092813167e37849adfcde SHA256 db3fffe1dc8c7e619fc661ba7bc9bacb0c1404a0ead197c1418ccc53c584ef32
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkg+8hsACgkQQU4yORhF8iDt6QCdE1cEsixgOxaWw7PwbQq0xJ5n
-7JcAn2JyO2x94k7Sg3LjsI/+dYV0QCdv
-=uz8W
+iEYEARECAAYFAkixzsgACgkQdIssYB9vBoPGSwCdFokD0/DFLpU/s0Hm3Uu3v6lP
+gMUAmwa5xR1S1xs2rIt8TA4mEMF8SvOj
+=T5uF
 -----END PGP SIGNATURE-----
diff --git a/www-apache/mod_python/files/mod_python-apr_brigade_sentinel.patch b/www-apache/mod_python/files/mod_python-apr_brigade_sentinel.patch
new file mode 100644
index 000000000000..95e3ea2eccfb
--- /dev/null
+++ b/www-apache/mod_python/files/mod_python-apr_brigade_sentinel.patch
@@ -0,0 +1,12 @@
+diff -burN mod_python-3.3.1.original/src/connobject.c mod_python-3.3.1/src/connobject.c
+--- mod_python-3.3.1.original/src/connobject.c	2006-12-03 05:36:37.000000000 +0100
++++ mod_python-3.3.1/src/connobject.c	2008-07-15 01:05:01.000000000 +0200
+@@ -139,7 +139,7 @@
+     bytes_read = 0;
+ 
+     while ((bytes_read < len || len == 0) &&
+-           !(b == APR_BRIGADE_SENTINEL(b) ||
++           !(b == APR_BRIGADE_SENTINEL(bb) ||
+              APR_BUCKET_IS_EOS(b) || APR_BUCKET_IS_FLUSH(b))) {
+ 
+         const char *data;
\ No newline at end of file
diff --git a/www-apache/mod_python/mod_python-3.3.1-r1.ebuild b/www-apache/mod_python/mod_python-3.3.1-r1.ebuild
new file mode 100644
index 000000000000..dd554ca98e76
--- /dev/null
+++ b/www-apache/mod_python/mod_python-3.3.1-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_python/mod_python-3.3.1-r1.ebuild,v 1.1 2008/08/25 01:42:55 neurogeek Exp $
+
+inherit eutils python apache-module multilib
+
+KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86"
+
+DESCRIPTION="An Apache2 module providing an embedded Python interpreter."
+HOMEPAGE="http://www.modpython.org/"
+SRC_URI="mirror://apache/httpd/modpython/${P}.tgz"
+LICENSE="Apache-1.1"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-lang/python"
+RDEPEND="${DEPEND}"
+
+APACHE2_MOD_CONF="16_${PN}"
+APACHE2_MOD_DEFINE="PYTHON"
+
+DOCFILES="README NEWS CREDITS"
+
+need_apache2
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${PN}-apr_brigade_sentinel.patch"
+	# Remove optimisations, we do that outside Portage
+	sed -i -e 's:--optimize 2:--no-compile:' dist/Makefile.in
+}
+
+src_compile() {
+	econf --with-apxs=${APXS} || die "econf failed"
+	sed -i -e 's/ -Wl,--hash-style  $//' src/Makefile
+	emake OPT="`apxs2 -q CFLAGS` -fPIC" || die "econf failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dohtml -r doc-html/*
+	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 $(python_get_sitedir)/mod_python
+	apache-module_pkg_postinst
+}
+
+pkg_postrm() {
+	python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/mod_python
+}