apr: 1.7.0 -> 1.7.2

+17 -26
+14
pkgs/development/libraries/apr/cross-assume-dev-zero-mmappable.patch
··· 1 + based onhttps://830833.bugs.gentoo.org/attachment.cgi?id=761676, 2 + adjusted for 1.7.2 3 + 4 + --- a/configure.in 2022-01-09 00:31:05.552582255 -0800 5 + +++ b/configure.in 2022-01-09 00:31:19.824582533 -0800 6 + @@ -1329,7 +1329,7 @@ 7 + return 3; 8 + } 9 + return 0; 10 + - }], [], [ac_cv_file__dev_zero=no], [ac_cv_file__dev_zero=no])]) 11 + + }], [], [ac_cv_file__dev_zero=no], [:])]) 12 + fi 13 + 14 + # Now we determine which one is our anonymous shmem preference.
+3 -26
pkgs/development/libraries/apr/default.nix
··· 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "apr"; 5 - version = "1.7.0"; 5 + version = "1.7.2"; 6 6 7 7 src = fetchurl { 8 8 url = "mirror://apache/apr/${pname}-${version}.tar.bz2"; 9 - sha256 = "1spp6r2a3xcl5yajm9safhzyilsdzgagc2dadif8x6z9nbq4iqg2"; 9 + sha256 = "sha256-ded8yGd2wDDApcQI370L8qC3Xu1TUeUtVDn6HlUJpD4="; 10 10 }; 11 11 12 12 patches = [ 13 - (fetchpatch { 14 - name = "CVE-2021-35940.patch"; 15 - url = "https://dist.apache.org/repos/dist/release/apr/patches/apr-1.7.0-CVE-2021-35940.patch"; 16 - sha256 = "1qd511dyqa1b7bj89iihrlbaavbzl6yyblqginghmcnhw8adymbs"; 17 - # convince fetchpatch to restore missing `a/`, `b/` to paths 18 - extraPrefix = ""; 19 - }) 20 - 21 - # Fix cross. 22 - (fetchpatch { 23 - url = "https://github.com/apache/apr/commit/374210c50ee9f4dbf265f0172dcf2d45b97d0550.patch"; 24 - sha256 = "04k62c5dh043jhkgs5qma6yqkq4q7nh0zswr81il4l7q1zil581y"; 25 - }) 26 - (fetchpatch { 27 - url = "https://github.com/apache/apr/commit/866e1df66be6704a584feaf5c3d241e3d631d03a.patch"; 28 - sha256 = "0hhm5v5wx985c28dq6d9ngnyqihpsphq4mw7rwylk39k2p90ppcm"; 29 - }) 30 - 31 - # Cross fix. Patch the /dev/zero mmapable detection logic. https://bugs.gentoo.org/show_bug.cgi?id=830833 32 - (fetchpatch { 33 - url = "https://830833.bugs.gentoo.org/attachment.cgi?id=761676"; 34 - name = "cross-assume-dev-zero-mmappable.patch"; 35 - sha256 = "sha256-rsouJp1o7p0d+AJ5KvyhUU79vAJOcVHEuwSEKaCEGa8="; 36 - }) 13 + ./cross-assume-dev-zero-mmappable.patch 37 14 ]; 38 15 39 16 # This test needs the net