[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_perl/
commit: 47bd83af8cd0b0bdb60995e40417f3d5660e1c7d
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Sun Apr 21 12:10:00 2024 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Tue May 7 07:55:29 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47bd83af
www-apache/mod_perl: Port to PERL_FEATURES
Signed-off-by: Andreas K. Hüttel gentoo.org>
.../{mod_perl-2.0.13.ebuild => mod_perl-2.0.13-r1.ebuild}| 9 +
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/www-apache/mod_perl/mod_perl-2.0.13.ebuild
b/www-apache/mod_perl/mod_perl-2.0.13-r1.ebuild
similarity index 89%
rename from www-apache/mod_perl/mod_perl-2.0.13.ebuild
rename to www-apache/mod_perl/mod_perl-2.0.13-r1.ebuild
index d2b6cb753c19..a0d8c495793b 100644
--- a/www-apache/mod_perl/mod_perl-2.0.13.ebuild
+++ b/www-apache/mod_perl/mod_perl-2.0.13-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://apache/perl/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="1"
KEYWORDS="amd64 ~arm ppc ppc64 ~riscv x86"
-IUSE="debug ithreads test"
+IUSE="debug perl_features_ithreads test"
RESTRICT="!test? ( test )"
# Apache::Reload, Apache::SizeLimit, and Apache::Test are force-unbundled.
@@ -25,11 +25,12 @@ RESTRICT="!test? ( test )"
# default one, which will likely need threading.
RDEPEND="
- dev-lang/perl[ithreads=]
+ perl_features_ithreads? ( || (
>=dev-lang/perl-5.38.2-r3[perl_features_ithreads]
=dev-lang/perl-5.38.2-r3[-perl_features_ithreads]
=dev-perl/Apache-Test-1.420.0
>=www-servers/apache-2.0.47
>=dev-libs/apr-util-1.4
- !ithreads? (
www-servers/apache[-apache2_mpms_event,-apache2_mpms_worker,apache2_mpms_prefork]
)
+ !perl_features_ithreads? (
www-servers/apache[-apache2_mpms_event,-apache2_mpms_worker,apache2_mpms_prefork]
)
"
DEPEND="${RDEPEND}"
BDEPEND="
@@ -75,7 +76,7 @@ src_configure() {
_init_apache2_late
local debug=$(usex debug 1 0)
- local nothreads=$(usex ithreads 0 1)
+ local nothreads=$(usex perl_features_ithreads 0 1)
myconf=(
MP_USE_DSO=1
MP_APXS=${APXS}
[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_perl/files/, www-apache/mod_perl/
commit: fa4e1c7d801e581efc2e56b4eb20b3b3328a7d2c
Author: Matt Turner gentoo org>
AuthorDate: Thu Mar 14 16:44:35 2024 +
Commit: Matt Turner gentoo org>
CommitDate: Fri Mar 15 14:57:16 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa4e1c7d
www-apache/mod_perl: Drop old versions
Signed-off-by: Matt Turner gentoo.org>
www-apache/mod_perl/Manifest | 2 -
.../mod_perl/files/mod_perl-2.0.11-perl534.patch | 17 ---
.../mod_perl/files/mod_perl-2.0.12-avoid-pch.patch | 22
.../mod_perl/files/mod_perl-2.0.12-perl538.patch | 25
www-apache/mod_perl/mod_perl-2.0.11-r1.ebuild | 143
www-apache/mod_perl/mod_perl-2.0.12.ebuild | 144 -
6 files changed, 353 deletions(-)
diff --git a/www-apache/mod_perl/Manifest b/www-apache/mod_perl/Manifest
index 611f1d0b35c3..494913bd57b1 100644
--- a/www-apache/mod_perl/Manifest
+++ b/www-apache/mod_perl/Manifest
@@ -1,3 +1 @@
-DIST mod_perl-2.0.11.tar.gz 3848147 BLAKE2B
8eeef6d1fadbf9d2e3bcff33c5114e588f032c2497f5191b1edd30da8bce72eadf5ea62482ec8ece7d7fde308c8c41d6682d1a325760c627bee75c3ce8cf6272
SHA512
f232b215ccb9217f69ccced8a037470e5975900b9a6fcc5a2e4674e6559d21f026547c1b97c48109352043946dc22539dd38004759be16ad5cfcb3a96973dfdf
-DIST mod_perl-2.0.12.tar.gz 3848030 BLAKE2B
fe4e57d76f7e7a79f171a96d2bab65743eeae45528c0bc3a8bc8ef6d91bb875d3857799f7d65cbf590994c30699a8646dbc905d76551fb97151d0827222a9ba2
SHA512
890dca0950847e32180485cabbeffbf236af2c92c7df957a233c210022b5172957eddb1db3e9281b87cd438d2fa404a05ae99c7eda098267c68d5e9262b400b0
DIST mod_perl-2.0.13.tar.gz 3848487 BLAKE2B
8fb640f6815dac7a93ceeca21c63d4c5d5f14c81d061b0fbfe5831afcb8682df509c367f113a7b1396fdd25ccebd66cf708f99b5e69c8393add0f7969c102249
SHA512
453c789743487e2d1167d005f21ef9780f36488db8830103e4ea0a0656f685bf5ec423cd1baa68ee30efc75d9e2b845c9656458203b9f48de81a315a91d587c9
diff --git a/www-apache/mod_perl/files/mod_perl-2.0.11-perl534.patch
b/www-apache/mod_perl/files/mod_perl-2.0.11-perl534.patch
deleted file mode 100644
index 77db5f65263d..
--- a/www-apache/mod_perl/files/mod_perl-2.0.11-perl534.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-
-Fix build for perl >= 5.33.7
-
-Patch by Leon Timmermans from
https://github.com/Perl/perl5/issues/18617
-
-
a/src/modules/perl/modperl_perl.c
-+++ b/src/modules/perl/modperl_perl.c
-@@ -268,7 +268,7 @@
- #ifdef MP_NEED_HASH_SEED_FIXUP
- if (MP_init_hash_seed_set) {
- #if MP_PERL_VERSION_AT_LEAST(5, 17, 6)
--memcpy(_hash_seed, _init_hash_seed,
-+memcpy(PL_hash_seed, _init_hash_seed,
- sizeof(PL_hash_seed) > sizeof(MP_init_hash_seed) ?
- sizeof(MP_init_hash_seed) : sizeof(PL_hash_seed));
- PL_hash_seed_set = MP_init_hash_seed_set;
diff --git a/www-apache/mod_perl/files/mod_perl-2.0.12-avoid-pch.patch
b/www-apache/mod_perl/files/mod_perl-2.0.12-avoid-pch.patch
deleted file mode 100644
index 989d472831f7..
--- a/www-apache/mod_perl/files/mod_perl-2.0.12-avoid-pch.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Avoid sandbox denial while attempting to generate PCH:
-```
-F: fopen_wr
-S: deny
-P: /usr/include/apr-1/apr.h.gch
-A: /usr/include/apr-1/apr.h.gch
-R: /usr/include/apr-1/apr.h.gch
-C: /usr/libexec/gcc/x86_64-pc-linux-gnu/13/cc1 -quiet /usr/include/apr-1/apr.h
-quiet -dM -dumpdir a- -dumpbase apr.h -dumpbase-ext .h -mtune=generic
-march=x86-64 -o /tmp/ccfl5N0L.s --output-pch /usr/include/apr-1/apr.h.gch
-```
-
-Sent upstream by email on 2023-07-05.
a/lib/Apache2/Build.pm
-+++ b/lib/Apache2/Build.pm
-@@ -1502,7 +1502,7 @@ sub get_apr_config {
- };
- }
- else {
--my @command = ($self->perl_config('cpp'), '-dM', $header);
-+my @command = ($self->perl_config('cpp'), '-E', '-dM', $header);
- open $fh, '-|', @command or do {
- error "Unable to preprocess $header with @command: $!";
- return undef;
diff --git a/www-apache/mod_perl/files/mod_perl-2.0.12-perl538.patch
b/www-apache/mod_perl/files/mod_perl-2.0.12-perl538.patch
deleted file mode 100644
index 3932dffe4a68..
--- a/www-apache/mod_perl/files/mod_perl-2.0.12-perl538.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-https://github.com/apache/mod_perl/commit/991cfeca9bac185f191510e0064f174d45718e6a
-
-From 991cfeca9bac185f191510e0064f174d45718e6a Mon Sep 17 00:00:00 2001
-From: Steve Hay
-Date: Tue, 27 Jun 2023 08:38:15 +
-Subject: [PATCH] Stop using do_open9() - this deprecated function was removed
- in 5.37.1
-
-Patch by Jitka Plesnikova from
https://rt.cpan.org/Ticket/Display.html?id=148451
-
-git-svn-id: https://svn.apache.org/repos/asf/perl/modperl/trunk@1910623
13f79535-47bb-0310-9956-ffa450edef68
a/src/modules/perl/modperl_io.c
-+++ b/src/modules/perl/modperl_io.c
-@@ -116,8 +116,8 @@ modperl_io_perlio_override_stdhandle(pTHX_ request_rec *r,
int mode)
- save_gp(handle, 1);
-
-
[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_perl/
commit: debe178d9ccb2de42dade74627d31ded21646fd2
Author: Matoro Mahri matoro tk>
AuthorDate: Wed Jan 17 22:54:44 2024 +
Commit: Florian Schmaus gentoo org>
CommitDate: Thu Jan 18 08:04:21 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=debe178d
www-apache/mod_perl: Stabilize 2.0.13 ppc, #920983
Signed-off-by: Matoro Mahri matoro.tk>
Signed-off-by: Florian Schmaus gentoo.org>
www-apache/mod_perl/mod_perl-2.0.13.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/www-apache/mod_perl/mod_perl-2.0.13.ebuild
b/www-apache/mod_perl/mod_perl-2.0.13.ebuild
index 5217341a19ba..d2b6cb753c19 100644
--- a/www-apache/mod_perl/mod_perl-2.0.13.ebuild
+++ b/www-apache/mod_perl/mod_perl-2.0.13.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://apache/perl/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="1"
-KEYWORDS="amd64 ~arm ~ppc ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm ppc ppc64 ~riscv x86"
IUSE="debug ithreads test"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_perl/
commit: e951911aeedec8ff74291248bcb86fb3dc2cd74e
Author: Matoro Mahri matoro tk>
AuthorDate: Wed Jan 17 22:26:09 2024 +
Commit: Florian Schmaus gentoo org>
CommitDate: Thu Jan 18 08:04:20 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e951911a
www-apache/mod_perl: Stabilize 2.0.13 ppc64, #920983
Signed-off-by: Matoro Mahri matoro.tk>
Signed-off-by: Florian Schmaus gentoo.org>
www-apache/mod_perl/mod_perl-2.0.13.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/www-apache/mod_perl/mod_perl-2.0.13.ebuild
b/www-apache/mod_perl/mod_perl-2.0.13.ebuild
index 009cf4363617..5217341a19ba 100644
--- a/www-apache/mod_perl/mod_perl-2.0.13.ebuild
+++ b/www-apache/mod_perl/mod_perl-2.0.13.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://apache/perl/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="1"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm ~ppc ppc64 ~riscv x86"
IUSE="debug ithreads test"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_perl/
commit: f24eec348d34f8dc5ac348521156359ff3e313f6
Author: Matoro Mahri matoro tk>
AuthorDate: Wed Jan 17 19:24:53 2024 +
Commit: Florian Schmaus gentoo org>
CommitDate: Thu Jan 18 08:04:18 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f24eec34
www-apache/mod_perl: Stabilize 2.0.13 x86, #920983
Signed-off-by: Matoro Mahri matoro.tk>
Signed-off-by: Florian Schmaus gentoo.org>
www-apache/mod_perl/mod_perl-2.0.13.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/www-apache/mod_perl/mod_perl-2.0.13.ebuild
b/www-apache/mod_perl/mod_perl-2.0.13.ebuild
index 5466dcc4ca67..009cf4363617 100644
--- a/www-apache/mod_perl/mod_perl-2.0.13.ebuild
+++ b/www-apache/mod_perl/mod_perl-2.0.13.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://apache/perl/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="1"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~riscv x86"
IUSE="debug ithreads test"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_perl/
commit: 454afe8eeb2062b2a050f660f19a236f0792944d
Author: Matoro Mahri matoro tk>
AuthorDate: Wed Jan 17 18:37:55 2024 +
Commit: Florian Schmaus gentoo org>
CommitDate: Thu Jan 18 08:04:17 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=454afe8e
www-apache/mod_perl: Stabilize 2.0.13 amd64, #920983
Signed-off-by: Matoro Mahri matoro.tk>
Signed-off-by: Florian Schmaus gentoo.org>
www-apache/mod_perl/mod_perl-2.0.13.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/www-apache/mod_perl/mod_perl-2.0.13.ebuild
b/www-apache/mod_perl/mod_perl-2.0.13.ebuild
index d2a2640320dc..5466dcc4ca67 100644
--- a/www-apache/mod_perl/mod_perl-2.0.13.ebuild
+++ b/www-apache/mod_perl/mod_perl-2.0.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="mirror://apache/perl/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="1"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~riscv ~x86"
IUSE="debug ithreads test"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_perl/
commit: ab9b6dfd0decc439972bb1fb190b24589c859cf7
Author: Sam James gentoo org>
AuthorDate: Mon Nov 13 03:57:41 2023 +
Commit: Sam James gentoo org>
CommitDate: Mon Nov 13 04:34:35 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab9b6dfd
www-apache/mod_perl: add 2.0.13
Signed-off-by: Sam James gentoo.org>
www-apache/mod_perl/Manifest | 1 +
www-apache/mod_perl/mod_perl-2.0.13.ebuild | 142 +
2 files changed, 143 insertions(+)
diff --git a/www-apache/mod_perl/Manifest b/www-apache/mod_perl/Manifest
index 5e94a56ae488..611f1d0b35c3 100644
--- a/www-apache/mod_perl/Manifest
+++ b/www-apache/mod_perl/Manifest
@@ -1,2 +1,3 @@
DIST mod_perl-2.0.11.tar.gz 3848147 BLAKE2B
8eeef6d1fadbf9d2e3bcff33c5114e588f032c2497f5191b1edd30da8bce72eadf5ea62482ec8ece7d7fde308c8c41d6682d1a325760c627bee75c3ce8cf6272
SHA512
f232b215ccb9217f69ccced8a037470e5975900b9a6fcc5a2e4674e6559d21f026547c1b97c48109352043946dc22539dd38004759be16ad5cfcb3a96973dfdf
DIST mod_perl-2.0.12.tar.gz 3848030 BLAKE2B
fe4e57d76f7e7a79f171a96d2bab65743eeae45528c0bc3a8bc8ef6d91bb875d3857799f7d65cbf590994c30699a8646dbc905d76551fb97151d0827222a9ba2
SHA512
890dca0950847e32180485cabbeffbf236af2c92c7df957a233c210022b5172957eddb1db3e9281b87cd438d2fa404a05ae99c7eda098267c68d5e9262b400b0
+DIST mod_perl-2.0.13.tar.gz 3848487 BLAKE2B
8fb640f6815dac7a93ceeca21c63d4c5d5f14c81d061b0fbfe5831afcb8682df509c367f113a7b1396fdd25ccebd66cf708f99b5e69c8393add0f7969c102249
SHA512
453c789743487e2d1167d005f21ef9780f36488db8830103e4ea0a0656f685bf5ec423cd1baa68ee30efc75d9e2b845c9656458203b9f48de81a315a91d587c9
diff --git a/www-apache/mod_perl/mod_perl-2.0.13.ebuild
b/www-apache/mod_perl/mod_perl-2.0.13.ebuild
new file mode 100644
index ..d2a2640320dc
--- /dev/null
+++ b/www-apache/mod_perl/mod_perl-2.0.13.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_TEST=do
+inherit depend.apache apache-module perl-module
+
+DESCRIPTION="An embedded Perl interpreter for Apache2"
+HOMEPAGE="https://perl.apache.org/
https://projects.apache.org/project.html?perl-mod_perl;
+SRC_URI="mirror://apache/perl/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="1"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~x86"
+IUSE="debug ithreads test"
+RESTRICT="!test? ( test )"
+
+# Apache::Reload, Apache::SizeLimit, and Apache::Test are force-unbundled.
+# The minimum versions requested here are the bundled versions.
+
+# The test dependencies are from CPAN (Bundle::Apache2).
+
+# When all MPMs are disabled via useflags, the apache ebuild selects a
+# default one, which will likely need threading.
+
+RDEPEND="
+ dev-lang/perl[ithreads=]
+ >=dev-perl/Apache-Test-1.420.0
+ >=www-servers/apache-2.0.47
+ >=dev-libs/apr-util-1.4
+ !ithreads? (
www-servers/apache[-apache2_mpms_event,-apache2_mpms_worker,apache2_mpms_prefork]
)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ dev-perl/Module-Build
+ test? (
+ >=dev-perl/CGI-3.110.0
+ dev-perl/Chatbot-Eliza
+ dev-perl/Devel-Symdump
+ dev-perl/HTML-Parser
+ dev-perl/IPC-Run3
+ dev-perl/libwww-perl
+
www-servers/apache[apache2_modules_version,-apache2_modules_unique_id]
+ !www-apache/mpm_itk
+ )
+"
+PDEPEND="
+ >=dev-perl/Apache-Reload-0.130.0
+ >=dev-perl/Apache-SizeLimit-0.970.0
+"
+
+APACHE2_MOD_FILE="${S}/src/modules/perl/mod_perl.so"
+APACHE2_MOD_CONF="2.0.3/75_${PN}"
+APACHE2_MOD_DEFINE="PERL"
+
+need_apache2
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.0.1-sneak-tmpdir.patch # seems to fix the make
test problem
+ "${FILESDIR}"/${PN}-2.0.4-inline.patch# 550244
+ "${FILESDIR}"/${PN}-2.0.10_rc1-bundled-Apache-Test.patch # 352724
+ "${FILESDIR}"/${PN}-2.0.10_rc1-Gentoo-not-Unix.patch
+ "${FILESDIR}"/${PN}-2.0.11-ranlib.patch # 728554
+)
+
+src_prepare() {
+ perl-module_src_prepare
+
+ # chainsaw unbundling
+ rm -rf Apache-{Test,Reload,SizeLimit}/ lib/Bundle/ || die
+}
+
+src_configure() {
+ _init_apache2_late
+
+ local debug=$(usex debug 1 0)
+ local nothreads=$(usex ithreads 0 1)
+ myconf=(
+ MP_USE_DSO=1
+ MP_APXS=${APXS}
+ MP_APR_CONFIG=/usr/bin/apr-1-config
+ MP_TRACE=${debug}
+ MP_DEBUG=${debug}
+ MP_NO_THREADS=${nothreads}
+ )
+
+ perl-module_src_configure
+}
+
+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}"
[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_perl/
commit: 254f6ce1aa6f1c005fce3a54a47b8e850542e82d
Author: Arthur Zamarin gentoo org>
AuthorDate: Sat Sep 2 14:31:16 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sat Sep 2 14:31:16 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=254f6ce1
www-apache/mod_perl: Stabilize 2.0.12 ppc64, #912526
Signed-off-by: Arthur Zamarin gentoo.org>
www-apache/mod_perl/mod_perl-2.0.12.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/www-apache/mod_perl/mod_perl-2.0.12.ebuild
b/www-apache/mod_perl/mod_perl-2.0.12.ebuild
index 43debf353a45..1ebaf1e19813 100644
--- a/www-apache/mod_perl/mod_perl-2.0.12.ebuild
+++ b/www-apache/mod_perl/mod_perl-2.0.12.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://apache/perl/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="1"
-KEYWORDS="amd64 ~arm ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm ppc ppc64 ~riscv x86"
IUSE="debug ithreads test"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_perl/
commit: c44aeffad233fbdc60b3b92eb283e0a2ad4548be
Author: Arthur Zamarin gentoo org>
AuthorDate: Sat Sep 2 14:30:47 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sat Sep 2 14:30:47 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c44aeffa
www-apache/mod_perl: Stabilize 2.0.12 amd64, #912526
Signed-off-by: Arthur Zamarin gentoo.org>
www-apache/mod_perl/mod_perl-2.0.12.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/www-apache/mod_perl/mod_perl-2.0.12.ebuild
b/www-apache/mod_perl/mod_perl-2.0.12.ebuild
index cf5c08e8fa9b..b148da77dddf 100644
--- a/www-apache/mod_perl/mod_perl-2.0.12.ebuild
+++ b/www-apache/mod_perl/mod_perl-2.0.12.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://apache/perl/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="1"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~riscv ~x86"
IUSE="debug ithreads test"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_perl/
commit: 689ce056b0e37102dcf4f853d7b63454d605d77e
Author: Arthur Zamarin gentoo org>
AuthorDate: Sat Sep 2 14:31:11 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sat Sep 2 14:31:11 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=689ce056
www-apache/mod_perl: Stabilize 2.0.12 x86, #912526
Signed-off-by: Arthur Zamarin gentoo.org>
www-apache/mod_perl/mod_perl-2.0.12.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/www-apache/mod_perl/mod_perl-2.0.12.ebuild
b/www-apache/mod_perl/mod_perl-2.0.12.ebuild
index 0beda16fa790..43debf353a45 100644
--- a/www-apache/mod_perl/mod_perl-2.0.12.ebuild
+++ b/www-apache/mod_perl/mod_perl-2.0.12.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://apache/perl/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="1"
-KEYWORDS="amd64 ~arm ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ppc ~ppc64 ~riscv x86"
IUSE="debug ithreads test"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_perl/
commit: fb3ff6ad29c49fd75771622bc815106ebe6a32d9
Author: Arthur Zamarin gentoo org>
AuthorDate: Sat Sep 2 14:30:55 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sat Sep 2 14:30:55 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb3ff6ad
www-apache/mod_perl: Stabilize 2.0.12 ppc, #912526
Signed-off-by: Arthur Zamarin gentoo.org>
www-apache/mod_perl/mod_perl-2.0.12.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/www-apache/mod_perl/mod_perl-2.0.12.ebuild
b/www-apache/mod_perl/mod_perl-2.0.12.ebuild
index b148da77dddf..0beda16fa790 100644
--- a/www-apache/mod_perl/mod_perl-2.0.12.ebuild
+++ b/www-apache/mod_perl/mod_perl-2.0.12.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://apache/perl/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="1"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ppc ~ppc64 ~riscv ~x86"
IUSE="debug ithreads test"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_perl/
commit: 2dff56b47e3ed7ca4a9fd2d99e97cbc01d75e8dd Author: Sam James gentoo org> AuthorDate: Wed Jul 5 01:25:18 2023 + Commit: Sam James gentoo org> CommitDate: Wed Jul 5 01:25:18 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2dff56b4 www-apache/mod_perl: add github upstream metadata Signed-off-by: Sam James gentoo.org> www-apache/mod_perl/metadata.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/www-apache/mod_perl/metadata.xml b/www-apache/mod_perl/metadata.xml index 743975e53191..78a62be94e65 100644 --- a/www-apache/mod_perl/metadata.xml +++ b/www-apache/mod_perl/metadata.xml @@ -8,4 +8,7 @@ Build for use with thread-capable perl, needs same setting as in dev-lang/perl + + apache/mod_perl +
[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_perl/, www-apache/mod_perl/files/
commit: 7cc1e787332e9a2217e560abf40bbd3d10403ce0
Author: Sam James gentoo org>
AuthorDate: Wed Jul 5 00:32:32 2023 +
Commit: Sam James gentoo org>
CommitDate: Wed Jul 5 00:38:22 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cc1e787
www-apache/mod_perl: add 2.0.12
Closes: https://bugs.gentoo.org/835357
Signed-off-by: Sam James gentoo.org>
www-apache/mod_perl/Manifest | 1 +
.../mod_perl/files/mod_perl-2.0.12-avoid-pch.patch | 22
.../mod_perl/files/mod_perl-2.0.12-perl538.patch | 25
www-apache/mod_perl/mod_perl-2.0.12.ebuild | 144 +
4 files changed, 192 insertions(+)
diff --git a/www-apache/mod_perl/Manifest b/www-apache/mod_perl/Manifest
index 238175ecb66c..5e94a56ae488 100644
--- a/www-apache/mod_perl/Manifest
+++ b/www-apache/mod_perl/Manifest
@@ -1 +1,2 @@
DIST mod_perl-2.0.11.tar.gz 3848147 BLAKE2B
8eeef6d1fadbf9d2e3bcff33c5114e588f032c2497f5191b1edd30da8bce72eadf5ea62482ec8ece7d7fde308c8c41d6682d1a325760c627bee75c3ce8cf6272
SHA512
f232b215ccb9217f69ccced8a037470e5975900b9a6fcc5a2e4674e6559d21f026547c1b97c48109352043946dc22539dd38004759be16ad5cfcb3a96973dfdf
+DIST mod_perl-2.0.12.tar.gz 3848030 BLAKE2B
fe4e57d76f7e7a79f171a96d2bab65743eeae45528c0bc3a8bc8ef6d91bb875d3857799f7d65cbf590994c30699a8646dbc905d76551fb97151d0827222a9ba2
SHA512
890dca0950847e32180485cabbeffbf236af2c92c7df957a233c210022b5172957eddb1db3e9281b87cd438d2fa404a05ae99c7eda098267c68d5e9262b400b0
diff --git a/www-apache/mod_perl/files/mod_perl-2.0.12-avoid-pch.patch
b/www-apache/mod_perl/files/mod_perl-2.0.12-avoid-pch.patch
new file mode 100644
index ..989d472831f7
--- /dev/null
+++ b/www-apache/mod_perl/files/mod_perl-2.0.12-avoid-pch.patch
@@ -0,0 +1,22 @@
+Avoid sandbox denial while attempting to generate PCH:
+```
+F: fopen_wr
+S: deny
+P: /usr/include/apr-1/apr.h.gch
+A: /usr/include/apr-1/apr.h.gch
+R: /usr/include/apr-1/apr.h.gch
+C: /usr/libexec/gcc/x86_64-pc-linux-gnu/13/cc1 -quiet /usr/include/apr-1/apr.h
-quiet -dM -dumpdir a- -dumpbase apr.h -dumpbase-ext .h -mtune=generic
-march=x86-64 -o /tmp/ccfl5N0L.s --output-pch /usr/include/apr-1/apr.h.gch
+```
+
+Sent upstream by email on 2023-07-05.
+--- a/lib/Apache2/Build.pm
b/lib/Apache2/Build.pm
+@@ -1502,7 +1502,7 @@ sub get_apr_config {
+ };
+ }
+ else {
+-my @command = ($self->perl_config('cpp'), '-dM', $header);
++my @command = ($self->perl_config('cpp'), '-E', '-dM', $header);
+ open $fh, '-|', @command or do {
+ error "Unable to preprocess $header with @command: $!";
+ return undef;
diff --git a/www-apache/mod_perl/files/mod_perl-2.0.12-perl538.patch
b/www-apache/mod_perl/files/mod_perl-2.0.12-perl538.patch
new file mode 100644
index ..3932dffe4a68
--- /dev/null
+++ b/www-apache/mod_perl/files/mod_perl-2.0.12-perl538.patch
@@ -0,0 +1,25 @@
+https://github.com/apache/mod_perl/commit/991cfeca9bac185f191510e0064f174d45718e6a
+
+From 991cfeca9bac185f191510e0064f174d45718e6a Mon Sep 17 00:00:00 2001
+From: Steve Hay
+Date: Tue, 27 Jun 2023 08:38:15 +
+Subject: [PATCH] Stop using do_open9() - this deprecated function was removed
+ in 5.37.1
+
+Patch by Jitka Plesnikova from
https://rt.cpan.org/Ticket/Display.html?id=148451
+
+git-svn-id: https://svn.apache.org/repos/asf/perl/modperl/trunk@1910623
13f79535-47bb-0310-9956-ffa450edef68
+--- a/src/modules/perl/modperl_io.c
b/src/modules/perl/modperl_io.c
+@@ -116,8 +116,8 @@ modperl_io_perlio_override_stdhandle(pTHX_ request_rec *r,
int mode)
+ save_gp(handle, 1);
+
+ sv_setref_pv(sv, "Apache2::RequestRec", (void*)r);
+-status = do_open9(handle, mode == O_RDONLY ? "<:Apache2" : ">:Apache2",
+- 9, FALSE, mode, 0, (PerlIO *)NULL, sv, 1);
++status = do_openn(handle, mode == O_RDONLY ? "<:Apache2" : ">:Apache2",
++ 9, FALSE, mode, 0, (PerlIO *)NULL, , 1);
+ if (status == 0) {
+ Perl_croak(aTHX_ "Failed to open STD%s: %" SVf,
+mode == O_RDONLY ? "IN" : "OUT", get_sv("!", TRUE));
+
diff --git a/www-apache/mod_perl/mod_perl-2.0.12.ebuild
b/www-apache/mod_perl/mod_perl-2.0.12.ebuild
new file mode 100644
index ..cf5c08e8fa9b
--- /dev/null
+++ b/www-apache/mod_perl/mod_perl-2.0.12.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_TEST=do
+inherit depend.apache apache-module perl-module
+
+DESCRIPTION="An embedded Perl interpreter for Apache2"
+HOMEPAGE="https://perl.apache.org/
https://projects.apache.org/project.html?perl-mod_perl;
+SRC_URI="mirror://apache/perl/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="1"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~x86"
+IUSE="debug ithreads test"
+RESTRICT="!test? ( test )"
+
+# Apache::Reload, Apache::SizeLimit, and Apache::Test are force-unbundled.
+# The
[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_perl/
commit: 0f38614d128ba6d7aa812d1df7f91aebbcd4ca64 Author: Petr Vaněk atlas cz> AuthorDate: Thu Aug 25 21:41:24 2022 + Commit: Sam James gentoo org> CommitDate: Fri Aug 26 10:46:32 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f38614d www-apache/mod_perl: use tag in metadata.xml Signed-off-by: Petr Vaněk atlas.cz> Signed-off-by: Sam James gentoo.org> www-apache/mod_perl/metadata.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www-apache/mod_perl/metadata.xml b/www-apache/mod_perl/metadata.xml index 66a7eddd5122..743975e53191 100644 --- a/www-apache/mod_perl/metadata.xml +++ b/www-apache/mod_perl/metadata.xml @@ -6,6 +6,6 @@ Gentoo Perl Project - Build for use with thread-capable perl, needs same setting as in dev-lang/perl + Build for use with thread-capable perl, needs same setting as in dev-lang/perl
[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_perl/, www-apache/mod_perl/files/
commit: b0d403ffa033acba47631a0e345ada2ae9015958
Author: David Seifert gentoo org>
AuthorDate: Tue Jun 28 14:32:34 2022 +
Commit: David Seifert gentoo org>
CommitDate: Tue Jun 28 14:32:34 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0d403ff
www-apache/mod_perl: update EAPI 5 -> 7
Closes: https://bugs.gentoo.org/828739
Signed-off-by: David Seifert gentoo.org>
www-apache/mod_perl/files/mod_perl-2.0.1-sneak-tmpdir.patch | 4 ++--
www-apache/mod_perl/files/mod_perl-2.0.11-perl534.patch | 4 ++--
.../{mod_perl-2.0.11.ebuild => mod_perl-2.0.11-r1.ebuild} | 13 -
3 files changed, 12 insertions(+), 9 deletions(-)
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
index 0930278aeba3..40c88c83eb87 100644
--- 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
@@ -1,5 +1,5 @@
t/conf/modperl_extra.pl.orig 2005-05-16 18:27:45.0 +1000
-+++ t/conf/modperl_extra.pl2005-05-16 18:34:46.0 +1000
+--- a/t/conf/modperl_extra.pl
b/t/conf/modperl_extra.pl
@@ -136,6 +136,8 @@
sub test_modperl_env {
# see t/response/TestModperl/env.pm
diff --git a/www-apache/mod_perl/files/mod_perl-2.0.11-perl534.patch
b/www-apache/mod_perl/files/mod_perl-2.0.11-perl534.patch
index c6c5bed4ed0c..77db5f65263d 100644
--- a/www-apache/mod_perl/files/mod_perl-2.0.11-perl534.patch
+++ b/www-apache/mod_perl/files/mod_perl-2.0.11-perl534.patch
@@ -4,8 +4,8 @@ Fix build for perl >= 5.33.7
Patch by Leon Timmermans from
https://github.com/Perl/perl5/issues/18617
perl/modperl/trunk/src/modules/perl/modperl_perl.c 2021/04/20 13:48:02
1889013
-+++ perl/modperl/trunk/src/modules/perl/modperl_perl.c 2021/04/20 13:55:29
1889014
+--- a/src/modules/perl/modperl_perl.c
b/src/modules/perl/modperl_perl.c
@@ -268,7 +268,7 @@
#ifdef MP_NEED_HASH_SEED_FIXUP
if (MP_init_hash_seed_set) {
diff --git a/www-apache/mod_perl/mod_perl-2.0.11.ebuild
b/www-apache/mod_perl/mod_perl-2.0.11-r1.ebuild
similarity index 95%
rename from www-apache/mod_perl/mod_perl-2.0.11.ebuild
rename to www-apache/mod_perl/mod_perl-2.0.11-r1.ebuild
index 77fb5135e3a3..3b0cc28a4471 100644
--- a/www-apache/mod_perl/mod_perl-2.0.11.ebuild
+++ b/www-apache/mod_perl/mod_perl-2.0.11-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
-inherit depend.apache apache-module perl-module eutils
+inherit depend.apache apache-module perl-module
DESCRIPTION="An embedded Perl interpreter for Apache2"
HOMEPAGE="https://perl.apache.org/
https://projects.apache.org/project.html?perl-mod_perl;
@@ -15,7 +15,7 @@ KEYWORDS="amd64 ~arm ppc ppc64 x86"
IUSE="debug ithreads test"
RESTRICT="!test? ( test )"
-SRC_TEST=do
+DIST_TEST=do
# Apache::Reload, Apache::SizeLimit, and Apache::Test are force-unbundled.
# The minimum versions requested here are the bundled versions.
@@ -73,6 +73,8 @@ src_prepare() {
}
src_configure() {
+ _init_apache2_late
+
local debug=$(usex debug 1 0)
local nothreads=$(usex ithreads 0 1)
myconf=(
@@ -108,7 +110,8 @@ src_install() {
default
perl_delete_localpod
- perl_delete_packlist
+ perl_fix_packlist
+ perl_delete_emptybsdir
insinto "${APACHE_MODULES_CONFDIR}"
doins "${FILESDIR}"/2.0.3/apache2-mod_perl-startup.pl
[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_perl/, www-apache/mod_perl/files/
commit: a7ef121be2bf04a4a82693e0aa240374f3ff45bc
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Sat May 22 14:52:15 2021 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Sat May 22 14:52:15 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7ef121b
www-apache/mod_perl: Fix build with Perl 5.34
Closes: https://bugs.gentoo.org/791403
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Andreas K. Hüttel gentoo.org>
www-apache/mod_perl/files/mod_perl-2.0.11-perl534.patch | 17 +
www-apache/mod_perl/mod_perl-2.0.11.ebuild | 1 +
2 files changed, 18 insertions(+)
diff --git a/www-apache/mod_perl/files/mod_perl-2.0.11-perl534.patch
b/www-apache/mod_perl/files/mod_perl-2.0.11-perl534.patch
new file mode 100644
index 000..c6c5bed4ed0
--- /dev/null
+++ b/www-apache/mod_perl/files/mod_perl-2.0.11-perl534.patch
@@ -0,0 +1,17 @@
+
+Fix build for perl >= 5.33.7
+
+Patch by Leon Timmermans from
https://github.com/Perl/perl5/issues/18617
+
+
+--- perl/modperl/trunk/src/modules/perl/modperl_perl.c 2021/04/20 13:48:02
1889013
perl/modperl/trunk/src/modules/perl/modperl_perl.c 2021/04/20 13:55:29
1889014
+@@ -268,7 +268,7 @@
+ #ifdef MP_NEED_HASH_SEED_FIXUP
+ if (MP_init_hash_seed_set) {
+ #if MP_PERL_VERSION_AT_LEAST(5, 17, 6)
+-memcpy(_hash_seed, _init_hash_seed,
++memcpy(PL_hash_seed, _init_hash_seed,
+ sizeof(PL_hash_seed) > sizeof(MP_init_hash_seed) ?
+ sizeof(MP_init_hash_seed) : sizeof(PL_hash_seed));
+ PL_hash_seed_set = MP_init_hash_seed_set;
diff --git a/www-apache/mod_perl/mod_perl-2.0.11.ebuild
b/www-apache/mod_perl/mod_perl-2.0.11.ebuild
index 3248c243ac0..77fb5135e3a 100644
--- a/www-apache/mod_perl/mod_perl-2.0.11.ebuild
+++ b/www-apache/mod_perl/mod_perl-2.0.11.ebuild
@@ -62,6 +62,7 @@ PATCHES=(
"${FILESDIR}/${PN}"-2.0.10_rc1-bundled-Apache-Test.patch # 352724
"${FILESDIR}/${PN}"-2.0.10_rc1-Gentoo-not-Unix.patch
"${FILESDIR}/${PN}"-2.0.11-ranlib.patch # 728554
+ "${FILESDIR}/${PN}"-2.0.11-perl534.patch # 791403
)
src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_perl/files/, www-apache/mod_perl/
commit: 27cca9bf1fd1d36ae3a736de7b7c9df00751604b
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Sat May 8 13:02:25 2021 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Sat May 8 13:03:09 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27cca9bf
www-apache/mod_perl: Fix build, bug 728554
Patch by Chris Hall
Closes: https://bugs.gentoo.org/728554
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Andreas K. Hüttel gentoo.org>
www-apache/mod_perl/files/mod_perl-2.0.11-ranlib.patch | 11 +++
www-apache/mod_perl/mod_perl-2.0.11.ebuild | 3 ++-
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/www-apache/mod_perl/files/mod_perl-2.0.11-ranlib.patch
b/www-apache/mod_perl/files/mod_perl-2.0.11-ranlib.patch
new file mode 100644
index 000..a8e9e303693
--- /dev/null
+++ b/www-apache/mod_perl/files/mod_perl-2.0.11-ranlib.patch
@@ -0,0 +1,11 @@
+--- ./lib/Apache2/Build.pm~2019-10-05 12:04:39.0 +0100
./lib/Apache2/Build.pm 2020-10-28 19:20:40.809279091 +
+@@ -1664,7 +1664,7 @@
+
+ my $ranlib = "\t" . '$(MODPERL_RANLIB) $@' . "\n";
+
+-$link .= "\n" . $ranlib unless (DARWIN or OPENBSD);
++#$link .= "\n" . $ranlib unless (DARWIN or OPENBSD);
+
+ $link;
+ }
diff --git a/www-apache/mod_perl/mod_perl-2.0.11.ebuild
b/www-apache/mod_perl/mod_perl-2.0.11.ebuild
index 014692d57e0..3248c243ac0 100644
--- a/www-apache/mod_perl/mod_perl-2.0.11.ebuild
+++ b/www-apache/mod_perl/mod_perl-2.0.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -61,6 +61,7 @@ PATCHES=(
"${FILESDIR}/${PN}"-2.0.4-inline.patch# 550244
"${FILESDIR}/${PN}"-2.0.10_rc1-bundled-Apache-Test.patch # 352724
"${FILESDIR}/${PN}"-2.0.10_rc1-Gentoo-not-Unix.patch
+ "${FILESDIR}/${PN}"-2.0.11-ranlib.patch # 728554
)
src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_perl/
commit: fd67a8798baf8d0df9272dbedeca4cceff22865f
Author: Matt Turner gentoo org>
AuthorDate: Sat Jun 13 21:09:12 2020 +
Commit: Matt Turner gentoo org>
CommitDate: Sat Jun 13 21:09:47 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd67a879
www-apache/mod_perl: drop alpha keywords
Signed-off-by: Matt Turner gentoo.org>
www-apache/mod_perl/mod_perl-2.0.11.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/www-apache/mod_perl/mod_perl-2.0.11.ebuild
b/www-apache/mod_perl/mod_perl-2.0.11.ebuild
index 2443adbbfa2..014692d57e0 100644
--- a/www-apache/mod_perl/mod_perl-2.0.11.ebuild
+++ b/www-apache/mod_perl/mod_perl-2.0.11.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/perl/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="1"
-KEYWORDS="~alpha amd64 ~arm ppc ppc64 x86"
+KEYWORDS="amd64 ~arm ppc ppc64 x86"
IUSE="debug ithreads test"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_perl/files/, www-apache/mod_perl/
commit: 562e0ddc683696a4d4e423ed6b2b3a4f9d5d4eab
Author: Kent Fredric gentoo org>
AuthorDate: Tue May 12 18:01:03 2020 +
Commit: Kent Fredric gentoo org>
CommitDate: Tue May 12 18:02:42 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=562e0ddc
www-apache/mod_perl: Sec cleanup 2.0.11 re bug #672086
Removing versions affected by CVE-2011-2767
Bug: https://bugs.gentoo.org/672086
Bug: https://rt.cpan.org/Public/Bug/Display.html?id=126984
Bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=644169
Bug: https://bugzilla.redhat.com/show_bug.cgi?id=1623265
Bug: https://nvd.nist.gov/vuln/detail/CVE-2011-2767
Bug: https://www.cvedetails.com/cve/CVE-2011-2767/
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Kent Fredric gentoo.org>
www-apache/mod_perl/Manifest | 1 -
.../files/mod_perl-2.0.10-apache24-tests-1.patch | 33 -
.../files/mod_perl-2.0.10-apache24-tests-2.patch | 23
www-apache/mod_perl/mod_perl-2.0.10.ebuild | 140 -
4 files changed, 197 deletions(-)
diff --git a/www-apache/mod_perl/Manifest b/www-apache/mod_perl/Manifest
index c26064fe0a8..238175ecb66 100644
--- a/www-apache/mod_perl/Manifest
+++ b/www-apache/mod_perl/Manifest
@@ -1,2 +1 @@
-DIST mod_perl-2.0.10.tar.gz 3846211 BLAKE2B
de44c76d22cc90984be20193bb635f27d68fbc25cab39333be93ee15c4636025d9e6d8f7bfc661b50ac19cfeb5f697f957acb7fbbb38e1f3f712c81ac27737ab
SHA512
0bf1a885cb32a3393e95f87e71983097613e263b9052dbf22494663b506e36a25d0256afed24285232276d9f43ebd3adaa18b91129bfb62116a8ccb023855bca
DIST mod_perl-2.0.11.tar.gz 3848147 BLAKE2B
8eeef6d1fadbf9d2e3bcff33c5114e588f032c2497f5191b1edd30da8bce72eadf5ea62482ec8ece7d7fde308c8c41d6682d1a325760c627bee75c3ce8cf6272
SHA512
f232b215ccb9217f69ccced8a037470e5975900b9a6fcc5a2e4674e6559d21f026547c1b97c48109352043946dc22539dd38004759be16ad5cfcb3a96973dfdf
diff --git a/www-apache/mod_perl/files/mod_perl-2.0.10-apache24-tests-1.patch
b/www-apache/mod_perl/files/mod_perl-2.0.10-apache24-tests-1.patch
deleted file mode 100644
index 822fb4e8755..000
--- a/www-apache/mod_perl/files/mod_perl-2.0.10-apache24-tests-1.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From f4dd0394f0975892b51a889f023d0e207553a656 Mon Sep 17 00:00:00 2001
-From: Niko Tyni
-Date: Fri, 23 Dec 2016 18:27:23 +0200
-Subject: [PATCH 1/2] Fix t/apache/read.t HTTP syntax for Apache 2.4.25
- compatibility
-
-HTTP/1.1 RFC 7230, section 2.6. "Protocol Versioning" says the HTTP name
-is case sensitive. Starting with Apache 2.4.25, using lower case will
-make the server issue a 400 Bad request response, causing a test failure.
-
-https://tools.ietf.org/html/rfc7230#section-2.6
-
-Bug-Debian: https://bugs.debian.org/849082
- t/apache/read.t | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/t/apache/read.t b/t/apache/read.t
-index 83670c9..9f7f504 100644
a/t/apache/read.t
-+++ b/t/apache/read.t
-@@ -24,7 +24,7 @@ close $fh;
-
- my $size = length $data;
-
--for my $string ("POST $location http/1.0",
-+for my $string ("POST $location HTTP/1.0",
- "Content-length: $size",
- "") {
- my $line = "$string\r\n";
---
-2.11.0
-
diff --git a/www-apache/mod_perl/files/mod_perl-2.0.10-apache24-tests-2.patch
b/www-apache/mod_perl/files/mod_perl-2.0.10-apache24-tests-2.patch
deleted file mode 100644
index 29e24cc770d..000
--- a/www-apache/mod_perl/files/mod_perl-2.0.10-apache24-tests-2.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Author: Stefan Fritsch
-Source: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=849082
-
./t/filter/TestFilter/in_bbs_inject_header.pm.orig 2016-10-27
22:11:16.0 +0200
-+++ ./t/filter/TestFilter/in_bbs_inject_header.pm 2016-12-24
06:55:19.049606491 +0100
-@@ -181,7 +181,7 @@
-
- if ($data and $data =~ /^POST/) {
- # demonstrate how to add a header while processing other headers
--my $header = "$header1_key: $header1_val\n";
-+my $header = "$header1_key: $header1_val\r\n";
- push @{ $ctx->{buckets} }, APR::Bucket->new($c->bucket_alloc,
$header);
- debug "queued header [$header]";
- }
-@@ -199,7 +199,7 @@
- # we hit the headers and body separator, which is a good
- # time to add extra headers:
- for my $key (keys %headers) {
--my $header = "$key: $headers{$key}\n";
-+my $header = "$key: $headers{$key}\r\n";
- push @{ $ctx->{buckets} }, APR::Bucket->new($c->bucket_alloc,
$header);
- debug "queued header [$header]";
- }
diff --git a/www-apache/mod_perl/mod_perl-2.0.10.ebuild
b/www-apache/mod_perl/mod_perl-2.0.10.ebuild
deleted file mode 100644
index 9e6cfc0edf7..000
--- a/www-apache/mod_perl/mod_perl-2.0.10.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of
[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_perl/
commit: 035673bb16f5fc8f36abc8dfe55b1c58f5a14e68
Author: Agostino Sarubbo gentoo org>
AuthorDate: Mon May 11 16:47:57 2020 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Mon May 11 16:49:05 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=035673bb
www-apache/mod_perl: x86 stable wrt bug #672086
Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo gentoo.org>
www-apache/mod_perl/mod_perl-2.0.11.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/www-apache/mod_perl/mod_perl-2.0.11.ebuild
b/www-apache/mod_perl/mod_perl-2.0.11.ebuild
index ab02e5b6118..2443adbbfa2 100644
--- a/www-apache/mod_perl/mod_perl-2.0.11.ebuild
+++ b/www-apache/mod_perl/mod_perl-2.0.11.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/perl/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="1"
-KEYWORDS="~alpha amd64 ~arm ppc ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm ppc ppc64 x86"
IUSE="debug ithreads test"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_perl/
commit: 659fcd47b30e8a261c9803b08b5e95c66abbf4b4
Author: Agostino Sarubbo gentoo org>
AuthorDate: Wed May 6 06:28:11 2020 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Wed May 6 06:28:11 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=659fcd47
www-apache/mod_perl: ppc64 stable wrt bug #672086
Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo gentoo.org>
www-apache/mod_perl/mod_perl-2.0.11.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/www-apache/mod_perl/mod_perl-2.0.11.ebuild
b/www-apache/mod_perl/mod_perl-2.0.11.ebuild
index b43bd23174a..ab02e5b6118 100644
--- a/www-apache/mod_perl/mod_perl-2.0.11.ebuild
+++ b/www-apache/mod_perl/mod_perl-2.0.11.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/perl/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="1"
-KEYWORDS="~alpha amd64 ~arm ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm ppc ppc64 ~x86"
IUSE="debug ithreads test"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_perl/
commit: aa76475694bb8ce92cd5e5d9f5867e913f90139b
Author: Agostino Sarubbo gentoo org>
AuthorDate: Tue May 5 06:45:40 2020 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Tue May 5 06:45:40 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa764756
www-apache/mod_perl: ppc stable wrt bug #672086
Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo gentoo.org>
www-apache/mod_perl/mod_perl-2.0.11.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/www-apache/mod_perl/mod_perl-2.0.11.ebuild
b/www-apache/mod_perl/mod_perl-2.0.11.ebuild
index 8c9c52472a0..b43bd23174a 100644
--- a/www-apache/mod_perl/mod_perl-2.0.11.ebuild
+++ b/www-apache/mod_perl/mod_perl-2.0.11.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/perl/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="1"
-KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm ppc ~ppc64 ~x86"
IUSE="debug ithreads test"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_perl/
commit: f7e8c0bbf453d0029f53248ec63daa263399085d
Author: Agostino Sarubbo gentoo org>
AuthorDate: Mon May 4 16:56:43 2020 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Mon May 4 16:56:43 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7e8c0bb
www-apache/mod_perl: amd64 stable wrt bug #672086
Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo gentoo.org>
www-apache/mod_perl/mod_perl-2.0.11.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/www-apache/mod_perl/mod_perl-2.0.11.ebuild
b/www-apache/mod_perl/mod_perl-2.0.11.ebuild
index 891635df5c1..8c9c52472a0 100644
--- a/www-apache/mod_perl/mod_perl-2.0.11.ebuild
+++ b/www-apache/mod_perl/mod_perl-2.0.11.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/perl/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 ~x86"
IUSE="debug ithreads test"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_perl/
commit: 9d1a1f3274d4a7a95a7beb5d4c8ef9ba72e168d4
Author: Andreas K. Huettel gentoo org>
AuthorDate: Tue Mar 17 09:43:16 2020 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Tue Mar 17 09:43:57 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d1a1f32
www-apache/mod_perl: Version bump
Bug: https://bugs.gentoo.org/672086
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Andreas K. Huettel gentoo.org>
www-apache/mod_perl/Manifest | 1 +
www-apache/mod_perl/mod_perl-2.0.11.ebuild | 138 +
2 files changed, 139 insertions(+)
diff --git a/www-apache/mod_perl/Manifest b/www-apache/mod_perl/Manifest
index d2cf4026ae7..c26064fe0a8 100644
--- a/www-apache/mod_perl/Manifest
+++ b/www-apache/mod_perl/Manifest
@@ -1 +1,2 @@
DIST mod_perl-2.0.10.tar.gz 3846211 BLAKE2B
de44c76d22cc90984be20193bb635f27d68fbc25cab39333be93ee15c4636025d9e6d8f7bfc661b50ac19cfeb5f697f957acb7fbbb38e1f3f712c81ac27737ab
SHA512
0bf1a885cb32a3393e95f87e71983097613e263b9052dbf22494663b506e36a25d0256afed24285232276d9f43ebd3adaa18b91129bfb62116a8ccb023855bca
+DIST mod_perl-2.0.11.tar.gz 3848147 BLAKE2B
8eeef6d1fadbf9d2e3bcff33c5114e588f032c2497f5191b1edd30da8bce72eadf5ea62482ec8ece7d7fde308c8c41d6682d1a325760c627bee75c3ce8cf6272
SHA512
f232b215ccb9217f69ccced8a037470e5975900b9a6fcc5a2e4674e6559d21f026547c1b97c48109352043946dc22539dd38004759be16ad5cfcb3a96973dfdf
diff --git a/www-apache/mod_perl/mod_perl-2.0.11.ebuild
b/www-apache/mod_perl/mod_perl-2.0.11.ebuild
new file mode 100644
index 000..891635df5c1
--- /dev/null
+++ b/www-apache/mod_perl/mod_perl-2.0.11.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2020 Gentoo Authors
+# 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://perl.apache.org/
https://projects.apache.org/project.html?perl-mod_perl;
+SRC_URI="mirror://apache/perl/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="debug ithreads test"
+RESTRICT="!test? ( test )"
+
+SRC_TEST=do
+
+# Apache::Reload, Apache::SizeLimit, and Apache::Test are force-unbundled.
+# The minimum versions requested here are the bundled versions.
+
+# The test dependencies are from CPAN (Bundle::Apache2).
+
+# When all MPMs are disabled via useflags, the apache ebuild selects a
+# default one, which will likely need threading.
+
+RDEPEND="
+ dev-lang/perl[ithreads=]
+ >=dev-perl/Apache-Test-1.420.0
+ >=www-servers/apache-2.0.47
+ >=dev-libs/apr-util-1.4
+ !ithreads? (
www-servers/apache[-apache2_mpms_event,-apache2_mpms_worker,apache2_mpms_prefork]
)
+"
+DEPEND="${RDEPEND}
+ dev-perl/Module-Build
+ test? (
+ >=dev-perl/CGI-3.110.0
+ dev-perl/Chatbot-Eliza
+ dev-perl/Devel-Symdump
+ dev-perl/HTML-Parser
+ dev-perl/IPC-Run3
+ dev-perl/libwww-perl
+
www-servers/apache[apache2_modules_version,-apache2_modules_unique_id]
+ !www-apache/mpm_itk
+ )
+"
+PDEPEND="
+ >=dev-perl/Apache-Reload-0.130.0
+ >=dev-perl/Apache-SizeLimit-0.970.0
+"
+
+APACHE2_MOD_FILE="${S}/src/modules/perl/mod_perl.so"
+APACHE2_MOD_CONF="2.0.3/75_${PN}"
+APACHE2_MOD_DEFINE="PERL"
+
+need_apache2
+
+PATCHES=(
+ "${FILESDIR}/${PN}"-2.0.1-sneak-tmpdir.patch # seems to fix the make
test problem
+ "${FILESDIR}/${PN}"-2.0.4-inline.patch# 550244
+ "${FILESDIR}/${PN}"-2.0.10_rc1-bundled-Apache-Test.patch # 352724
+ "${FILESDIR}/${PN}"-2.0.10_rc1-Gentoo-not-Unix.patch
+)
+
+src_prepare() {
+ perl-module_src_prepare
+
+ # chainsaw unbundling
+ rm -rf Apache-{Test,Reload,SizeLimit}/ lib/Bundle/ || die
+}
+
+src_configure() {
+ local debug=$(usex debug 1 0)
+ local nothreads=$(usex ithreads 0 1)
+ myconf=(
+ MP_USE_DSO=1
+ MP_APXS=${APXS}
+ MP_APR_CONFIG=/usr/bin/apr-1-config
+ MP_TRACE=${debug}
+ MP_DEBUG=${debug}
+ MP_NO_THREADS=${nothreads}
+ )
+
+ perl-module_src_configure
+}
+
+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}" || die
+ fi
+
+ # We force verbose tests for now to get meaningful bug reports.
+ MAKEOPTS+=" -j1"
+ TMPDIR="${T}" HOME="${T}/" TEST_VERBOSE=1 LC_TIME=C perl-module_src_test
+}
+
+src_install() {
+ apache-module_src_install
+
+ default
+
+
[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_perl/
commit: 70bbddc6ad013611aa67b1ff91ef447756c4d023 Author: Andreas K. Hüttel gentoo org> AuthorDate: Sat Dec 22 12:46:10 2018 + Commit: Andreas K. Hüttel gentoo org> CommitDate: Sat Dec 22 12:46:27 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70bbddc6 www-apache/mod_perl: Tests are now fixed, bug 614684 Only remaining thing was PEBKAC Closes: https://bugs.gentoo.org/662692 Closes: https://bugs.gentoo.org/614684 Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Andreas K. Hüttel gentoo.org> www-apache/mod_perl/mod_perl-2.0.10.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www-apache/mod_perl/mod_perl-2.0.10.ebuild b/www-apache/mod_perl/mod_perl-2.0.10.ebuild index ea0cffbccc0..ef5bb45f7ca 100644 --- a/www-apache/mod_perl/mod_perl-2.0.10.ebuild +++ b/www-apache/mod_perl/mod_perl-2.0.10.ebuild @@ -22,7 +22,7 @@ SRC_TEST=do # The test dependencies are from CPAN (Bundle::Apache2). # When all MPMs are disabled via useflags, the apache ebuild selects a -# default one, which will likely need threading... +# default one, which will likely need threading. RDEPEND=" dev-lang/perl[ithreads=]
[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_perl/, www-apache/mod_perl/files/
commit: a51f0209d1d749e4749c6bab33ba130549892f66
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Fri Dec 21 23:38:43 2018 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Fri Dec 21 23:39:12 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a51f0209
www-apache/mod_perl: Partly fix tests, bug 614684
Partly fix tests; the breakage was *not* caused by Perl,
but by Apache 2.4 (as opposed to Apache 2.2). Patches from
Debian.
Still fails with a similar problem (syntax error in test
config file, bc. of old Apache syntax).
Bug: https://bugs.gentoo.org/614684
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas K. Hüttel gentoo.org>
.../files/mod_perl-2.0.10-apache24-tests-1.patch | 33 ++
.../files/mod_perl-2.0.10-apache24-tests-2.patch | 23 +++
www-apache/mod_perl/mod_perl-2.0.10.ebuild | 4 ++-
3 files changed, 59 insertions(+), 1 deletion(-)
diff --git a/www-apache/mod_perl/files/mod_perl-2.0.10-apache24-tests-1.patch
b/www-apache/mod_perl/files/mod_perl-2.0.10-apache24-tests-1.patch
new file mode 100644
index 000..822fb4e8755
--- /dev/null
+++ b/www-apache/mod_perl/files/mod_perl-2.0.10-apache24-tests-1.patch
@@ -0,0 +1,33 @@
+From f4dd0394f0975892b51a889f023d0e207553a656 Mon Sep 17 00:00:00 2001
+From: Niko Tyni
+Date: Fri, 23 Dec 2016 18:27:23 +0200
+Subject: [PATCH 1/2] Fix t/apache/read.t HTTP syntax for Apache 2.4.25
+ compatibility
+
+HTTP/1.1 RFC 7230, section 2.6. "Protocol Versioning" says the HTTP name
+is case sensitive. Starting with Apache 2.4.25, using lower case will
+make the server issue a 400 Bad request response, causing a test failure.
+
+https://tools.ietf.org/html/rfc7230#section-2.6
+
+Bug-Debian: https://bugs.debian.org/849082
+---
+ t/apache/read.t | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/t/apache/read.t b/t/apache/read.t
+index 83670c9..9f7f504 100644
+--- a/t/apache/read.t
b/t/apache/read.t
+@@ -24,7 +24,7 @@ close $fh;
+
+ my $size = length $data;
+
+-for my $string ("POST $location http/1.0",
++for my $string ("POST $location HTTP/1.0",
+ "Content-length: $size",
+ "") {
+ my $line = "$string\r\n";
+--
+2.11.0
+
diff --git a/www-apache/mod_perl/files/mod_perl-2.0.10-apache24-tests-2.patch
b/www-apache/mod_perl/files/mod_perl-2.0.10-apache24-tests-2.patch
new file mode 100644
index 000..29e24cc770d
--- /dev/null
+++ b/www-apache/mod_perl/files/mod_perl-2.0.10-apache24-tests-2.patch
@@ -0,0 +1,23 @@
+Author: Stefan Fritsch
+Source: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=849082
+
+--- ./t/filter/TestFilter/in_bbs_inject_header.pm.orig 2016-10-27
22:11:16.0 +0200
./t/filter/TestFilter/in_bbs_inject_header.pm 2016-12-24
06:55:19.049606491 +0100
+@@ -181,7 +181,7 @@
+
+ if ($data and $data =~ /^POST/) {
+ # demonstrate how to add a header while processing other headers
+-my $header = "$header1_key: $header1_val\n";
++my $header = "$header1_key: $header1_val\r\n";
+ push @{ $ctx->{buckets} }, APR::Bucket->new($c->bucket_alloc,
$header);
+ debug "queued header [$header]";
+ }
+@@ -199,7 +199,7 @@
+ # we hit the headers and body separator, which is a good
+ # time to add extra headers:
+ for my $key (keys %headers) {
+-my $header = "$key: $headers{$key}\n";
++my $header = "$key: $headers{$key}\r\n";
+ push @{ $ctx->{buckets} }, APR::Bucket->new($c->bucket_alloc,
$header);
+ debug "queued header [$header]";
+ }
diff --git a/www-apache/mod_perl/mod_perl-2.0.10.ebuild
b/www-apache/mod_perl/mod_perl-2.0.10.ebuild
index f83252b19f5..ea0cffbccc0 100644
--- a/www-apache/mod_perl/mod_perl-2.0.10.ebuild
+++ b/www-apache/mod_perl/mod_perl-2.0.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -60,6 +60,8 @@ PATCHES=(
"${FILESDIR}/${PN}"-2.0.4-inline.patch# 550244
"${FILESDIR}/${PN}"-2.0.10_rc1-bundled-Apache-Test.patch # 352724
"${FILESDIR}/${PN}"-2.0.10_rc1-Gentoo-not-Unix.patch
+ "${FILESDIR}/${PN}"-2.0.10-apache24-tests-1.patch # 614684
+ "${FILESDIR}/${PN}"-2.0.10-apache24-tests-2.patch # 614684
)
src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_perl/
commit: 49e5248272ec67dc3b4f931a014b6df35b24962e Author: Christian Ruppert gentoo org> AuthorDate: Mon Jul 23 08:14:28 2018 + Commit: Christian Ruppert gentoo org> CommitDate: Mon Jul 23 08:15:30 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49e52482 www-apache/mod_perl: Drop Maintainership Package-Manager: Portage-2.3.43, Repoman-2.3.10 www-apache/mod_perl/metadata.xml | 4 1 file changed, 4 deletions(-) diff --git a/www-apache/mod_perl/metadata.xml b/www-apache/mod_perl/metadata.xml index 28acd8c8093..45922683c5c 100644 --- a/www-apache/mod_perl/metadata.xml +++ b/www-apache/mod_perl/metadata.xml @@ -1,10 +1,6 @@ http://www.gentoo.org/dtd/metadata.dtd;> - - id...@gentoo.org - Christian Ruppert - p...@gentoo.org Gentoo Perl Project
[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_perl/, www-apache/mod_perl/files/
commit: 87b4594255ffbc32de676c9a636a1278d4d9db18
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Sun Apr 30 11:30:24 2017 +
Commit: Andreas Hüttel gentoo org>
CommitDate: Sun Apr 30 11:31:33 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87b45942
www-apache/mod_perl: Remove old
Package-Manager: Portage-2.3.5, Repoman-2.3.2
www-apache/mod_perl/Manifest | 1 -
.../files/mod_perl-2.0.8-bundled-Apache-Test.patch | 127 -
www-apache/mod_perl/mod_perl-2.0.8.ebuild | 156 -
3 files changed, 284 deletions(-)
diff --git a/www-apache/mod_perl/Manifest b/www-apache/mod_perl/Manifest
index 2fb03577734..d725f21537d 100644
--- a/www-apache/mod_perl/Manifest
+++ b/www-apache/mod_perl/Manifest
@@ -1,2 +1 @@
DIST mod_perl-2.0.10.tar.gz 3846211 SHA256
d1cf83ed4ea3a9dfceaa6d9662ff645177090749881093051020bf42f9872b64 SHA512
0bf1a885cb32a3393e95f87e71983097613e263b9052dbf22494663b506e36a25d0256afed24285232276d9f43ebd3adaa18b91129bfb62116a8ccb023855bca
WHIRLPOOL
5ca9c3d961292a36d6be08e6f619385d54dd3551fc27a7387f53604e9971429c732fc988df50c35b1d62d520bab763fe4d127beb09aef86209583f2ef0d21eaf
-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.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 2e4da922aea..000
--- a/www-apache/mod_perl/files/mod_perl-2.0.8-bundled-Apache-Test.patch
+++ /dev/null
@@ -1,127 +0,0 @@
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,37 +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/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
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);
a/lib/ModPerl/BuildMM.pm
-+++ b/lib/ModPerl/BuildMM.pm
-@@ -38,12 +38,10 @@ my @methods = grep *{$stash->{$_}}{CODE}
- 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" .
--
[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_perl/
commit: 69d56995fb6839d0bddae518b477f5bd31dcece1
Author: Agostino Sarubbo gentoo org>
AuthorDate: Sun Apr 30 09:34:32 2017 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Sun Apr 30 09:36:58 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69d56995
www-apache/mod_perl: ppc64 stable wrt bug #597824
Package-Manager: Portage-2.3.3, Repoman-2.3.1
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo gentoo.org>
www-apache/mod_perl/mod_perl-2.0.10.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/www-apache/mod_perl/mod_perl-2.0.10.ebuild
b/www-apache/mod_perl/mod_perl-2.0.10.ebuild
index 3c3e6cae16c..f83252b19f5 100644
--- a/www-apache/mod_perl/mod_perl-2.0.10.ebuild
+++ b/www-apache/mod_perl/mod_perl-2.0.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/perl/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="1"
-KEYWORDS="alpha amd64 ~arm ppc ~ppc64 x86"
+KEYWORDS="alpha amd64 ~arm ppc ppc64 x86"
IUSE="debug ithreads test"
SRC_TEST=do
[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_perl/, www-apache/mod_perl/files/
commit: cbe143c6f22c7742de05401bcd8f6d275da6a0cf
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Wed Apr 19 21:40:18 2017 +
Commit: Andreas Hüttel gentoo org>
CommitDate: Wed Apr 19 21:40:18 2017 +
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..000
---
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.0
+0200
-+++ mod_perl-2.0.10_pre201601/Makefile.PL 2016-01-09 21:02:00.0
+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
[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_perl/
commit: 50d758aa2f0b24dcbe06c342b26d2c878e66ce92
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Wed Apr 19 21:26:13 2017 +
Commit: Andreas Hüttel gentoo org>
CommitDate: Wed Apr 19 21:32:26 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50d758aa
www-apache/mod_perl: Drop hppa ia64 sparc, bug 597822
Package-Manager: Portage-2.3.5, Repoman-2.3.2
www-apache/mod_perl/mod_perl-2.0.10_pre201601.ebuild | 4 ++--
www-apache/mod_perl/mod_perl-2.0.8.ebuild| 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
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
index 8af3cc48aab..d4a442f4df2 100644
--- a/www-apache/mod_perl/mod_perl-2.0.10_pre201601.ebuild
+++ b/www-apache/mod_perl/mod_perl-2.0.10_pre201601.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -12,7 +12,7 @@
SRC_URI="http://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.gz;
LICENSE="GPL-2"
SLOT="1"
-KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ~arm ~ppc ~ppc64 x86"
IUSE="debug"
# Make sure we always use the latest Apache-Test version or even check the
diff --git a/www-apache/mod_perl/mod_perl-2.0.8.ebuild
b/www-apache/mod_perl/mod_perl-2.0.8.ebuild
index 5c9da83eec8..e53722324e0 100644
--- a/www-apache/mod_perl/mod_perl-2.0.8.ebuild
+++ b/www-apache/mod_perl/mod_perl-2.0.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -10,7 +10,7 @@ SRC_URI="mirror://apache/perl/${P}.tar.gz"
HOMEPAGE="https://projects.apache.org/projects/mod_perl.html;
LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 ppc ppc64 x86"
IUSE="debug"
SLOT="1"
[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_perl/
commit: 707576a430cb381d8670e41ad9ffed04eca6399b
Author: Michael Weber gentoo org>
AuthorDate: Fri Mar 31 08:41:39 2017 +
Commit: Michael Weber gentoo org>
CommitDate: Fri Mar 31 08:41:39 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=707576a4
www-apache/mod_perl: add ~arm ~ppc ~ppc64 keywords (bug 597822).
Package-Manager: Portage-2.3.5, Repoman-2.3.2
RepoMan-Options: --include-arches="arm arm64 ppc ppc64"
www-apache/mod_perl/mod_perl-2.0.10.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/www-apache/mod_perl/mod_perl-2.0.10.ebuild
b/www-apache/mod_perl/mod_perl-2.0.10.ebuild
index 281ca50ce54..c2545cde65f 100644
--- a/www-apache/mod_perl/mod_perl-2.0.10.ebuild
+++ b/www-apache/mod_perl/mod_perl-2.0.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/perl/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="1"
-KEYWORDS="alpha amd64 x86"
+KEYWORDS="alpha amd64 ~arm ~ppc ~ppc64 x86"
IUSE="debug ithreads test"
SRC_TEST=do
[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_perl/files/
commit: 4ab3674a4357ebbf5cf4831ecd5138b0db298087
Author: Michael Mair-Keimberger (asterix) gmail
com>
AuthorDate: Mon Feb 13 18:11:44 2017 +
Commit: Patrice Clement gentoo org>
CommitDate: Tue Feb 14 21:17:06 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ab3674a
www-apache/mod_perl: remove unused patch.
Closes: https://github.com/gentoo/gentoo/pull/3961
.../mod_perl/files/mod_perl_init_b554794.patch | 241 -
1 file changed, 241 deletions(-)
diff --git a/www-apache/mod_perl/files/mod_perl_init_b554794.patch
b/www-apache/mod_perl/files/mod_perl_init_b554794.patch
deleted file mode 100644
index b33a34a6ef..00
--- a/www-apache/mod_perl/files/mod_perl_init_b554794.patch
+++ /dev/null
@@ -1,241 +0,0 @@
a/src/modules/perl/modperl_env.c.orig 2015-12-28 11:42:26.604632457
+0100
-+++ b/src/modules/perl/modperl_env.c 2015-12-28 12:36:35.305228288 +0100
-@@ -120,6 +120,7 @@
- const apr_array_header_t *array;
- apr_table_entry_t *elts;
-
-+modperl_env_init(aTHX);
- modperl_env_untie(mg_flags);
-
- array = apr_table_elts(table);
-@@ -431,13 +432,11 @@
- }
-
- /* to store the original virtual tables
-- * these are global, not per-interpreter
-+ * handy access to perl's original virtual tables
- */
--static MGVTBL MP_PERL_vtbl_env;
--static MGVTBL MP_PERL_vtbl_envelem;
-
- #define MP_PL_vtbl_call(name, meth) \
--MP_PERL_vtbl_##name.svt_##meth(aTHX_ sv, mg)
-+PL_vtbl_##name.svt_##meth(aTHX_ sv, mg)
-
- #define MP_dENV_KEY \
- STRLEN klen; \
-@@ -534,6 +533,26 @@
- return 0;
- }
-
-+static int modperl_env_magic_copy(pTHX_ SV *sv, MAGIC *mg, SV *nsv, const
char *name, I32 namlen)
-+{
-+MP_TRACE_e(MP_FUNC, "setting up %%ENV element magic");
-+sv_magicext(nsv, mg->mg_obj, toLOWER(mg->mg_type), _vtbl_envelem,
name, namlen);
-+
-+return 1;
-+}
-+
-+static int modperl_env_magic_local_all(pTHX_ SV *nsv, MAGIC *mg)
-+{
-+MAGIC *nmg;
-+MP_TRACE_e(MP_FUNC, "localizing %%ENV");
-+nmg = sv_magicext(nsv, mg->mg_obj, mg->mg_type, _vtbl_env,
(char*)NULL, 0);
-+nmg->mg_ptr = mg->mg_ptr;
-+nmg->mg_flags |= MGf_COPY;
-+nmg->mg_flags |= MGf_LOCAL;
-+
-+return 1;
-+}
-+
- static int modperl_env_magic_set(pTHX_ SV *sv, MAGIC *mg)
- {
- request_rec *r = (request_rec *)EnvMgObj;
-@@ -625,15 +644,18 @@
- #endif
-
- /* override %ENV virtual tables with our own */
--static MGVTBL MP_vtbl_env = {
-+MGVTBL MP_vtbl_env = {
- 0,
- modperl_env_magic_set_all,
- 0,
- modperl_env_magic_clear_all,
--0
-+0,
-+modperl_env_magic_copy,
-+0,
-+modperl_env_magic_local_all
- };
-
--static MGVTBL MP_vtbl_envelem = {
-+MGVTBL MP_vtbl_envelem = {
- 0,
- modperl_env_magic_set,
- 0,
-@@ -641,20 +663,62 @@
- 0
- };
-
--void modperl_env_init(void)
-+void modperl_env_init(pTHX)
- {
--/* save originals */
--StructCopy(_vtbl_env, _PERL_vtbl_env, MGVTBL);
--StructCopy(_vtbl_envelem, _PERL_vtbl_envelem, MGVTBL);
-+MAGIC *mg;
-
--/* replace with our versions */
--StructCopy(_vtbl_env, _vtbl_env, MGVTBL);
--StructCopy(_vtbl_envelem, _vtbl_envelem, MGVTBL);
-+/* Find the 'E' magic on %ENV */
-+if (!my_perl)
-+return;
-+if (!PL_envgv)
-+return;
-+if (!SvRMAGICAL(ENVHV))
-+return;
-+mg = mg_find((const SV *)ENVHV, PERL_MAGIC_env);
-+if (!mg)
-+return;
-+
-+/* Ignore it if it isn't perl's original version */
-+if (mg->mg_virtual != _vtbl_env)
-+return;
-+
-+MP_TRACE_e(MP_FUNC, "env_init - ptr: %x obj: %x flags: %x",
-+ mg->mg_ptr, mg->mg_obj, mg->mg_flags);
-+
-+/* Remove it */
-+mg_free_type((SV*)ENVHV, PERL_MAGIC_env);
-+
-+/* Add our version instead */
-+mg = sv_magicext((SV*)ENVHV, (SV*)NULL, PERL_MAGIC_env, _vtbl_env,
(char*)NULL, 0);
-+mg->mg_flags |= MGf_COPY;
-+mg->mg_flags |= MGf_LOCAL;
- }
-
--void modperl_env_unload(void)
-+void modperl_env_unload(pTHX)
- {
--/* restore originals */
--StructCopy(_PERL_vtbl_env, _vtbl_env, MGVTBL);
--StructCopy(_PERL_vtbl_envelem, _vtbl_envelem, MGVTBL);
-+ MAGIC *mg;
-+
-+/* Find the 'E' magic on %ENV */
-+if (!my_perl)
-+return;
-+if (!PL_envgv)
-+return;
-+if (!SvRMAGICAL(ENVHV))
-+return;
-+mg = mg_find((const SV *)ENVHV, PERL_MAGIC_env);
-+if (!mg)
-+return;
-+
-+/* Ignore it if it isn't our version */
-+if (mg->mg_virtual != _vtbl_env)
-+return;
-+
-+MP_TRACE_e(MP_FUNC, "env_unload - ptr: %x obj: %x flags: %x",
-+ mg->mg_ptr, mg->mg_obj, mg->mg_flags);
-+
-+/* Remove it */
-+mg_free_type((SV*)ENVHV, PERL_MAGIC_env);
-+
-+/* Restore perl's original version */
-+sv_magicext((SV*)ENVHV, (SV*)NULL, PERL_MAGIC_env, _vtbl_env,
(char*)NULL, 0);
- }
a/src/modules/perl/modperl_env.h.orig 2015-12-28 11:42:34.868727490
[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_perl/
commit: 3d44e2d5ebd9837924b766627ab58d55cec43afa
Author: Robin H. Johnson gentoo org>
AuthorDate: Wed Feb 8 00:39:17 2017 +
Commit: Robin H. Johnson gentoo org>
CommitDate: Wed Feb 8 00:41:37 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d44e2d5
www-apache/mod_perl: missing DEPEND
mod_perl needs the APR_ECRYPT header definition which was introduced in
apr-util-1.4.x. Any box with only apr-util-1.3.x would fail to compile
otherwise. Compile failure found during infra upgrades, as nothing else
brought in newer apr-util on old systems.
Package-Manager: portage-2.3.2
www-apache/mod_perl/mod_perl-2.0.10.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/www-apache/mod_perl/mod_perl-2.0.10.ebuild
b/www-apache/mod_perl/mod_perl-2.0.10.ebuild
index 000d701..61a70b4 100644
--- a/www-apache/mod_perl/mod_perl-2.0.10.ebuild
+++ b/www-apache/mod_perl/mod_perl-2.0.10.ebuild
@@ -29,6 +29,7 @@ RDEPEND="
dev-lang/perl[ithreads=]
>=dev-perl/Apache-Test-1.400.0
>=www-servers/apache-2.0.47
+ >=dev-libs/apr-util-1.4
!ithreads? (
www-servers/apache[-apache2_mpms_event,-apache2_mpms_worker,apache2_mpms_prefork]
)
"
DEPEND="${RDEPEND}
[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_perl/
commit: cf9fef3ca4b6cf1c6cec68e4be1a5969186a03c3
Author: Kent Fredric gentoo org>
AuthorDate: Thu Feb 2 00:05:26 2017 +
Commit: Kent Fredric gentoo org>
CommitDate: Thu Feb 2 00:06:03 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf9fef3c
www-apache/mod_perl: Block testing with mpm-itk installed re bug #603378
mpm_itk needs root or things running apache as non-root fail.
mod_perl tests needs to be not run as root or it will skip tests.
Therefor, mod_perl's tests and mpm_itk can't coexist.
Bug: https://bugs.gentoo.org/603378
Package-Manager: Portage-2.3.3, Repoman-2.3.1
www-apache/mod_perl/mod_perl-2.0.10.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/www-apache/mod_perl/mod_perl-2.0.10.ebuild
b/www-apache/mod_perl/mod_perl-2.0.10.ebuild
index b13af32..000d701 100644
--- a/www-apache/mod_perl/mod_perl-2.0.10.ebuild
+++ b/www-apache/mod_perl/mod_perl-2.0.10.ebuild
@@ -41,6 +41,7 @@ DEPEND="${RDEPEND}
dev-perl/IPC-Run3
dev-perl/libwww-perl
www-servers/apache[apache2_modules_version,-apache2_modules_unique_id]
+ !www-apache/mpm_itk
)
"
PDEPEND="
[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_perl/
commit: 446f4d53d5a2b7519e17de9eced3b92f74125264
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Fri Jan 20 23:37:34 2017 +
Commit: Andreas Hüttel gentoo org>
CommitDate: Fri Jan 20 23:37:56 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=446f4d53
www-apache/mod_perl: Remove old
Package-Manager: Portage-2.3.3, Repoman-2.3.1
www-apache/mod_perl/mod_perl-2.0.8-r3.ebuild | 165 ---
1 file changed, 165 deletions(-)
diff --git a/www-apache/mod_perl/mod_perl-2.0.8-r3.ebuild
b/www-apache/mod_perl/mod_perl-2.0.8-r3.ebuild
deleted file mode 100644
index 0f895d1..
--- a/www-apache/mod_perl/mod_perl-2.0.8-r3.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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"
-SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~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_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 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
-
- # 410453
- epatch
"${FILESDIR}/use-client_ip-client_add-instead-of-remote_ip-remote.patch"
- epatch "${FILESDIR}/use-log.level-instead-of-loglevel.patch"
-
- # 554794
- epatch "${FILESDIR}/mod_perl_init_b554794.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
[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_perl/
commit: 37c9c91c34b948111e75f3d1a3aaea484f916543
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Sat Jan 14 13:52:17 2017 +
Commit: Andreas Hüttel gentoo org>
CommitDate: Sat Jan 14 13:52:17 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37c9c91c
www-apache/mod_perl: Remove old
Package-Manager: Portage-2.3.3, Repoman-2.3.1
www-apache/mod_perl/Manifest | 1 -
www-apache/mod_perl/mod_perl-2.0.10_rc1-r1.ebuild | 139 --
2 files changed, 140 deletions(-)
diff --git a/www-apache/mod_perl/Manifest b/www-apache/mod_perl/Manifest
index 8e3a2ab..1206f88 100644
--- a/www-apache/mod_perl/Manifest
+++ b/www-apache/mod_perl/Manifest
@@ -1,4 +1,3 @@
-DIST mod_perl-2.0.10-rc1.tar.gz 3845157 SHA256
d01da2b8b8acd9e2f4853f130f142259296310fb961bb3c55ad029b5a8d5d7af SHA512
9c99de8d553bce98786d6e99a78abdb39ecc411b82456a0cec0a667bd5d274c5978fd76ca4e9489d06e6661c64ab60b281fc8c741289777b1e0d067114a7a904
WHIRLPOOL
827f9f64524de44456a091e7fb558997e9ec8901a887d2b8d5767545cd330d4a0b18e6a6b2e00b31e36ac365d1b7c5b7aaad6aa5404a05e330f2c0ddae82497e
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/mod_perl-2.0.10_rc1-r1.ebuild
b/www-apache/mod_perl/mod_perl-2.0.10_rc1-r1.ebuild
deleted file mode 100644
index 3036d9f..
--- a/www-apache/mod_perl/mod_perl-2.0.10_rc1-r1.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit depend.apache apache-module perl-module eutils
-
-DESCRIPTION="An embedded Perl interpreter for Apache2"
-HOMEPAGE="https://perl.apache.org/
https://projects.apache.org/project.html?perl-mod_perl;
-#SRC_URI="mirror://apache/perl/${P}.tar.gz"
-SRC_URI="https://dist.apache.org/repos/dist/dev/perl/mod_perl-2.0.10-rc1.tar.gz;
-
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug ithreads test"
-
-S=${WORKDIR}/${P/_rc1/-rc1}
-
-SRC_TEST=do
-
-# Apache::Reload, Apache::SizeLimit, and Apache::Test are force-unbundled.
-# The minimum versions requested here are the bundled versions.
-
-# The test dependencies are from CPAN (Bundle::Apache2).
-
-# When all MPMs are disabled via useflags, the apache ebuild selects a
-# default one, which will likely need threading...
-
-RDEPEND="
- dev-lang/perl[ithreads=]
- >=dev-perl/Apache-Test-1.400.0
- >=www-servers/apache-2.0.47
- !ithreads? (
www-servers/apache[-apache2_mpms_event,-apache2_mpms_worker,apache2_mpms_prefork]
)
-"
-DEPEND="${RDEPEND}
- dev-perl/Module-Build
- test? (
- >=dev-perl/CGI-3.110.0
- dev-perl/Chatbot-Eliza
- dev-perl/Devel-Symdump
- dev-perl/HTML-Parser
- dev-perl/IPC-Run3
- dev-perl/libwww-perl
-
www-servers/apache[apache2_modules_version,-apache2_modules_unique_id]
- )
-"
-PDEPEND="
- >=dev-perl/Apache-Reload-0.130.0
- >=dev-perl/Apache-SizeLimit-0.970.0
-"
-
-APACHE2_MOD_FILE="${S}/src/modules/perl/mod_perl.so"
-APACHE2_MOD_CONF="2.0.3/75_${PN}"
-APACHE2_MOD_DEFINE="PERL"
-
-need_apache2
-
-PATCHES=(
- "${FILESDIR}/${PN}"-2.0.1-sneak-tmpdir.patch # seems to fix the make
test problem
- "${FILESDIR}/${PN}"-2.0.4-inline.patch# 550244
- "${FILESDIR}/${PN}"-2.0.10_rc1-bundled-Apache-Test.patch # 352724
- "${FILESDIR}/${PN}"-2.0.10_rc1-Gentoo-not-Unix.patch
-)
-
-src_prepare() {
- perl-module_src_prepare
-
- # chainsaw unbundling
- rm -rf Apache-{Test,Reload,SizeLimit}/ lib/Bundle/ || die
-}
-
-src_configure() {
- local debug=$(usex debug 1 0)
- local nothreads=$(usex ithreads 0 1)
- myconf=(
- MP_USE_DSO=1
- MP_APXS=${APXS}
-
[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_perl/
commit: 1ef4b0aace5c06172b9cf645d06ebcb8069dbc07
Author: Aaron Bauman gentoo org>
AuthorDate: Tue Jan 10 08:21:59 2017 +
Commit: Aaron Bauman gentoo org>
CommitDate: Tue Jan 10 08:22:51 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ef4b0aa
www-apache/mod_perl: amd64 stable
Gentoo-bug: 597824
Package-Manager: portage-2.3.0
www-apache/mod_perl/mod_perl-2.0.10.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/www-apache/mod_perl/mod_perl-2.0.10.ebuild
b/www-apache/mod_perl/mod_perl-2.0.10.ebuild
index dd2e4f8..b13af32 100644
--- a/www-apache/mod_perl/mod_perl-2.0.10.ebuild
+++ b/www-apache/mod_perl/mod_perl-2.0.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -12,7 +12,7 @@ SRC_URI="mirror://apache/perl/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="1"
-KEYWORDS="alpha ~amd64 x86"
+KEYWORDS="alpha amd64 x86"
IUSE="debug ithreads test"
SRC_TEST=do
[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_perl/
commit: 7bb96af3b851d08c782d166e42ad40ac59233e34
Author: Thomas Deutschmann gentoo org>
AuthorDate: Wed Dec 21 21:03:54 2016 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Wed Dec 21 21:33:51 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bb96af3
www-apache/mod_perl: x86 stable (bug #597824)
Package-Manager: Portage-2.3.2, Repoman-2.3.1
www-apache/mod_perl/mod_perl-2.0.10.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/www-apache/mod_perl/mod_perl-2.0.10.ebuild
b/www-apache/mod_perl/mod_perl-2.0.10.ebuild
index 0e3359f..dd2e4f8 100644
--- a/www-apache/mod_perl/mod_perl-2.0.10.ebuild
+++ b/www-apache/mod_perl/mod_perl-2.0.10.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://apache/perl/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="1"
-KEYWORDS="alpha ~amd64 ~x86"
+KEYWORDS="alpha ~amd64 x86"
IUSE="debug ithreads test"
SRC_TEST=do
[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_perl/
commit: 8f21064b16b814f280859287c528d4e157142ab4
Author: Tobias Klausmann gentoo org>
AuthorDate: Mon Dec 5 15:54:27 2016 +
Commit: Tobias Klausmann gentoo org>
CommitDate: Mon Dec 5 15:54:27 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f21064b
www-apache/mod_perl-2.0.10-r0: stable on alpha
Gentoo-Bug: 597824
www-apache/mod_perl/mod_perl-2.0.10.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/www-apache/mod_perl/mod_perl-2.0.10.ebuild
b/www-apache/mod_perl/mod_perl-2.0.10.ebuild
index c4891c3..0e3359f 100644
--- a/www-apache/mod_perl/mod_perl-2.0.10.ebuild
+++ b/www-apache/mod_perl/mod_perl-2.0.10.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://apache/perl/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="1"
-KEYWORDS="~alpha ~amd64 ~x86"
+KEYWORDS="alpha ~amd64 ~x86"
IUSE="debug ithreads test"
SRC_TEST=do
[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_perl/
commit: 0b56b856caa0828b78892ff12ed90d4e10f0a85b
Author: Tobias Klausmann gentoo org>
AuthorDate: Fri Nov 25 08:44:16 2016 +
Commit: Tobias Klausmann gentoo org>
CommitDate: Fri Nov 25 08:44:16 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b56b856
www-apache/mod_perl-2.0.10-r0: keyworded for ~alpha
Gentoo-Bug: 597822
www-apache/mod_perl/mod_perl-2.0.10.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/www-apache/mod_perl/mod_perl-2.0.10.ebuild
b/www-apache/mod_perl/mod_perl-2.0.10.ebuild
index 38daccf..c4891c3 100644
--- a/www-apache/mod_perl/mod_perl-2.0.10.ebuild
+++ b/www-apache/mod_perl/mod_perl-2.0.10.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://apache/perl/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="1"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~x86"
IUSE="debug ithreads test"
SRC_TEST=do
[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_perl/
commit: ecae76809308f2aba7d0e2e9ab62867671a370af
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Fri Oct 28 23:49:15 2016 +
Commit: Andreas Hüttel gentoo org>
CommitDate: Fri Oct 28 23:49:44 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecae7680
www-apache/mod_perl: Version bump to actual release
Package-Manager: portage-2.3.2
www-apache/mod_perl/Manifest | 1 +
www-apache/mod_perl/mod_perl-2.0.10.ebuild | 136 +
2 files changed, 137 insertions(+)
diff --git a/www-apache/mod_perl/Manifest b/www-apache/mod_perl/Manifest
index f57c1e5..8e3a2ab 100644
--- a/www-apache/mod_perl/Manifest
+++ b/www-apache/mod_perl/Manifest
@@ -1,3 +1,4 @@
DIST mod_perl-2.0.10-rc1.tar.gz 3845157 SHA256
d01da2b8b8acd9e2f4853f130f142259296310fb961bb3c55ad029b5a8d5d7af SHA512
9c99de8d553bce98786d6e99a78abdb39ecc411b82456a0cec0a667bd5d274c5978fd76ca4e9489d06e6661c64ab60b281fc8c741289777b1e0d067114a7a904
WHIRLPOOL
827f9f64524de44456a091e7fb558997e9ec8901a887d2b8d5767545cd330d4a0b18e6a6b2e00b31e36ac365d1b7c5b7aaad6aa5404a05e330f2c0ddae82497e
+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/mod_perl-2.0.10.ebuild
b/www-apache/mod_perl/mod_perl-2.0.10.ebuild
new file mode 100644
index ..38daccf
--- /dev/null
+++ b/www-apache/mod_perl/mod_perl-2.0.10.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit depend.apache apache-module perl-module eutils
+
+DESCRIPTION="An embedded Perl interpreter for Apache2"
+HOMEPAGE="https://perl.apache.org/
https://projects.apache.org/project.html?perl-mod_perl;
+SRC_URI="mirror://apache/perl/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="1"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug ithreads test"
+
+SRC_TEST=do
+
+# Apache::Reload, Apache::SizeLimit, and Apache::Test are force-unbundled.
+# The minimum versions requested here are the bundled versions.
+
+# The test dependencies are from CPAN (Bundle::Apache2).
+
+# When all MPMs are disabled via useflags, the apache ebuild selects a
+# default one, which will likely need threading...
+
+RDEPEND="
+ dev-lang/perl[ithreads=]
+ >=dev-perl/Apache-Test-1.400.0
+ >=www-servers/apache-2.0.47
+ !ithreads? (
www-servers/apache[-apache2_mpms_event,-apache2_mpms_worker,apache2_mpms_prefork]
)
+"
+DEPEND="${RDEPEND}
+ dev-perl/Module-Build
+ test? (
+ >=dev-perl/CGI-3.110.0
+ dev-perl/Chatbot-Eliza
+ dev-perl/Devel-Symdump
+ dev-perl/HTML-Parser
+ dev-perl/IPC-Run3
+ dev-perl/libwww-perl
+
www-servers/apache[apache2_modules_version,-apache2_modules_unique_id]
+ )
+"
+PDEPEND="
+ >=dev-perl/Apache-Reload-0.130.0
+ >=dev-perl/Apache-SizeLimit-0.970.0
+"
+
+APACHE2_MOD_FILE="${S}/src/modules/perl/mod_perl.so"
+APACHE2_MOD_CONF="2.0.3/75_${PN}"
+APACHE2_MOD_DEFINE="PERL"
+
+need_apache2
+
+PATCHES=(
+ "${FILESDIR}/${PN}"-2.0.1-sneak-tmpdir.patch # seems to fix the make
test problem
+ "${FILESDIR}/${PN}"-2.0.4-inline.patch# 550244
+ "${FILESDIR}/${PN}"-2.0.10_rc1-bundled-Apache-Test.patch # 352724
+ "${FILESDIR}/${PN}"-2.0.10_rc1-Gentoo-not-Unix.patch
+)
+
+src_prepare() {
+ perl-module_src_prepare
+
+ # chainsaw unbundling
+ rm -rf Apache-{Test,Reload,SizeLimit}/ lib/Bundle/ || die
+}
+
+src_configure() {
+ local debug=$(usex debug 1 0)
+ local nothreads=$(usex ithreads 0 1)
+ myconf=(
+ MP_USE_DSO=1
+ MP_APXS=${APXS}
+ MP_APR_CONFIG=/usr/bin/apr-1-config
+ MP_TRACE=${debug}
+ MP_DEBUG=${debug}
+
[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_perl/
commit: 7cfe5d9a2c4b809fcfa9b48856adcc28c33e5d6b
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Fri Oct 21 23:28:11 2016 +
Commit: Andreas Hüttel gentoo org>
CommitDate: Fri Oct 21 23:28:37 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cfe5d9a
www-apache/mod_perl: Better flag handling, force threading support on/off, bug
522698
Package-Manager: portage-2.3.2
www-apache/mod_perl/metadata.xml | 5 -
...{mod_perl-2.0.10_rc1.ebuild => mod_perl-2.0.10_rc1-r1.ebuild} | 9 +
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/www-apache/mod_perl/metadata.xml b/www-apache/mod_perl/metadata.xml
index f75208c..28acd8c 100644
--- a/www-apache/mod_perl/metadata.xml
+++ b/www-apache/mod_perl/metadata.xml
@@ -5,8 +5,11 @@
id...@gentoo.org
Christian Ruppert
-
+
p...@gentoo.org
Gentoo Perl Project
+
+ Build for use with thread-capable perl,
needs same setting as in dev-lang/perl
+
diff --git a/www-apache/mod_perl/mod_perl-2.0.10_rc1.ebuild
b/www-apache/mod_perl/mod_perl-2.0.10_rc1-r1.ebuild
similarity index 92%
rename from www-apache/mod_perl/mod_perl-2.0.10_rc1.ebuild
rename to www-apache/mod_perl/mod_perl-2.0.10_rc1-r1.ebuild
index f1db319..3036d9f 100644
--- a/www-apache/mod_perl/mod_perl-2.0.10_rc1.ebuild
+++ b/www-apache/mod_perl/mod_perl-2.0.10_rc1-r1.ebuild
@@ -14,7 +14,7 @@
SRC_URI="https://dist.apache.org/repos/dist/dev/perl/mod_perl-2.0.10-rc1.tar.gz;
LICENSE="Apache-2.0"
SLOT="1"
KEYWORDS="~amd64 ~x86"
-IUSE="debug test apache2_mpms_event apache2_mpms_worker apache2_mpms_prefork"
+IUSE="debug ithreads test"
S=${WORKDIR}/${P/_rc1/-rc1}
@@ -29,11 +29,10 @@ SRC_TEST=do
# default one, which will likely need threading...
RDEPEND="
+ dev-lang/perl[ithreads=]
>=dev-perl/Apache-Test-1.400.0
>=www-servers/apache-2.0.47
- apache2_mpms_event? ( dev-lang/perl[ithreads] )
- apache2_mpms_worker? ( dev-lang/perl[ithreads] )
- !apache2_mpms_event? ( !apache2_mpms_worker? ( !apache2_mpms_prefork? (
dev-lang/perl[ithreads] ) ) )
+ !ithreads? (
www-servers/apache[-apache2_mpms_event,-apache2_mpms_worker,apache2_mpms_prefork]
)
"
DEPEND="${RDEPEND}
dev-perl/Module-Build
@@ -74,12 +73,14 @@ src_prepare() {
src_configure() {
local debug=$(usex debug 1 0)
+ local nothreads=$(usex ithreads 0 1)
myconf=(
MP_USE_DSO=1
MP_APXS=${APXS}
MP_APR_CONFIG=/usr/bin/apr-1-config
MP_TRACE=${debug}
MP_DEBUG=${debug}
+ MP_NO_THREADS=${nothreads}
)
perl-module_src_configure
[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_perl/files/
commit: e5d15d1bb7ddafd2a9a29fed4a4def3e62356054
Author: Sergiy Borodych gmail com>
AuthorDate: Tue Oct 4 14:54:11 2016 +
Commit: Patrice Clement gentoo org>
CommitDate: Sat Oct 8 12:45:31 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5d15d1b
www-apache/mod_perl: remove old orphan file.
Closes: https://github.com/gentoo/gentoo/pull/2473
Signed-off-by: Patrice Clement gentoo.org>
.../files/mod_perl-2.0.7-bundled-Apache-Test.patch | 134 -
1 file changed, 134 deletions(-)
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..
--- 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 {
[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_perl/
commit: 8d3fd2d3c4d45d5117de6cceea0d3ab564bc8a66
Author: Sergiy Borodych gmail com>
AuthorDate: Tue Oct 4 14:56:00 2016 +
Commit: Patrice Clement gentoo org>
CommitDate: Sat Oct 8 12:45:37 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d3fd2d3
www-apache/mod_perl: add one more HOMEPAGE entry.
Closes: https://github.com/gentoo/gentoo/pull/2473
Signed-off-by: Patrice Clement gentoo.org>
www-apache/mod_perl/mod_perl-2.0.10_rc1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/www-apache/mod_perl/mod_perl-2.0.10_rc1.ebuild
b/www-apache/mod_perl/mod_perl-2.0.10_rc1.ebuild
index 16c96d6..f1db319 100644
--- a/www-apache/mod_perl/mod_perl-2.0.10_rc1.ebuild
+++ b/www-apache/mod_perl/mod_perl-2.0.10_rc1.ebuild
@@ -7,7 +7,7 @@ EAPI=5
inherit depend.apache apache-module perl-module eutils
DESCRIPTION="An embedded Perl interpreter for Apache2"
-HOMEPAGE="https://perl.apache.org/;
+HOMEPAGE="https://perl.apache.org/
https://projects.apache.org/project.html?perl-mod_perl;
#SRC_URI="mirror://apache/perl/${P}.tar.gz"
SRC_URI="https://dist.apache.org/repos/dist/dev/perl/mod_perl-2.0.10-rc1.tar.gz;
[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_perl/
commit: 833523c3ea8634365a0c32f0033f13bdc54c30af
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Sat Oct 1 18:10:53 2016 +
Commit: Andreas Hüttel gentoo org>
CommitDate: Sat Oct 1 18:11:28 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=833523c3
www-apache/mod_perl: QA fixes suggested by soap
Package-Manager: portage-2.3.1
www-apache/mod_perl/mod_perl-2.0.10_rc1.ebuild | 7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/www-apache/mod_perl/mod_perl-2.0.10_rc1.ebuild
b/www-apache/mod_perl/mod_perl-2.0.10_rc1.ebuild
index 3de1718..16c96d6 100644
--- a/www-apache/mod_perl/mod_perl-2.0.10_rc1.ebuild
+++ b/www-apache/mod_perl/mod_perl-2.0.10_rc1.ebuild
@@ -69,7 +69,7 @@ src_prepare() {
perl-module_src_prepare
# chainsaw unbundling
- rm -rf Apache-{Test,Reload,SizeLimit}/ lib/Bundle/
+ rm -rf Apache-{Test,Reload,SizeLimit}/ lib/Bundle/ || die
}
src_configure() {
@@ -92,7 +92,7 @@ src_test() {
# IF YOU SUDO TO EMERGE AND HAVE !env_reset set testing will fail!
if [[ "$(id -u)" == "0" ]]; then
- chown nobody:nobody "${WORKDIR}" "${T}"
+ chown nobody:nobody "${WORKDIR}" "${T}" || die
fi
# We force verbose tests for now to get meaningful bug reports.
@@ -124,9 +124,10 @@ src_install() {
-e "s,${S}\(/[^[:space:]\"\']\+\)\?,/,g" \
"${D}/${VENDOR_ARCH}/Apache2/BuildConfig.pm" || die
+ local fname
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}
+ sed -i -e "s:\(${D}\|${S}\):/:g" ${fname} || die
done
perl_remove_temppath
[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_perl/, www-apache/mod_perl/files/
commit: 5b1864cdd9a0e05afe4f401698f7f7dffab97f9f
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Sat Oct 1 11:46:29 2016 +
Commit: Andreas Hüttel gentoo org>
CommitDate: Sat Oct 1 11:59:54 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b1864cd
www-apache/mod_perl: Version bump to 2.0.10-rc1 with more or less complete
rework; tests should pass now
Package-Manager: portage-2.3.1
www-apache/mod_perl/Manifest | 1 +
.../mod_perl-2.0.10_rc1-Gentoo-not-Unix.patch | 36 ++
.../mod_perl-2.0.10_rc1-bundled-Apache-Test.patch | 80
www-apache/mod_perl/mod_perl-2.0.10_rc1.ebuild | 137 +
4 files changed, 254 insertions(+)
diff --git a/www-apache/mod_perl/Manifest b/www-apache/mod_perl/Manifest
index 3c73173..f57c1e5 100644
--- a/www-apache/mod_perl/Manifest
+++ b/www-apache/mod_perl/Manifest
@@ -1,2 +1,3 @@
+DIST mod_perl-2.0.10-rc1.tar.gz 3845157 SHA256
d01da2b8b8acd9e2f4853f130f142259296310fb961bb3c55ad029b5a8d5d7af SHA512
9c99de8d553bce98786d6e99a78abdb39ecc411b82456a0cec0a667bd5d274c5978fd76ca4e9489d06e6661c64ab60b281fc8c741289777b1e0d067114a7a904
WHIRLPOOL
827f9f64524de44456a091e7fb558997e9ec8901a887d2b8d5767545cd330d4a0b18e6a6b2e00b31e36ac365d1b7c5b7aaad6aa5404a05e330f2c0ddae82497e
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_rc1-Gentoo-not-Unix.patch
b/www-apache/mod_perl/files/mod_perl-2.0.10_rc1-Gentoo-not-Unix.patch
new file mode 100644
index ..578878f
--- /dev/null
+++ b/www-apache/mod_perl/files/mod_perl-2.0.10_rc1-Gentoo-not-Unix.patch
@@ -0,0 +1,36 @@
+Tests fail because the server banner contains "Gentoo" instead of "Unix".
Disable them.
+
+
+diff -ruN mod_perl-2.0.10-rc1.orig/t/response/TestAPI/server_const.pm
mod_perl-2.0.10-rc1/t/response/TestAPI/server_const.pm
+--- mod_perl-2.0.10-rc1.orig/t/response/TestAPI/server_const.pm
2016-09-30 14:45:31.0 +0200
mod_perl-2.0.10-rc1/t/response/TestAPI/server_const.pm 2016-10-01
13:18:02.359794404 +0200
+@@ -25,7 +25,7 @@
+
+ my $r = shift;
+
+-plan $r, tests => 6;
++plan $r, tests => 4;
+
+ # test Apache2::ServerUtil constant subroutines
+
+@@ -45,13 +45,13 @@
+ ok t_cmp($server_descr, qr!\bworld domination series/2\.0\b!,
+ 'Apache2::ServerUtil::get_server_description() -- component');
+
+-# assuming ServerTokens Full (default) the banner equals description
+-ok t_cmp(Apache2::ServerUtil::get_server_banner, $server_descr,
+- 'Apache2::ServerUtil::get_server_banner()');
+-
+-# version is just an alias for banner
+-ok t_cmp(Apache2::ServerUtil::get_server_version, $server_descr,
+- 'Apache2::ServerUtil::get_server_version()');
++## assuming ServerTokens Full (default) the banner equals description
++#ok t_cmp(Apache2::ServerUtil::get_server_banner, $server_descr,
++# 'Apache2::ServerUtil::get_server_banner()');
++
++## version is just an alias for banner
++#ok t_cmp(Apache2::ServerUtil::get_server_version, $server_descr,
++# 'Apache2::ServerUtil::get_server_version()');
+
+ Apache2::Const::OK;
+ }
diff --git
a/www-apache/mod_perl/files/mod_perl-2.0.10_rc1-bundled-Apache-Test.patch
b/www-apache/mod_perl/files/mod_perl-2.0.10_rc1-bundled-Apache-Test.patch
new file mode 100644
index ..e8ec5d0
--- /dev/null
+++ b/www-apache/mod_perl/files/mod_perl-2.0.10_rc1-bundled-Apache-Test.patch
@@ -0,0 +1,80 @@
+diff -ruN mod_perl-2.0.10-rc1.orig/Makefile.PL mod_perl-2.0.10-rc1/Makefile.PL
+--- mod_perl-2.0.10-rc1.orig/Makefile.PL 2016-09-30 14:45:23.0
+0200
mod_perl-2.0.10-rc1/Makefile.PL2016-10-01 00:35:17.140862642 +0200
+@@ -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. " .
+-
[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_perl/
commit: b29e3a62a5609bae162aecf38b91e9b86088df9e
Author: Pacho Ramos gentoo org>
AuthorDate: Fri Aug 26 09:23:28 2016 +
Commit: Pacho Ramos gentoo org>
CommitDate: Fri Aug 26 09:28:27 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b29e3a62
www-apache/mod_perl: x86 stable, bug #548932
Package-Manager: portage-2.3.0
www-apache/mod_perl/mod_perl-2.0.10_pre201601.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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
index 806c4e9..9735237 100644
--- a/www-apache/mod_perl/mod_perl-2.0.10_pre201601.ebuild
+++ b/www-apache/mod_perl/mod_perl-2.0.10_pre201601.ebuild
@@ -13,7 +13,7 @@
SRC_URI="http://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.gz;
LICENSE="GPL-2"
SLOT="1"
-KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
IUSE="debug"
# Make sure we always use the latest Apache-Test version or even check the
[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_perl/
commit: d241f763330b11f637f15f76c7b34bfc5cd37d66
Author: Tobias Klausmann gentoo org>
AuthorDate: Mon May 23 11:42:06 2016 +
Commit: Tobias Klausmann gentoo org>
CommitDate: Mon May 23 11:42:25 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d241f763
www-apache/mod_perl-2.0.10_pre201601-r0: add alpha keyword
Gentoo-Bug: 548932
Package-Manager: portage-2.3.0_rc1
www-apache/mod_perl/mod_perl-2.0.10_pre201601.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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
index 717c2db..806c4e9 100644
--- a/www-apache/mod_perl/mod_perl-2.0.10_pre201601.ebuild
+++ b/www-apache/mod_perl/mod_perl-2.0.10_pre201601.ebuild
@@ -13,7 +13,7 @@
SRC_URI="http://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.gz;
LICENSE="GPL-2"
SLOT="1"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="debug"
# Make sure we always use the latest Apache-Test version or even check the
[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_perl/
commit: 80bdd5a6d50b25986b68d1f20bad96cbd99fff4e
Author: Agostino Sarubbo gentoo org>
AuthorDate: Mon Mar 7 12:54:32 2016 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Mon Mar 7 12:54:32 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80bdd5a6
www-apache/mod_perl: amd64 stable wrt bug #548932
Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo gentoo.org>
www-apache/mod_perl/mod_perl-2.0.10_pre201601.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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
index 2de8412..717c2db 100644
--- a/www-apache/mod_perl/mod_perl-2.0.10_pre201601.ebuild
+++ b/www-apache/mod_perl/mod_perl-2.0.10_pre201601.ebuild
@@ -13,7 +13,7 @@
SRC_URI="http://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.gz;
LICENSE="GPL-2"
SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="debug"
# Make sure we always use the latest Apache-Test version or even check the
[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_perl/
commit: 3173f721fce94ef83b0ca56abf70e5c2eb3a9336
Author: Andreas K. Huettel gentoo org>
AuthorDate: Fri Jan 22 17:38:01 2016 +
Commit: Andreas Hüttel gentoo org>
CommitDate: Fri Jan 22 17:38:01 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3173f721
www-apache/mod_perl: Remove old
Package-Manager: portage-2.2.27
www-apache/mod_perl/mod_perl-2.0.8-r2.ebuild | 162 ---
1 file changed, 162 deletions(-)
diff --git a/www-apache/mod_perl/mod_perl-2.0.8-r2.ebuild
b/www-apache/mod_perl/mod_perl-2.0.8-r2.ebuild
deleted file mode 100644
index ebdf20d..000
--- a/www-apache/mod_perl/mod_perl-2.0.8-r2.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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"
-SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~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_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 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
-
- # 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
-
[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_perl/
commit: 18c5ce75ed3c4dda9a70277cdb9af98f93e0afae
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Fri Jan 22 00:02:45 2016 +
Commit: Andreas Hüttel gentoo org>
CommitDate: Fri Jan 22 00:02:45 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18c5ce75
www-apache/mod_perl: Restore keywords after encouraging feedback
Package-Manager: portage-2.2.26
www-apache/mod_perl/mod_perl-2.0.10_pre201601.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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
index 722d40c..2de8412 100644
--- a/www-apache/mod_perl/mod_perl-2.0.10_pre201601.ebuild
+++ b/www-apache/mod_perl/mod_perl-2.0.10_pre201601.ebuild
@@ -13,7 +13,7 @@
SRC_URI="http://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.gz;
LICENSE="GPL-2"
SLOT="1"
-KEYWORDS=""
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="debug"
# Make sure we always use the latest Apache-Test version or even check the
[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_perl/
commit: 6a0f86bffc8d798f102f446fa433ac930e518520
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Sat Jan 9 19:31:42 2016 +
Commit: Andreas Hüttel gentoo org>
CommitDate: Sat Jan 9 19:31:42 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a0f86bf
Remove old
Package-Manager: portage-2.2.26
www-apache/mod_perl/mod_perl-2.0.8-r1.ebuild | 162 ---
1 file changed, 162 deletions(-)
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 0520b8c..000
--- a/www-apache/mod_perl/mod_perl-2.0.8-r1.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit depend.apache apache-module perl-module eutils
-
-DESCRIPTION="An embedded Perl interpreter for Apache2"
-SRC_URI="mirror://apache/perl/${P}.tar.gz"
-HOMEPAGE="https://projects.apache.org/projects/mod_perl.html;
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug"
-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-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_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 2003.05.06
-# sed -i -e "s/sleep \$_/sleep \$_ << 2/" \
-# "${S}"/Apache-Test/lib/Apache/TestServer.pm \
-# || die "problem editing TestServer.pm"
-
- # rendhalver - this got redone for 2.0.1 and seems to fix the make test
problems
- epatch "${FILESDIR}"/mod_perl-2.0.1-sneak-tmpdir.patch
-
- # 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
-
- # 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 myargs=
-
- if use debug; then
- myargs="MP_TRACE=1 MP_DEBUG=1"
- else
- myargs="MP_TRACE=0 MP_DEBUG=0"
- fi
-
- perl Makefile.PL \
- PREFIX="${EPREFIX}"/usr \
- INSTALLDIRS=vendor \
- MP_USE_DSO=1 \
- MP_APXS=${APXS} \
- MP_APR_CONFIG=/usr/bin/apr-1-config \
- ${myargs} || 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}"
-
[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_perl/
commit: 00f816a676e32ff3af7f6cf27eaf1f818e160574
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Sat Jan 9 19:30:04 2016 +
Commit: Andreas Hüttel gentoo org>
CommitDate: Sat Jan 9 19:30:26 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00f816a6
Restore keywords after positive feedback
Package-Manager: portage-2.2.26
www-apache/mod_perl/mod_perl-2.0.8-r3.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/www-apache/mod_perl/mod_perl-2.0.8-r3.ebuild
b/www-apache/mod_perl/mod_perl-2.0.8-r3.ebuild
index bdd6215..0f895d1 100644
--- a/www-apache/mod_perl/mod_perl-2.0.8-r3.ebuild
+++ b/www-apache/mod_perl/mod_perl-2.0.8-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -12,7 +12,7 @@ SRC_URI="mirror://apache/perl/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="1"
-KEYWORDS=""
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="debug"
# Make sure we always use the latest Apache-Test version or even check the
[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_perl/, www-apache/mod_perl/files/
commit: 26dbb9c470dc0126d8eb9cbb26a3ff4818069915
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Sat Jan 9 20:09:54 2016 +
Commit: Andreas Hüttel gentoo org>
CommitDate: Sat Jan 9 20:10:13 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26dbb9c4
Add a snapshot from upstream SVN
Package-Manager: portage-2.2.26
www-apache/mod_perl/Manifest | 1 +
...perl-2.0.10_pre201601-bundled-Apache-Test.patch | 123 +++
.../mod_perl/mod_perl-2.0.10_pre201601.ebuild | 165 +
3 files changed, 289 insertions(+)
diff --git a/www-apache/mod_perl/Manifest b/www-apache/mod_perl/Manifest
index 74557b1..3c73173 100644
--- a/www-apache/mod_perl/Manifest
+++ b/www-apache/mod_perl/Manifest
@@ -1 +1,2 @@
+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
new file mode 100644
index 000..af53cad
--- /dev/null
+++
b/www-apache/mod_perl/files/mod_perl-2.0.10_pre201601-bundled-Apache-Test.patch
@@ -0,0 +1,123 @@
+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.0
+0200
mod_perl-2.0.10_pre201601/Makefile.PL 2016-01-09 21:02:00.0
+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.0 +0200
mod_perl-2.0.10_pre201601/lib/ModPerl/BuildMM.pm 2016-01-09
21:04:34.0 +0100
+@@ -39,12 +39,10 @@
+ ModPerl::MM::override_eu_mm_mv_all_methods(@methods);
+ use strict 'refs';
+
+-my $apache_test_dir = catdir Cwd::getcwd(),
[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_perl/, www-apache/mod_perl/files/
commit: ff626b3e8835f83406c28bdfee3f213b75d192ab
Author: Tobias Klausmann gentoo org>
AuthorDate: Tue Dec 29 09:08:13 2015 +
Commit: Tobias Klausmann gentoo org>
CommitDate: Tue Dec 29 09:09:48 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff626b3e
www-apache/mod_perl Fix Perl initialization
Newer (>=5.22) versions of Perl require initialization to be handled
differently. The added patch comes from mod_perl's SVN, commit #1717474,
plus a few adaptations to apply cleanly.
Gentoo-Bug: 554794
Package-Manager: portage-2.2.26
.../mod_perl/files/mod_perl_init_b554794.patch | 241 +
www-apache/mod_perl/mod_perl-2.0.8-r3.ebuild | 165 ++
2 files changed, 406 insertions(+)
diff --git a/www-apache/mod_perl/files/mod_perl_init_b554794.patch
b/www-apache/mod_perl/files/mod_perl_init_b554794.patch
new file mode 100644
index 000..b33a34a
--- /dev/null
+++ b/www-apache/mod_perl/files/mod_perl_init_b554794.patch
@@ -0,0 +1,241 @@
+--- a/src/modules/perl/modperl_env.c.orig 2015-12-28 11:42:26.604632457
+0100
b/src/modules/perl/modperl_env.c 2015-12-28 12:36:35.305228288 +0100
+@@ -120,6 +120,7 @@
+ const apr_array_header_t *array;
+ apr_table_entry_t *elts;
+
++modperl_env_init(aTHX);
+ modperl_env_untie(mg_flags);
+
+ array = apr_table_elts(table);
+@@ -431,13 +432,11 @@
+ }
+
+ /* to store the original virtual tables
+- * these are global, not per-interpreter
++ * handy access to perl's original virtual tables
+ */
+-static MGVTBL MP_PERL_vtbl_env;
+-static MGVTBL MP_PERL_vtbl_envelem;
+
+ #define MP_PL_vtbl_call(name, meth) \
+-MP_PERL_vtbl_##name.svt_##meth(aTHX_ sv, mg)
++PL_vtbl_##name.svt_##meth(aTHX_ sv, mg)
+
+ #define MP_dENV_KEY \
+ STRLEN klen; \
+@@ -534,6 +533,26 @@
+ return 0;
+ }
+
++static int modperl_env_magic_copy(pTHX_ SV *sv, MAGIC *mg, SV *nsv, const
char *name, I32 namlen)
++{
++MP_TRACE_e(MP_FUNC, "setting up %%ENV element magic");
++sv_magicext(nsv, mg->mg_obj, toLOWER(mg->mg_type), _vtbl_envelem,
name, namlen);
++
++return 1;
++}
++
++static int modperl_env_magic_local_all(pTHX_ SV *nsv, MAGIC *mg)
++{
++MAGIC *nmg;
++MP_TRACE_e(MP_FUNC, "localizing %%ENV");
++nmg = sv_magicext(nsv, mg->mg_obj, mg->mg_type, _vtbl_env,
(char*)NULL, 0);
++nmg->mg_ptr = mg->mg_ptr;
++nmg->mg_flags |= MGf_COPY;
++nmg->mg_flags |= MGf_LOCAL;
++
++return 1;
++}
++
+ static int modperl_env_magic_set(pTHX_ SV *sv, MAGIC *mg)
+ {
+ request_rec *r = (request_rec *)EnvMgObj;
+@@ -625,15 +644,18 @@
+ #endif
+
+ /* override %ENV virtual tables with our own */
+-static MGVTBL MP_vtbl_env = {
++MGVTBL MP_vtbl_env = {
+ 0,
+ modperl_env_magic_set_all,
+ 0,
+ modperl_env_magic_clear_all,
+-0
++0,
++modperl_env_magic_copy,
++0,
++modperl_env_magic_local_all
+ };
+
+-static MGVTBL MP_vtbl_envelem = {
++MGVTBL MP_vtbl_envelem = {
+ 0,
+ modperl_env_magic_set,
+ 0,
+@@ -641,20 +663,62 @@
+ 0
+ };
+
+-void modperl_env_init(void)
++void modperl_env_init(pTHX)
+ {
+-/* save originals */
+-StructCopy(_vtbl_env, _PERL_vtbl_env, MGVTBL);
+-StructCopy(_vtbl_envelem, _PERL_vtbl_envelem, MGVTBL);
++MAGIC *mg;
+
+-/* replace with our versions */
+-StructCopy(_vtbl_env, _vtbl_env, MGVTBL);
+-StructCopy(_vtbl_envelem, _vtbl_envelem, MGVTBL);
++/* Find the 'E' magic on %ENV */
++if (!my_perl)
++return;
++if (!PL_envgv)
++return;
++if (!SvRMAGICAL(ENVHV))
++return;
++mg = mg_find((const SV *)ENVHV, PERL_MAGIC_env);
++if (!mg)
++return;
++
++/* Ignore it if it isn't perl's original version */
++if (mg->mg_virtual != _vtbl_env)
++return;
++
++MP_TRACE_e(MP_FUNC, "env_init - ptr: %x obj: %x flags: %x",
++ mg->mg_ptr, mg->mg_obj, mg->mg_flags);
++
++/* Remove it */
++mg_free_type((SV*)ENVHV, PERL_MAGIC_env);
++
++/* Add our version instead */
++mg = sv_magicext((SV*)ENVHV, (SV*)NULL, PERL_MAGIC_env, _vtbl_env,
(char*)NULL, 0);
++mg->mg_flags |= MGf_COPY;
++mg->mg_flags |= MGf_LOCAL;
+ }
+
+-void modperl_env_unload(void)
++void modperl_env_unload(pTHX)
+ {
+-/* restore originals */
+-StructCopy(_PERL_vtbl_env, _vtbl_env, MGVTBL);
+-StructCopy(_PERL_vtbl_envelem, _vtbl_envelem, MGVTBL);
++ MAGIC *mg;
++
++/* Find the 'E' magic on %ENV */
++if (!my_perl)
++return;
++if (!PL_envgv)
++return;
++if (!SvRMAGICAL(ENVHV))
++return;
++mg = mg_find((const SV *)ENVHV, PERL_MAGIC_env);
++if (!mg)
++return;
++
++/* Ignore it if it isn't our version */
++if (mg->mg_virtual != _vtbl_env)
++return;
++
++MP_TRACE_e(MP_FUNC, "env_unload - ptr: %x obj: %x flags: %x",
++ mg->mg_ptr, mg->mg_obj, mg->mg_flags);
++
++/* Remove it */
++
[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_perl/
commit: 73ed29f74d8e7b4758073678aaf208e582fa1fa1
Author: Markus Meier gentoo org>
AuthorDate: Sun Nov 22 08:02:42 2015 +
Commit: Markus Meier gentoo org>
CommitDate: Sun Nov 22 08:02:42 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73ed29f7
www-apache/mod_perl: add ~arm, bug #549968
Package-Manager: portage-2.2.25
www-apache/mod_perl/mod_perl-2.0.8-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/www-apache/mod_perl/mod_perl-2.0.8-r2.ebuild
b/www-apache/mod_perl/mod_perl-2.0.8-r2.ebuild
index b4b85c9..ebdf20d 100644
--- a/www-apache/mod_perl/mod_perl-2.0.8-r2.ebuild
+++ b/www-apache/mod_perl/mod_perl-2.0.8-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://apache/perl/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="1"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="debug"
# Make sure we always use the latest Apache-Test version or even check the
