version bump wrt #220909

Package-Manager: portage-2.1.5.2

4 files changed, 155 insertions, 8 deletions

diff --git a/www-apache/mod_perl/ChangeLog b/www-apache/mod_perl/ChangeLog
index ef519e5f45e8..f5fb9e567e76 100644
--- a/www-apache/mod_perl/ChangeLog
+++ b/www-apache/mod_perl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-apache/mod_perl
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_perl/ChangeLog,v 1.65 2008/05/28 13:25:32 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_perl/ChangeLog,v 1.66 2008/06/01 12:36:46 hollow Exp $
+
+*mod_perl-2.0.4 (01 Jun 2008)
+
+  01 Jun 2008; Benedikt Böhm <hollow@gentoo.org> +mod_perl-2.0.4.ebuild:
+  version bump wrt #220909
 
   28 May 2008; Guy Martin <gmsoft@gentoo.org> ChangeLog:
   Stable on hppa.
diff --git a/www-apache/mod_perl/Manifest b/www-apache/mod_perl/Manifest
index bdeed1644283..223d3c55ed0f 100644
--- a/www-apache/mod_perl/Manifest
+++ b/www-apache/mod_perl/Manifest
@@ -1,9 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 2.0.3/75_mod_perl.conf 1221 RMD160 5fe4dee7d3123be5f3cd8cd41bb54fd1b63f0328 SHA1 068bf3f674a13e1db51046851a837ee7501353b7 SHA256 e7c2f4b84e9c9fc73e421740736f67674ebc7e7f13f8b2f71c9360f746fd441a
 AUX 2.0.3/apache2-mod_perl-startup.pl 478 RMD160 ef12070dd5e5707286e3c714ec3aeae78ce5cfd4 SHA1 80ece64910771b6c36d7b2d30373287bc1bf4b87 SHA256 f77741fb3bb18928fb15f95c6908a17d8f06d7efbb6785e0732f201347e26544
 AUX RegistryCooker.patch 1226 RMD160 21c434c214e1d6104a7aafd2330cbc70c717f768 SHA1 be4887aa6ba38a8cba5f1ceff1ccdd69e539a44c SHA256 f0d3e610cdac459de535143acf1f9a2a319327f9f956455a5279b02915e4a637
 AUX mod_perl-2.0.1-sneak-tmpdir.patch 337 RMD160 56c6023dc46bb5531fa44730f52b68b8333155f0 SHA1 96b2a385e5934d99222de545836329ea359b8115 SHA256 1f319a15e3d12a349c46c0783c7ad840d81d01ed41adda55c47d4ac31595615d
 DIST mod_perl-2.0.3.tar.gz 3714974 RMD160 29662a131c1bef6e4adc551d4467d12931a4d919 SHA1 e5d8b3cd7273c284cfbd79acb953ce179322bdc9 SHA256 df257f233ed6a5c9f8589d6e059563f816bf417f164fc3364a2a434de13045f2
+DIST mod_perl-2.0.4.tar.gz 3727717 RMD160 111b8f33e2dcc43ef7a0a7d557ceb467f0c55c6d SHA1 65299a16ec414a690a48a2bbe63acaa3c6bb897b SHA256 7da2046aa65dbef64ff5b71400bed4b6b82441e6313c8ca4becb85fb4a89a0f0
 EBUILD mod_perl-2.0.3-r1.ebuild 5297 RMD160 999a76d7bd87b18294fc8ee7e01abd54af8d08ae SHA1 82d5abb09b794256a89bf889690e8a86b3a45994 SHA256 8a503f3f1f9c8458f164257b60a79b1118f1c649c7d6c8d265d677a2af91b924
 EBUILD mod_perl-2.0.3-r2.ebuild 4467 RMD160 e2c769b06855f0c37b3d379a16cda4107a26b358 SHA1 45e7eac3ddf641279d8ce01c660ce60bbbea664f SHA256 244c6e14d313532025bf560ffe2f90fc97117cd99bdb573a6533d7e46428666a
