aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2021-07-27 13:39:24 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2021-07-28 15:46:07 +0000
commit4520e31caccbe9edf586f70384d4589e42b22783 (patch)
treee7f6a17b1cfcbfc073715c3d9c7df49017df2f1a
parent662243f1e2f637daee2c9f909aaaedf9945a828d (diff)
downloadaports-4520e31caccbe9edf586f70384d4589e42b22783.tar.gz
aports-4520e31caccbe9edf586f70384d4589e42b22783.tar.bz2
aports-4520e31caccbe9edf586f70384d4589e42b22783.tar.xz
testing/apache2-mod-perl: rebuild against perl 5.34
-rw-r--r--testing/apache2-mod-perl/APKBUILD10
-rw-r--r--testing/apache2-mod-perl/mod_perl-2.0.11-fix_building_with_perl-5.33.7.patch22
2 files changed, 29 insertions, 3 deletions
diff --git a/testing/apache2-mod-perl/APKBUILD b/testing/apache2-mod-perl/APKBUILD
index ef6a338156..2962199027 100644
--- a/testing/apache2-mod-perl/APKBUILD
+++ b/testing/apache2-mod-perl/APKBUILD
@@ -4,7 +4,7 @@
pkgname=apache2-mod-perl
_pkgreal=mod_perl
pkgver=2.0.11
-pkgrel=0
+pkgrel=1
pkgdesc="Perl Module for Apache2"
url="https://perl.apache.org/"
arch="all"
@@ -15,6 +15,7 @@ makedepends="apache2-dev perl-dev perl-linux-pid apr-dev apr-util-dev"
options="!check" # fails to start test server
subpackages="$pkgname-dbg $pkgname-doc $pkgname-dev"
source="https://www-eu.apache.org/dist/perl/$_pkgreal-$pkgver.tar.gz
+ mod_perl-2.0.11-fix_building_with_perl-5.33.7.patch
$pkgname.conf"
builddir="$srcdir/$_pkgreal-$pkgver"
@@ -48,5 +49,8 @@ dev() {
"$subpkgdir"/usr/lib/perl5/vendor_perl/auto/Apache2
}
-sha512sums="f232b215ccb9217f69ccced8a037470e5975900b9a6fcc5a2e4674e6559d21f026547c1b97c48109352043946dc22539dd38004759be16ad5cfcb3a96973dfdf mod_perl-2.0.11.tar.gz
-15a430ce597e370997a08d6aa1b5e55d4fa723ecac031fe39906c8cc767b90d5bf63e3026dfaa8b10ae8b09a17832f4f07cb8b2fdcd6c9ef427edfaf4e8a48b0 apache2-mod-perl.conf"
+sha512sums="
+f232b215ccb9217f69ccced8a037470e5975900b9a6fcc5a2e4674e6559d21f026547c1b97c48109352043946dc22539dd38004759be16ad5cfcb3a96973dfdf mod_perl-2.0.11.tar.gz
+0483ee2bb33ac20aa01cabab9cc4dd1c420eb62ba1b3bd4a4091e11f42e184158191e6f1197fde52c982403ed2c257ce29e72b414cc4e94ba1fd51963c69a09c mod_perl-2.0.11-fix_building_with_perl-5.33.7.patch
+15a430ce597e370997a08d6aa1b5e55d4fa723ecac031fe39906c8cc767b90d5bf63e3026dfaa8b10ae8b09a17832f4f07cb8b2fdcd6c9ef427edfaf4e8a48b0 apache2-mod-perl.conf
+"
diff --git a/testing/apache2-mod-perl/mod_perl-2.0.11-fix_building_with_perl-5.33.7.patch b/testing/apache2-mod-perl/mod_perl-2.0.11-fix_building_with_perl-5.33.7.patch
new file mode 100644
index 0000000000..b35f476eb8
--- /dev/null
+++ b/testing/apache2-mod-perl/mod_perl-2.0.11-fix_building_with_perl-5.33.7.patch
@@ -0,0 +1,22 @@
+------------------------------------------------------------------------
+r1889014 | stevehay | 2021-04-20 15:55:29 +0200 (Út, 20 dub 2021) | 3 lines
+
+Fix build for perl >= 5.33.7
+
+Patch by Leon Timmermans <fawaka@gmail.com> from https://github.com/Perl/perl5/issues/18617
+
+Index: src/modules/perl/modperl_perl.c
+===================================================================
+--- ./src/modules/perl/modperl_perl.c (revision 1889013)
++++ ./src/modules/perl/modperl_perl.c (revision 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;
+
+------------------------------------------------------------------------