Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

bind: 9.12.4-P1 -> 9.14.2

9.12 is EOL as of May 2019.

9.14.2 release notes (which appear to extend those for 9.14.1):

https://ftp.isc.org/isc/bind9/9.14.2/RELEASE-NOTES-bind-9.14.2.html

Please check the security fixes and prioritize this as appropriate.

+19 -27
+6 -14
pkgs/servers/dns/bind/default.nix
··· 8 8 assert enableSeccomp -> libseccomp != null; 9 9 assert enablePython -> python3 != null; 10 10 11 - let version = "9.12.4-P1"; in 11 + let version = "9.14.2"; in 12 12 13 13 stdenv.mkDerivation rec { 14 14 name = "bind-${version}"; 15 15 16 16 src = fetchurl { 17 17 url = "https://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz"; 18 - sha256 = "1if7zc5gzrfd28csc63v9bjwrc0rgvm1x9yx058946hc5gp5lyp2"; 18 + sha256 = "033zqajnj5ys45g899132xkhh9f0hsh76ffv7302wl166xbjfh0f"; 19 19 }; 20 20 21 21 outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ]; 22 22 23 - patches = [ ./dont-keep-configure-flags.patch ./remove-mkdir-var.patch ] ++ 24 - [ 25 - # Workaround for missing atomic operations on aarch64. Upstream added the 26 - # below patch after the release. Can probably be dropped with the next 27 - # version. 28 - (fetchpatch { 29 - name = "client-atomics-as-refcount.patch"; 30 - url = https://gitlab.isc.org/isc-projects/bind9/commit/d72f436b7d7c697b262968c48c2d7643069ab17f.diff; 31 - sha256 = "0sidlab9wcv21751fbq3h9m4wy6hk7frag9ar2jndw8rn3axr2qy"; 32 - }) 33 - ] ++ 34 - stdenv.lib.optional stdenv.isDarwin ./darwin-openssl-linking-fix.patch; 23 + patches = [ 24 + ./dont-keep-configure-flags.patch 25 + ./remove-mkdir-var.patch 26 + ] ++ stdenv.lib.optional stdenv.isDarwin ./darwin-openssl-linking-fix.patch; 35 27 36 28 nativeBuildInputs = [ perl ]; 37 29 buildInputs = [ libtool libxml2 openssl ]
+13 -13
pkgs/servers/dns/bind/dont-keep-configure-flags.patch
··· 1 1 diff --git a/bin/named/include/named/globals.h b/bin/named/include/named/globals.h 2 - index 388dc97..3c6135c 100644 2 + index b8e356b..cbe6c94 100644 3 3 --- a/bin/named/include/named/globals.h 4 4 +++ b/bin/named/include/named/globals.h 5 - @@ -65,7 +65,9 @@ EXTERN const char * named_g_version INIT(VERSION); 5 + @@ -68,7 +68,9 @@ EXTERN const char * named_g_version INIT(VERSION); 6 6 EXTERN const char * named_g_product INIT(PRODUCT); 7 7 EXTERN const char * named_g_description INIT(DESCRIPTION); 8 8 EXTERN const char * named_g_srcid INIT(SRCID); ··· 13 13 EXTERN in_port_t named_g_port INIT(0); 14 14 EXTERN isc_dscp_t named_g_dscp INIT(-1); 15 15 diff --git a/bin/named/main.c b/bin/named/main.c 16 - index 4fb0566..60d56cd 100644 16 + index 62d9ce3..342abdc 100644 17 17 --- a/bin/named/main.c 18 18 +++ b/bin/named/main.c 19 - @@ -672,8 +672,10 @@ parse_command_line(int argc, char *argv[]) { 20 - (*named_g_description != '\0') ? " " : "", 21 - named_g_description, named_g_srcid); 22 - printf("running on %s\n", named_os_uname()); 23 - + #if 0 24 - printf("built by %s with %s\n", 25 - named_g_builder, named_g_configargs); 26 - + #endif 19 + @@ -459,8 +459,10 @@ printversion(bool verbose) { 20 + } 21 + 22 + printf("running on %s\n", named_os_uname()); 23 + +#if 0 24 + printf("built by %s with %s\n", 25 + named_g_builder, named_g_configargs); 26 + +#endif 27 27 #ifdef __clang__ 28 - printf("compiled by CLANG %s\n", __VERSION__); 28 + printf("compiled by CLANG %s\n", __VERSION__); 29 29 #else 30 - @@ -1075,9 +1077,11 @@ setup(void) { 30 + @@ -1001,9 +1003,11 @@ setup(void) { 31 31 NAMED_LOGMODULE_MAIN, ISC_LOG_NOTICE, 32 32 "running on %s", named_os_uname()); 33 33