CVS commit: pkgsrc/www/ap2-perl

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Thu Jul 13 18:29:37 UTC 2023

Modified Files:
        pkgsrc/www/ap2-perl: Makefile distinfo
Added Files:
        pkgsrc/www/ap2-perl/patches: patch-src_modules_perl_modperl__io.c

Log Message:
ap2-perl: Fix runtime symbol issue with newer perl.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 pkgsrc/www/ap2-perl/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/www/ap2-perl/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/www/ap2-perl/patches/patch-src_modules_perl_modperl__io.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/ap2-perl/Makefile
diff -u pkgsrc/www/ap2-perl/Makefile:1.65 pkgsrc/www/ap2-perl/Makefile:1.66
--- pkgsrc/www/ap2-perl/Makefile:1.65   Thu Jul  6 09:42:18 2023
+++ pkgsrc/www/ap2-perl/Makefile        Thu Jul 13 18:29:37 2023
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.65 2023/07/06 09:42:18 wiz Exp $
+# $NetBSD: Makefile,v 1.66 2023/07/13 18:29:37 jperkin Exp $
 
 DISTNAME=      mod_perl-2.0.12
 PKGNAME=       ${APACHE_PKG_PREFIX}-${DISTNAME:S/mod_//}
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    www perl5
 MASTER_SITES=  ${MASTER_SITE_APACHE:=perl/}
 

Index: pkgsrc/www/ap2-perl/distinfo
diff -u pkgsrc/www/ap2-perl/distinfo:1.28 pkgsrc/www/ap2-perl/distinfo:1.29
--- pkgsrc/www/ap2-perl/distinfo:1.28   Tue Feb  1 11:46:28 2022
+++ pkgsrc/www/ap2-perl/distinfo        Thu Jul 13 18:29:37 2023
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.28 2022/02/01 11:46:28 wiz Exp $
+$NetBSD: distinfo,v 1.29 2023/07/13 18:29:37 jperkin Exp $
 
 BLAKE2s (mod_perl-2.0.12.tar.gz) = c01c8843070beea87339783b08f3444520b0f12fc7648dc831427cb0102f580c
 SHA512 (mod_perl-2.0.12.tar.gz) = 890dca0950847e32180485cabbeffbf236af2c92c7df957a233c210022b5172957eddb1db3e9281b87cd438d2fa404a05ae99c7eda098267c68d5e9262b400b0
 Size (mod_perl-2.0.12.tar.gz) = 3848030 bytes
+SHA1 (patch-src_modules_perl_modperl__io.c) = e05256de9c6757ecb746790baa7565f680c5015d
 SHA1 (patch-src_modules_perl_modperl_common_util.h) = a5fd094351fef2994b67c6c70abc18c772aec532
 SHA1 (patch-xs_APR_aprext_Makefile.PL) = 9ada16e6be30236c6dbd4de4955e0077a83d3d85

Added files:

Index: pkgsrc/www/ap2-perl/patches/patch-src_modules_perl_modperl__io.c
diff -u /dev/null pkgsrc/www/ap2-perl/patches/patch-src_modules_perl_modperl__io.c:1.1
--- /dev/null   Thu Jul 13 18:29:37 2023
+++ pkgsrc/www/ap2-perl/patches/patch-src_modules_perl_modperl__io.c    Thu Jul 13 18:29:37 2023
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_modules_perl_modperl__io.c,v 1.1 2023/07/13 18:29:37 jperkin Exp $
+
+Pull in upstream fix for newer perl.
+https://github.com/apache/mod_perl/commit/991cfeca9bac185f191510e0064f174d45718e6a
+
+--- src/modules/perl/modperl_io.c.orig 2022-01-30 13:02:22.000000000 +0000
++++ src/modules/perl/modperl_io.c
+@@ -116,8 +116,8 @@ modperl_io_perlio_override_stdhandle(pTH
+     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));