diff options
Diffstat (limited to 'www-apache')
25 files changed, 0 insertions, 2234 deletions
diff --git a/www-apache/mod_perl/ChangeLog b/www-apache/mod_perl/ChangeLog deleted file mode 100644 index 5f82961..0000000 --- a/www-apache/mod_perl/ChangeLog +++ /dev/null @@ -1,680 +0,0 @@ -# ChangeLog for www-apache/mod_perl -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_perl/ChangeLog,v 1.105 2012/11/27 19:27:09 pacho Exp $ - -*mod_perl-2.0.8 (21 Jun 2013) - - 21 Jun 2013; <jmbsvicetto@gentoo.org> +mod_perl-2.0.7.ebuild, - +mod_perl-2.0.8.ebuild, +files/2.0.3/75_mod_perl.conf, - +files/2.0.3/apache2-mod_perl-startup.pl, - +files/debian/010-doc-no-more-send_http_header.patch, - +files/debian/031-test-extra-args.patch, - +files/debian/099-fix-url-on-index_top.patch, - +files/debian/200_fix-pod-spelling-errors.patch, - +files/debian/260_fix_pipelined_response_deadlock.patch, - +files/debian/290-httpd-transition-test-todo.patch, - +files/debian/300-http-headers-version.patch, - +files/debian/310-defaultruntimedir.patch, - +files/debian/320-cleanup-authn-authz-providers.patch, - +files/mod_perl-2.0.1-sneak-tmpdir.patch, - +files/mod_perl-2.0.7-bundled-Apache-Test.patch, - +files/mod_perl-2.0.8-Test-ModPerl-Registry-fix.patch, - +files/mod_perl-2.0.8-Test_Mod_Proxy-apache24-fix.patch, - +files/mod_perl-2.0.8-bundled-Apache-Test.patch, +metadata.xml: - Add mod_perl to my overlay. - Use debian work to get mod_perl to build with apache-2.4 based on - http://marc.info/?l=apache-modperl&m=136987032617467&w=2 and - http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=666822 . - Many thanks to Gregor Herrmann <gregoa@debian.org> for all the pointers and - help. - - 27 Nov 2012; Pacho Ramos <pacho@gentoo.org> metadata.xml: - Drop apache herd as discussed in http://www.gossamer- - threads.com/lists/gentoo/dev/262834 - - 13 Nov 2012; Brent Baude <ranger@gentoo.org> mod_perl-2.0.7.ebuild: - Marking mod_perl-2.0.7 ppc64 for bug 432610 - - 30 Oct 2012; Christian Ruppert <idl0r@gentoo.org> -mod_perl-2.0.4-r1.ebuild, - -mod_perl-2.0.5.ebuild, -files/mod_perl-2.0.5-bundled-Apache-Test.patch, - -files/CVE-2009-0796.patch: - Cleanup - - 10 Oct 2012; Brent Baude <ranger@gentoo.org> mod_perl-2.0.7.ebuild: - Marking mod_perl-2.0.7 ppc for bug 432610 - - 18 Sep 2012; Jeroen Roovers <jer@gentoo.org> mod_perl-2.0.7.ebuild: - Stable for HPPA (bug #432610). - - 11 Sep 2012; Raúl Porcel <armin76@gentoo.org> mod_perl-2.0.7.ebuild: - alpha/ia64/sparc stable wrt #432610 - - 27 Aug 2012; Johannes Huber <johu@gentoo.org> mod_perl-2.0.7.ebuild: - Stable for x86, wrt bug #432610 - - 25 Aug 2012; Agostino Sarubbo <ago@gentoo.org> mod_perl-2.0.7.ebuild: - Stable for amd64, wrt bug #432610 - - 07 Jun 2012; Christian Ruppert <idl0r@gentoo.org> mod_perl-2.0.7.ebuild: - 2.0.7 is still not apache 2.4 ready - -*mod_perl-2.0.7 (06 Jun 2012) - - 06 Jun 2012; Christian Ruppert <idl0r@gentoo.org> +mod_perl-2.0.7.ebuild, - +files/mod_perl-2.0.7-bundled-Apache-Test.patch: - Version bump, bug 419839 - - 03 Apr 2012; Christian Ruppert <idl0r@gentoo.org> mod_perl-2.0.4-r1.ebuild, - mod_perl-2.0.5.ebuild: - Depend on apache <2.4* - - 19 Nov 2011; Christian Ruppert <idl0r@gentoo.org> mod_perl-2.0.5.ebuild: - Add debug useflag to enable/disable MP_TRACE and MP_DEBUG. - - 09 Aug 2011; Kacper Kowalik <xarthisius@gentoo.org> mod_perl-2.0.5.ebuild: - Marked ~ppc/~ppc64 wrt #359047 - - 22 Jul 2011; Jeroen Roovers <jer@gentoo.org> mod_perl-2.0.5.ebuild: - Marked ~hppa (bug #359047). - - 04 Jul 2011; Christian Ruppert <idl0r@gentoo.org> mod_perl-2.0.5.ebuild: - Fix apache/perl dependencies again, bug 373943. - - 01 Jul 2011; Christian Ruppert <idl0r@gentoo.org> mod_perl-2.0.5.ebuild: - Fix Dependencies. Add threads useflag. - - 15 May 2011; Raúl Porcel <armin76@gentoo.org> mod_perl-2.0.5.ebuild: - Add ~alpha/~ia64/~sparc wrt #359047 - - 21 Mar 2011; Christian Ruppert <idl0r@gentoo.org> metadata.xml: - Add myself as primary maintainer - -*mod_perl-2.0.5 (14 Mar 2011) - - 14 Mar 2011; Christian Ruppert <idl0r@gentoo.org> +mod_perl-2.0.5.ebuild, - +files/mod_perl-2.0.5-bundled-Apache-Test.patch: - Version bump, bug 355303, fixes also bug 352724. - - 07 Mar 2010; Benedikt Böhm <hollow@gentoo.org> mod_perl-2.0.4-r1.ebuild: - remove duplicate dependency on apache - - 12 Jan 2010; Benedikt Böhm <hollow@gentoo.org> mod_perl-2.0.4-r1.ebuild: - fix #300730 - - 11 Jan 2010; Benedikt Böhm <hollow@gentoo.org> mod_perl-2.0.4-r1.ebuild: - convert to EAPI2 wrt #296219 - - 18 Sep 2009; Benedikt Böhm <hollow@gentoo.org> -mod_perl-2.0.3-r2.ebuild, - -mod_perl-2.0.4.ebuild, -files/RegistryCooker.patch: - remove old ebuilds - - 22 Jul 2009; Joseph Jezak <josejx@gentoo.org> mod_perl-2.0.4-r1.ebuild: - Marked ppc/ppc64 stable early for bug #266035. - - 19 Jul 2009; nixnut <nixnut@gentoo.org> mod_perl-2.0.4-r1.ebuild: - ~ppc #276593 - - 19 Jul 2009; Torsten Veller <tove@gentoo.org> mod_perl-2.0.3-r2.ebuild, - mod_perl-2.0.4.ebuild, mod_perl-2.0.4-r1.ebuild: - IO-Compress replaces Compress-Zlib - - 08 Jul 2009; Markus Meier <maekke@gentoo.org> mod_perl-2.0.4-r1.ebuild: - amd64 stable, bug #266035 - - 08 Jul 2009; Raúl Porcel <armin76@gentoo.org> mod_perl-2.0.4-r1.ebuild: - alpha/ia64/sparc stable wrt #276593 - - 07 Jul 2009; Jeroen Roovers <jer@gentoo.org> mod_perl-2.0.4-r1.ebuild: - Stable for HPPA (bug #266035). - - 07 Jul 2009; Christian Faulhammer <fauli@gentoo.org> - mod_perl-2.0.4-r1.ebuild: - stable x86, security bug 266035 - - 07 Jul 2009; Benedikt Böhm <hollow@gentoo.org> mod_perl-2.0.4-r1.ebuild: - fix circular dependencies - - 07 Jul 2009; Jeroen Roovers <jer@gentoo.org> mod_perl-2.0.4-r1.ebuild: - Marked ~hppa (bug #266035). - - 07 Jul 2009; Benedikt Böhm <hollow@gentoo.org> mod_perl-2.0.4-r1.ebuild: - add blocker wrt #276707 - - 05 Jul 2009; Benedikt Böhm <hollow@gentoo.org> mod_perl-2.0.4-r1.ebuild: - fix #224985, #243244 - -*mod_perl-2.0.4-r1 (05 Jul 2009) - - 05 Jul 2009; Benedikt Böhm <hollow@gentoo.org> - +files/CVE-2009-0796.patch, -mod_perl-2.0.3-r1.ebuild, - +mod_perl-2.0.4-r1.ebuild: - fix #266035 - - 26 May 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> - mod_perl-2.0.3-r1.ebuild: - Add pkg_setup(). - - 18 Nov 2008; Torsten Veller <tove@gentoo.org> mod_perl-2.0.3-r1.ebuild, - mod_perl-2.0.3-r2.ebuild, mod_perl-2.0.4.ebuild: - New virtuals: Compress-Zlib - - 05 Jul 2008; Benedikt Böhm <hollow@gentoo.org> mod_perl-2.0.4.ebuild: - fix #227277 - - 01 Jun 2008; Benedikt Böhm <hollow@gentoo.org> mod_perl-2.0.4.ebuild: - fix SRC_URI - -*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. - - 13 May 2008; Jeroen Roovers <jer@gentoo.org> mod_perl-2.0.3-r2.ebuild: - Marked ~hppa (LuckyLuke). - - 23 Mar 2008; Benedikt Böhm <hollow@gentoo.org> mod_perl-2.0.3-r2.ebuild: - fix depend.apache usage wrt #208033 - - 22 Mar 2008; Benedikt Böhm <hollow@gentoo.org> mod_perl-2.0.3-r2.ebuild: - amd64 stable wrt #209179 - - 10 Feb 2008; Raúl Porcel <armin76@gentoo.org> mod_perl-2.0.3-r2.ebuild: - alpha/ia64/sparc stable wrt #209179 - - 08 Feb 2008; Tobias Scherbaum <dertobi123@gentoo.org> - mod_perl-2.0.3-r2.ebuild: - ppc stable, bug #209179 - - 07 Feb 2008; Christian Faulhammer <opfer@gentoo.org> - mod_perl-2.0.3-r2.ebuild: - stable x86, bug 209179 - - 07 Feb 2008; Brent Baude <ranger@gentoo.org> mod_perl-2.0.3-r2.ebuild: - Marking mod_perl-2.0.3-r2 ppc64 for bug 209179 - - 06 Feb 2008; Benedikt Böhm <hollow@gentoo.org> mod_perl-2.0.3-r2.ebuild: - rename check_apache_threads to has_apache_threads as suggested by dberkholz - - 06 Feb 2008; Benedikt Böhm <hollow@gentoo.org> mod_perl-2.0.3-r2.ebuild: - use new depend.apache functions to simplify ebuild logic - - 29 Jan 2008; Benedikt Böhm <hollow@gentoo.org> mod_perl-2.0.3-r2.ebuild: - fix depend.apache usage wrt #208033 - - 27 Jan 2008; Benedikt Böhm <hollow@gentoo.org> - files/2.0.3/75_mod_perl.conf, mod_perl-2.0.3-r2.ebuild: - fix #204916 - -*mod_perl-2.0.3-r2 (06 Jan 2008) - - 06 Jan 2008; Benedikt Böhm <hollow@gentoo.org> - files/2.0.3/75_mod_perl.conf, +mod_perl-2.0.3-r2.ebuild: - fix #182235, #199183 - - 13 Jun 2007; Luca Longinotti <chtekk@gentoo.org> - -files/1.29/75_mod_perl.conf, -files/1.30/75_mod_perl.conf, - -files/2.0.2/75_mod_perl.conf, -files/2.0.2/apache2-mod_perl-startup.pl, - -files/75_mod_perl.conf, -files/apache2-mod_perl-startup.pl, metadata.xml, - -mod_perl-1.27-r4.ebuild, -mod_perl-1.30.ebuild: - Remove Apache1. Cleanup filesdir. Update metadata. - - 10 Apr 2007; Christian Hartmann <ian@gentoo.org> mod_perl-1.27-r4.ebuild, - -mod_perl-1.29.ebuild, -mod_perl-2.0.2.ebuild, -mod_perl-2.0.3.ebuild: - Removed vulnerable versions; 1.27-r4 stays for mips only - - 10 Apr 2007; Jose Luis Rivero <yoswink@gentoo.org> mod_perl-1.30.ebuild: - Stable on alpha wrt security bug #172676 - - 09 Apr 2007; Michael Cummings <mcummings@gentoo.org> mod_perl-1.30.ebuild: - security bug #172676 - also fixed the fperm line at the end for the conf file - - 06 Apr 2007; Michael Cummings <mcummings@gentoo.org> - mod_perl-2.0.3-r1.ebuild: - Marking amd64 stable, bug 172676 - - 06 Apr 2007; Christian Faulhammer <opfer@gentoo.org> - mod_perl-2.0.3-r1.ebuild: - stable x86, security bug 172676 - - 06 Apr 2007; Christian Hartmann <ian@gentoo.org> Manifest: - Fix manifest - - 04 Apr 2007; Jose Luis Rivero <yoswink@gentoo.org> - mod_perl-2.0.3-r1.ebuild: - Stable on alpha wrt security bug #172676 - - 04 Apr 2007; Raúl Porcel <armin76@gentoo.org> mod_perl-1.30.ebuild, - mod_perl-2.0.3-r1.ebuild: - ia64 stable wrt security bug 172676 - - 03 Apr 2007; Gustavo Zacarias <gustavoz@gentoo.org> mod_perl-1.30.ebuild, - mod_perl-2.0.3-r1.ebuild: - Stable on sparc wrt security #172676 - - 02 Apr 2007; Tobias Scherbaum <dertobi123@gentoo.org> - mod_perl-1.30.ebuild, mod_perl-2.0.3-r1.ebuild: - ppc stable, bug #172676 - - 02 Apr 2007; Markus Rothe <corsair@gentoo.org> mod_perl-1.30.ebuild, - mod_perl-2.0.3-r1.ebuild: - Stable on ppc64; bug #172676 - - 31 Mar 2007; Christian Faulhammer <opfer@gentoo.org> mod_perl-1.30.ebuild: - stable x86, security bug 172676 - -*mod_perl-2.0.3-r1 (30 Mar 2007) - - 30 Mar 2007; Michael Cummings <mcummings@gentoo.org> - +files/RegistryCooker.patch, +mod_perl-2.0.3-r1.ebuild: - Fixes for mod_perl-2.0.3 re: bug 172676 - -*mod_perl-1.30 (30 Mar 2007) - - 30 Mar 2007; Michael Cummings <mcummings@gentoo.org> - +files/1.30/75_mod_perl.conf, +mod_perl-1.30.ebuild: - Bug 172676 - - 23 Feb 2007; Michael Cummings <mcummings@gentoo.org> - mod_perl-2.0.2.ebuild, mod_perl-2.0.3.ebuild: - Removed ROOT per bug 168044 - - 08 Feb 2007; Michael Cummings <mcummings@gentoo.org> - mod_perl-2.0.3.ebuild: - Switching from exit to die, thanks to davide angelocola on the ml for - pointing this out - - 25 Jan 2007; Luca Longinotti <chtekk@gentoo.org> - -files/mod_perl-1.99.16-sneak-tmpdir.patch, -files/2.0.1/75_mod_perl.conf, - -files/mod_perl-1.99.17-Apache2.pm, - -files/2.0.1/apache2-mod_perl-startup.pl, -mod_perl-2.0.1-r2.ebuild, - -mod_perl-2.0.1-r3.ebuild: - Initial parts of cleanup. - - 19 Jan 2007; Markus Rothe <corsair@gentoo.org> mod_perl-2.0.2.ebuild: - Stable on ppc64; bug #162244 - - 17 Jan 2007; Christian Faulhammer <opfer@gentoo.org> - mod_perl-2.0.2.ebuild: - stable x86, bug #162244 - - 16 Jan 2007; Joseph Jezak <josejx@gentoo.org> mod_perl-1.29.ebuild, - mod_perl-2.0.2.ebuild: - Marked ppc stable for bug #162244. - - 12 Jan 2007; Michael Cummings <mcummings@gentoo.org> - +files/2.0.3/75_mod_perl.conf, +files/2.0.3/apache2-mod_perl-startup.pl: - bug 161292, missing 2.0.3 files added :) - -*mod_perl-2.0.3 (09 Jan 2007) - - 09 Jan 2007; Michael Cummings <mcummings@gentoo.org> - +mod_perl-2.0.3.ebuild: - Version bump - - 06 Jan 2007; Bryan Østergaard <kloeri@gentoo.org> mod_perl-2.0.2.ebuild: - Stable on Alpha. - -*mod_perl-2.0.1-r3 (23 Oct 2006) - - 23 Oct 2006; Michael Cummings <mcummings@gentoo.org> - +mod_perl-2.0.1-r3.ebuild, mod_perl-2.0.2.ebuild: - Altered dep for Apache-Test to be >= 1.27 - 1.28 is in the tree and - supercedes these versions. - - 16 Oct 2006; Michael Cummings <mcummings@gentoo.org> - -mod_perl-1.27-r1.ebuild, -mod_perl-1.27-r2.ebuild, - mod_perl-1.27-r4.ebuild, mod_perl-1.29.ebuild, -mod_perl-1.99.11.ebuild, - -mod_perl-1.99.16.ebuild, -mod_perl-2.0.1-r1.ebuild, - mod_perl-2.0.1-r2.ebuild: - Marking amd64 stable; cleaning up ebuilds - - 02 Sep 2006; Bryan Østergaard <kloeri@gentoo.org> mod_perl-2.0.2.ebuild: - Stable on ia64. - - 25 Jun 2006; Marcus D. Hanwell <cryos@gentoo.org> mod_perl-2.0.2.ebuild: - Marked stable on amd64, closes bug 136823. - - 12 Jun 2006; Michael Cummings <mcummings@gentoo.org> - mod_perl-2.0.2.ebuild: - Marking sparc stable - - 04 Jun 2006; Michael Stewart <vericgar@gentoo.org> mod_perl-1.29.ebuild, - mod_perl-2.0.1-r1.ebuild, mod_perl-2.0.1-r2.ebuild, mod_perl-2.0.2.ebuild: - Address dependency issues caused by depend.apache. Refer to bug 107127. - - 27 Apr 2006; Alec Warner <antarus@gentoo.org> - files/digest-mod_perl-1.27-r1, files/digest-mod_perl-1.27-r2, - files/digest-mod_perl-1.27-r4, files/digest-mod_perl-1.29, - files/digest-mod_perl-1.99.11, files/digest-mod_perl-1.99.16, - files/digest-mod_perl-2.0.1-r1, files/digest-mod_perl-2.0.1-r2, - files/digest-mod_perl-2.0.2, Manifest: - Fixing SHA256 digest, pass four - - 08 Apr 2006; Bryan Østergaard <kloeri@gentoo.org - mod_perl-2.0.1-r2.ebuild: - Stable on alpha. - - 30 Mar 2006; <mcummings@gentoo.org> mod_perl-2.0.1-r2.ebuild: - Marking sparc stable, tested and confirmed. - - 10 Mar 2006; Michael Hanselmann <hansmi@gentoo.org> - mod_perl-2.0.1-r2.ebuild: - Stable on ppc. - - 10 Mar 2006; Aron Griffis <agriffis@gentoo.org> mod_perl-2.0.1-r2.ebuild: - Mark 2.0.1-r2 stable on ia64 - - 27 Feb 2006; Markus Rothe <corsair@gentoo.org> mod_perl-2.0.1-r2.ebuild: - Stable on ppc64 - -*mod_perl-2.0.2 (26 Feb 2006) - - 26 Feb 2006; Michael Cummings <mcummings@gentoo.org> - +files/2.0.2/75_mod_perl.conf, +files/2.0.2/apache2-mod_perl-startup.pl, - +files/1.29/75_mod_perl.conf, mod_perl-1.29.ebuild, - mod_perl-2.0.1-r2.ebuild, +mod_perl-2.0.2.ebuild: - Bug 77551 and friends: 1.29 unmasked; 2.0.1 unmasked; 2.0.2 added; all - should be installing appropritately for new-style apaches. Thanks to - Benedikt Boehm and Yuval Yaari for patches, ebuilds, and patience. - - 13 Feb 2006; Michael Cummings <mcummings@gentoo.org> - mod_perl-1.99.11.ebuild, mod_perl-1.99.16.ebuild, - mod_perl-2.0.1-r1.ebuild, mod_perl-2.0.1-r2.ebuild: - Virtuals for perl-core - - 06 Dec 2005; Aaron Kulbe <superlag@gentoo.org> mod_perl-2.0.1-r2.ebuild: - Making ebuild multilib aware, so it will build on AMD64. Bug #114634 - - 12 Nov 2005; Michael Cummings <mcummings@gentoo.org> - mod_perl-1.27-r1.ebuild, mod_perl-1.27-r2.ebuild, mod_perl-1.27-r4.ebuild, - mod_perl-1.29.ebuild: - Fixed config syntax, bug 109482 - - 25 Aug 2005; Michael Cummings <mcummings@gentoo.org> - mod_perl-1.99.11.ebuild, mod_perl-1.99.16.ebuild, mod_perl-2.0.1-r1.ebuild, - mod_perl-2.0.1-r2.ebuild: - Bug 103487, cp -a changed to cp -pPR - - 08 Aug 2005; Michael Cummings <mcummings@gentoo.org> - mod_perl-2.0.1-r2.ebuild: - bug 101292 - note for threaded vs unthreaded apache/perl systems - - 08 Aug 2005; Michael Cummings <mcummings@gentoo.org> - files/apache2-mod_perl-startup.pl: - Corrected apache2-*.pl - -*mod_perl-2.0.1-r2 (08 Aug 2005) - - 08 Aug 2005; Michael Cummings <mcummings@gentoo.org> files/75_mod_perl.conf, - files/apache2-mod_perl-startup.pl, +files/2.0.1/75_mod_perl.conf, - +files/2.0.1/apache2-mod_perl-startup.pl, mod_perl-2.0.1-r1.ebuild, - +mod_perl-2.0.1-r2.ebuild: - With help from rendhalver, split out the mod-perl2 conf/files so that both - older and newer versions were available - -*mod_perl-2.0.1-r1 (29 Jul 2005) - - 29 Jul 2005; Michael Cummings <mcummings@gentoo.org> - -files/mod_perl-2.0.1-makefile.patch, -mod_perl-1.99.10.ebuild, - -mod_perl-1.99.17-r1.ebuild, -mod_perl-1.99.17.ebuild, - -mod_perl-2.0.0.ebuild, +mod_perl-2.0.1-r1.ebuild, -mod_perl-2.0.1.ebuild: - Sorry for the version bump, but this is a corrected ebuild (see viewcvs for - some bad diffs). The issue with testing has been resolved - if you run sudo - emerge and you have !env_reset set in your /etc/sudoers (and have testing - enabled), expect to have trouble. sudo su - and then emerging has no problems - with the tests (somewhere along the line the uid and euid get muddled). Thanks - again to rendhalver for a lot of work and patience. - -*mod_perl-2.0.1 (25 Jul 2005) - - 25 Jul 2005; Michael Cummings <mcummings@gentoo.org> files/75_mod_perl.conf, - files/apache2-mod_perl-startup.pl, +mod_perl-2.0.1.ebuild: - Thanks to rendhalver for the legwork here. This installs cleanly and launches - w/o issue. Please test. - -*mod_perl-2.0.0 (04 Jun 2005) - - 04 Jun 2005; Elfyn McBratney <beu@gentoo.org> +mod_perl-2.0.0.ebuild: - Version bump; this revision is for current-stable apache _only_, and - _will_ not work with the 'refreshed' apache versions in testing - -r1 - will shortly follow for that. - - 29 May 2005; Markus Rothe <corsair@gentoo.org> mod_perl-1.29.ebuild, - mod_perl-1.99.17-r1.ebuild: - Stable on ppc64; added ~ppc64 - - 24 May 2005; Michael Cummings <mcummings@gentoo.org> - mod_perl-1.99.10.ebuild, mod_perl-1.99.11.ebuild, mod_perl-1.99.16.ebuild, - mod_perl-1.99.17-r1.ebuild, mod_perl-1.99.17.ebuild: - dev-perl/CGI => perl-core/CGI - -*mod_perl-1.99.17-r1 (09 May 2005) -*mod_perl-1.99.17 (09 May 2005) -*mod_perl-1.99.16 (09 May 2005) -*mod_perl-1.99.11 (09 May 2005) -*mod_perl-1.99.10 (09 May 2005) -*mod_perl-1.29 (09 May 2005) -*mod_perl-1.27-r4 (09 May 2005) -*mod_perl-1.27-r2 (09 May 2005) -*mod_perl-1.27-r1 (09 May 2005) - - 09 May 2005; Elfyn McBratney <beu@gentoo.org> - +files/mod_perl-1.99.16-sneak-tmpdir.patch, +files/75_mod_perl.conf, - +files/apache2-mod_perl-startup.pl, +files/mod_perl-1.99.17-Apache2.pm, - +metadata.xml, +mod_perl-1.27-r1.ebuild, +mod_perl-1.27-r2.ebuild, - +mod_perl-1.27-r4.ebuild, +mod_perl-1.29.ebuild, +mod_perl-1.99.10.ebuild, - +mod_perl-1.99.11.ebuild, +mod_perl-1.99.16.ebuild, - +mod_perl-1.99.17.ebuild, +mod_perl-1.99.17-r1.ebuild: - dev-perl/mod_perl -> www-apache/mod_perl - - 20 Apr 2005; Gustavo Zacarias <gustavoz@gentoo.org> mod_perl-1.29.ebuild: - Stable on sparc - - 11 Apr 2005; Markus Rothe <corsair@gentoo.org> mod_perl-1.29.ebuild: - Added ~ppc64 to KEYWORDS - - 01 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> mod_perl-1.27-r4.ebuild: - Stable on ppc. - - 01 Apr 2005; Aron Griffis <agriffis@gentoo.org> mod_perl-1.99.11.ebuild: - stable on ia64 - -*mod_perl-1.27-r1 (19 Mar 2005) - - 19 Mar 2005; Elfyn McBratney <beu@gentoo.org> +mod_perl-1.27-r1.ebuild, - +mod_perl-1.27-r2.ebuild, +mod_perl-1.99.10.ebuild, - +mod_perl-1.99.11.ebuild: - Tree break #1 - re-add. - - 16 Mar 2005; Elfyn McBratney <beu@gentoo.org> mod_perl-1.27-r4.ebuild, - mod_perl-1.29.ebuild, mod_perl-1.99.16.ebuild, mod_perl-1.99.17-r1.ebuild, - mod_perl-1.99.17.ebuild: - Drop sys-apps/sed from DEPEND. - - 16 Mar 2005; Elfyn McBratney <beu@gentoo.org> - -files/mod_perl-1.99.10-nonukes.patch, -mod_perl-1.27-r1.ebuild, - -mod_perl-1.27-r2.ebuild, -mod_perl-1.27.ebuild, -mod_perl-1.99.08.ebuild, - -mod_perl-1.99.09.ebuild, -mod_perl-1.99.10.ebuild, - -mod_perl-1.99.11.ebuild: - Remove old versions. - - 11 Mar 2005; Elfyn McBratney <beu@gentoo.org> - -files/mod_perl-1.27-ipv6.patch, -files/mod_perl-1.29-ipv6.patch, - mod_perl-1.27-r2.ebuild, mod_perl-1.27-r4.ebuild, mod_perl-1.29.ebuild: - Drop the IPv6 patches (which don't add functionality as Apache 1.3 isn't - IPv6-aware). - - 30 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> : - Change encoding to UTF-8 for GLEP 31 compliance - -*mod_perl-1.99.17-r1 (13 Nov 2004) - - 13 Nov 2004; Robert Coie <rac@gentoo.org> - +files/mod_perl-1.99.17-Apache2.pm, +mod_perl-1.99.17-r1.ebuild: - Replace Apache2.pm to set @INC up properly - -*mod_perl-1.99.17 (27 Oct 2004) - - 27 Oct 2004; Doug Goldstein <cardoe@gentoo.org> +mod_perl-1.99.17.ebuild: - revision bump... works here.. leaving it masked though - -*mod_perl-1.99.16 (28 Sep 2004) - - 28 Sep 2004; Robert Coie <rac@gentoo.org> - +files/mod_perl-1.99.16-sneak-tmpdir.patch, +mod_perl-1.99.16.ebuild: - New upstream, maketest has some inconsistent problems, reliability suspect - - 21 Sep 2004; Michael Cummings <mcummings@gentoo.org> - +files/mod_perl-1.29-ipv6.patch: - Added missing patch for 1.29. Still applies cleanly. Closes bug 53094. - - 03 Sep 2004; Caleb Tennis <caleb@gentoo.org> -mod_perl-1.27-r3.ebuild: - Removing package.masked version - - 28 Aug 2004; David Holm <dholm@gentoo.org> mod_perl-1.99.11.ebuild: - Added to ~ppc. - - 07 Aug 2004; Jason Wever <weeve@gentoo.org> mod_perl-1.99.11.ebuild: - Added ~sparc keyword, resolves bug #59331. - - 30 May 2004; Bryan Østergaard <kloeri@gentoo.org> mod_perl-1.99.11.ebuild: - Stable on alpha. - - 20 Apr 2004; Michael Cummings <mcummings@gentoo.org> - mod_perl-1.99.09.ebuild, mod_perl-1.99.10.ebuild, mod_perl-1.99.11.ebuild: - Syntax fixes from bug 48373. - - 16 Apr 2004; Michael Sterrett <mr_bones_@gentoo.org> - mod_perl-1.27-r3.ebuild, mod_perl-1.27-r4.ebuild, mod_perl-1.29.ebuild: - move inherit to the right place - - 01 Mar 2004; Michael Cummings <mcummings@gentoo.org> mod_perl-1.29.ebuild: - Fixed bad packlist info. This may affect (in a postive way) other problems - with mod_perl. Will bump if it proves to be effective. - - 29 Feb 2004; Jason Wever <weeve@gentoo.org> mod_perl-1.27-r4.ebuild: - Marked stable on sparc. - - 24 Feb 2004; <agriffis@gentoo.org> mod_perl-1.29.ebuild: - stable on alpha and ia64 - - 18 Feb 2004; Aron Griffis <agriffis@gentoo.org> mod_perl-1.99.11.ebuild: - add ~alpha and ~ia64 - - 18 Jan 2004; <tuxus@gentoo.org> mod_perl-1.27-r4.ebuild: - Added ~mips to KEYWORDS. - -*mod_perl-1.29 (23 Dec 2003) - - 23 Dec 2003; <rac@gentoo.org> mod_perl-1.29.ebuild: - Upstream bump. - -*mod_perl-1.99.11 (16 Dec 2003) - - 16 Dec 2003; <rac@gentoo.org> mod_perl-1.99.11.ebuild: - New upstream bump, fix bug 30257 by disabling parallel make - -*mod_perl-1.99.10 (31 Oct 2003) -*mod_perl-1.27-r4 (14 Oct 2003) - - 14 Oct 2003; <rac@gentoo.org> mod_perl-1.27-r4.ebuild: - sed-fu to fix deprecated use of tail -1 in a couple of places, solves build - problems on machines with new coreutils, including the amd64 port - -*mod_perl-1.27-r1 (24 Jun 2003) - - 12 Jul 2003; Daniel Ahlberg <aliz@gentoo.org> : - Added missing changelog entry. - - 25 Jun 2003; <rac@gentoo.org> mod_perl-1.27-r2.ebuild, - mod_perl-1.27-r3.ebuild: - Fine-tune ipv6 patch application using has_version because the apache dep has - been relaxed. Addresses bug #23332. - -*mod_perl-1.27-r3 (24 Jun 2003) - - 24 Jun 2003; <rac@gentoo.org> mod_perl-1.27-r3.ebuild: - Move to vendor directory, change how prefixes are defined in an attempt to - avoid problems mholzer and others were reporting with inability to find - Apache.pm - - 22 Jun 2003; <rac@gentoo.org> mod_perl-1.99.08.ebuild, - mod_perl-1.99.09.ebuild: - revert to ~x86 - - 10 Jun 2003; Michael Cummings <mcummings@gentoo.org> - mod_perl-1.27-r2.ebuild: - mod-perl-1.27 doesn't work well with apache 2. the lock for apache 1 wasn't - carried over to the r2 ebuild - fixed - - 06 Jun 2003; <rac@gentoo.org> mod_perl-1.99.09.ebuild: - Add sed-4 dependency, make sed die on failure - - 20 May 2003; <rac@gentoo.org> mod_perl-1.99.09.ebuild: - Eliminate "|| die" from the make test line, to address bug #21325. - -*mod_perl-1.99.09 (19 May 2003) - - 19 May 2003; <rac@gentoo.org> mod_perl-1.99.09.ebuild: - Upstream version bump, enable "make test". Major kudos to Corporate Gadfly - <corporate_gadfly@hotmail.com> in bugs #19951 and #20124. - -*mod_perl-1.99.08 (24 Jun 2003) - - 12 Jul 2003; Daniel Ahlberg <aliz@gentoo.org> : - Added missing changelog entry. - -*mod_perl-1.27-r2 (01 Mar 2003) - - 01 Mar 2003; Robert Coie <rac@gentoo.org> mod_perl-1.27-r2.ebuild, - files/mod_perl-1.27-ipv6.patch: - Add patch originally from - http://pasky.ji.cz/~pasky/dev/apache/mod_perl-1.27+ipv6.patch, to - allow building against an IPv6-enabled Apache (bug #6986). Changed - dependency on Apache to be >=1.3.27-r4, as that is the first version - in which the ipv6 USE variable is employed by the Apache ebuild, and - that is necessary for this patch to operate correctly. - - 24 Jan 2003; <woodchip@gentoo.org> mod_perl-1.99.08 : version bump; #14503. - - 06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords - -*mod_perl-1.99.07 (29 Nov 2002) - - 17 Dec 2002; Brandon Low <lostlogic@gentoo.org> : - This should be a new slot. marked slot=1. - - 29 Nov 2002; Donny Davies <woodchip@gentoo.org> : - New development version for Apache2. - - 29 Oct 2002; Seemant Kulleen <seemant@gentoo.org> ChangeLog : - forced version bump to install into correct locations - -*mod_perl-1.27 (20 Jun 2002) - - 15 Sep 2002; Ryan Phillips <rphillips@gentoo.org> mod_perl-1.27.ebuild : - Added libwww-perl depedency... Hopefully fixes #7867 - - 9 Sep 2002; <mcummings@gentoo.org> mod_perl-1.27.ebuild : - Corrected build syntax - - 1 Aug 2002; Calum Selkirk <cselkirk@gentoo.org> mod_perl-1.27.ebuild : - Added ppc to KEYWORDS. - - 20 Jun 2002; Thilo Bangert <bangert@gentoo.org> mod_perl-1.27.ebuild : - version bump - -*mod_perl-1.26 (7 May 2002) - -*mod_perl-1.25-r2 (9 Apr 2002) - - 9 Apr 2002; Donny Davies <woodchip@gentoo.org> : - Small updates to fit in with the reworked apache package. - -*mod_perl-1.25-r1 (27 Mar 2002) - - 27 Mar 2002; Seemant Kulleen <seemant@gentoo.org> mod_perl-1.25-r1.ebuild : - Updated the ebuild to new syntax, and ungzipped HTML documentation. diff --git a/www-apache/mod_perl/Manifest b/www-apache/mod_perl/Manifest deleted file mode 100644 index db3af68..0000000 --- a/www-apache/mod_perl/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST libapache2-mod-perl2_2.0.8+httpd24-r1449661.orig.tar.gz 3803732 SHA256 47c8f079fac7b2fa0f15096607a8ad0eff293d01527b65c1e8cbe4ed5e7b69ad SHA512 7b5a29b243366914007aedaf20096b14522f1305d88f5a8b5f3268e6063c19927055694ebd353bb20c08520a418d61484e2220c00078f05bc88bd8a0fc9e2712 WHIRLPOOL dc97a073618b0a1efc4b11b2f456014877784c1f5560eed321446f57c9e92b85d1d44b9f7bfdb581bd2b53b3c8fd5a48e60af6cf2a42bfe3967bd3a60daff95d -DIST mod_perl-2.0.9.tar.gz 3846584 SHA256 0260f26ab771c1c95fadc67544b3400e420bb30b8a77565d2d02ad05498ef52b SHA512 421d385f0d5d04cbe8c1e9559960eea86a017fa1bed88e614009143550baf852e2345001faff1fb849d9b3e6383786e0011f45ebc3e7d26ad57651fbad4e2f2c WHIRLPOOL 6b461666d380482f4f5816cbf74e100c741ce970fc19b8032d4f6a32cace9497c724631fb72c293723a5e9d67671eb4278204705089984ab2e224364ae6e0bef diff --git a/www-apache/mod_perl/files/2.0.3/75_mod_perl.conf b/www-apache/mod_perl/files/2.0.3/75_mod_perl.conf deleted file mode 100644 index 596d2cc..0000000 --- a/www-apache/mod_perl/files/2.0.3/75_mod_perl.conf +++ /dev/null @@ -1,50 +0,0 @@ -<IfDefine PERL> -LoadModule perl_module modules/mod_perl.so - -#PerlTrace all -PerlRequire "/etc/apache2/modules.d/apache2-mod_perl-startup.pl" -PerlModule ModPerl::Registry - -# Provide two aliases to the same cgi-bin directory, to see the effects of the -# 2 different mod_perl modes for Apache2::Registry Mode -Alias /perl/ /var/www/localhost/perl/ -# for Apache2::Perlrun Mode -Alias /cgi-perl/ /var/www/localhost/perl/ - -<Location /perl-status> - SetHandler perl-script - PerlResponseHandler Apache2::Status - Order deny,allow - Deny from all - Allow from 127.0.0.1 -</Location> - -<Directory /home/*/public_html/perl> - SetHandler perl-script - PerlResponseHandler ModPerl::PerlRun - Options -Indexes ExecCGI - PerlOptions +ParseHeaders -</Directory> - -# set Apache::Registry Mode for /perl Alias -<Location /perl/*.pl> - SetHandler perl-script - PerlResponseHandler ModPerl::Registry - Options -Indexes ExecCGI - PerlSendHeader On - Order allow,deny - Allow from all -</Location> - -# set Apache::PerlRun Mode for /cgi-perl Alias -<Location /cgi-perl/*.pl> - SetHandler perl-script - PerlResponseHandler ModPerl::PerlRun - Options -Indexes ExecCGI - PerlSendHeader On - Order allow,deny - Allow from all -</Location> -</IfDefine> - -# vim: ts=4 filetype=apache diff --git a/www-apache/mod_perl/files/2.0.3/apache2-mod_perl-startup.pl b/www-apache/mod_perl/files/2.0.3/apache2-mod_perl-startup.pl deleted file mode 100644 index afc048a..0000000 --- a/www-apache/mod_perl/files/2.0.3/apache2-mod_perl-startup.pl +++ /dev/null @@ -1,24 +0,0 @@ -use lib qw(/home/httpd/perl); - -# enable if the mod_perl 1.0 compatibility is needed -#use Apache2::compat (); - -use ModPerl::Util (); #for CORE::GLOBAL::exit - -use Apache2::RequestRec (); -use Apache2::RequestIO (); -use Apache2::RequestUtil (); - -use Apache2::ServerRec (); -use Apache2::ServerUtil (); -use Apache2::Connection (); -use Apache2::Log (); - -use APR::Table (); - -use ModPerl::Registry (); - -use Apache2::Const -compile => ':common'; -use APR::Const -compile => ':common'; - -1; diff --git a/www-apache/mod_perl/files/2.0.8/75_mod_perl.conf b/www-apache/mod_perl/files/2.0.8/75_mod_perl.conf deleted file mode 100644 index 710b747..0000000 --- a/www-apache/mod_perl/files/2.0.8/75_mod_perl.conf +++ /dev/null @@ -1,46 +0,0 @@ -<IfDefine PERL> -LoadModule perl_module modules/mod_perl.so - -#PerlTrace all -PerlRequire "/etc/apache2/modules.d/apache2-mod_perl-startup.pl" -PerlModule ModPerl::Registry - -# Provide two aliases to the same cgi-bin directory, to see the effects of the -# 2 different mod_perl modes for Apache2::Registry Mode -Alias /perl/ /var/www/localhost/perl/ -# for Apache2::Perlrun Mode -Alias /cgi-perl/ /var/www/localhost/perl/ - -<Location /perl-status> - SetHandler perl-script - PerlResponseHandler Apache2::Status - Require local -</Location> - -<Directory /home/*/public_html/perl> - SetHandler perl-script - PerlResponseHandler ModPerl::PerlRun - Options -Indexes ExecCGI - PerlOptions +ParseHeaders -</Directory> - -# set Apache::Registry Mode for /perl Alias -<Location /perl/*.pl> - SetHandler perl-script - PerlResponseHandler ModPerl::Registry - Options -Indexes ExecCGI - PerlSendHeader On - Require all granted -</Location> - -# set Apache::PerlRun Mode for /cgi-perl Alias -<Location /cgi-perl/*.pl> - SetHandler perl-script - PerlResponseHandler ModPerl::PerlRun - Options -Indexes ExecCGI - PerlSendHeader On - Require all granted -</Location> -</IfDefine> - -# vim: ts=4 filetype=apache diff --git a/www-apache/mod_perl/files/debian/010-doc-no-more-send_http_header.patch b/www-apache/mod_perl/files/debian/010-doc-no-more-send_http_header.patch deleted file mode 100644 index c0fc439..0000000 --- a/www-apache/mod_perl/files/debian/010-doc-no-more-send_http_header.patch +++ /dev/null @@ -1,18 +0,0 @@ -Author: Damyan Ivanov <dmn@debian.org> -Description: Can't locate object method "send_http_header" - Trivial patch to remove a stale reference to send_http_header that is no - longer available or necessary -Last-Update: 2011-03-22 -Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=507821 -Forwarded: yes -Reviewed-by: Nicholas Bamber <nicholas@periapt.co.uk> ---- a/docs/api/ModPerl/Registry.pod -+++ b/docs/api/ModPerl/Registry.pod -@@ -31,7 +31,6 @@ For example: - - my $r = Apache2::RequestUtil->request; - $r->content_type("text/html"); -- $r->send_http_header; - $r->print("mod_perl rules!"); - - XXX: STOPPED here. Below is the old Apache::Registry document which I diff --git a/www-apache/mod_perl/files/debian/031-test-extra-args.patch b/www-apache/mod_perl/files/debian/031-test-extra-args.patch deleted file mode 100644 index fbee5f3..0000000 --- a/www-apache/mod_perl/files/debian/031-test-extra-args.patch +++ /dev/null @@ -1,24 +0,0 @@ -Author: Niko Tyni <ntyni@debian.org> -Subject: APACHE_TEST_EXTRA - Honour $(APACHE_TEST_EXTRA_ARGS); Makefile.PL has apparently not been updated - since this was added to Apache::Test. -Forwarded: http://www.gossamer-threads.com/lists/modperl/dev/105354 -Last-Update: 2012-05-19 -Reviewed-by: Nicholas Bamber <nicholas@periapt.co.uk> ---- a/Makefile.PL -+++ b/Makefile.PL -@@ -788,12 +788,12 @@ TEST_FILES = - - test_clean : - $(FULLPERL) -I$(INST_ARCHLIB) -I$(INST_LIB) \ -- t/TEST -clean -+ t/TEST $(APACHE_TEST_EXTRA_ARGS) -clean - - run_tests : test_clean - $(PASSENV) \ - $(FULLPERL) -I$(INST_ARCHLIB) -I$(INST_LIB) \ -- t/TEST -bugreport -verbose=$(TEST_VERBOSE) $(TEST_FILES) -+ t/TEST $(APACHE_TEST_EXTRA_ARGS) -bugreport -verbose=$(TEST_VERBOSE) $(TEST_FILES) - - run_subtests :: - cd ModPerl-Registry && $(MAKE) test diff --git a/www-apache/mod_perl/files/debian/099-fix-url-on-index_top.patch b/www-apache/mod_perl/files/debian/099-fix-url-on-index_top.patch deleted file mode 100644 index aeeda12..0000000 --- a/www-apache/mod_perl/files/debian/099-fix-url-on-index_top.patch +++ /dev/null @@ -1,17 +0,0 @@ -Description: Fix link present on doc/index_top.html page -Author: Dario Minnucci <midget@debian.org> -Forwarded: no -Last-Update: 2011-03-22 -Reviewed-by: Nicholas Bamber <nicholas@periapt.co.uk> ---- a/docs/index_top.html -+++ b/docs/index_top.html -@@ -3,6 +3,6 @@ - <title>index bottom</title> - </head> - <body bgcolor="white"> -- <p>FYI: <a href="../../products/apache-modules.html#Porting_CPAN_modules_to_mod_perl_2_0_Status">Porting CPAN modules to mod_perl 2.0 Status</a></p> -+ <p>FYI: <a href="http://perl.apache.org/products/apache-modules.html#Porting_CPAN_modules_to_mod_perl_2_0_Status">Porting CPAN modules to mod_perl 2.0 Status</a></p> - </body> --</html> -\ No newline at end of file -+</html> diff --git a/www-apache/mod_perl/files/debian/200_fix-pod-spelling-errors.patch b/www-apache/mod_perl/files/debian/200_fix-pod-spelling-errors.patch deleted file mode 100644 index 9861a23..0000000 --- a/www-apache/mod_perl/files/debian/200_fix-pod-spelling-errors.patch +++ /dev/null @@ -1,195 +0,0 @@ -Description: Fix spelling errors in documentation - This includes both POD and comments. - The 'overriden -> overridden' fix may also be applied to variable names, - but is not done with this patch. -Forwarded: http://mail-archives.apache.org/mod_mbox/perl-modperl/201004.mbox/thread -Author: Damyan Ivanov <dmn@debian.org> -Last-Update: 2011-04-10 -Reviewed-by: Nicholas Bamber <nicholas@periapt.co.uk> - ---- a/docs/api/Apache2/Util.pod -+++ b/docs/api/Apache2/Util.pod -@@ -36,7 +36,7 @@ C<Apache2::Util> provides the following - - =head2 C<escape_path> - --convert an OS path to a URL in an OS dependant way. -+convert an OS path to a URL in an OS dependent way. - - $escaped_path = Apache2::Util::escape_path($path, $p); - $escaped_path = Apache2::Util::escape_path($path, $p, $partial); ---- a/docs/api/ModPerl/MM.pod -+++ b/docs/api/ModPerl/MM.pod -@@ -55,7 +55,7 @@ hasn't already specified a method I<MY:: - C<ModPerl::MM> will DWIM and do nothing. - - In case the functionality of C<ModPerl::MM> methods needs to be --extended, rather than completely overriden, the C<ModPerl::MM> methods -+extended, rather than completely overridden, the C<ModPerl::MM> methods - can be called internally. For example if you need to modify constants - in addition to the modifications applied by - C<ModPerl::MM::MY::constants>, call the C<ModPerl::MM::MY::constants> -@@ -72,7 +72,7 @@ not C<ModPerl::MM>), then do your extra - In certain cases a developers may want to prevent from C<ModPerl::MM> - to override certain methods. In that case an explicit override in - I<Makefile.PL> will do the job. For example if you don't want the --C<constants()> method to be overriden by C<ModPerl::MM>, add to your -+C<constants()> method to be overridden by C<ModPerl::MM>, add to your - I<Makefile.PL>: - - sub MY::constants { shift->MM::constants(@_); }"; -@@ -89,7 +89,7 @@ C<ModPerl::MM::WriteMakefile> supplies d - C<INC> and C<TYPEMAPS> unless they weren't passed to - C<ModPerl::MM::WriteMakefile> from I<Makefile.PL>. - --If the default values aren't satisfying these should be overriden in -+If the default values aren't satisfying these should be overridden in - I<Makefile.PL>. For example to supply an empty INC, explicitly set the - argument in I<Makefile.PL>. - ---- a/docs/api/ModPerl/RegistryCooker.pod -+++ b/docs/api/ModPerl/RegistryCooker.pod -@@ -25,7 +25,7 @@ Provide ingredients that can be used by - - =item * - --Provide a default behavior, which can be overriden in sub-classed -+Provide a default behavior, which can be overridden in sub-classed - - META: in the future this functionality may move into a separate class. - ---- a/lib/Apache2/compat.pm -+++ b/lib/Apache2/compat.pm -@@ -254,7 +254,7 @@ sub override_mp2_api { - } - - # restore_mp2_api does the opposite of override_mp2_api(), it removes --# the overriden API and restores the original mod_perl 2.0 API -+# the overridden API and restores the original mod_perl 2.0 API - sub restore_mp2_api { - my (@subs) = @_; - ---- a/lib/Apache2/porting.pm -+++ b/lib/Apache2/porting.pm -@@ -84,9 +84,9 @@ BEGIN { - $package =~ s|/|::|g; - $package =~ s|.pm$||; - -- # this picks the original require (which could be overriden -+ # this picks the original require (which could be overridden - # elsewhere, so we don't lose that) because we haven't -- # overriden it yet -+ # overridden it yet - return require $_[0] unless $packages{$package}; - - my $msg = "mod_perl 2.0 API doesn't include package '$package'."; ---- a/xs/APR/Pool/APR__Pool.h -+++ b/xs/APR/Pool/APR__Pool.h -@@ -49,7 +49,7 @@ APR_OPTIONAL_FN_TYPE(modperl_thx_interp_ - #define MP_APR_POOL_SV_HAS_OWNERSHIP(sv) mpxs_pool_is_custom(sv) - - /* before the magic is freed, one needs to carefully detach the -- * dependant pool magic added by mpxs_add_pool_magic (most of the time -+ * dependent pool magic added by mpxs_add_pool_magic (most of the time - * it'd be a parent pool), and postpone its destruction, until after - * the child pool is destroyed. Since if we don't do that the - * destruction of the parent pool will destroy the child pool C guts ---- a/todo/bugs_build -+++ b/todo/bugs_build -@@ -71,7 +71,7 @@ HPUX11i DSO - - * we have a dependency check problem when xs/*/*.h use code from - xs/modperl_xs*.h, when the latter change 'make' won't rebuild the -- dependant files -+ dependent files - - * Testing: - Need to put Philippe's smoking test into the core ---- a/docs/api/Apache2/RequestUtil.pod -+++ b/docs/api/Apache2/RequestUtil.pod -@@ -815,7 +815,7 @@ Nothing, except it doesn't work as expec - same code is called in a sub-request then the pnote of $r-E<gt>prev is magically - updated at a distance to the same value! - --Try explain why that is to anyone not deeply familar with perl internals! -+Try to explain why that is to anyone not deeply familiar with perl internals! - - The fix is to avoid pnotes taking a ref to the invisible op_targ embededed in - the code by passing a simple lexical variable as the actual argument. That can be done in-line like this: ---- a/docs/user/intro/overview.pod -+++ b/docs/user/intro/overview.pod -@@ -279,7 +279,7 @@ mod_perl 2.0's I<method handlers>. See t - - =item * - --The I<warnings> pragma, which allows to force the code to be super -+The I<warnings> pragma, which allows one to force the code to be super - clean, via the setting: - - use warnings FATAL => 'all'; ---- a/docs/user/handlers/http.pod -+++ b/docs/user/handlers/http.pod -@@ -1580,7 +1580,7 @@ There are several usages for this use ph - a cleanup code, for example removing temporarily created files. The - less obvious is to use this phase instead of - C<L<PerlLogHandler|/PerlLogHandler>> if the logging operation is time --consuming. This approach allows to free the client as soon as the -+consuming. This approach allows one to free the client as soon as the - response is sent. - - This phase is of type ---- a/docs/user/coding/coding.pod -+++ b/docs/user/coding/coding.pod -@@ -300,7 +300,7 @@ downgrade them to be non-fatal. The foll - no warnings 'redefine'; - use warnings 'redefine'; - --Perl 5.8.0 allows to do all this in one line: -+Perl 5.8.0 allows one to do all this in one line: - - use warnings FATAL => 'all', NONFATAL => 'redefine'; - ---- a/docs/api/Apache2/SizeLimit.pod -+++ b/docs/api/Apache2/SizeLimit.pod -@@ -147,7 +147,7 @@ the patch is included in the mm-tree (li - to make it into the vanilla kernel in the near future. - - F</proc/self/smaps> reports various sizes for each memory segment of a --process and allows to count the amount of shared memory correctly. -+process and allows one to count the amount of shared memory correctly. - - If C<Apache2::SizeLimit> detects a kernel that supports F</proc/self/smaps> - and if the C<Linux::Smaps> module is installed it will use them instead of ---- a/docs/api/Apache2/RequestRec.pod -+++ b/docs/api/Apache2/RequestRec.pod -@@ -804,7 +804,7 @@ Get/set MIME response headers, printed o - - =back - --See also C<L<err_headers_out|/C_err_headers_out_>>, which allows to -+See also C<L<err_headers_out|/C_err_headers_out_>>, which allows one to - set headers for non-2xx responses and persist across internal - redirects. - ---- a/docs/api/ModPerl/RegistryLoader.pod -+++ b/docs/api/ModPerl/RegistryLoader.pod -@@ -175,7 +175,7 @@ otherwise the C<$virtual_hostname> argum - C<ModPerl::RegistryLoader> performs a very simple job, at run time it - loads and sub-classes the module passed via the I<package> attribute - and overrides some of its functions, to emulate the run-time --environment. This allows to preload the same script into different -+environment. This allows one to preload the same script into different - registry environments. - - =head1 Authors ---- a/docs/devel/core/mod_perl_specific.pod -+++ b/docs/devel/core/mod_perl_specific.pod -@@ -131,7 +131,7 @@ a normal Perl handler by modperl_run_fil - retrieve ctx->handler - modperl_output_filter_handler -> modperl_run_filter -> modperl_callback - --This trick allows to have more than one filter handler in the filters -+This trick allows one to have more than one filter handler in the filters - chain using the same Apache filter name (the real filter's name is - stored in ctx-E<gt>handler-E<gt>name. - diff --git a/www-apache/mod_perl/files/debian/260_fix_pipelined_response_deadlock.patch b/www-apache/mod_perl/files/debian/260_fix_pipelined_response_deadlock.patch deleted file mode 100644 index 81c14e9..0000000 --- a/www-apache/mod_perl/files/debian/260_fix_pipelined_response_deadlock.patch +++ /dev/null @@ -1,111 +0,0 @@ -Subject: pipelined response deadlock -Date: Fri, 4 Jan 2013 16:27:07 +0000 -From: Zefram <zefram [...] fysh.org> - -There's a race condition that can cause mod_perl's test suite to hang -in t/filter/in_str_declined.t. The problem is that the response handler -starts generating response body, and so triggers header output, before -it reads the request body. If LWP::Protocol::http, which is the client -for this test, receives a complete set of response headers, it will stop -sending the request body. (However, if the request body is no more than -8192 octets then it will send the whole body before it starts looking -for a response. The failure only shows up with an appreciably large -request body.) - -RFC 2616 doesn't explicitly address this sort of pipelining, but the -start of section 6 does say "After receiving and interpreting a request -message, a server responds with an HTTP response message.", which can be -read as prohibiting sending any part of the response before the entire -request has been received. - -The attached patch fixes this issue by making all the POST handlers in -the test suite read the body before doing anything that generates output -(specifically plan()). - --zefram - -Bug-Debian: http://bugs.debian.org/676754 -Bug: https://rt.cpan.org/Public/Bug/Display.html?id=82409 -Origin: https://rt.cpan.org/Public/Bug/Display.html?id=82409 - ---- a/t/filter/TestFilter/in_str_declined.pm -+++ b/t/filter/TestFilter/in_str_declined.pm -@@ -35,13 +35,17 @@ sub handler { - sub response { - my $r = shift; - -+ my $data; -+ if ($r->method_number == Apache2::Const::M_POST) { -+ # consume the data so the input filter is invoked -+ $data = TestCommon::Utils::read_post($r); -+ } -+ - plan $r, tests => 2; - - $r->content_type('text/plain'); - - if ($r->method_number == Apache2::Const::M_POST) { -- # consume the data so the input filter is invoked -- my $data = TestCommon::Utils::read_post($r); - ok t_cmp(length $data, 20000, "the request body received ok"); - } - ---- a/t/filter/TestFilter/in_str_declined_read.pm -+++ b/t/filter/TestFilter/in_str_declined_read.pm -@@ -31,14 +31,19 @@ sub handler { - sub response { - my $r = shift; - -+ my $err; -+ if ($r->method_number == Apache2::Const::M_POST) { -+ # this should fail, because of the failing filter -+ eval { TestCommon::Utils::read_post($r) }; -+ $err = $@; -+ } -+ - plan $r, tests => 1; - - $r->content_type('text/plain'); - - if ($r->method_number == Apache2::Const::M_POST) { -- # this should fail, because of the failing filter -- eval { TestCommon::Utils::read_post($r) }; -- ok $@; -+ ok $err; - } - - Apache2::Const::OK; ---- a/t/filter/TestFilter/in_str_msg.pm -+++ b/t/filter/TestFilter/in_str_msg.pm -@@ -76,10 +76,10 @@ my $expected = "UPCASED"; - sub response { - my $r = shift; - -- plan $r, tests => 1; -- - my $received = TestCommon::Utils::read_post($r); - -+ plan $r, tests => 1; -+ - ok t_cmp($received, $expected, - "request filter must have upcased the data"); - ---- a/t/response/TestModperl/post_utf8.pm -+++ b/t/response/TestModperl/post_utf8.pm -@@ -29,14 +29,14 @@ sub handler { - # $r->content_type("text/plain; charset=utf-8"); - # $r->print("expected: $expected_utf8\n"); - -+ my $received = TestCommon::Utils::read_post($r) || ""; -+ - # utf encode/decode was added only in 5.8.0 - # XXX: currently binmode is only available with perlio (used on the - # server side on the tied/perlio STDOUT) - plan $r, tests => 2, - need need_min_perl_version(5.008), need_perl('perlio'); - -- my $received = TestCommon::Utils::read_post($r) || ""; -- - # workaround for perl-5.8.0, which doesn't decode correctly a - # tainted variable - require ModPerl::Util; diff --git a/www-apache/mod_perl/files/debian/290-httpd-transition-test-todo.patch b/www-apache/mod_perl/files/debian/290-httpd-transition-test-todo.patch deleted file mode 100644 index 8457799..0000000 --- a/www-apache/mod_perl/files/debian/290-httpd-transition-test-todo.patch +++ /dev/null @@ -1,20 +0,0 @@ -Description: Mark individual failing tests as TODO rather than ignore the overall test suite exit status -Origin: vendor -Forwarded: no -Author: Dominic Hargreaves <dom@earth.li> -Reviewed-by: gregor herrmann <gregoa@debian.org> -Last-Update: 2013-06-03 - -diff --git a/t/directive/perlloadmodule3.t b/t/directive/perlloadmodule3.t -index 8c1d0dc..92d7199 100644 ---- a/t/directive/perlloadmodule3.t -+++ b/t/directive/perlloadmodule3.t -@@ -14,7 +14,7 @@ my $path = Apache::TestRequest::module2path($module); - # smaller portions of information, but requires a more elaborate - # logic. Alternatively could use diff($expected, $received). - --plan tests => 3; -+plan tests => 3, todo => [1]; - - t_debug("connecting to $base_hostport"); - { diff --git a/www-apache/mod_perl/files/debian/300-http-headers-version.patch b/www-apache/mod_perl/files/debian/300-http-headers-version.patch deleted file mode 100644 index 5f4dd82..0000000 --- a/www-apache/mod_perl/files/debian/300-http-headers-version.patch +++ /dev/null @@ -1,36 +0,0 @@ -Description: adjust the version check for HTTP::Headers -Origin: vendor -Bug-Debian: http://bugs.debian.org/710873 -Forwarded: no -Author: gregor herrmann <gregoa@debian.org> -Last-Update: 2013-06-03 - ---- a/t/api/err_headers_out.t -+++ b/t/api/err_headers_out.t -@@ -5,6 +5,8 @@ - use Apache::TestRequest; - use Apache::TestUtil; - -+use version; -+ - plan tests => 6, need 'HTML::HeadParser'; - - my $location = '/TestAPI__err_headers_out'; -@@ -25,7 +27,7 @@ - local $HTTP::Headers::TRANSLATE_UNDERSCORE= - $HTTP::Headers::TRANSLATE_UNDERSCORE; - undef $HTTP::Headers::TRANSLATE_UNDERSCORE -- if defined HTTP::Headers->VERSION and HTTP::Headers->VERSION==6.00; -+ if defined HTTP::Headers->VERSION and version->parse(HTTP::Headers->VERSION) >= version->parse(6.00); - - ok t_cmp $res->header('X-err_headers_out'), "err_headers_out", - "X-err_headers_out: made it"; -@@ -50,7 +52,7 @@ - local $HTTP::Headers::TRANSLATE_UNDERSCORE= - $HTTP::Headers::TRANSLATE_UNDERSCORE; - undef $HTTP::Headers::TRANSLATE_UNDERSCORE -- if defined HTTP::Headers->VERSION and HTTP::Headers->VERSION==6.00; -+ if defined HTTP::Headers->VERSION and version->parse(HTTP::Headers->VERSION) >= version->parse(6.00); - - ok t_cmp $res->header('X-err_headers_out'), "err_headers_out", - "X-err_headers_out: made it"; diff --git a/www-apache/mod_perl/files/debian/310-defaultruntimedir.patch b/www-apache/mod_perl/files/debian/310-defaultruntimedir.patch deleted file mode 100644 index 651f1f8..0000000 --- a/www-apache/mod_perl/files/debian/310-defaultruntimedir.patch +++ /dev/null @@ -1,33 +0,0 @@ -Description: Since Apache 2.4, DefaultRuntimeDir needs to be set, - otherwise mod_auth_digest tries to write to /var/run and fails (depending - on permissions). Set DefaultRuntimeDir in the generated httpd.conf of - Apache::Test conditionally. - This also means we don't need the extra DefaultRuntimeDir in t/conf/extra.conf.in. -Origin: vendor -Forwarded: no -Author: gregor herrmann <gregoa@debian.org>, - Niko Tyni <ntyni@debian.org> -Last-Update: 2013-06-04 - ---- a/Apache-Test/lib/Apache/TestConfig.pm -+++ b/Apache-Test/lib/Apache/TestConfig.pm -@@ -2148,6 +2148,10 @@ - ErrorLog @t_logs@/error_log - LogLevel debug - -+<IfVersion > 2.4.1> -+ DefaultRunTimeDir "@t_logs@" -+</IfVersion> -+ - <IfModule mod_log_config.c> - TransferLog @t_logs@/access_log - </IfModule> ---- a/t/conf/extra.conf.in -+++ b/t/conf/extra.conf.in -@@ -1,6 +1,5 @@ - # needed to test $r->psignature - ServerSignature On --DefaultRuntimeDir run/ - - # The following tests require more than one interpreter during the - # same request: diff --git a/www-apache/mod_perl/files/debian/320-cleanup-authn-authz-providers.patch b/www-apache/mod_perl/files/debian/320-cleanup-authn-authz-providers.patch deleted file mode 100644 index 0a2f0a7..0000000 --- a/www-apache/mod_perl/files/debian/320-cleanup-authn-authz-providers.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 75662f4285bad8d28fe787d1293bdd95a535cad1 Mon Sep 17 00:00:00 2001 -From: Niko Tyni <ntyni@debian.org> -Date: Fri, 14 Jun 2013 14:07:22 +0300 -Subject: [PATCH] Make sure authn and authz providers are cleaned up in time - -The authn and authz providers need to be registered in the configuration -pool rather than the server process pool. The latter outlives the load -time of the mod_perl shared object, so cleanup hooks could get called -after the registered functions were unloaded, causing SIGSEGVs and other -undefined behaviour. - -Fix suggested by Stefan Fritsch. - -Bug-Debian: http://bugs.debian.org/711213 ---- - src/modules/perl/modperl_cmd.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/modules/perl/modperl_cmd.c b/src/modules/perl/modperl_cmd.c -index 4ae0a62..d14b330 100644 ---- a/src/modules/perl/modperl_cmd.c -+++ b/src/modules/perl/modperl_cmd.c -@@ -419,7 +419,7 @@ MP_CMD_SRV_DECLARE(init_handlers) - - MP_CMD_SRV_DECLARE2(authz_provider) - { -- apr_pool_t *p = parms->server->process->pool; -+ apr_pool_t *p = parms->pool; - char *name = apr_pstrdup(p, arg1); - char *cb = apr_pstrdup(p, arg2); - -@@ -431,7 +431,7 @@ MP_CMD_SRV_DECLARE2(authz_provider) - - MP_CMD_SRV_DECLARE2(authn_provider) - { -- apr_pool_t *p = parms->server->process->pool; -+ apr_pool_t *p = parms->pool; - char *name = apr_pstrdup(p, arg1); - char *cb = apr_pstrdup(p, arg2); - --- -1.7.10.4 - diff --git a/www-apache/mod_perl/files/mod_perl-2.0.1-sneak-tmpdir.patch b/www-apache/mod_perl/files/mod_perl-2.0.1-sneak-tmpdir.patch deleted file mode 100644 index 0930278..0000000 --- a/www-apache/mod_perl/files/mod_perl-2.0.1-sneak-tmpdir.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- t/conf/modperl_extra.pl.orig 2005-05-16 18:27:45.000000000 +1000 -+++ t/conf/modperl_extra.pl 2005-05-16 18:34:46.000000000 +1000 -@@ -136,6 +136,8 @@ - sub test_modperl_env { - # see t/response/TestModperl/env.pm - $ENV{MODPERL_EXTRA_PL} = __FILE__; -+ $ENV{TMPDIR} = __FILE__; -+ $ENV{TMPDIR} =~ s,/work/.*,/temp,; - } - - 1; diff --git a/www-apache/mod_perl/files/mod_perl-2.0.4-inline.patch b/www-apache/mod_perl/files/mod_perl-2.0.4-inline.patch deleted file mode 100644 index 5c51a80..0000000 --- a/www-apache/mod_perl/files/mod_perl-2.0.4-inline.patch +++ /dev/null @@ -1,22 +0,0 @@ -https://bugs.gentoo.org/550244 - -taken from Fedora: -http://pkgs.fedoraproject.org/cgit/mod_perl.git/tree/mod_perl-2.0.4-inline.patch?h=f22 - -fixes building with gcc-5: -apache2: Syntax error on line 148 of /etc/apache2/httpd.conf: -Syntax error on line 2 of /etc/apache2/modules.d/75_mod_perl.conf: -Cannot load modules/mod_perl.so into server: -/usr/lib64/apache2/modules/mod_perl.so: undefined symbol: modperl_handler_name - ---- mod_perl-2.0.4/src/modules/perl/modperl_common_util.h.inline -+++ mod_perl-2.0.4/src/modules/perl/modperl_common_util.h -@@ -22,7 +22,7 @@ - #ifdef MP_DEBUG - #define MP_INLINE - #else --#define MP_INLINE APR_INLINE -+#define MP_INLINE - #endif - - #ifdef CYGWIN diff --git a/www-apache/mod_perl/files/mod_perl-2.0.7-bundled-Apache-Test.patch b/www-apache/mod_perl/files/mod_perl-2.0.7-bundled-Apache-Test.patch deleted file mode 100644 index 478495e..0000000 --- a/www-apache/mod_perl/files/mod_perl-2.0.7-bundled-Apache-Test.patch +++ /dev/null @@ -1,134 +0,0 @@ -diff --git a/Makefile.PL b/Makefile.PL -index c4a0430..e85cf01 100644 ---- a/Makefile.PL -+++ b/Makefile.PL -@@ -24,7 +24,7 @@ BEGIN { - - } - --use lib qw(lib Apache-Test/lib); -+use lib qw(lib); - - use Config; - use File::Spec::Functions; -@@ -117,16 +117,6 @@ sub get_DEFINE { - } - - sub configure { -- -- # mod_perl test suite relies on having Apache-Test bundled with -- # the mod_perl source, since any pre-installed version may not do -- # the right thing -- unless (-d "Apache-Test") { -- error "Can't find a sub-directory Apache-Test. " . -- "Make sure that you are using a complete source distribution"; -- exit 1; -- } -- - set_modperl_version(); - - if ($old_modperl_version) { -@@ -798,14 +788,9 @@ run_tests : test_clean - run_subtests :: - cd ModPerl-Registry && $(MAKE) test - --run_subtests :: -- cd Apache-Reload && $(MAKE) test -- - EOF - - $preamble .= <<'EOF' unless $build->mpm_is_threaded(); --run_subtests :: -- cd Apache-SizeLimit && $(MAKE) test - - EOF - -@@ -816,36 +801,6 @@ EOF - return $preamble; - } - --sub MY::postamble { -- my $self = shift; -- -- my $string = $self->ModPerl::BuildMM::MY::postamble; -- -- $string .= <<'EOF'; --mydist : Apache-Test/META.yml mod_perl.spec manifest tardist -- --rpm: dist -- @[ -d $(PWD)/rpm ] || mkdir $(PWD)/rpm -- rpmbuild -ta --define "_rpmdir $(PWD)/rpm" \ -- --define "_srcrpmdir $(PWD)/rpm" \ -- $(DISTVNAME).tar.gz -- @mv $(PWD)/rpm/*/*.rpm $(PWD)/rpm/ -- @rm -rf $(PWD)/rpm/*/ -- --mod_perl.spec: build/make_rpm_spec -- $(PERL) build/make_rpm_spec -- --Apache-Test/META.yml: -- cd Apache-Test && make metafile -- --tag : -- svn copy https://svn.apache.org/repos/asf/perl/modperl/branches/release/$(VERSION_SYM) https://svn.apache.org/repos/asf/perl/modperl/tags/$(VERSION_SYM) -- svn copy https://svn.apache.org/repos/asf/perl/modperl/docs/trunk https://svn.apache.org/repos/asf/perl/modperl/docs/tags/$(VERSION_SYM) --EOF -- -- return $string; --} -- - # this is a workaround so that ModPerl::MM will move MY::constants - # away, and Apache-Test/Makefile.PL which has its own MY::constants - # won't get complaints on MY::constants redefined -diff --git a/ModPerl-Registry/Makefile.PL b/ModPerl-Registry/Makefile.PL -index e72e65c..8610935 100644 ---- a/ModPerl-Registry/Makefile.PL -+++ b/ModPerl-Registry/Makefile.PL -@@ -14,7 +14,7 @@ use Apache::TestMM qw(test clean); - - # prerequisites - my %require = ( -- "Apache::Test" => "", # any version will do? -+ "Apache::Test" => 0, # any version will do? - ); - - my @scripts = qw(t/TEST t/SMOKE); -diff --git a/lib/ModPerl/BuildMM.pm b/lib/ModPerl/BuildMM.pm -index 1c729e2..8651999 100644 ---- a/lib/ModPerl/BuildMM.pm -+++ b/lib/ModPerl/BuildMM.pm -@@ -38,12 +38,10 @@ my @methods = grep *{$stash->{$_}}{CODE}, keys %$stash; - ModPerl::MM::override_eu_mm_mv_all_methods(@methods); - use strict 'refs'; - --my $apache_test_dir = catdir Cwd::getcwd(), "Apache-Test", "lib"; -- - #to override MakeMaker MOD_INSTALL macro - sub mod_install { - q{$(PERL) -I$(INST_LIB) -I$(PERL_LIB) \\}."\n" . -- qq{-I$apache_test_dir -MModPerl::BuildMM \\}."\n" . -+ qq{-MModPerl::BuildMM \\}."\n" . - q{-e "ExtUtils::Install::install({@ARGV},'$(VERBINST)',0,'$(UNINST)');"}."\n"; - } - -@@ -269,7 +267,7 @@ sub ModPerl::BuildMM::MY::postamble { - - push @target, - '$(FULLPERL) -I$(INST_LIB) ' . -- "-I$apache_test_dir -MModPerl::BuildMM " . -+ "-MModPerl::BuildMM " . - "-e ModPerl::BuildMM::glue_pod $pm $podpath $blib"; - - # Win32 doesn't normally install man pages -diff --git a/lib/ModPerl/Manifest.pm b/lib/ModPerl/Manifest.pm -index 1e856bc..9f1833c 100644 ---- a/lib/ModPerl/Manifest.pm -+++ b/lib/ModPerl/Manifest.pm -@@ -33,7 +33,6 @@ our @EXPORT_OK = qw(mkmanifest); - my @add_files = qw{ - MANIFEST - mod_perl.spec -- Apache-Test/META.yml - }; - - sub get_svn_files { diff --git a/www-apache/mod_perl/files/mod_perl-2.0.8-Test-ModPerl-Registry-fix.patch b/www-apache/mod_perl/files/mod_perl-2.0.8-Test-ModPerl-Registry-fix.patch deleted file mode 100644 index d8ca378..0000000 --- a/www-apache/mod_perl/files/mod_perl-2.0.8-Test-ModPerl-Registry-fix.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -ur httpd24-orig/ModPerl-Registry/t/conf/extra.conf.in httpd24/ModPerl-Registry/t/conf/extra.conf.in ---- httpd24-orig/ModPerl-Registry/t/conf/extra.conf.in 2013-06-21 15:02:19.747710142 +0000 -+++ httpd24/ModPerl-Registry/t/conf/extra.conf.in 2013-06-21 15:11:42.695660587 +0000 -@@ -218,8 +218,8 @@ - <IfModule mod_rewrite.c> - - RewriteEngine On -- RewriteLogLevel 9 -- RewriteLog @ServerRoot@/logs/rewrite_log -+ LogLevel rewrite:trace8 -+ ErrorLog @ServerRoot@/logs/rewrite_log - RewriteRule /rewritetest /rewrite_env/env_val.pl?REWRITE_TEST [E=REWRITE_TEST:GOTCHA,PT,NS,L] - - <Location /rewrite_env> diff --git a/www-apache/mod_perl/files/mod_perl-2.0.8-auth-modules-fix.patch b/www-apache/mod_perl/files/mod_perl-2.0.8-auth-modules-fix.patch deleted file mode 100644 index 8f369e4..0000000 --- a/www-apache/mod_perl/files/mod_perl-2.0.8-auth-modules-fix.patch +++ /dev/null @@ -1,96 +0,0 @@ -diff -ur httpd24-orig/t/response/TestModules/proxy.pm httpd24/t/response/TestModules/proxy.pm ---- httpd24-orig/t/response/TestModules/proxy.pm 2013-06-21 13:11:41.421816434 +0000 -+++ httpd24/t/response/TestModules/proxy.pm 2013-06-21 13:14:00.011312328 +0000 -@@ -47,9 +47,7 @@ - <IfModule mod_proxy.c> - <Proxy http://@servername@:@port@/*> - <IfModule @ACCESS_MODULE@> -- Order Deny,Allow -- Deny from all -- Allow from @servername@ -+ Require host @servername@ - </IfModule> - </Proxy> - -diff -ur httpd24-orig/t/response/TestAPI/access2.pm httpd24/t/response/TestAPI/access2.pm ---- httpd24-orig/t/response/TestAPI/access2.pm 2013-06-21 17:52:12.980765956 +0000 -+++ httpd24/t/response/TestAPI/access2.pm 2013-06-21 17:54:54.670189526 +0000 -@@ -103,16 +103,17 @@ - - <IfModule @ACCESS_MODULE@> - # needed to test $r->satisfies -- Allow from All -+ Require all granted - </IfModule> - AuthType Basic - AuthName "Access" -- Require my-user goo bar -- Require my-group xar tar -- <Limit POST> -- Require valid-user -- </Limit> -- Satisfy All -+ <RequireAll> -+ Require my-user goo bar -+ Require my-group xar tar -+ <Limit POST> -+ Require valid-user -+ </Limit> -+ </RequireAll> - <IfModule @AUTH_MODULE@> - # htpasswd -mbc auth-users goo foo - # htpasswd -mb auth-users bar mar -diff -ur httpd24-orig/t/filter/TestFilter/both_str_req_proxy.pm httpd24/t/filter/TestFilter/both_str_req_proxy.pm ---- httpd24-orig/t/filter/TestFilter/both_str_req_proxy.pm 2013-06-21 17:59:43.869157727 +0000 -+++ httpd24/t/filter/TestFilter/both_str_req_proxy.pm 2013-06-21 18:01:04.218870886 +0000 -@@ -62,9 +62,7 @@ - <IfModule mod_proxy.c> - <Proxy http://@servername@:@port@/*> - <IfModule @ACCESS_MODULE@> -- Order Deny,Allow -- Deny from all -- Allow from @servername@ -+ Require host @servername@ - </IfModule> - </Proxy> - -diff -ur httpd24-orig/t/protocol/TestProtocol/pseudo_http.pm httpd24/t/protocol/TestProtocol/pseudo_http.pm ---- httpd24-orig/t/protocol/TestProtocol/pseudo_http.pm 2013-06-21 17:59:43.869157727 +0000 -+++ httpd24/t/protocol/TestProtocol/pseudo_http.pm 2013-06-21 18:05:32.087914088 +0000 -@@ -154,21 +154,21 @@ - - <Location TestProtocol::pseudo_http> - -- <IfModule @ACCESS_MODULE@> -- Order Deny,Allow -- Allow from @servername@ -- </IfModule> -- -- <IfModule @AUTH_MODULE@> -- # htpasswd -mbc basic-auth stas foobar -- # using md5 password so it'll work on win32 too -- AuthUserFile @ServerRoot@/htdocs/protocols/basic-auth -- </IfModule> -- -- AuthName TestProtocol::pseudo_http -- AuthType Basic -- Require user stas -- Satisfy any -+ <RequireAny> -+ <IfModule @ACCESS_MODULE@> -+ Require host @servername@ -+ </IfModule> -+ -+ <IfModule @AUTH_MODULE@> -+ # htpasswd -mbc basic-auth stas foobar -+ # using md5 password so it'll work on win32 too -+ AuthUserFile @ServerRoot@/htdocs/protocols/basic-auth -+ </IfModule> -+ -+ AuthName TestProtocol::pseudo_http -+ AuthType Basic -+ Require user stas -+ </RequireAny> - - </Location> - diff --git a/www-apache/mod_perl/files/mod_perl-2.0.8-bundled-Apache-Test.patch b/www-apache/mod_perl/files/mod_perl-2.0.8-bundled-Apache-Test.patch deleted file mode 100644 index f453c09..0000000 --- a/www-apache/mod_perl/files/mod_perl-2.0.8-bundled-Apache-Test.patch +++ /dev/null @@ -1,131 +0,0 @@ -diff -ur httpd24-orig/lib/ModPerl/BuildMM.pm httpd24/lib/ModPerl/BuildMM.pm ---- httpd24-orig/lib/ModPerl/BuildMM.pm 2013-06-20 21:13:35.491728266 +0000 -+++ httpd24/lib/ModPerl/BuildMM.pm 2013-06-20 21:16:02.991193839 +0000 -@@ -38,12 +38,10 @@ - ModPerl::MM::override_eu_mm_mv_all_methods(@methods); - use strict 'refs'; - --my $apache_test_dir = catdir Cwd::getcwd(), "Apache-Test", "lib"; -- - #to override MakeMaker MOD_INSTALL macro - sub mod_install { - q{$(PERL) -I$(INST_LIB) -I$(PERL_LIB) \\}."\n" . -- qq{-I$apache_test_dir -MModPerl::BuildMM \\}."\n" . -+ qq{-MModPerl::BuildMM \\}."\n" . - q{-e "ExtUtils::Install::install({@ARGV},'$(VERBINST)',0,'$(UNINST)');"}."\n"; - } - -@@ -269,7 +267,7 @@ - - push @target, - '$(FULLPERL) -I$(INST_LIB) ' . -- "-I$apache_test_dir -MModPerl::BuildMM " . -+ "-MModPerl::BuildMM " . - "-e ModPerl::BuildMM::glue_pod $pm $podpath $blib"; - - # Win32 doesn't normally install man pages -diff -ur httpd24-orig/lib/ModPerl/Manifest.pm httpd24/lib/ModPerl/Manifest.pm ---- httpd24-orig/lib/ModPerl/Manifest.pm 2013-06-20 21:13:35.491728266 +0000 -+++ httpd24/lib/ModPerl/Manifest.pm 2013-06-20 21:16:02.991193839 +0000 -@@ -33,7 +33,6 @@ - my @add_files = qw{ - MANIFEST - mod_perl.spec -- Apache-Test/META.yml - }; - - sub get_svn_files { -diff -ur httpd24-orig/Makefile.PL httpd24/Makefile.PL ---- httpd24-orig/Makefile.PL 2013-06-20 21:13:35.461728372 +0000 -+++ httpd24/Makefile.PL 2013-06-20 21:16:02.991193839 +0000 -@@ -24,7 +24,7 @@ - - } - --use lib qw(lib Apache-Test/lib); -+use lib qw(lib); - - use Config; - use File::Spec::Functions; -@@ -117,16 +117,6 @@ - } - - sub configure { -- -- # mod_perl test suite relies on having Apache-Test bundled with -- # the mod_perl source, since any pre-installed version may not do -- # the right thing -- unless (-d "Apache-Test") { -- error "Can't find a sub-directory Apache-Test. " . -- "Make sure that you are using a complete source distribution"; -- exit 1; -- } -- - set_modperl_version(); - - if ($old_modperl_version) { -@@ -798,14 +788,9 @@ - run_subtests :: - cd ModPerl-Registry && $(MAKE) test - --run_subtests :: -- cd Apache-Reload && $(MAKE) test -- - EOF - - $preamble .= <<'EOF' unless $build->mpm_is_threaded(); --run_subtests :: -- cd Apache-SizeLimit && $(MAKE) test - - EOF - -@@ -816,37 +801,6 @@ - return $preamble; - } - --sub MY::postamble { -- my $self = shift; -- -- my $string = $self->ModPerl::BuildMM::MY::postamble; -- -- $string .= <<'EOF'; --mydist : Apache-Test/META.yml mod_perl.spec manifest tardist -- --rpm: dist -- @[ -d $(PWD)/rpm ] || mkdir $(PWD)/rpm -- rpmbuild -ta --define "_rpmdir $(PWD)/rpm" \ -- --define "_srcrpmdir $(PWD)/rpm" \ -- $(DISTVNAME).tar.gz -- @mv $(PWD)/rpm/*/*.rpm $(PWD)/rpm/ -- @rm -rf $(PWD)/rpm/*/ -- --mod_perl.spec: build/make_rpm_spec -- $(PERL) build/make_rpm_spec -- --Apache-Test/META.yml: -- cd Apache-Test && make metafile -- --tag : -- svn copy https://svn.apache.org/repos/asf/perl/modperl/trunk https://svn.apache.org/repos/asf/perl/modperl/branches/release/$(VERSION_SYM) -- svn copy https://svn.apache.org/repos/asf/perl/modperl/branches/release/$(VERSION_SYM) https://svn.apache.org/repos/asf/perl/modperl/tags/$(VERSION_SYM) -- svn copy https://svn.apache.org/repos/asf/perl/modperl/docs/trunk https://svn.apache.org/repos/asf/perl/modperl/docs/tags/$(VERSION_SYM) --EOF -- -- return $string; --} -- - # this is a workaround so that ModPerl::MM will move MY::constants - # away, and Apache-Test/Makefile.PL which has its own MY::constants - # won't get complaints on MY::constants redefined -diff -ur httpd24-orig/ModPerl-Registry/Makefile.PL httpd24/ModPerl-Registry/Makefile.PL ---- httpd24-orig/ModPerl-Registry/Makefile.PL 2013-06-20 21:13:35.471728336 +0000 -+++ httpd24/ModPerl-Registry/Makefile.PL 2013-06-20 21:16:02.991193839 +0000 -@@ -14,7 +14,7 @@ - - # prerequisites - my %require = ( -- "Apache::Test" => "", # any version will do? -+ "Apache::Test" => 0, # any version will do? - ); - - my @scripts = qw(t/TEST t/SMOKE); diff --git a/www-apache/mod_perl/files/mod_perl-2.0.9-Test-ModPerl-Registry-fix.patch b/www-apache/mod_perl/files/mod_perl-2.0.9-Test-ModPerl-Registry-fix.patch deleted file mode 100644 index bf2a067..0000000 --- a/www-apache/mod_perl/files/mod_perl-2.0.9-Test-ModPerl-Registry-fix.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -ur mod_perl-2.0.9-orig/ModPerl-Registry/t/conf/extra.conf.in mod_perl-2.0.9/ModPerl-Registry/t/conf/extra.conf.in ---- mod_perl-2.0.9-orig/ModPerl-Registry/t/conf/extra.conf.in 2015-08-06 22:06:49.738009495 +0000 -+++ mod_perl-2.0.9/ModPerl-Registry/t/conf/extra.conf.in 2015-08-06 22:10:35.377297791 +0000 -@@ -219,8 +219,8 @@ - - RewriteEngine On - <IfVersion < 2.4.0> -- RewriteLogLevel 9 -- RewriteLog @ServerRoot@/logs/rewrite_log -+ LogLevel rewrite:trace8 -+ ErrorLog @ServerRoot@/logs/rewrite_log - </IfVersion> - RewriteRule /rewritetest /rewrite_env/env_val.pl?REWRITE_TEST [E=REWRITE_TEST:GOTCHA,PT,NS,L] - diff --git a/www-apache/mod_perl/files/mod_perl-2.0.9-bundled-Apache-Test.patch b/www-apache/mod_perl/files/mod_perl-2.0.9-bundled-Apache-Test.patch deleted file mode 100644 index d647fe0..0000000 --- a/www-apache/mod_perl/files/mod_perl-2.0.9-bundled-Apache-Test.patch +++ /dev/null @@ -1,123 +0,0 @@ -diff -ur mod_perl-2.0.9-orig/lib/ModPerl/BuildMM.pm mod_perl-2.0.9/lib/ModPerl/BuildMM.pm ---- mod_perl-2.0.9-orig/lib/ModPerl/BuildMM.pm 2015-08-06 21:39:21.933134749 +0000 -+++ mod_perl-2.0.9/lib/ModPerl/BuildMM.pm 2015-08-06 21:41:49.552679551 +0000 -@@ -39,12 +39,10 @@ - ModPerl::MM::override_eu_mm_mv_all_methods(@methods); - use strict 'refs'; - --my $apache_test_dir = catdir Cwd::getcwd(), "Apache-Test", "lib"; -- - #to override MakeMaker MOD_INSTALL macro - sub mod_install { - q{$(PERL) -I$(INST_LIB) -I$(PERL_LIB) \\}."\n" . -- qq{-I$apache_test_dir -MModPerl::BuildMM \\}."\n" . -+ qq{-MModPerl::BuildMM \\}."\n" . - q{-e "ExtUtils::Install::install({@ARGV},'$(VERBINST)',0,'$(UNINST)');"}."\n"; - } - -@@ -271,7 +269,7 @@ - - push @target, - '$(FULLPERL) -I$(INST_LIB) ' . -- "-I$apache_test_dir -MModPerl::BuildMM " . -+ "-MModPerl::BuildMM " . - "-e ModPerl::BuildMM::glue_pod $pm $podpath $blib"; - - # Win32 doesn't normally install man pages -diff -ur mod_perl-2.0.9-orig/lib/ModPerl/Manifest.pm mod_perl-2.0.9/lib/ModPerl/Manifest.pm ---- mod_perl-2.0.9-orig/lib/ModPerl/Manifest.pm 2015-08-06 21:39:21.933134749 +0000 -+++ mod_perl-2.0.9/lib/ModPerl/Manifest.pm 2015-08-06 21:43:04.812443268 +0000 -@@ -34,7 +34,6 @@ - my @add_files = qw{ - MANIFEST - mod_perl.spec -- Apache-Test/META.yml - }; - - sub get_svn_files { -diff -ur mod_perl-2.0.9-orig/Makefile.PL mod_perl-2.0.9/Makefile.PL ---- mod_perl-2.0.9-orig/Makefile.PL 2015-08-06 21:39:21.933134749 +0000 -+++ mod_perl-2.0.9/Makefile.PL 2015-08-06 21:47:56.001531014 +0000 -@@ -25,7 +25,7 @@ - - } - --use lib qw(lib Apache-Test/lib); -+use lib qw(lib); - - use Config; - use File::Spec::Functions; -@@ -122,15 +122,6 @@ - - sub configure { - -- # mod_perl test suite relies on having Apache-Test bundled with -- # the mod_perl source, since any pre-installed version may not do -- # the right thing -- unless (-d "Apache-Test") { -- error "Can't find a sub-directory Apache-Test. " . -- "Make sure that you are using a complete source distribution"; -- exit 1; -- } -- - set_modperl_version(); - - if ($old_modperl_version) { -@@ -853,14 +844,9 @@ - run_subtests :: - cd ModPerl-Registry && $(MAKE) test - --run_subtests :: -- cd Apache-Reload && $(MAKE) test -- - EOF - - $preamble .= <<'EOF' unless $build->mpm_is_threaded(); --run_subtests :: -- cd Apache-SizeLimit && $(MAKE) test - - EOF - -@@ -871,42 +857,6 @@ - return $preamble; - } - --sub MY::postamble { -- my $self = shift; -- -- my $string = $self->ModPerl::BuildMM::MY::postamble; -- -- if (!WIN32) { -- $string .= <<'EOF'; --rpm: dist -- @[ -d $(PWD)/rpm ] || mkdir $(PWD)/rpm -- rpmbuild -ta --define "_rpmdir $(PWD)/rpm" \ -- --define "_srcrpmdir $(PWD)/rpm" \ -- $(DISTVNAME).tar.gz -- @mv $(PWD)/rpm/*/*.rpm $(PWD)/rpm/ -- @rm -rf $(PWD)/rpm/*/ -- --EOF -- } -- -- $string .= <<'EOF'; --mydist : Apache-Test/META.yml mod_perl.spec manifest tardist -- --mod_perl.spec: build/make_rpm_spec -- $(PERL) build/make_rpm_spec -- --Apache-Test/META.yml: -- cd Apache-Test && make metafile -- --tag : -- svn copy https://svn.apache.org/repos/asf/perl/modperl/trunk https://svn.apache.org/repos/asf/perl/modperl/branches/release/$(VERSION_SYM) -- svn copy https://svn.apache.org/repos/asf/perl/modperl/branches/release/$(VERSION_SYM) https://svn.apache.org/repos/asf/perl/modperl/tags/$(VERSION_SYM) -- svn copy https://svn.apache.org/repos/asf/perl/modperl/docs/trunk https://svn.apache.org/repos/asf/perl/modperl/docs/tags/$(VERSION_SYM) --EOF -- -- return $string; --} -- - # this is a workaround so that ModPerl::MM will move MY::constants - # away, and Apache-Test/Makefile.PL which has its own MY::constants - # won't get complaints on MY::constants redefined diff --git a/www-apache/mod_perl/metadata.xml b/www-apache/mod_perl/metadata.xml deleted file mode 100644 index ddc9b1d..0000000 --- a/www-apache/mod_perl/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="person"> - <email>jmbsvicetto@gentoo.org</email> - <name>Jorge Manuel B. S. Vicetto</name> -</maintainer> -</pkgmetadata> diff --git a/www-apache/mod_perl/mod_perl-2.0.8-r1.ebuild b/www-apache/mod_perl/mod_perl-2.0.8-r1.ebuild deleted file mode 100644 index e2b02be..0000000 --- a/www-apache/mod_perl/mod_perl-2.0.8-r1.ebuild +++ /dev/null @@ -1,192 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit depend.apache apache-module perl-module eutils - -DESCRIPTION="An embedded Perl interpreter for Apache2" -HOMEPAGE="https://projects.apache.org/projects/mod_perl.html" -SRC_URI="mirror://debian//pool/main/liba/libapache2-mod-perl2/libapache2-mod-perl2_2.0.8+httpd24-r1449661.orig.tar.gz" - -LICENSE="GPL-2" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="debug test" -SLOT="1" - -# Make sure we always use the latest Apache-Test version or even check the -# version of the bundled Apache-Test! -# -# We need both, apache and perl but either apache without threads or perl with -# ithreads, bug 373943 -DEPEND=" - dev-lang/perl - >=dev-perl/Apache-Test-1.360 - >=dev-perl/CGI-3.08 - >=www-servers/apache-2.4 - || ( www-servers/apache[-threads] dev-lang/perl[ithreads] ) - test? ( dev-perl/HTML-Parser ) -" -RDEPEND="${DEPEND}" -PDEPEND=" - >=dev-perl/Apache-Reload-0.11 - >=dev-perl/Apache-SizeLimit-0.95 -" - -S="${WORKDIR}/httpd24" - -APACHE2_MOD_FILE="${S}/src/modules/perl/mod_perl.so" -APACHE2_MOD_CONF="2.0.8/75_${PN}" -APACHE2_MOD_DEFINE="PERL" - -SRC_TEST="do" - -DOCFILES="Changes INSTALL README STATUS" - -need_apache2_4 - -src_prepare() { - perl-module_src_prepare - - # 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}"/${PN}-2.0.1-sneak-tmpdir.patch - # bug 550244 - epatch "${FILESDIR}"/${PN}-2.0.4-inline.patch - # bug 352724 - epatch "${FILESDIR}/${P}-bundled-Apache-Test.patch" - rm -rf Apache-{Test,Reload,SizeLimit}/ lib/Bundle/ -# sed -i -e 's:^Apache-\(Reload\|SizeLimit\|Test\).*::' \ -# -e 's:^lib/Bundle/Apache2.pm::' MANIFEST || die - - sed -i -e 's:^DefaultRuntimeDir.*/:DefaultRuntimeDir ${T}:' \ - t/conf/extra.conf.in || die - - # Debian patches for apache-2.4 update - # Add relevant patches from debian's repo: - # http://anonscm.debian.org/gitweb/?p=pkg-perl/packages/libapache2-mod-perl2.git;a=tree;f=debian/patches;h=6e625451bd47025c39272bd4bbc72bea6f5aed8f;hb=refs/heads/master - epatch "${FILESDIR}/debian/099-fix-url-on-index_top.patch" - epatch "${FILESDIR}/debian/010-doc-no-more-send_http_header.patch" - epatch "${FILESDIR}/debian/031-test-extra-args.patch" - epatch "${FILESDIR}/debian/200_fix-pod-spelling-errors.patch" - epatch "${FILESDIR}/debian/290-httpd-transition-test-todo.patch" - - # Fix Mod_Proxy test -# epatch "${FILESDIR}/${P}-Test_Mod_Proxy-apache24-fix.patch" - - # Fix ModPerl-Registry test - epatch "${FILESDIR}/${P}-Test-ModPerl-Registry-fix.patch" - - # Fix TestAPI test -# epatch "${FILESDIR}/${P}-TestAPI-fix.patch" - - # Fix auth* module references on tests -# epatch "${FILESDIR}/${P}-auth-fixes.patch" - epatch "${FILESDIR}/${P}-auth-modules-fix.patch" - -# epatch "${FILESDIR}/ -#260_fix_pipelined_response_deadlock.patch -#300-http-headers-version.patch -#310-defaultruntimedir.patch -#320-cleanup-authn-authz-providers.patch -} - -src_configure() { - local debug=$(usex debug 1 0) - - perl Makefile.PL \ - PREFIX="${EPREFIX}"/usr \ - INSTALLDIRS=vendor \ - MP_USE_DSO=1 \ - MP_APXS=${APXS} \ - MP_APR_CONFIG=/usr/bin/apr-1-config \ - MP_TRACE=${debug} \ - MP_DEBUG=${debug} \ - || 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}" "${T}" - fi - - # this does not || die because of bug 21325. kudos to smark for - # the idea of setting HOME. - TMPDIR="${T}" HOME="${T}/" perl-module_src_test -} - -src_install() { - apache-module_src_install - - default - - # TODO: add some stuff from docs/ back? - - # rendhalver - fix the perllocal.pod that gets installed - # it seems to me that this has been getting installed for ages - perl_delete_localpod - # Remove empty .bs files as well - perl_delete_packlist - - insinto "${APACHE_MODULES_CONFDIR}" - doins "${FILESDIR}"/2.0.3/apache2-mod_perl-startup.pl - - # 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. - - # Sorry for this evil hack... - perl_set_version # just to be sure... - sed -i \ - -e "s,-I${S}/[^[:space:]\"\']\+[[:space:]]\?,,g" \ - -e "s,-typemap[[:space:]]${S}/[^[:space:]\"\']\+[[:space:]]\?,,g" \ - -e "s,${S}\(/[^[:space:]\"\']\+\)\?,/,g" \ - "${D}/${VENDOR_ARCH}/Apache2/BuildConfig.pm" || die - - for fname in $(find "${D}" -type f -not -name '*.so'); do - grep -q "\(${D}\|${S}\)" "${fname}" && ewarn "QA: File contains a temporary path ${fname}" - sed -i -e "s:\(${D}\|${S}\):/:g" ${fname} - done - # All the rest - perl_remove_temppath -} - -pkg_postinst() { - apache-module_pkg_postinst -} diff --git a/www-apache/mod_perl/mod_perl-2.0.9.ebuild b/www-apache/mod_perl/mod_perl-2.0.9.ebuild deleted file mode 100644 index 925f7d5..0000000 --- a/www-apache/mod_perl/mod_perl-2.0.9.ebuild +++ /dev/null @@ -1,190 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit depend.apache apache-module perl-module eutils - -DESCRIPTION="An embedded Perl interpreter for Apache2" -HOMEPAGE="https://projects.apache.org/projects/mod_perl.html" -SRC_URI="mirror://apache/perl/${P}.tar.gz" - -LICENSE="GPL-2" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="debug test" -SLOT="1" - -# Make sure we always use the latest Apache-Test version or even check the -# version of the bundled Apache-Test! -# -# We need both, apache and perl but either apache without threads or perl with -# ithreads, bug 373943 -DEPEND=" - dev-lang/perl - >=dev-perl/Apache-Test-1.360 - >=dev-perl/CGI-3.08 - >=www-servers/apache-2.4 - || ( www-servers/apache[-threads] dev-lang/perl[ithreads] ) - test? ( dev-perl/HTML-Parser ) -" -RDEPEND="${DEPEND}" -PDEPEND=" - >=dev-perl/Apache-Reload-0.11 - >=dev-perl/Apache-SizeLimit-0.95 -" - -APACHE2_MOD_FILE="${S}/src/modules/perl/mod_perl.so" -APACHE2_MOD_CONF="2.0.8/75_${PN}" -APACHE2_MOD_DEFINE="PERL" - -SRC_TEST="do" - -DOCFILES="Changes INSTALL README STATUS" - -need_apache2_4 - -src_prepare() { - perl-module_src_prepare - - # 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}"/${PN}-2.0.1-sneak-tmpdir.patch - # bug 550244 - epatch "${FILESDIR}"/${PN}-2.0.4-inline.patch - # bug 352724 - epatch "${FILESDIR}/${P}-bundled-Apache-Test.patch" - rm -rf Apache-{Test,Reload,SizeLimit}/ lib/Bundle/ -# sed -i -e 's:^Apache-\(Reload\|SizeLimit\|Test\).*::' \ -# -e 's:^lib/Bundle/Apache2.pm::' MANIFEST || die - - sed -i -e 's:^DefaultRuntimeDir.*/:DefaultRuntimeDir ${T}:' \ - t/conf/extra.conf.in || die - - # Debian patches for apache-2.4 update - # Add relevant patches from debian's repo: - # http://anonscm.debian.org/gitweb/?p=pkg-perl/packages/libapache2-mod-perl2.git;a=tree;f=debian/patches;h=6e625451bd47025c39272bd4bbc72bea6f5aed8f;hb=refs/heads/master - epatch "${FILESDIR}/debian/099-fix-url-on-index_top.patch" - epatch "${FILESDIR}/debian/010-doc-no-more-send_http_header.patch" - epatch "${FILESDIR}/debian/031-test-extra-args.patch" - epatch "${FILESDIR}/debian/200_fix-pod-spelling-errors.patch" - epatch "${FILESDIR}/debian/290-httpd-transition-test-todo.patch" - - # Fix Mod_Proxy test -# epatch "${FILESDIR}/${P}-Test_Mod_Proxy-apache24-fix.patch" - - # Fix ModPerl-Registry test - epatch "${FILESDIR}/${P}-Test-ModPerl-Registry-fix.patch" - - # Fix TestAPI test -# epatch "${FILESDIR}/${P}-TestAPI-fix.patch" - - # Fix auth* module references on tests -# epatch "${FILESDIR}/${P}-auth-fixes.patch" -# epatch "${FILESDIR}/${PN}-2.0.8-auth-modules-fix.patch" - -# epatch "${FILESDIR}/ -#260_fix_pipelined_response_deadlock.patch -#300-http-headers-version.patch -#310-defaultruntimedir.patch -#320-cleanup-authn-authz-providers.patch -} - -src_configure() { - local debug=$(usex debug 1 0) - - perl Makefile.PL \ - PREFIX="${EPREFIX}"/usr \ - INSTALLDIRS=vendor \ - MP_USE_DSO=1 \ - MP_APXS=${APXS} \ - MP_APR_CONFIG=/usr/bin/apr-1-config \ - MP_TRACE=${debug} \ - MP_DEBUG=${debug} \ - || 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}" "${T}" - fi - - # this does not || die because of bug 21325. kudos to smark for - # the idea of setting HOME. - TMPDIR="${T}" HOME="${T}/" perl-module_src_test -} - -src_install() { - apache-module_src_install - - default - - # TODO: add some stuff from docs/ back? - - # rendhalver - fix the perllocal.pod that gets installed - # it seems to me that this has been getting installed for ages - perl_delete_localpod - # Remove empty .bs files as well - perl_delete_packlist - - insinto "${APACHE_MODULES_CONFDIR}" - doins "${FILESDIR}"/2.0.3/apache2-mod_perl-startup.pl - - # 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. - - # Sorry for this evil hack... - perl_set_version # just to be sure... - sed -i \ - -e "s,-I${S}/[^[:space:]\"\']\+[[:space:]]\?,,g" \ - -e "s,-typemap[[:space:]]${S}/[^[:space:]\"\']\+[[:space:]]\?,,g" \ - -e "s,${S}\(/[^[:space:]\"\']\+\)\?,/,g" \ - "${D}/${VENDOR_ARCH}/Apache2/BuildConfig.pm" || die - - for fname in $(find "${D}" -type f -not -name '*.so'); do - grep -q "\(${D}\|${S}\)" "${fname}" && ewarn "QA: File contains a temporary path ${fname}" - sed -i -e "s:\(${D}\|${S}\):/:g" ${fname} - done - # All the rest - perl_remove_temppath -} - -pkg_postinst() { - apache-module_pkg_postinst -} |