cleanup vunerable versions, bump 2.7 series due to security update (#39154)

12 files changed, 28 insertions, 199 deletions

diff --git a/dev-python/mod_python/ChangeLog b/dev-python/mod_python/ChangeLog
index effa930ed2ed..bec16b1ec910 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-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mod_python/ChangeLog,v 1.11 2003/12/13 03:04:16 kloeri Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mod_python/ChangeLog,v 1.12 2004/01/24 21:06:45 liquidx Exp $
+
+*mod_python-2.7.10 (24 Jan 2004)
+
+  24 Jan 2004; Alastair Tse <liquidx@gentoo.org> mod_python-2.7.8.ebuild,
+  mod_python-2.7.9.ebuild, mod_python-3.0.3.ebuild,
+  files/mod_python-3.0.3-dest1.diff, files/mod_python-3.0.3-dest2.diff,
+  files/patch-2.7.8.diff:
+  cleanup vunerable versions, bump 2.7 series due to security update (#39154)
 
   13 Dec 2003; Bryan Østergaard,,, <kloeri@gentoo.org>
   mod_python-3.0.3.ebuild, mod_python-3.0.4.ebuild:
diff --git a/dev-python/mod_python/Manifest b/dev-python/mod_python/Manifest
index 1c95732e5ba4..b54b88678fac 100644
--- a/dev-python/mod_python/Manifest
+++ b/dev-python/mod_python/Manifest
@@ -1,15 +1,8 @@
-MD5 bd87bc5760aea537ccb33141181edd1b mod_python-3.0.4.ebuild 1743
-MD5 e1b86e5574bcdb91f2574b467320fd89 mod_python-2.7.8.ebuild 2482
-MD5 32d2d5bf14b22fdf0936cd0b99d9d989 mod_python-3.0.3.ebuild 1722
-MD5 8d354ec671cfdc297b13dd29a7d0e2c4 mod_python-2.7.9.ebuild 2564
-MD5 558bb229a123fc41ba89db9fd7d17944 ChangeLog 1894
+MD5 d3722d21882fafc0920a35a85ccc5f57 ChangeLog 2232
 MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
-MD5 ff854e7ccb21572faafdc9bc82795c11 files/mod_python-3.0.3-dest1.diff 376
-MD5 155cbbec64eef8aba0304289113190f4 files/mod_python-3.0.3-dest2.diff 438
+MD5 e4c76a8d8cfd36c8b102bdf7db583855 mod_python-2.7.10.ebuild 2468
+MD5 bd87bc5760aea537ccb33141181edd1b mod_python-3.0.4.ebuild 1743
 MD5 05bbbfafd26dcf70f83fcc2b015751dc files/16_mod_python.conf 1106
-MD5 01ce560a5062d990e685e78b756fa5ba files/mod_python.conf 70
-MD5 ac95b270f8945a09277fe4e573d0e7bd files/patch-2.7.8.diff 194
-MD5 0cbbebc73f7833ec15b734bfe8397496 files/digest-mod_python-2.7.8 131
-MD5 4304a4f240ae9e992b5b158c6669845d files/digest-mod_python-2.7.9 65
-MD5 ea4bd8d232afcacbaf35bb406028b92b files/digest-mod_python-3.0.3 65
+MD5 eedde8a8dd90829d24fdb18cc86054f6 files/digest-mod_python-2.7.10 66
 MD5 1fbcf045bdfe9827a893a88a56407656 files/digest-mod_python-3.0.4 65
+MD5 01ce560a5062d990e685e78b756fa5ba files/mod_python.conf 70
diff --git a/dev-python/mod_python/files/digest-mod_python-2.7.10 b/dev-python/mod_python/files/digest-mod_python-2.7.10
new file mode 100644
index 000000000000..6786b906ffea
--- /dev/null
+++ b/dev-python/mod_python/files/digest-mod_python-2.7.10
@@ -0,0 +1 @@
+MD5 12c98bdefa06735679efc878b81e9bb2 mod_python-2.7.10.tgz 175631
diff --git a/dev-python/mod_python/files/digest-mod_python-2.7.8 b/dev-python/mod_python/files/digest-mod_python-2.7.8
deleted file mode 100644
index 6beff81ee5e8..000000000000
--- a/dev-python/mod_python/files/digest-mod_python-2.7.8
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 4d5bee8317bfb45a3bb09f02b435e917 mod_python-2.7.8.tgz 176639
-MD5 52e9b875597a208fca9d393e710087b6 apache_1.3.26.tar.gz 2303147
diff --git a/dev-python/mod_python/files/digest-mod_python-2.7.9 b/dev-python/mod_python/files/digest-mod_python-2.7.9
deleted file mode 100644
index 7dfa49a5e755..000000000000
--- a/dev-python/mod_python/files/digest-mod_python-2.7.9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 fc8c83b310d22a75491de3c2647a0f71 mod_python-2.7.9.tgz 176181
diff --git a/dev-python/mod_python/files/digest-mod_python-3.0.3 b/dev-python/mod_python/files/digest-mod_python-3.0.3
deleted file mode 100644
index 6d6688b42e98..000000000000
--- a/dev-python/mod_python/files/digest-mod_python-3.0.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 39f8db0bafac6ce241599d2299b5d853 mod_python-3.0.3.tgz 219378
diff --git a/dev-python/mod_python/files/mod_python-3.0.3-dest1.diff b/dev-python/mod_python/files/mod_python-3.0.3-dest1.diff
deleted file mode 100644
index dba4c03578e1..000000000000
--- a/dev-python/mod_python/files/mod_python-3.0.3-dest1.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	2002-12-30 18:59:34.000000000 +0000
-+++ Makefile.in	2003-09-08 01:56:03.000000000 +0000
-@@ -93,7 +93,7 @@
- 	@echo
- 	@echo "Performing DSO installation."
- 	@echo
--	$(INSTALL) src/mod_python.so $(LIBEXECDIR)
-+	$(INSTALL) src/mod_python.so $(DESTDIR)$(LIBEXECDIR)
- 	@$(MAKE) install_py_lib
- 	@echo
- 	@echo "Now don't forget to edit your main config and add"
diff --git a/dev-python/mod_python/files/mod_python-3.0.3-dest2.diff b/dev-python/mod_python/files/mod_python-3.0.3-dest2.diff
deleted file mode 100644
index 384ed145f0f3..000000000000
--- a/dev-python/mod_python/files/mod_python-3.0.3-dest2.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- dist/Makefile.in.orig	2003-09-08 02:26:56.000000000 +0000
-+++ dist/Makefile.in	2003-09-08 02:29:20.000000000 +0000
-@@ -79,7 +79,7 @@
- 	cd dist; \
- 	gunzip -c mod_python-$(MP_VERSION).tar.gz | tar xf -; \
- 	cd mod_python-$(MP_VERSION); \
--	$(PYTHON_BIN) setup.py install --optimize 2 --force; \
-+	$(PYTHON_BIN) setup.py install --prefix=${DESTDIR}/usr --optimize 2 --force; \
- 	cd ..; rm -rf mod_python-$(MP_VERSION)
- 
- mod_python.so:
diff --git a/dev-python/mod_python/files/patch-2.7.8.diff b/dev-python/mod_python/files/patch-2.7.8.diff
deleted file mode 100644
index d9e04e746e13..000000000000
--- a/dev-python/mod_python/files/patch-2.7.8.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Makefile.in
-+++ src/Makefile.in	2000/11/27 11:11:21
-@@ -59,7 +59,7 @@
- INCLUDES=@INCLUDES@
- LIBS=@LIBS@
- LDFLAGS=@LDFLAGS@
--OPT=
-+OPT=$(OPTFLAGS)
- CFLAGS=$(OPT) $(INCLUDES) 
- srcdir=.
- 
diff --git a/dev-python/mod_python/mod_python-2.7.9.ebuild b/dev-python/mod_python/mod_python-2.7.10.ebuild
index f055b9a2ae55..b23d01703cdd 100644
--- a/dev-python/mod_python/mod_python-2.7.9.ebuild
+++ b/dev-python/mod_python/mod_python-2.7.10.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mod_python/mod_python-2.7.9.ebuild,v 1.1 2003/12/12 02:44:23 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mod_python/mod_python-2.7.10.ebuild,v 1.1 2004/01/24 21:06:45 liquidx Exp $
+
+inherit python
 
 DESCRIPTION="Python module for Apache 1.x, not for Apache 2.x"
 SRC_URI="http://www.apache.org/dist/httpd/modpython/${P}.tgz"
@@ -9,16 +11,16 @@ HOMEPAGE="http://www.modpython.org/"
 LICENSE="as-is"
 KEYWORDS="~x86"
 SLOT="0"
+IUSE=""
 
-DEPEND="=net-www/apache-1* dev-lang/python"
+DEPEND="=net-www/apache-1*"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
 	# This patch from SuSE fixes the missing CFLAGS.
 	# If you remove it, your apache will most likely
 	# fail (lots of dieing pids in error_log).
-	sed -i -e 's:OPT=:OPT=$(OPTFLAGS):' src/Makefile.in
+	sed -e 's:OPT=:OPT=$(OPTFLAGS):' -i ${S}/src/Makefile.in
 }
 
 src_compile() {
@@ -29,21 +31,19 @@ src_compile() {
 	export OPTFLAGS="`/usr/sbin/apxs -q CFLAGS`"
 	econf --with-apxs=/usr/sbin/apxs
 
-	cp Makefile Makefile.orig
 	sed -e 's/LIBEXECDIR=\/usr\/lib\/apache/LIBEXECDIR=${D}\/usr\/lib\/apache-extramodules/' \
 		-e 's/PY_STD_LIB=/PY_STD_LIB=${D}/' \
-		Makefile.orig > Makefile
+		-i Makefile
 
-	cd src
-	cp Makefile Makefile.orig
 	sed -e 's/CFLAGS=$(OPT) $(INCLUDES)/CFLAGS=$(OPT) $(INCLUDES) -DEAPI -O0/' \
-		Makefile.orig > Makefile
+		-i ${S}/src/Makefile
 
 	emake || die "emake failed"
 }
 
 src_install() {
-	PY_LIBPATH="/usr/lib/python$(python -c 'import sys; print sys.version[0:3]')"
+	python_version
+	PY_LIBPATH="/usr/lib/python${PYVER}"
 
 	dodir /usr/lib/apache-extramodules
 	dodir ${PY_LIBPATH}
@@ -57,9 +57,9 @@ src_install() {
 	insinto /etc/apache/conf/addon-modules
 	doins ${FILESDIR}/mod_python.conf
 	dodoc COPYRIGHT CREDITS NEWS README
-	insinto /usr/share/doc/${P}/html
+	insinto /usr/share/doc/${PF}/html
 	doins doc-html/*
-	insinto /usr/share/doc/${P}/html/icons
+	insinto /usr/share/doc/${PF}/html/icons
 	doins doc-html/icons/*
 }
 
diff --git a/dev-python/mod_python/mod_python-2.7.8.ebuild b/dev-python/mod_python/mod_python-2.7.8.ebuild
deleted file mode 100644
index da8531459a42..000000000000
--- a/dev-python/mod_python/mod_python-2.7.8.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mod_python/mod_python-2.7.8.ebuild,v 1.11 2003/09/10 22:29:45 msterret Exp $
-
-DESCRIPTION="Python module for Apache 1.x, not for Apache 2.x"
-SRC_URI="http://www.modpython.org/dist/${P}.tgz"
-HOMEPAGE="http://www.modpython.org/"
-
-LICENSE="as-is"
-KEYWORDS="~x86"
-SLOT="0"
-
-DEPEND="=net-www/apache-1* dev-lang/python"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	# This patch from SuSE fixes the missing CFLAGS.
-	# If you remove it, your apache will most likely
-	# fail (lots of dieing pids in error_log).
-	patch -p0 < ${FILESDIR}/patch-2.7.8.diff
-}
-
-src_compile() {
-	# If we dont add that, ./configure breaks this ebuild
-	# because the last task (make depend) is somehow borked
-	echo 'echo "configure done"' >> configure
-
-	export OPTFLAGS="`/usr/sbin/apxs -q CFLAGS`"
-	econf --with-apxs=/usr/sbin/apxs
-
-	cp Makefile Makefile.orig
-	sed -e 's/LIBEXECDIR=\/usr\/lib\/apache/LIBEXECDIR=${D}\/usr\/lib\/apache-extramodules/' \
-		-e 's/PY_STD_LIB=/PY_STD_LIB=${D}/' \
-		Makefile.orig > Makefile
-
-	cd src
-	cp Makefile Makefile.orig
-	sed -e 's/CFLAGS=$(OPT) $(INCLUDES)/CFLAGS=$(OPT) $(INCLUDES) -DEAPI -O0/' \
-		Makefile.orig > Makefile
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	dodir /usr/lib/apache-extramodules
-	dodir /usr/lib/python2.2
-	dodir /etc/apache/conf/addon-modules
-
-	# compileall.py is needed or make install will fail
-	cp /usr/lib/python2.2/compileall.py ${D}usr/lib/python2.2/
-	emake D=${D} install || die
-	rm ${D}usr/lib/python2.2/compileall.py
-
-	insinto /etc/apache/conf/addon-modules
-	doins ${FILESDIR}/mod_python.conf
-	dodoc COPYRIGHT CREDITS NEWS README
-	insinto /usr/share/doc/${P}/html
-	doins doc-html/*
-	insinto /usr/share/doc/${P}/html/icons
-	doins doc-html/icons/*
-}
-
-pkg_postinst() {
-	einfo
-	einfo "To have Apache run python programs, please do the following:"
-	einfo "1. Execute the command:"
-	einfo " \"ebuild /var/db/pkg/dev-python/${PF}/${PF}.ebuild config\""
-	einfo "2. Edit /etc/conf.d/apache and add \"-D PYTHON\""
-	einfo
-	einfo "That will include the ${PN} mime types in your configuration"
-	einfo "automagically and setup Apache to load ${PN} when it starts."
-	einfo
-}
-
-pkg_config() {
-	${ROOT}/usr/sbin/apacheaddmod \
-		${ROOT}/etc/apache/conf/apache.conf \
-		extramodules/mod_python.so mod_python.c python_module \
-		before=perl define=PYTHON addconf=conf/addon-modules/mod_python.conf
-	:;
-}
diff --git a/dev-python/mod_python/mod_python-3.0.3.ebuild b/dev-python/mod_python/mod_python-3.0.3.ebuild
deleted file mode 100644
index 2e541e4814b7..000000000000
--- a/dev-python/mod_python/mod_python-3.0.3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mod_python/mod_python-3.0.3.ebuild,v 1.4 2003/12/13 03:04:17 kloeri Exp $
-
-
-DESCRIPTION="An Apache2 DSO providing an embedded Python interpreter"
-HOMEPAGE="http://www.modpython.org/"
-SRC_URI="http://www.apache.org/dist/httpd/modpython/${P}.tgz"
-LICENSE="Apache-1.1"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-DEPEND="dev-lang/python >=net-www/apache-2.0"
-
-src_unpack() {
-	unpack ${A} || die
-	cd ${S} || die
-	epatch ${FILESDIR}/${P}-dest1.diff
-	epatch ${FILESDIR}/${P}-dest2.diff
-
-	# Fix compilation when using Python-2.3
-	has_version ">=dev-lang/python-2.3" && \
-		sed -i -e 's:LONG_LONG:PY_LONG_LONG:g' \
-		"${S}/src/requestobject.c"
-}
-
-src_compile() {
-	./configure --with-apxs=/usr/sbin/apxs2 || die
-	make OPT="`apxs2 -q CFLAGS` -fPIC" || die
-}
-
-src_install() {
-	dodir /usr/lib/{apache2,apache2-extramodules}
-	make install DESTDIR=${D} || die
-	mv ${D}/usr/lib/apache2/${PN}.so ${D}/usr/lib/apache2-extramodules
-	rm -rf ${D}/usr/lib/apache2
-	insinto /etc/apache2/conf/modules.d
-	doins ${FILESDIR}/16_mod_python.conf
-	dodoc ${FILESDIR}/16_mod_python.conf README NEWS CREDITS COPYRIGHT
-	dohtml doc-html/*
-	insinto /usr/share/doc/${P}/html/icons
-	doins doc-html/icons/*
-}
-
-pkg_postinst() {
-	einfo "To have Apache run python programs, please do the following:"
-	einfo "Edit /etc/conf.d/apache2 (/etc/conf.d/apache if you're using"
-	einfo "apache 1.x) and add \"-D PYTHON\""
-	einfo "That will setup Apache to load python when it starts."
-	einfo
-	einfo "If you're new to mod_python there's a manual and tutorial"
-	einfo "installed in /usr/share/doc/${P}/html/index.html."
-}
-