summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Matteo Bernardini2023-07-04 18:56:06 +0200
committer Matteo Bernardini2024-04-27 10:38:25 +0200
commit321af9d78620a99eac6e4b6e4f5667683d9e546f (patch)
tree54b00c977cb70b8a2576987aaae0610201650f5d
parent68ac93024440c1dcb61e579018ce241a1ab44180 (diff)
downloadslackbuilds-mod_perl.tar.gz
perl/mod_perl: Patch for the newer perl.mod_perl
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
-rw-r--r--perl/mod_perl/mod_perl.SlackBuild3
-rw-r--r--perl/mod_perl/r1910623.patch23
2 files changed, 26 insertions, 0 deletions
diff --git a/perl/mod_perl/mod_perl.SlackBuild b/perl/mod_perl/mod_perl.SlackBuild
index d197c0b49d..5a5fde9d5a 100644
--- a/perl/mod_perl/mod_perl.SlackBuild
+++ b/perl/mod_perl/mod_perl.SlackBuild
@@ -77,6 +77,9 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+# Thanks to msantinho @ LQ!
+patch -p0 < $CWD/r1910623.patch
+
# Thanks to ARCH Linux
sed -i -e '1098,1102d' Apache-Test/lib/Apache/TestRun.pm
sed -i '51,56c push @INC, "xs/tables/current24";' lib/ModPerl/MapUtil.pm
diff --git a/perl/mod_perl/r1910623.patch b/perl/mod_perl/r1910623.patch
new file mode 100644
index 0000000000..a6939c54ec
--- /dev/null
+++ b/perl/mod_perl/r1910623.patch
@@ -0,0 +1,23 @@
+Author: stevehay
+Date: Tue Jun 27 08:38:15 2023
+New Revision: 1910623
+
+Stop using do_open9() - this deprecated function was removed in 5.37.1
+
+Patch by Jitka Plesnikova <jp...@redhat.com> from https://rt.cpan.org/Ticket/Display.html?id=148451
+
+Index: src/modules/perl/modperl_io.c
+===================================================================
+--- src/modules/perl/modperl_io.c (revision 1910622)
++++ src/modules/perl/modperl_io.c (revision 1910623)
+@@ -116,8 +116,8 @@
+ 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));