-MISC ChangeLog 19050 RMD160 0152fd053f299e6d884614237b2de6932e0d19b7 SHA1 b51a473895ad0a9ba10c364be6e6bd16ffeb0c0d SHA256 eea746401193b21ad5e9a920ba3f460a0625f7ab0b446b0e4b0fb7dc705616f5
+EBUILD mod_perl-2.0.4.ebuild 4297 RMD160 168e623e0293dba64f8dd6a0638586c94530dcee SHA1 b5318e983053d14c85e04a405ef005388a98e3f4 SHA256 d1cc815e7eae36a903d0cb08930ae1d157f3f7ddecae65b8dfb91c5646184137
+MISC ChangeLog 19183 RMD160 b0753a7075d1d4f0786eaa9608f898f00968ffe4 SHA1 5a63cb128b2a9fb90b97cef20f4aa0bf7b5378a8 SHA256 2dfd51b95a5fb17950044e46362f5714e73f648fdeaa45eebe9fe80bd3d4d479
 MISC metadata.xml 289 RMD160 490c4256f14e1d9f37d432f700d4daea64a76b7c SHA1 e17d9d05b33898dddf745543d699ccb7348afc0a SHA256 a6c8f7ccb9eed3ab8dc936a39b96af61d48b48734852c78b80d85979508a13ce
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkhCl+gACgkQmPFBzbX68WGdagCff+qfgqUt7NHxE9dT8VxW4U6a
+VFMAnja/7/WHkx5kmE0zja8uSWyVnzNT
+=mmi0
+-----END PGP SIGNATURE-----
diff --git a/www-apache/mod_perl/mod_perl-2.0.4.ebuild b/www-apache/mod_perl/mod_perl-2.0.4.ebuild
new file mode 100644
index 000000000000..1df260f7f804
--- /dev/null
+++ b/www-apache/mod_perl/mod_perl-2.0.4.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_perl/mod_perl-2.0.4.ebuild,v 1.1 2008/06/01 12:36:46 hollow Exp $
+
+inherit apache-module perl-module eutils multilib
+
+DESCRIPTION="An embedded Perl interpreter for Apache2"
+SRC_URI="mirror://cpan/authors/id/P/PG/PGOLLUCCI/${P}.tar.gz"
+HOMEPAGE="http://perl.apache.org/"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+SLOT="1"
+
+# see bug 30087 for why sudo is in here
+DEPEND=">=dev-perl/Apache-Test-1.27
+	>=virtual/perl-CGI-3.08
+	>=dev-perl/Compress-Zlib-1.09
+	app-admin/sudo"
+RDEPEND="${DEPEND}"
+
+APACHE2_MOD_FILE="${S}/src/modules/perl/mod_perl.so"
+APACHE2_MOD_CONF="2.0.3/75_${PN}"
+APACHE2_MOD_DEFINE="PERL"
+
+DOCFILES="Changes INSTALL LICENSE README STATUS"
+
+need_apache2
+
+pkg_setup() {
+	has_apache_threads_in dev-lang/perl ithreads
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# I am not entirely happy with this solution, but here's what's
+	# going on here if someone wants to take a stab at another
+	# approach.  When userpriv compilation is off, then the make
+	# process drops to user "nobody" to run the test servers.  This
+	# server is closed, and then the socket is rebound using
+	# SO_REUSEADDR.  If the same user does this, there is no problem,
+	# and the socket may be rebound immediately.  If a different user
+	# (yes, in my testing, even root) attempts to rebind, it fails.
+	# Since the "is the socket available yet" code and the
+	# second-batch bind call both run as root, this will fail.
+
+	# The upstream settings on my test machine cause the second batch
+	# of tests to fail, believing the socket to still be in use.  I
+	# tried patching various parts to make them run as the user
+	# specified in $config->{vars}{user} using getpwnam, but found
+	# this patch to be fairly intrusive, because the userid must be
+	# restored and the patch must be applied to multiple places.
+
+	# For now, we will simply extend the timeout in hopes that in the
+	# non-userpriv case, the socket will clear from the kernel tables
+	# normally, and the tests will proceed.
+
+	# If anybody is still having problems, then commenting out "make
+	# test" below should allow the software to build properly.
+
+	# Robert Coie <rac@gentoo.org> 2003.05.06
+
+	sed -i -e "s/sleep \$_/sleep \$_ << 2/" \
+		"${S}"/Apache-Test/lib/Apache/TestServer.pm \
+		|| die "problem editing TestServer.pm"
+
+	# rendhalver - this got redone for 2.0.1 and seems to fix the make test problems
+	epatch "${FILESDIR}"/mod_perl-2.0.1-sneak-tmpdir.patch
+}
+
+src_compile() {
+	perl Makefile.PL \
+		PREFIX="${D}"/usr \
+		MP_TRACE=1 \
+		MP_DEBUG=1 \
+		MP_USE_DSO=1 \
+		MP_APXS=${APXS}  \
+		INSTALLDIRS=vendor </dev/null || die
+
+	# reported that parallel make is broken in bug 30257
+	emake -j1 || die
+}
+
+src_test() {
+	# make test notes whether it is running as root, and drops
+	# privileges all the way to "nobody" if so, so we must adjust
+	# write permissions accordingly in this case.
+
+	# IF YOU SUDO TO EMERGE AND HAVE !env_reset set testing will fail!
+	if [[ "$(id -u)" == "0" ]]; then
+		chown nobody:nobody "${WORKDIR}"
+		chown nobody:nobody "${T}"
+	fi
+
+	# this does not || die because of bug 21325.  kudos to smark for
+	# the idea of setting HOME.
+	TMPDIR="${T}" HOME="${T}/" make test
+}
+
+src_install() {
+	apache-module_src_install
+
+	dodir "${APACHE_MODULESDIR}"
+	make install \
+		MODPERL_AP_LIBEXECDIR="${D}${APACHE_MODULESDIR}" \
+		MODPERL_AP_INCLUDEDIR="${D}${APACHE_INCLUDEDIR}" \
+		MP_INST_APACHE2=1 \
+		INSTALLDIRS=vendor || die
+
+	# rendhalver - fix the perllocal.pod that gets installed
+	# it seems to me that this has been getting installed for ages
+	fixlocalpod
+
+	insinto "${APACHE_MODULES_CONFDIR}"
+	doins "${FILESDIR}"/${PV}/apache2-mod_perl-startup.pl
+	cp -pPR docs "${D}"/usr/share/doc/${PF}
+	cp -pPR todo "${D}"/usr/share/doc/${PF}
+
+	# this is an attempt to get @INC in line with /usr/bin/perl.
+	# there is blib garbage in the mainstream one that can only be
+	# useful during internal testing, so we wait until here and then
+	# just go with a clean slate.  should be much easier to see what's
+	# happening and revert if problematic.
+	for FILE in $(grep -lr portage "${D}"/*|grep -v ".so"); do
+		sed -i -e "s:${D}:/:g" ${FILE}
+	done
+}
diff --git a/www-apache/mod_security/Manifest b/www-apache/mod_security/Manifest
index eeec0be570f8..0ca0fccf6217 100644
--- a/www-apache/mod_security/Manifest
+++ b/www-apache/mod_security/Manifest
@@ -3,19 +3,19 @@ Hash: SHA1
 
 AUX 2.1.2/99_mod_security.conf 198 RMD160 cde9de9e21d3e31467737a87fe6af73e18827bc6 SHA1 f41792ed3de6955786d5b08da708c74e2be6d3bf SHA256 45ae219fca3eddadf47b9ebd1ebd44c668833b894a38672c481a828af97cdfcf
 DIST modsecurity-apache_2.1.2.tar.gz 657803 RMD160 3d0d2a767133ab1ec1ef3848e2f85c3c1652cf1f SHA1 ee0f851308c0b0b87b620c83b3532d495528fa8d SHA256 88644e0a512534e394d434df3f0f233889d9e6a5a91ed2e893b5bb9a4d190c8a
-DIST modsecurity-apache_2.1.4-rc1.tar.gz 676134 RMD160 b35ca41a076a91ded4508430c6abbcf206abecaa SHA1 cf1131be899ad4b56c2c78871ac72e7ff2cb075f SHA256 6af611efc37d6e7fbb41503eb339e7604e0910f4a2867c20c32e6bf21885f8bf
 DIST modsecurity-apache_2.1.6.tar.gz 679366 RMD160 3133e67f415ba3273563e6f4e0a43c7ecc7812ae SHA1 08c2d18d555159fa7cab626c410f92a7bbfa57b3 SHA256 144e2c82a5b0f356e11148184d97634302c6c4281aef68d2700b970b84536273
 DIST modsecurity-apache_2.5.1.tar.gz 1045582 RMD160 43f1c0ab702363ebfe15a220d17dcbe1c535daa1 SHA1 b9965bb801445833aa04ac62c90c0e374426dd73 SHA256 d66838c6f88c1c38dad7c862a5f08b33cb6b80220c66b3a17439570e89169b0e
+DIST modsecurity-apache_2.5.4.tar.gz 1071980 RMD160 a4fd4029ef3bd17a2a68b5f3bbbb3a11bdcbcdfb SHA1 b17dd1a65b6aace86e65f44271a418e2b119a323 SHA256 be515456add43ecac6c441da1fcdb1ab94908ae6ff0c837854bcf141343932ae
 EBUILD mod_security-2.1.2.ebuild 1400 RMD160 1182531b3194a46b014a140212d2190a2957fe96 SHA1 023b1817c4e1181a77f8b9a9b2135dae39d29e31 SHA256 5edc46ed1e7fc8a4d2f232e2c7f45de54ba10e9c5b43b2274d64764a46b23037
-EBUILD mod_security-2.1.4_rc1.ebuild 1428 RMD160 c6018dbef11b4cc3e6d3750b661cd0f91ad0eaf4 SHA1 77f94060b0f0cf8851c6d2927c31c7d43dc873f4 SHA256 51b10b77034fceb20da324e7f3dce302c143da1156dc5ee810f55af475c84485
 EBUILD mod_security-2.1.6.ebuild 1424 RMD160 687f4e0692cb8443411d5df23ab9d301215c9a37 SHA1 961cf48f6330f014c57a476838388ac386273377 SHA256 6578d751df77c29dc41e4cf1d8b80b86434efc32393327eaaa184c05d68cba3b
 EBUILD mod_security-2.5.1.ebuild 1577 RMD160 62cca868a725ed26313f03f7fb7e6309ba943936 SHA1 d5ed30f65747836a920cd7fd8e30a7e235773e6c SHA256 e0584327b4f0045e263ba1c04b6238970c7d72fbdf5c4b00cffe14222188207d
-MISC ChangeLog 5874 RMD160 e297336b494602f4e073ae5a8fece82dd241ac8c SHA1 da3bfa08925395a1e558ad30dbd2d4f5ff242e84 SHA256 c999c7d374c5e13b8894b8f2e42c88cbf1197f1bf767412257e1af6ae74eb6b7
+EBUILD mod_security-2.5.4.ebuild 1577 RMD160 4438563d8dee4179294da05531d0b621c0711503 SHA1 ee67d7e36cbc1ecfad8cc235053e85e82b5a6682 SHA256 10bf217cb6a9e3cfd53788c1d36c8f6ca50b5a4758d949db39f09769e4faf32e
+MISC ChangeLog 6049 RMD160 de2fdb397a671f27bc66bf959414010a942ee7f8 SHA1 cb88fcac247d3cd2ae55041252353c633a07b34d SHA256 a13a2a7e67a8be9a8dc191eaa14f7d2294d7f11d38abfc0abe192a6bc0bd91c4
 MISC metadata.xml 255 RMD160 a80959a97f317179745aa51dc813fc77fc12f431 SHA1 202b14b369f47c3f1f5b44384447c7769cc61755 SHA256 deef3dd2faff775a34529a8909b6e003cce31ee1a9858ace880da761f463ab65
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkgRvoQACgkQmPFBzbX68WFiagCeNwLa61Hh2QD4XStY4ixu0rNj
-YOEAn3+LuW/EeJPW6tOjsQoe/J8YwoOc
-=FUmd
+iEYEARECAAYFAkhCmMUACgkQmPFBzbX68WGTsgCfSQcaBG4MAxrR0rhCVdHY2ZeC
+IK0An2/YFXyRLXFXrWPf346qhDBdChCJ
+=B/+j
 -----END PGP SIGNATURE-----