ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 04:43:09 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #214608 from risicle/ris-apr-1.7.2

Browse Source 
apr: 1.7.0 -> 1.7.2
This commit is contained in:
Thomas Gerbet 2023-02-06 21:53:28 +01:00 committed by GitHub
commit aad34322f0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/development/libraries/apr/cross-assume-dev-zero-mmappable.patch Normal file
View File

@ -0,0 +1,14 @@
based onhttps://830833.bugs.gentoo.org/attachment.cgi?id=761676,
adjusted for 1.7.2
--- a/configure.in 2022-01-09 00:31:05.552582255 -0800
+++ b/configure.in 2022-01-09 00:31:19.824582533 -0800
@@ -1329,7 +1329,7 @@
return 3;
}
return 0;
- }], [], [ac_cv_file__dev_zero=no], [ac_cv_file__dev_zero=no])])
+ }], [], [ac_cv_file__dev_zero=no], [:])])
fi
# Now we determine which one is our anonymous shmem preference.

29
pkgs/development/libraries/apr/default.nix
View File

@ -2,38 +2,15 @@
stdenv.mkDerivation rec {
pname = "apr";
version = "1.7.0";
version = "1.7.2";
src = fetchurl {
url = "mirror://apache/apr/${pname}-${version}.tar.bz2";
sha256 = "1spp6r2a3xcl5yajm9safhzyilsdzgagc2dadif8x6z9nbq4iqg2";
sha256 = "sha256-ded8yGd2wDDApcQI370L8qC3Xu1TUeUtVDn6HlUJpD4=";
};
patches = [
(fetchpatch {
name = "CVE-2021-35940.patch";
url = "https://dist.apache.org/repos/dist/release/apr/patches/apr-1.7.0-CVE-2021-35940.patch";
sha256 = "1qd511dyqa1b7bj89iihrlbaavbzl6yyblqginghmcnhw8adymbs";
# convince fetchpatch to restore missing `a/`, `b/` to paths
extraPrefix = "";
})
# Fix cross.
(fetchpatch {
url = "https://github.com/apache/apr/commit/374210c50ee9f4dbf265f0172dcf2d45b97d0550.patch";
sha256 = "04k62c5dh043jhkgs5qma6yqkq4q7nh0zswr81il4l7q1zil581y";
})
(fetchpatch {
url = "https://github.com/apache/apr/commit/866e1df66be6704a584feaf5c3d241e3d631d03a.patch";
sha256 = "0hhm5v5wx985c28dq6d9ngnyqihpsphq4mw7rwylk39k2p90ppcm";
})
# Cross fix. Patch the /dev/zero mmapable detection logic. https://bugs.gentoo.org/show_bug.cgi?id=830833
(fetchpatch {
url = "https://830833.bugs.gentoo.org/attachment.cgi?id=761676";
name = "cross-assume-dev-zero-mmappable.patch";
sha256 = "sha256-rsouJp1o7p0d+AJ5KvyhUU79vAJOcVHEuwSEKaCEGa8=";
})
./cross-assume-dev-zero-mmappable.patch
];
# This test needs the net