Oh my! mod_perl released a new version that includes the perl 5.22+ patches!
https://metacpan.org/pod/release/SHAY/mod_perl-2.0.10/Changes Anyone who actually uses this want to test? I was able to get all the tests passing except one that seems to be a problem in others are seeing: http://marc.info/?l=apache-modperl&m=147541037913776&w=2 More details and showing it happened in 2.09, but still no response: http://www.gossamer-threads.com/lists/modperl/modperl/108837 Index: Makefile =================================================================== RCS file: /cvs/ports/www/ap2-mod_perl/Makefile,v retrieving revision 1.39 diff -u -p -r1.39 Makefile --- Makefile 12 Oct 2016 11:05:05 -0000 1.39 +++ Makefile 1 Nov 2016 21:58:50 -0000 @@ -2,8 +2,7 @@ COMMENT= module that embeds a Perl interpreter into Apache2 -DISTNAME= mod_perl-2.0.9 -REVISION= 2 +DISTNAME= mod_perl-2.0.10 PKGNAME= ap2-${DISTNAME:S/-rc/rc/} CATEGORIES= www net @@ -23,6 +22,9 @@ LIB_DEPENDS= converters/libiconv \ devel/apr-util RUN_DEPENDS= www/apache-httpd BUILD_DEPENDS= ${RUN_DEPENDS} + +# Addtional dependencies to avoid skipping tests +TEST_DEPENDS= devel/p5-BSD-Resource PORTHOME= ${WRKDIR} Index: distinfo =================================================================== RCS file: /cvs/ports/www/ap2-mod_perl/distinfo,v retrieving revision 1.7 diff -u -p -r1.7 distinfo --- distinfo 28 Apr 2016 16:41:22 -0000 1.7 +++ distinfo 1 Nov 2016 21:58:50 -0000 @@ -1,2 +1,2 @@ -SHA256 (mod_perl-2.0.9.tar.gz) = AmDyardxwclfrcZ1RLNADkILswuKd1ZdLQKtBUmO9Ss= -SIZE (mod_perl-2.0.9.tar.gz) = 3846584 +SHA256 (mod_perl-2.0.10.tar.gz) = 0c+D7U6jqd/Oqm2WYv9kUXcJB0mIEJMFECC/QvmHK2Q= +SIZE (mod_perl-2.0.10.tar.gz) = 3846211 Index: patches/patch-src_modules_perl_mod_perl_c =================================================================== RCS file: patches/patch-src_modules_perl_mod_perl_c diff -N patches/patch-src_modules_perl_mod_perl_c --- patches/patch-src_modules_perl_mod_perl_c 12 Oct 2016 11:05:05 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,37 +0,0 @@ -$OpenBSD: patch-src_modules_perl_mod_perl_c,v 1.1 2016/10/12 11:05:05 sthen Exp $ - -From 82827132efd3c2e25cc413c85af61bb63375da6e Mon Sep 17 00:00:00 2001 -From: Steve Hay <steve...@apache.org> -Date: Tue, 1 Dec 2015 17:39:43 +0000 -Subject: [PATCH] Add support for Perl 5.22.x. - ---- src/modules/perl/mod_perl.c.orig Thu Jun 18 21:13:55 2015 -+++ src/modules/perl/mod_perl.c Wed Oct 12 11:51:59 2016 -@@ -262,6 +262,8 @@ PerlInterpreter *modperl_startup(server_rec *s, apr_po - exit(1); - } - -+ modperl_env_init(aTHX); -+ - /* suspend END blocks to be run at server shutdown */ - endav = PL_endav; - PL_endav = (AV *)NULL; -@@ -576,9 +578,6 @@ static apr_status_t modperl_sys_init(void) - /* modifies PL_ppaddr */ - modperl_perl_pp_set_all(); - -- /* modifies PL_vtbl_env{elem} */ -- modperl_env_init(); -- - return APR_SUCCESS; - } - -@@ -596,8 +595,6 @@ static apr_status_t modperl_sys_term(void *data) - MP_PERL_FREE_THREAD_KEY_WORKAROUND; - - MP_TRACE_i(MP_FUNC, "mod_perl sys term"); -- -- modperl_env_unload(); - - modperl_perl_pp_unset_all(); - Index: patches/patch-src_modules_perl_modperl_env_c =================================================================== RCS file: patches/patch-src_modules_perl_modperl_env_c diff -N patches/patch-src_modules_perl_modperl_env_c --- patches/patch-src_modules_perl_modperl_env_c 12 Oct 2016 11:05:05 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,160 +0,0 @@ -$OpenBSD: patch-src_modules_perl_modperl_env_c,v 1.1 2016/10/12 11:05:05 sthen Exp $ - -From 82827132efd3c2e25cc413c85af61bb63375da6e Mon Sep 17 00:00:00 2001 -From: Steve Hay <steve...@apache.org> -Date: Tue, 1 Dec 2015 17:39:43 +0000 -Subject: [PATCH] Add support for Perl 5.22.x. - -From a6629db9dacd3c6152df599397cfa913928d18d2 Mon Sep 17 00:00:00 2001 -From: Steve Hay <steve...@apache.org> -Date: Fri, 4 Mar 2016 08:23:32 +0000 -Subject: [PATCH] Fix compile errors since SVN revision 1717474 for unthreaded perl - ---- src/modules/perl/modperl_env.c.orig Wed Oct 12 11:52:43 2016 -+++ src/modules/perl/modperl_env.c Wed Oct 12 11:52:36 2016 -@@ -121,6 +121,7 @@ static void modperl_env_table_populate(pTHX_ apr_table - 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,14 +432,10 @@ void modperl_env_request_untie(pTHX_ request_rec *r) - #endif - } - --/* 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; \ -@@ -529,6 +526,26 @@ static int modperl_env_magic_clear_all(pTHX_ SV *sv, M - 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), &MP_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, &MP_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; -@@ -613,15 +630,18 @@ static int modperl_env_magic_get(pTHX_ SV *sv, MAGIC * - #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, -@@ -629,22 +649,60 @@ static MGVTBL MP_vtbl_envelem = { - 0 - }; - --void modperl_env_init(void) -+void modperl_env_init(pTHX) - { -- /* save originals */ -- StructCopy(&PL_vtbl_env, &MP_PERL_vtbl_env, MGVTBL); -- StructCopy(&PL_vtbl_envelem, &MP_PERL_vtbl_envelem, MGVTBL); -+ MAGIC *mg; - -- /* replace with our versions */ -- StructCopy(&MP_vtbl_env, &PL_vtbl_env, MGVTBL); -- StructCopy(&MP_vtbl_envelem, &PL_vtbl_envelem, MGVTBL); -+ /* Find the 'E' magic on %ENV */ -+ 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 != &PL_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, &MP_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(&MP_PERL_vtbl_env, &PL_vtbl_env, MGVTBL); -- StructCopy(&MP_PERL_vtbl_envelem, &PL_vtbl_envelem, MGVTBL); -+ MAGIC *mg; -+ -+ /* Find the 'E' magic on %ENV */ -+ 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 != &MP_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, &PL_vtbl_env, (char*)NULL, 0); - } - - /* Index: patches/patch-src_modules_perl_modperl_env_h =================================================================== RCS file: patches/patch-src_modules_perl_modperl_env_h diff -N patches/patch-src_modules_perl_modperl_env_h --- patches/patch-src_modules_perl_modperl_env_h 12 Oct 2016 11:05:05 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,33 +0,0 @@ -$OpenBSD: patch-src_modules_perl_modperl_env_h,v 1.1 2016/10/12 11:05:05 sthen Exp $ - -From 82827132efd3c2e25cc413c85af61bb63375da6e Mon Sep 17 00:00:00 2001 -From: Steve Hay <steve...@apache.org> -Date: Tue, 1 Dec 2015 17:39:43 +0000 -Subject: [PATCH] Add support for Perl 5.22.x. - ---- src/modules/perl/modperl_env.h.orig Thu Jun 18 21:13:54 2015 -+++ src/modules/perl/modperl_env.h Wed Oct 12 11:51:59 2016 -@@ -28,7 +28,7 @@ - MP_magical_tie(ENVHV, mg_flags) - - #define modperl_envelem_tie(sv, key, klen) \ -- sv_magic(sv, (SV *)NULL, 'e', key, klen) -+ sv_magicext(sv, (SV *)NULL, PERL_MAGIC_envelem, &MP_vtbl_envelem, key, klen) - - void modperl_env_hash_keys(pTHX); - -@@ -58,9 +58,12 @@ void modperl_env_request_tie(pTHX_ request_rec *r); - - void modperl_env_request_untie(pTHX_ request_rec *r); - --void modperl_env_init(void); -+void modperl_env_init(pTHX); - --void modperl_env_unload(void); -+void modperl_env_unload(pTHX); -+ -+MGVTBL MP_vtbl_env; -+MGVTBL MP_vtbl_envelem; - - #endif /* MODPERL_ENV_H */ - Index: patches/patch-src_modules_perl_modperl_perl_c =================================================================== RCS file: patches/patch-src_modules_perl_modperl_perl_c diff -N patches/patch-src_modules_perl_modperl_perl_c --- patches/patch-src_modules_perl_modperl_perl_c 12 Oct 2016 11:05:05 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,23 +0,0 @@ -$OpenBSD: patch-src_modules_perl_modperl_perl_c,v 1.1 2016/10/12 11:05:05 sthen Exp $ - -From 82827132efd3c2e25cc413c85af61bb63375da6e Mon Sep 17 00:00:00 2001 -From: Steve Hay <steve...@apache.org> -Date: Tue, 1 Dec 2015 17:39:43 +0000 -Subject: [PATCH] Add support for Perl 5.22.x. - -From a6629db9dacd3c6152df599397cfa913928d18d2 Mon Sep 17 00:00:00 2001 -From: Steve Hay <steve...@apache.org> -Date: Fri, 4 Mar 2016 08:23:32 +0000 -Subject: [PATCH] Fix compile errors since SVN revision 1717474 for unthreaded perl - ---- src/modules/perl/modperl_perl.c.orig Wed Oct 12 11:52:43 2016 -+++ src/modules/perl/modperl_perl.c Wed Oct 12 11:52:36 2016 -@@ -181,6 +181,8 @@ void modperl_perl_destruct(PerlInterpreter *perl) - } - } - -+ modperl_env_unload(aTHX); -+ - perl_destruct(perl); - - /* XXX: big bug in 5.6.1 fixed in 5.7.2+ Index: patches/patch-t_lib_TestAPRlib_util_pm =================================================================== RCS file: patches/patch-t_lib_TestAPRlib_util_pm diff -N patches/patch-t_lib_TestAPRlib_util_pm --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-t_lib_TestAPRlib_util_pm 1 Nov 2016 21:58:50 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- t/lib/TestAPRlib/util.pm.orig Tue Nov 1 10:42:49 2016 ++++ t/lib/TestAPRlib/util.pm Tue Nov 1 10:49:55 2016 +@@ -11,7 +11,7 @@ use Apache::TestUtil; + + use APR::Util (); + +-use constant CRYPT_WORKS => $^O !~ /^(MSWin32|beos|NetWare)$/; ++use constant CRYPT_WORKS => $^O !~ /^(MSWin32|beos|NetWare|openbsd)$/; + + my $clear = "this is some text"; + # to get the hash values used: Index: patches/patch-t_response_TestModperl_env_pm =================================================================== RCS file: patches/patch-t_response_TestModperl_env_pm diff -N patches/patch-t_response_TestModperl_env_pm --- patches/patch-t_response_TestModperl_env_pm 12 Oct 2016 11:05:05 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,27 +0,0 @@ -$OpenBSD: patch-t_response_TestModperl_env_pm,v 1.1 2016/10/12 11:05:05 sthen Exp $ - -From 82827132efd3c2e25cc413c85af61bb63375da6e Mon Sep 17 00:00:00 2001 -From: Steve Hay <steve...@apache.org> -Date: Tue, 1 Dec 2015 17:39:43 +0000 -Subject: [PATCH] Add support for Perl 5.22.x. - ---- t/response/TestModperl/env.pm.orig Thu Jun 18 21:13:58 2015 -+++ t/response/TestModperl/env.pm Wed Oct 12 11:51:59 2016 -@@ -15,7 +15,7 @@ use Apache2::Const -compile => 'OK'; - sub handler { - my $r = shift; - -- plan $r, tests => 23 + keys(%ENV); -+ plan $r, tests => 23 + 3 * keys(%ENV); - - my $env = $r->subprocess_env; - -@@ -75,6 +75,8 @@ sub handler { - for my $key (sort keys %ENV) { - eval { delete $ENV{$key}; }; - ok t_cmp($@, '', $key); -+ ok t_cmp($ENV{$key}, undef, "ENV{$key} is empty"); -+ ok t_cmp($env->get($key), undef, "subprocess_env($key) is empty"); - } - - Apache2::Const::OK; Index: patches/patch-t_response_TestModperl_perl_pm =================================================================== RCS file: patches/patch-t_response_TestModperl_perl_pm diff -N patches/patch-t_response_TestModperl_perl_pm --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-t_response_TestModperl_perl_pm 1 Nov 2016 21:58:50 -0000 @@ -0,0 +1,14 @@ +$OpenBSD$ +--- t/response/TestModperl/perl.pm.orig Thu Oct 27 13:11:28 2016 ++++ t/response/TestModperl/perl.pm Tue Nov 1 14:22:28 2016 +@@ -17,8 +17,8 @@ sub handler { + + plan $r, tests => 1; + +- ok t_cmp("SNXJvM5I.PJrE", +- crypt("testing", "SNXJvM5I.PJrE"), ++ ok t_cmp('$2b$12$123456789012345678901u1ZJSwXPi/vx1HZAMoHfzxhzXjZiOB5q', ++ crypt("testing", '$2b$12$123456789012345678901u1ZJSwXPi/vx1HZAMoHfzxhzXjZiOB5q'), + "crypt"); + + Apache2::Const::OK; ----- End forwarded message ----- -- andrew - http://afresh1.com Real programmers don't document. If it was hard to write, it should be hard to understand.
