MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 07:13:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

bind: 9.12.4-P1 -> 9.14.2

Browse source 
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.
This commit is contained in:
Will Dietz 2019-05-17 02:59:53 -05:00
parent 03badf6e30
commit ee4fc39aa7
No known key found for this signature in database
GPG key ID: EBB0EA4124809D02
2 changed files with 19 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
pkgs/servers/dns/bind/default.nix
View file

@ -8,30 +8,22 @@
assert enableSeccomp -> libseccomp != null; assert enableSeccomp -> libseccomp != null;
assert enablePython -> python3 != null; assert enablePython -> python3 != null;
let version = "9.12.4-P1"; in let version = "9.14.2"; 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 = "1if7zc5gzrfd28csc63v9bjwrc0rgvm1x9yx058946hc5gp5lyp2"; sha256 = "033zqajnj5ys45g899132xkhh9f0hsh76ffv7302wl166xbjfh0f";
}; };
outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ]; outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ];
patches = [ ./dont-keep-configure-flags.patch ./remove-mkdir-var.patch ] ++ patches = [
[ ./dont-keep-configure-flags.patch
# Workaround for missing atomic operations on aarch64. Upstream added the ./remove-mkdir-var.patch
# below patch after the release. Can probably be dropped with the next ] ++ stdenv.lib.optional stdenv.isDarwin ./darwin-openssl-linking-fix.patch;
# version.
(fetchpatch {
name = "client-atomics-as-refcount.patch";
url = https://gitlab.isc.org/isc-projects/bind9/commit/d72f436b7d7c697b262968c48c2d7643069ab17f.diff;
sha256 = "0sidlab9wcv21751fbq3h9m4wy6hk7frag9ar2jndw8rn3axr2qy";
})
] ++
stdenv.lib.optional stdenv.isDarwin ./darwin-openssl-linking-fix.patch;
nativeBuildInputs = [ perl ]; nativeBuildInputs = [ perl ];
buildInputs = [ libtool libxml2 openssl ] buildInputs = [ libtool libxml2 openssl ]

14
pkgs/servers/dns/bind/dont-keep-configure-flags.patch
View file

@ -1,8 +1,8 @@
diff --git a/bin/named/include/named/globals.h b/bin/named/include/named/globals.h diff --git a/bin/named/include/named/globals.h b/bin/named/include/named/globals.h
index 388dc97..3c6135c 100644 index b8e356b..cbe6c94 100644
--- a/bin/named/include/named/globals.h --- a/bin/named/include/named/globals.h
+++ b/bin/named/include/named/globals.h +++ b/bin/named/include/named/globals.h
@@ -65,7 +65,9 @@ EXTERN const char * named_g_version INIT(VERSION); @@ -68,7 +68,9 @@ EXTERN const char * named_g_version INIT(VERSION);
EXTERN const char * named_g_product INIT(PRODUCT); EXTERN const char * named_g_product INIT(PRODUCT);
EXTERN const char * named_g_description INIT(DESCRIPTION); EXTERN const char * named_g_description INIT(DESCRIPTION);
EXTERN const char * named_g_srcid INIT(SRCID); EXTERN const char * named_g_srcid INIT(SRCID);
@ -13,12 +13,12 @@ index 388dc97..3c6135c 100644
EXTERN in_port_t named_g_port INIT(0); EXTERN in_port_t named_g_port INIT(0);
EXTERN isc_dscp_t named_g_dscp INIT(-1); EXTERN isc_dscp_t named_g_dscp INIT(-1);
diff --git a/bin/named/main.c b/bin/named/main.c diff --git a/bin/named/main.c b/bin/named/main.c
index 4fb0566..60d56cd 100644 index 62d9ce3..342abdc 100644
--- a/bin/named/main.c --- a/bin/named/main.c
+++ b/bin/named/main.c +++ b/bin/named/main.c
@@ -672,8 +672,10 @@ parse_command_line(int argc, char *argv[]) { @@ -459,8 +459,10 @@ printversion(bool verbose) {
(*named_g_description != '\0') ? " " : "", }
named_g_description, named_g_srcid);
printf("running on %s\n", named_os_uname()); printf("running on %s\n", named_os_uname());
+#if 0 +#if 0
printf("built by %s with %s\n", printf("built by %s with %s\n",
@ -27,7 +27,7 @@ index 4fb0566..60d56cd 100644
#ifdef __clang__ #ifdef __clang__
printf("compiled by CLANG %s\n", __VERSION__); printf("compiled by CLANG %s\n", __VERSION__);
#else #else
@@ -1075,9 +1077,11 @@ setup(void) { @@ -1001,9 +1003,11 @@ setup(void) {
NAMED_LOGMODULE_MAIN, ISC_LOG_NOTICE, NAMED_LOGMODULE_MAIN, ISC_LOG_NOTICE,
"running on %s", named_os_uname()); "running on %s", named_os_uname());