BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #194043 from LeSuisse/modperl-2.0.12

Browse source 
apacheHttpdPackages.mod_perl: 2.0.11 -> 2.0.12
This commit is contained in:
Jörg Thalheim 2022-10-02 17:36:24 +02:00 committed by GitHub
commit d93a5e66a7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkgs/development/perl-modules/mod_perl2-PL_hash_seed.patch
View file

@ -1,13 +0,0 @@
From https://github.com/Perl/perl5/issues/18617#issuecomment-822056978 by Leont
--- a/src/modules/perl/modperl_perl.c
+++ a/src/modules/perl/modperl_perl.c
@@ -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;

9
pkgs/servers/http/apache-modules/mod_perl/default.nix
View file

@ -2,18 +2,13 @@
stdenv.mkDerivation rec {
pname = "mod_perl";
version = "2.0.11";
version = "2.0.12";
src = fetchurl {
url = "mirror://apache/perl/${pname}-${version}.tar.gz";
sha256 = "0x3gq4nz96y202cymgrf56n8spm7bffkd1p74dh9q3zrrlc9wana";
sha256 = "sha256-9bghtZsP3JZw5G7Q/PMtiRHyUSYYmotowWUvkiHu4mk=";
};
patches = [
# Fix build on perl-5.34.0, https://github.com/Perl/perl5/issues/18617
../../../../development/perl-modules/mod_perl2-PL_hash_seed.patch
];
buildInputs = [ apacheHttpd perl ];
buildPhase = ''
perl Makefile.PL \

11
pkgs/top-level/perl-packages.nix
View file

@ -15732,17 +15732,12 @@ let
mod_perl2 = buildPerlPackage {
pname = "mod_perl";
version = "2.0.11";
version = "2.0.12";
src = fetchurl {
url = "mirror://cpan/authors/id/S/SH/SHAY/mod_perl-2.0.11.tar.gz";
hash = "sha256-yiqeGM35D5xgI+eGNp1bp16NrCkuv+qZAMKb9C3Bb3Q=";
url = "mirror://cpan/authors/id/S/SH/SHAY/mod_perl-2.0.12.tar.gz";
hash = "sha256-9bghtZsP3JZw5G7Q/PMtiRHyUSYYmotowWUvkiHu4mk=";
};
patches = [
# Fix build on perl-5.34.0, https://github.com/Perl/perl5/issues/18617
../development/perl-modules/mod_perl2-PL_hash_seed.patch
];
makeMakerFlags = "MP_AP_DESTDIR=$out";
buildInputs = [ pkgs.apacheHttpd ];
doCheck = false; # would try to start Apache HTTP server