diff -Nru libapache2-mod-perl2-2.0.11/debian/changelog libapache2-mod-perl2-2.0.11/debian/changelog --- libapache2-mod-perl2-2.0.11/debian/changelog 2020-11-29 14:59:21.000000000 +0000 +++ libapache2-mod-perl2-2.0.11/debian/changelog 2021-02-22 18:00:30.000000000 +0000 @@ -1,3 +1,11 @@ +libapache2-mod-perl2 (2.0.11-4) unstable; urgency=medium + + * Add a patch from upstream SVN to fix a SIGSEGV crash due to wrong use + of perl_parse(). (LP: #1915959) + * Update years of packaging copyright. + + -- gregor herrmann Mon, 22 Feb 2021 19:00:30 +0100 + libapache2-mod-perl2 (2.0.11-3) unstable; urgency=medium [ Debian Janitor ] diff -Nru libapache2-mod-perl2-2.0.11/debian/copyright libapache2-mod-perl2-2.0.11/debian/copyright --- libapache2-mod-perl2-2.0.11/debian/copyright 2020-11-29 14:59:21.000000000 +0000 +++ libapache2-mod-perl2-2.0.11/debian/copyright 2021-02-22 18:00:30.000000000 +0000 @@ -38,7 +38,7 @@ 2007-2008, Gunnar Wolf 2007, Steve Langasek 2008, Niko Tyni - 2008-2020, gregor herrmann + 2008-2021, gregor herrmann 2011, Nicholas Bamber 2018, Xavier Guimard License: Apache-2.0 diff -Nru libapache2-mod-perl2-2.0.11/debian/patches/Fix_SIGSEGV_perl_parse.patch libapache2-mod-perl2-2.0.11/debian/patches/Fix_SIGSEGV_perl_parse.patch --- libapache2-mod-perl2-2.0.11/debian/patches/Fix_SIGSEGV_perl_parse.patch 1970-01-01 00:00:00.000000000 +0000 +++ libapache2-mod-perl2-2.0.11/debian/patches/Fix_SIGSEGV_perl_parse.patch 2021-02-22 18:00:30.000000000 +0000 @@ -0,0 +1,29 @@ +Description: Fix SIGSEGV crash due to wrong use of perl_parse() +Origin: https://svn.apache.org/viewvc?view=revision&revision=1886793 +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libapache2-mod-perl2/+bug/1915959 +Author: Charles Pigott +Reviewed-by: gregor herrmann +Last-Update: 2021-02-22 + +--- a/src/modules/perl/modperl_config.c ++++ b/src/modules/perl/modperl_config.c +@@ -163,7 +163,8 @@ + scfg->PerlPostConfigRequire = + apr_array_make(p, 1, sizeof(modperl_require_file_t *)); + +- scfg->argv = apr_array_make(p, 2, sizeof(char *)); ++ /* 2 arguments + NULL terminator */ ++ scfg->argv = apr_array_make(p, 3, sizeof(char *)); + + scfg->setvars = apr_table_make(p, 2); + scfg->configvars = apr_table_make(p, 2); +@@ -219,6 +220,9 @@ + + *argc = scfg->argv->nelts; + ++ /* perl_parse() expects a NULL terminated argv array */ ++ modperl_config_srv_argv_push(NULL); ++ + MP_TRACE_g_do(dump_argv(scfg)); + + return (char **)scfg->argv->elts; diff -Nru libapache2-mod-perl2-2.0.11/debian/patches/series libapache2-mod-perl2-2.0.11/debian/patches/series --- libapache2-mod-perl2-2.0.11/debian/patches/series 2020-11-29 14:59:21.000000000 +0000 +++ libapache2-mod-perl2-2.0.11/debian/patches/series 2021-02-22 18:00:30.000000000 +0000 @@ -12,3 +12,4 @@ 360-conditional-linux-pid-module.patch 0001-Skip-t-protocol-pseudo_http.t-incompatible-with-Apac.patch honour-env-LDFLAGS.patch +Fix_SIGSEGV_perl_parse.patch