diff options
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 11 | ||||
| -rw-r--r-- | perl-5-33-7.patch | 11 |
3 files changed, 22 insertions, 4 deletions
@@ -1,7 +1,7 @@ pkgbase = mod_perl pkgdesc = Apache module that embeds the Perl interpreter within the server pkgver = 2.0.11 - pkgrel = 4 + pkgrel = 5 url = http://perl.apache.org/ arch = i686 arch = x86_64 @@ -16,9 +16,11 @@ pkgbase = mod_perl options = !emptydirs source = http://apache.org/dist/perl/mod_perl-2.0.11.tar.gz source = http://apache.org/dist/perl/mod_perl-2.0.11.tar.gz.asc + source = perl-5-33-7.patch validpgpkeys = 2026E6A4A6A4483E61BA6F3FAB34BA0040E92ECE sha256sums = ca2a9e18cdf90f9c6023e786369d5ba75e8dac292ebfea9900c29bf42dc16f74 sha256sums = SKIP + sha256sums = 9df55e5c5d55771687019645c651204fb62cabe24b904a31197a78cdf9332a21 pkgname = mod_perl @@ -6,20 +6,25 @@ pkgname=mod_perl pkgver=2.0.11 -pkgrel=4 +pkgrel=5 pkgdesc='Apache module that embeds the Perl interpreter within the server' arch=(i686 x86_64 armv6h armv7h) url='http://perl.apache.org/' license=(APACHE) depends=(perl apache db apr-util perl-linux-pid) options=(!emptydirs) -source=(http://apache.org/dist/perl/mod_perl-$pkgver.tar.gz{,.asc}) +source=(http://apache.org/dist/perl/mod_perl-$pkgver.tar.gz{,.asc} perl-5-33-7.patch) validpgpkeys=(2026E6A4A6A4483E61BA6F3FAB34BA0040E92ECE) sha256sums=('ca2a9e18cdf90f9c6023e786369d5ba75e8dac292ebfea9900c29bf42dc16f74' - 'SKIP') + 'SKIP' + '9df55e5c5d55771687019645c651204fb62cabe24b904a31197a78cdf9332a21') prepare() { cd mod_perl-$pkgver + # Workaround to support Perl 5.33.7++ - should be fixed upstream soon + # See https://github.com/Perl/perl5/issues/18617 + patch --forward --strip=0 --input="${srcdir}/perl-5-33-7.patch" + # Workaround per http://mail-archives.apache.org/mod_mbox/perl-modperl/202009.mbox/%3C8d69b2e8-4a4e-bde4-6eff-7018ddf6354e%40gmail.com%3E 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-5-33-7.patch b/perl-5-33-7.patch new file mode 100644 index 000000000000..f0c588061775 --- /dev/null +++ b/perl-5-33-7.patch @@ -0,0 +1,11 @@ +--- src/modules/perl/modperl_perl.c 2021/04/20 13:48:02 1889013 ++++ src/modules/perl/modperl_perl.c 2021/04/20 13:55:29 1889014 +@@ -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; |