commit: cbe143c6f22c7742de05401bcd8f6d275da6a0cf
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 19 21:40:18 2017 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Wed Apr 19 21:40:18 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbe143c6
www-apache/mod_perl: Remove old
Package-Manager: Portage-2.3.5, Repoman-2.3.2
www-apache/mod_perl/Manifest | 1 -
...perl-2.0.10_pre201601-bundled-Apache-Test.patch | 123 ----------------
...ip-client_add-instead-of-remote_ip-remote.patch | 47 ------
.../files/use-log.level-instead-of-loglevel.patch | 27 ----
.../mod_perl/mod_perl-2.0.10_pre201601.ebuild | 164 ---------------------
5 files changed, 362 deletions(-)
diff --git a/www-apache/mod_perl/Manifest b/www-apache/mod_perl/Manifest
index 1206f881c3c..2fb03577734 100644
--- a/www-apache/mod_perl/Manifest
+++ b/www-apache/mod_perl/Manifest
@@ -1,3 +1,2 @@
DIST mod_perl-2.0.10.tar.gz 3846211 SHA256
d1cf83ed4ea3a9dfceaa6d9662ff645177090749881093051020bf42f9872b64 SHA512
0bf1a885cb32a3393e95f87e71983097613e263b9052dbf22494663b506e36a25d0256afed24285232276d9f43ebd3adaa18b91129bfb62116a8ccb023855bca
WHIRLPOOL
5ca9c3d961292a36d6be08e6f619385d54dd3551fc27a7387f53604e9971429c732fc988df50c35b1d62d520bab763fe4d127beb09aef86209583f2ef0d21eaf
-DIST mod_perl-2.0.10_pre201601.tar.gz 3854229 SHA256
a89c23b66b21c600b74a48125c02c91159c07b08cc07fb4f55015e8e07713697 SHA512
04e57e79031374f3ec432e950fb9f79d1202da9dfc0d86a5137b7346c18f313a4e58ecfffed51efd7e6494baec86b22a42d6712ce5f7824f9f479c05bac00659
WHIRLPOOL
5d37b067aa945cafc0cc7a1f1b27257d8409f6804f22880ae7fd6c21424bbd2c07bace483d95590d255678725f67d081741978cff24cfc91716c08294547e622
DIST mod_perl-2.0.8.tar.gz 3790026 SHA256
35dc1b7a40a90a395ce88bba2df84f22289975f34d1757de6d715560c20a20e6 SHA512
d5090651699c4436fe8d0a525226543c971aa05db337dc1b1e89023183df1c7dd8b8775f3a0f7d3b9ec40e8c058ac23bd24141cf15a5fe5806226d634dfb4c87
WHIRLPOOL
d22e1c353339b08ad752e9f9c7fc0ec4d6a173c4cd3004380b14098e1028737e0eb69d2f56dbe0da3cbfb01b31232c5073d7edb28bf4fed6b2ccd67b09ad7080
diff --git
a/www-apache/mod_perl/files/mod_perl-2.0.10_pre201601-bundled-Apache-Test.patch
b/www-apache/mod_perl/files/mod_perl-2.0.10_pre201601-bundled-Apache-Test.patch
deleted file mode 100644
index af53cad6559..00000000000
---
a/www-apache/mod_perl/files/mod_perl-2.0.10_pre201601-bundled-Apache-Test.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-diff -ruN mod_perl-2.0.10_pre201601.orig/Makefile.PL
mod_perl-2.0.10_pre201601/Makefile.PL
---- mod_perl-2.0.10_pre201601.orig/Makefile.PL 2015-05-13 10:01:18.000000000
+0200
-+++ mod_perl-2.0.10_pre201601/Makefile.PL 2016-01-09 21:02:00.000000000
+0100
-@@ -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 -ruN mod_perl-2.0.10_pre201601.orig/lib/ModPerl/BuildMM.pm
mod_perl-2.0.10_pre201601/lib/ModPerl/BuildMM.pm
---- mod_perl-2.0.10_pre201601.orig/lib/ModPerl/BuildMM.pm 2015-04-01
18:19:18.000000000 +0200
-+++ mod_perl-2.0.10_pre201601/lib/ModPerl/BuildMM.pm 2016-01-09
21:04:34.000000000 +0100
-@@ -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 -ruN mod_perl-2.0.10_pre201601.orig/lib/ModPerl/Manifest.pm
mod_perl-2.0.10_pre201601/lib/ModPerl/Manifest.pm
---- mod_perl-2.0.10_pre201601.orig/lib/ModPerl/Manifest.pm 2015-05-13
09:23:09.000000000 +0200
-+++ mod_perl-2.0.10_pre201601/lib/ModPerl/Manifest.pm 2016-01-09
21:04:50.000000000 +0100
-@@ -119,7 +119,6 @@
- t/apr-ext/perlio
- # PAUSE breaks if a dist has more than one META.yml. the top-level
- # META.yml already excludes Apache-Test from indexing
--Apache-Test/META.yml
- # exclude Apache-Test/MANIFEST since it confuses the mp2 build (e.g it
- # wants Apache-Test/META.yml which we don't supply, see above)
- Apache-Test/MANIFEST
diff --git
a/www-apache/mod_perl/files/use-client_ip-client_add-instead-of-remote_ip-remote.patch
b/www-apache/mod_perl/files/use-client_ip-client_add-instead-of-remote_ip-remote.patch
deleted file mode 100644
index 1a695b85409..00000000000
---
a/www-apache/mod_perl/files/use-client_ip-client_add-instead-of-remote_ip-remote.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 3fb7843aa2aa992be430068929f4e1cc7787a233 Mon Sep 17 00:00:00 2001
-From: Martin Jansa <martin.ja...@gmail.com>
-Date: Tue, 3 Apr 2012 19:25:41 +0200
-Subject: [PATCH] use client_ip/client_add instead of remote_ip/remote_addr
-
-Signed-off-by: Martin Jansa <martin.ja...@gmail.com>
----
- xs/maps/apache2_structures.map | 4 ++--
- xs/tables/current/Apache2/StructureTable.pm | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/xs/maps/apache2_structures.map b/xs/maps/apache2_structures.map
-index f86ec93..c0fcf78 100644
---- a/xs/maps/apache2_structures.map
-+++ b/xs/maps/apache2_structures.map
-@@ -106,8 +106,8 @@ $ limit_req_fields
- < local_addr
- < local_ip
- < local_host
--< remote_addr
-- remote_ip
-+< client_addr
-+ client_ip
- < remote_host
- - remote_logname
- < aborted
-diff --git a/xs/tables/current/Apache2/StructureTable.pm
b/xs/tables/current/Apache2/StructureTable.pm
-index af50be1..0c0465a 100644
---- a/xs/tables/current/Apache2/StructureTable.pm
-+++ b/xs/tables/current/Apache2/StructureTable.pm
-@@ -2708,11 +2708,11 @@ $Apache2::StructureTable = [
- },
- {
- 'type' => 'apr_sockaddr_t *',
-- 'name' => 'remote_addr'
-+ 'name' => 'client_addr'
- },
- {
- 'type' => 'char *',
-- 'name' => 'remote_ip'
-+ 'name' => 'client_ip'
- },
- {
- 'type' => 'char *',
---
-1.7.8.5
-
diff --git a/www-apache/mod_perl/files/use-log.level-instead-of-loglevel.patch
b/www-apache/mod_perl/files/use-log.level-instead-of-loglevel.patch
deleted file mode 100644
index aeb8d98af79..00000000000
--- a/www-apache/mod_perl/files/use-log.level-instead-of-loglevel.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 0d6ac25c1c7871be52e8399c6e8bc8509ed5f3d9 Mon Sep 17 00:00:00 2001
-From: Martin Jansa <martin.ja...@gmail.com>
-Date: Tue, 3 Apr 2012 19:30:33 +0200
-Subject: [PATCH] use log.level instead of loglevel
-
-Signed-off-by: Martin Jansa <martin.ja...@gmail.com>
----
- xs/maps/apache2_structures.map | 2 +-
- xs/tables/current/Apache2/StructureTable.pm | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/xs/tables/current/Apache2/StructureTable.pm
b/xs/tables/current/Apache2/StructureTable.pm
-index 0c0465a..439184e 100644
---- a/xs/tables/current/Apache2/StructureTable.pm
-+++ b/xs/tables/current/Apache2/StructureTable.pm
-@@ -3245,7 +3245,7 @@ $Apache2::StructureTable = [
- },
- {
- 'type' => 'int',
-- 'name' => 'loglevel'
-+ 'name' => 'log.level'
- },
- {
- 'type' => 'int',
---
-1.7.8.5
-
diff --git a/www-apache/mod_perl/mod_perl-2.0.10_pre201601.ebuild
b/www-apache/mod_perl/mod_perl-2.0.10_pre201601.ebuild
deleted file mode 100644
index d4a442f4df2..00000000000
--- a/www-apache/mod_perl/mod_perl-2.0.10_pre201601.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2017 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"
-SRC_URI="http://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.gz";
-
-LICENSE="GPL-2"
-SLOT="1"
-KEYWORDS="alpha amd64 ~arm ~ppc ~ppc64 x86"
-IUSE="debug"
-
-# 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-perl/Apache-Test-1.360
- >=dev-perl/CGI-3.08
- dev-lang/perl[ithreads]
- www-servers/apache
-"
-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.3/75_${PN}"
-APACHE2_MOD_DEFINE="PERL"
-
-SRC_TEST="do"
-
-DOCFILES="Changes INSTALL README STATUS"
-
-need_apache2
-
-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 <r...@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
- epatch "${FILESDIR}"/${PN}-2.0.4-inline.patch #550244
-
- # 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
-# uncomment this once we're packaging a proper release again
-
- # 410453
- epatch
"${FILESDIR}/use-client_ip-client_add-instead-of-remote_ip-remote.patch"
- epatch "${FILESDIR}/use-log.level-instead-of-loglevel.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
-#emake DESTDIR="${D}" install || die
-
- # 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
-}
