diff options
Diffstat (limited to 'www-apache/mod_perl/files')
-rw-r--r-- | www-apache/mod_perl/files/mod_perl-2.0.12-avoid-pch.patch | 22 | ||||
-rw-r--r-- | www-apache/mod_perl/files/mod_perl-2.0.12-perl538.patch | 25 |
2 files changed, 47 insertions, 0 deletions
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 000000000000..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 000000000000..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 <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)); + |