Merge pull request #63582 from alyssais/bind

bind: 9.14.2 -> 9.14.3 (CVE-2019-6471)
This commit is contained in:
Alyssa Ross 2019-06-20 18:22:57 +00:00 committed by GitHub
commit e40fb9167c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -8,14 +8,14 @@
assert enableSeccomp -> libseccomp != null; assert enableSeccomp -> libseccomp != null;
assert enablePython -> python3 != null; assert enablePython -> python3 != null;
let version = "9.14.2"; in let version = "9.14.3"; in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "bind-${version}"; name = "bind-${version}";
src = fetchurl { src = fetchurl {
url = "https://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz"; url = "https://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz";
sha256 = "033zqajnj5ys45g899132xkhh9f0hsh76ffv7302wl166xbjfh0f"; sha256 = "1ymxr38c62w6961j8g2vllnv0s72z7zk4b2j2k8ixdh1rymqm1yf";
}; };
outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ]; outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ];
@ -23,12 +23,6 @@ stdenv.mkDerivation rec {
patches = [ patches = [
./dont-keep-configure-flags.patch ./dont-keep-configure-flags.patch
./remove-mkdir-var.patch ./remove-mkdir-var.patch
# Fix build on armv6l
(fetchpatch {
url = "https://gitlab.isc.org/isc-projects/bind9/commit/f546769b8b1077a0ebfe270b8a283469ea3158d0.patch";
sha256 = "060f35lj6rr2qg7sy9pwy3946q2bsps4m9knmw15x6n6nmzvxrcv";
excludes = [ "CHANGES" ];
})
]; ];
nativeBuildInputs = [ perl ]; nativeBuildInputs = [ perl ];