diff --git a/apache2-mod_perl-prctl-short-name.patch b/apache2-mod_perl-prctl-short-name.patch index 2cff410..00b0ffd 100644 --- a/apache2-mod_perl-prctl-short-name.patch +++ b/apache2-mod_perl-prctl-short-name.patch @@ -1,7 +1,7 @@ -Index: mod_perl-2.0.10/src/modules/perl/mod_perl.c +Index: mod_perl-2.0.12/src/modules/perl/mod_perl.c =================================================================== ---- mod_perl-2.0.10.orig/src/modules/perl/mod_perl.c 2016-10-27 22:11:11.000000000 +0200 -+++ mod_perl-2.0.10/src/modules/perl/mod_perl.c 2018-07-17 10:47:27.962807330 +0200 +--- mod_perl-2.0.12.orig/src/modules/perl/mod_perl.c ++++ mod_perl-2.0.12/src/modules/perl/mod_perl.c @@ -15,6 +15,7 @@ */ diff --git a/apache2-mod_perl.changes b/apache2-mod_perl.changes index 5a52fbb..fb6a4c1 100644 --- a/apache2-mod_perl.changes +++ b/apache2-mod_perl.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Thu Apr 21 15:15:11 UTC 2022 - David Anes + +- update to 2.0.12: + * Add bug tracker information to README, and add CONTRIBUTING.md. + * Fix detection of APR's threading support on RHEL 8. + * Fix build for perl >= 5.33.7. + * Fix SIGSEGV crash due to wrong use of perl_parse(). + * Improve installation instructions for AIX. +- remove patch: + * fix_perl_5.34_build.patch (there is a fix already upstreamed) +- refreshed patches: + * avoid-broken-provides.diff + * apache2-mod_perl-prctl-short-name.patch + ------------------------------------------------------------------- Mon Sep 27 16:39:34 UTC 2021 - Dirk Stoecker diff --git a/apache2-mod_perl.spec b/apache2-mod_perl.spec index c0e7516..c57605b 100644 --- a/apache2-mod_perl.spec +++ b/apache2-mod_perl.spec @@ -1,7 +1,7 @@ # # spec file for package apache2-mod_perl # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ %define srcname mod_perl Name: apache2-mod_perl -Version: 2.0.11 +Version: 2.0.12 Release: 0 Summary: Embedded Perl for Apache License: Apache-2.0 @@ -30,8 +30,6 @@ Source2: https://www.apache.org/dist/perl/KEYS#/%{name}.keyring Patch1: avoid-broken-provides.diff # bsc#1091625, workaround, according to mls it should be solved in perl Patch2: apache2-mod_perl-prctl-short-name.patch -# PATCH-FIX-UPSTREAM fix build error caused by new error checking in perl 5.34.0 -Patch3: fix_perl_5.34_build.patch BuildRequires: apache-rpm-macros BuildRequires: apache2-devel BuildRequires: db-devel @@ -86,7 +84,6 @@ software depending on apache2-mod_perl. %setup -q -n %{srcname}-%{version} %patch1 -p1 %patch2 -p1 -%patch3 -p1 %build perl Makefile.PL INSTALLDIRS=vendor MP_APXS=%{apache_apxs} MP_APR_CONFIG=%{_bindir}/apr-1-config MP_CCOPTS="%{apache_cflags} -fgnu89-inline" diff --git a/avoid-broken-provides.diff b/avoid-broken-provides.diff index 73ecd7c..e85ed55 100644 --- a/avoid-broken-provides.diff +++ b/avoid-broken-provides.diff @@ -1,5 +1,7 @@ ---- httpd24/Apache-Test/lib/Apache/TestRequest.pm -+++ httpd24/Apache-Test/lib/Apache/TestRequest.pm +Index: mod_perl-2.0.12/Apache-Test/lib/Apache/TestRequest.pm +=================================================================== +--- mod_perl-2.0.12.orig/Apache-Test/lib/Apache/TestRequest.pm ++++ mod_perl-2.0.12/Apache-Test/lib/Apache/TestRequest.pm @@ -43,7 +43,8 @@ unless ($ENV{APACHE_TEST_PRETEND_NO_LWP} require HTTP::Request::Common; diff --git a/fix_perl_5.34_build.patch b/fix_perl_5.34_build.patch deleted file mode 100644 index 9d40f2e..0000000 --- a/fix_perl_5.34_build.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -ur mod_perl-2.0.11/src/modules/perl/modperl_perl.c mod_perl-2.0.11_fix/src/modules/perl/modperl_perl.c ---- mod_perl-2.0.11/src/modules/perl/modperl_perl.c 2019-10-05 13:04:42.000000000 +0200 -+++ mod_perl-2.0.11_fix/src/modules/perl/modperl_perl.c 2021-09-27 18:45:52.566005007 +0200 -@@ -268,7 +268,7 @@ - #ifdef MP_NEED_HASH_SEED_FIXUP - if (MP_init_hash_seed_set) { - #if MP_PERL_VERSION_AT_LEAST(5, 17, 6) -- memcpy(&PL_hash_seed, &MP_init_hash_seed, -+ memcpy(PL_hash_seed, &MP_init_hash_seed, - sizeof(PL_hash_seed) > sizeof(MP_init_hash_seed) ? - sizeof(MP_init_hash_seed) : sizeof(PL_hash_seed)); - PL_hash_seed_set = MP_init_hash_seed_set; -diff -ur mod_perl-2.0.11/src/modules/perl/modperl_util.c mod_perl-2.0.11_fix/src/modules/perl/modperl_util.c ---- mod_perl-2.0.11/src/modules/perl/modperl_util.c 2019-10-05 13:04:43.000000000 +0200 -+++ mod_perl-2.0.11_fix/src/modules/perl/modperl_util.c 2021-09-27 18:38:17.156578770 +0200 -@@ -632,7 +632,7 @@ - - if (r->finfo.size != size) { - SvREFCNT_dec(sv); -- Perl_croak(aTHX_ "Error: read %d bytes, expected %d ('%s')", -+ Perl_croak(aTHX_ "Error: read %ld bytes, expected %ld ('%s')", - size, (apr_size_t)r->finfo.size, r->filename); - } - diff --git a/mod_perl-2.0.11.tar.gz b/mod_perl-2.0.11.tar.gz deleted file mode 100644 index f4c3c30..0000000 --- a/mod_perl-2.0.11.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ca2a9e18cdf90f9c6023e786369d5ba75e8dac292ebfea9900c29bf42dc16f74 -size 3848147 diff --git a/mod_perl-2.0.11.tar.gz.asc b/mod_perl-2.0.11.tar.gz.asc deleted file mode 100644 index cb8cb7d..0000000 --- a/mod_perl-2.0.11.tar.gz.asc +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iQIcBAABCgAGBQJdmHvVAAoJEKs0ugBA6S7OE4QP/0g94ActGmL7SgF4m+7NeJbL -UzZdBnqy60HqLBrLhg8Mn7+T2j51KPrh76TL9CrLUCD3cYWPyes1a7wZieAt+Utw -qX6XAuhRaO89ep4zhp6tdBtnT83FjFRgbyaArg0PmL6hNAEu8iWHVcwkNH2PQ67i -6YRQVtJqFwi8c6pkU0jWeJDNcsXnoQf3thV0CmcjuDHsrqxUYRfGrU83gBlX44ct -GFSBMSIgJdn/ssTZ3VYje9I7HKsl+eRU8R1uouMtX5Pbenu7P3RgWnYmBoUOl3kA -PUOCnNoDLOiV5V9oCr5s7o+DdpwicqQOvKQ9BAaSSjTH5SaHoH6IR/F/jfw2/KLA -mFFGLudemFVNSN2y2qvfsNMzj41c4lidALrrpSUS1WxFQz6Dgd7xGwkNzFG+qATU -TbRMx/NU/ejNRdKLf7gMWEhFav5s00ufbCLOD5zpFTAIVfk5LMwWlhzEUM86Q+h4 -VLbfuNpxBgSh7uG8mtJxKSOSsIGndobKEH5r0VGS8GNfK6MEnjEHaJ8IQtoCQVCg -TwLaAxHO/k4esdUckgTKF6HikMCV5GRD5r1zI7PJ7cDuZiIZ0wx3Kq5JMIlO72co -w7FwuEZ3jCvI+wrHBS9Sej4hT9StGzGJ/Feu6BAitnPfMaBOgWRcH2xljUXup8Kc -Yo//9KWX3LK+ZywvOsBo -=/Ksd ------END PGP SIGNATURE----- diff --git a/mod_perl-2.0.12.tar.gz b/mod_perl-2.0.12.tar.gz new file mode 100644 index 0000000..7d2fbac --- /dev/null +++ b/mod_perl-2.0.12.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f5b821b59b0fdc9670e46ed0fcf32d8911f25126189a8b68c1652f9221eee269 +size 3848030 diff --git a/mod_perl-2.0.12.tar.gz.asc b/mod_perl-2.0.12.tar.gz.asc new file mode 100644 index 0000000..520c190 --- /dev/null +++ b/mod_perl-2.0.12.tar.gz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEICbmpKakSD5hum8/qzS6AEDpLs4FAmH2jwoACgkQqzS6AEDp +Ls6r2hAAk0ZN1AVnbWBXDI38D/d4bMLXVZRrxp05uTH7kfpvm5HazKL8hXNOmb/d +BOoTZ23IdUoqX3WQh6GlqoknDaL4oAPlyZ1WMESwOjJSybUhsmjlM17SWU0xhOuW +02HecMAyLGjX8OYraT0lCYpRqLSNijeZ9qqjIir5+RjnINRLF612jk+mzsZIp8Yf +leZhEMVpT394wJMkwPf5Ownylfy1jOBYBPLh01af7ucA8AcJQoc+qx4UGLn3niFJ +8Hj44KIEU46OIxRQiUScxruPaINclHn4nt6+05/6jU3pBAX7wubjyWp039g/yx4N +OXBA2rEwoQ3PI6jv6Ena/+7gi9Ap6wDlENmSijfosz/LzM1l1sYK3TsFRIhVSKaR +AWLUXao3lugv6v5LjD6o4+aA6e/kwP0WjhkNwZmm87yw7wP1zITGV2+5PTWgnDe+ +ZJfFAmhP+KGBFM1pnd2BhIj/GROhoP4B9+3sF5yEGU0HNbSda7YE2lPgDXLoj9iK +ZrQaP/jkYf1AFNu5Ydh1pXkpFnsHbPHibuzalZEwKQ2Xq6Hr67+ya0YSf0G7M9R/ +ZkADtXpELFBLl/0blL5FxEs8TgPvgYZtgT1EX5ETrgsw+1bgqf4tzh1B2evvdv6K +vu3oHoDBly2ZtzMRhZNJptuRKLMJ55unvQeKMAeSEgSQK51AFO8= +=SqJc +-----END PGP SIGNATURE-----