* [gentoo-commits] repo/gentoo:master commit in: www-apache/mod_perl/files/, www-apache/mod_perl/
@ 2020-05-12 18:02 Kent Fredric
0 siblings, 0 replies; 4+ messages in thread
From: Kent Fredric @ 2020-05-12 18:02 UTC (permalink / raw
To: gentoo-commits
commit: 562e0ddc683696a4d4e423ed6b2b3a4f9d5d4eab
Author: Kent Fredric <kentnl <AT> gentoo <DOT> org>
AuthorDate: Tue May 12 18:01:03 2020 +0000
Commit: Kent Fredric <kentnl <AT> gentoo <DOT> org>
CommitDate: Tue May 12 18:02:42 2020 +0000
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 <kentnl <AT> 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..00000000000
--- 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 <ntyni@debian.org>
-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..00000000000
--- a/www-apache/mod_perl/files/mod_perl-2.0.10-apache24-tests-2.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Author: Stefan Fritsch <sf@sfritsch.de>
-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.000000000 +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..00000000000
--- 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 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.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}
- 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.10-apache24-tests-1.patch # 614684
- "${FILESDIR}/${PN}"-2.0.10-apache24-tests-2.patch # 614684
-)
-
-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 perl-module_src_test
-}
-
-src_install() {
- apache-module_src_install
-
- default
-
- perl_delete_localpod
- perl_delete_packlist
-
- insinto "${APACHE_MODULES_CONFDIR}"
- doins "${FILESDIR}"/2.0.3/apache2-mod_perl-startup.pl
-
- # this is an attempt to get @INC in line with /usr/bin/perl.
- # there is blib garbage in the mainstream one that can only be
- # useful during internal testing, so we wait until here and then
- # just go with a clean slate. should be much easier to see what's
- # happening and revert if problematic.
-
- perl_set_version
- sed -i \
- -e "s,-I${S}/[^[:space:]\"\']\+[[:space:]]\?,,g" \
- -e "s,-typemap[[:space:]]${S}/[^[:space:]\"\']\+[[:space:]]\?,,g" \
- -e "s,${S}\(/[^[:space:]\"\']\+\)\?,/,g" \
- "${D}/${VENDOR_ARCH}/Apache2/BuildConfig.pm" || die
-
- 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} || die
- done
-
- perl_remove_temppath
-}
-
-pkg_postinst() {
- apache-module_pkg_postinst
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-apache/mod_perl/files/, www-apache/mod_perl/
@ 2021-05-08 13:03 Andreas K. Hüttel
0 siblings, 0 replies; 4+ messages in thread
From: Andreas K. Hüttel @ 2021-05-08 13:03 UTC (permalink / raw
To: gentoo-commits
commit: 27cca9bf1fd1d36ae3a736de7b7c9df00751604b
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat May 8 13:02:25 2021 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat May 8 13:03:09 2021 +0000
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 <dilfridge <AT> 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 00000000000..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.000000000 +0100
++++ ./lib/Apache2/Build.pm 2020-10-28 19:20:40.809279091 +0000
+@@ -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() {
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-apache/mod_perl/files/, www-apache/mod_perl/
@ 2024-03-15 14:58 Matt Turner
0 siblings, 0 replies; 4+ messages in thread
From: Matt Turner @ 2024-03-15 14:58 UTC (permalink / raw
To: gentoo-commits
commit: fa4e1c7d801e581efc2e56b4eb20b3b3328a7d2c
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 14 16:44:35 2024 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Mar 15 14:57:16 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa4e1c7d
www-apache/mod_perl: Drop old versions
Signed-off-by: Matt Turner <mattst88 <AT> 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..000000000000
--- 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 <fawaka@gmail.com> 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(&PL_hash_seed, &MP_init_hash_seed,
-+ memcpy(PL_hash_seed, &MP_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..000000000000
--- 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..000000000000
--- 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 <stevehay@apache.org>
-Date: Tue, 27 Jun 2023 08:38:15 +0000
-Subject: [PATCH] Stop using do_open9() - this deprecated function was removed
- in 5.37.1
-
-Patch by Jitka Plesnikova <jplesnik@redhat.com> 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, &sv, 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.11-r1.ebuild b/www-apache/mod_perl/mod_perl-2.0.11-r1.ebuild
deleted file mode 100644
index 374329841fba..000000000000
--- a/www-apache/mod_perl/mod_perl-2.0.11-r1.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 )"
-
-DIST_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
- "${FILESDIR}/${PN}"-2.0.11-ranlib.patch # 728554
- "${FILESDIR}/${PN}"-2.0.11-perl534.patch # 791403
-)
-
-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}" "${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
-
- perl_delete_localpod
- perl_fix_packlist
- perl_delete_emptybsdir
-
- insinto "${APACHE_MODULES_CONFDIR}"
- doins "${FILESDIR}"/2.0.3/apache2-mod_perl-startup.pl
-
- # this is an attempt to get @INC in line with /usr/bin/perl.
- # there is blib garbage in the mainstream one that can only be
- # useful during internal testing, so we wait until here and then
- # just go with a clean slate. should be much easier to see what's
- # happening and revert if problematic.
-
- perl_set_version
- sed -i \
- -e "s,-I${S}/[^[:space:]\"\']\+[[:space:]]\?,,g" \
- -e "s,-typemap[[:space:]]${S}/[^[:space:]\"\']\+[[:space:]]\?,,g" \
- -e "s,${S}\(/[^[:space:]\"\']\+\)\?,/,g" \
- "${D}/${VENDOR_ARCH}/Apache2/BuildConfig.pm" || die
-
- 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} || die
- done
-
- perl_remove_temppath
-}
-
-pkg_postinst() {
- apache-module_pkg_postinst
-}
diff --git a/www-apache/mod_perl/mod_perl-2.0.12.ebuild b/www-apache/mod_perl/mod_perl-2.0.12.ebuild
deleted file mode 100644
index 1ebaf1e19813..000000000000
--- a/www-apache/mod_perl/mod_perl-2.0.12.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# 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
- "${FILESDIR}"/${PN}-2.0.12-perl538.patch
- "${FILESDIR}"/${PN}-2.0.12-avoid-pch.patch
-)
-
-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}" "${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
-
- perl_delete_localpod
- perl_fix_packlist
- perl_delete_emptybsdir
-
- insinto "${APACHE_MODULES_CONFDIR}"
- doins "${FILESDIR}"/2.0.3/apache2-mod_perl-startup.pl
-
- # this is an attempt to get @INC in line with /usr/bin/perl.
- # there is blib garbage in the mainstream one that can only be
- # useful during internal testing, so we wait until here and then
- # just go with a clean slate. should be much easier to see what's
- # happening and revert if problematic.
-
- perl_set_version
- sed -i \
- -e "s,-I${S}/[^[:space:]\"\']\+[[:space:]]\?,,g" \
- -e "s,-typemap[[:space:]]${S}/[^[:space:]\"\']\+[[:space:]]\?,,g" \
- -e "s,${S}\(/[^[:space:]\"\']\+\)\?,/,g" \
- "${D}/${VENDOR_ARCH}/Apache2/BuildConfig.pm" || die
-
- 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} || die
- done
-
- perl_remove_temppath
-}
-
-pkg_postinst() {
- apache-module_pkg_postinst
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-apache/mod_perl/files/, www-apache/mod_perl/
@ 2025-06-30 12:25 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2025-06-30 12:25 UTC (permalink / raw
To: gentoo-commits
commit: 2a7a49ce39447bf4a7effed3d38ec525f8d7cc4d
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 30 12:23:05 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jun 30 12:23:05 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a7a49ce
www-apache/mod_perl: fix modern C issue
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../mod_perl/files/mod_perl-2.0.13-c99.patch | 43 ++++++
www-apache/mod_perl/mod_perl-2.0.13-r2.ebuild | 144 +++++++++++++++++++++
2 files changed, 187 insertions(+)
diff --git a/www-apache/mod_perl/files/mod_perl-2.0.13-c99.patch b/www-apache/mod_perl/files/mod_perl-2.0.13-c99.patch
new file mode 100644
index 000000000000..f0ef4cba0c52
--- /dev/null
+++ b/www-apache/mod_perl/files/mod_perl-2.0.13-c99.patch
@@ -0,0 +1,43 @@
+https://github.com/apache/mod_perl/commit/ead5012b9f8bca08415f39e15226dbc6112a9538
+
+From ead5012b9f8bca08415f39e15226dbc6112a9538 Mon Sep 17 00:00:00 2001
+From: Joe Orton <jorton@apache.org>
+Date: Tue, 6 Feb 2024 08:33:52 +0000
+Subject: [PATCH] * src/modules/perl/modperl_common_util.c
+ (modperl_table_magic_copy): Use I32 rather than int for 'namelen' argument,
+ fixing an incompatible function pointer error/warning in a 32-bit build:
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+modperl_common_util.c:57:53: error: initialization of ‘int (*)(PerlInterpreter *, SV *, MAGIC *, SV *, const char *, I32)’ {aka ‘int (*)(struct interpreter *, struct sv *, struct magic *, struct sv *, const char *, long int)’} from incompatible pointer type ‘int (*)(PerlInterpreter *, SV *, MAGIC *, SV *, const char *, int)’ {aka ‘int (*)(struct interpreter *, struct sv *, struct magic *, struct sv *, const char *, int)’} [-Wincompatible-pointer-types]
+ 57 | modperl_table_magic_copy};
+ | ^~~~~~~~~~~~~~~~~~~~~~~~
+
+Checked back to Perl 5.14.x which has I32 (a typedef of long int on
+i686) rather than int in the prototype for the svt_copy function
+pointer in MGVTBL, so I32 appears to have been always correct here:
+
+int (*svt_copy)(SV *sv, MAGIC* mg, SV *nsv, const char *name, I32 namlen);
+
+per https://perldoc.perl.org/5.14.0/perlguts
+
+
+git-svn-id: https://svn.apache.org/repos/asf/perl/modperl/trunk@1915593 13f79535-47bb-0310-9956-ffa450edef68
+---
+ src/modules/perl/modperl_common_util.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/modules/perl/modperl_common_util.c b/src/modules/perl/modperl_common_util.c
+index c5f285f9d..461750f2f 100644
+--- a/src/modules/perl/modperl_common_util.c
++++ b/src/modules/perl/modperl_common_util.c
+@@ -41,7 +41,7 @@
+
+ MP_INLINE static
+ int modperl_table_magic_copy(pTHX_ SV *sv, MAGIC *mg, SV *nsv,
+- const char *name, int namelen)
++ const char *name, I32 namelen)
+ {
+ /* prefetch the value whenever we're iterating over the keys */
+ MAGIC *tie_magic = mg_find(nsv, PERL_MAGIC_tiedelem);
diff --git a/www-apache/mod_perl/mod_perl-2.0.13-r2.ebuild b/www-apache/mod_perl/mod_perl-2.0.13-r2.ebuild
new file mode 100644
index 000000000000..d8210716297d
--- /dev/null
+++ b/www-apache/mod_perl/mod_perl-2.0.13-r2.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2025 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 perl_features_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="
+ perl_features_ithreads? ( || ( >=dev-lang/perl-5.38.2-r3[perl_features_ithreads] <dev-lang/perl-5.38.2-r3[ithreads] ) )
+ !perl_features_ithreads? ( || ( >=dev-lang/perl-5.38.2-r3[-perl_features_ithreads] <dev-lang/perl-5.38.2-r3[-ithreads] ) )
+ >=dev-perl/Apache-Test-1.420.0
+ >=www-servers/apache-2.0.47
+ >=dev-libs/apr-util-1.4
+ !perl_features_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
+ "${FILESDIR}"/${PN}-2.0.13-c99.patch
+)
+
+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 perl_features_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
+
+ perl_delete_localpod
+ perl_fix_packlist
+ perl_delete_emptybsdir
+
+ insinto "${APACHE_MODULES_CONFDIR}"
+ doins "${FILESDIR}"/2.0.3/apache2-mod_perl-startup.pl
+
+ # this is an attempt to get @INC in line with /usr/bin/perl.
+ # there is blib garbage in the mainstream one that can only be
+ # useful during internal testing, so we wait until here and then
+ # just go with a clean slate. should be much easier to see what's
+ # happening and revert if problematic.
+
+ perl_set_version
+ sed -i \
+ -e "s,-I${S}/[^[:space:]\"\']\+[[:space:]]\?,,g" \
+ -e "s,-typemap[[:space:]]${S}/[^[:space:]\"\']\+[[:space:]]\?,,g" \
+ -e "s,${S}\(/[^[:space:]\"\']\+\)\?,/,g" \
+ "${D}/${VENDOR_ARCH}/Apache2/BuildConfig.pm" || die
+
+ 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} || die
+ done
+
+ perl_remove_temppath
+}
+
+pkg_postinst() {
+ apache-module_pkg_postinst
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2025-06-30 12:25 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-05-12 18:02 [gentoo-commits] repo/gentoo:master commit in: www-apache/mod_perl/files/, www-apache/mod_perl/ Kent Fredric
-- strict thread matches above, loose matches on Subject: below --
2021-05-08 13:03 Andreas K. Hüttel
2024-03-15 14:58 Matt Turner
2025-06-30 12:25 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox