dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

bind: 9.11.2 -> 9.12.0

Browse Source
This commit is contained in:
Tim Steinbach 2018-02-25 13:20:47 -05:00
parent de149ba967
commit 54415188b2
No known key found for this signature in database
GPG Key ID: 472BFCCA96BD0EDA
3 changed files with 29 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/servers/dns/bind/darwin-openssl-linking-fix.patch
View File

@ -1,8 +1,8 @@
diff --git a/configure b/configure diff --git a/configure b/configure
index 6779cc3..4275520 100755 index b9ad66b..a2a7382 100755
--- a/configure --- a/configure
+++ b/configure +++ b/configure
@@ -15707,21 +15707,6 @@ $as_echo "not found" >&6; } @@ -16033,21 +16033,6 @@ $as_echo "not found" >&6; }
*-hp-hpux*) *-hp-hpux*)
DST_OPENSSL_LIBS="-L$use_openssl/lib -Wl,+b: -lcrypto" DST_OPENSSL_LIBS="-L$use_openssl/lib -Wl,+b: -lcrypto"
;; ;;

4
pkgs/servers/dns/bind/default.nix
View File

@ -3,14 +3,14 @@
assert enableSeccomp -> libseccomp != null; assert enableSeccomp -> libseccomp != null;
let version = "9.11.2-P1"; in let version = "9.12.0"; in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "bind-${version}"; name = "bind-${version}";
src = fetchurl { src = fetchurl {
url = "http://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz"; url = "http://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz";
sha256 = "04hjvwvs7ssgj69lqparx0wj0w3xkc0x8y2iv62kzjighd41bhyf"; sha256 = "10iwkghl5g50b7wc17bsb9wa0dh2gd57bjlk6ynixhywz6dhx1r9";
}; };
outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ]; outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ];

45
pkgs/servers/dns/bind/dont-keep-configure-flags.patch
View File

@ -1,40 +1,41 @@
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 f354cfb..2aa0cc5 100644 index 388dc97..3c6135c 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
@@ -71,7 +71,9 @@ EXTERN const char * ns_g_version INIT(VERSION); @@ -65,7 +65,9 @@ EXTERN const char * named_g_version INIT(VERSION);
EXTERN const char * ns_g_product INIT(PRODUCT); EXTERN const char * named_g_product INIT(PRODUCT);
EXTERN const char * ns_g_description INIT(DESCRIPTION); EXTERN const char * named_g_description INIT(DESCRIPTION);
EXTERN const char * ns_g_srcid INIT(SRCID); EXTERN const char * named_g_srcid INIT(SRCID);
+#if 0 +#if 0
EXTERN const char * ns_g_configargs INIT(CONFIGARGS); EXTERN const char * named_g_configargs INIT(CONFIGARGS);
+#endif +#endif
EXTERN const char * ns_g_builder INIT(BUILDER); EXTERN const char * named_g_builder INIT(BUILDER);
EXTERN in_port_t ns_g_port INIT(0); EXTERN in_port_t named_g_port INIT(0);
EXTERN isc_dscp_t ns_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 556db54..edab41d 100644 index 4fb0566..60d56cd 100644
--- a/bin/named/main.c --- a/bin/named/main.c
+++ b/bin/named/main.c +++ b/bin/named/main.c
@@ -636,8 +636,10 @@ parse_command_line(int argc, char *argv[]) { @@ -672,8 +672,10 @@ parse_command_line(int argc, char *argv[]) {
(*ns_g_description != '\0') ? " " : "", (*named_g_description != '\0') ? " " : "",
ns_g_description, ns_g_srcid); named_g_description, named_g_srcid);
printf("running on %s\n", ns_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",
ns_g_builder, ns_g_configargs); named_g_builder, named_g_configargs);
+ #endif + #endif
#ifdef __clang__ #ifdef __clang__
printf("compiled by CLANG %s\n", __VERSION__); printf("compiled by CLANG %s\n", __VERSION__);
#else #else
@@ -998,8 +1000,10 @@ setup(void) { @@ -1075,9 +1077,11 @@ setup(void) {
isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN, NAMED_LOGMODULE_MAIN, ISC_LOG_NOTICE,
ISC_LOG_NOTICE, "running on %s", ns_os_uname()); "running on %s", named_os_uname());
+#if 0 +#if 0
isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN, isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL,
ISC_LOG_NOTICE, "built with %s", ns_g_configargs); NAMED_LOGMODULE_MAIN, ISC_LOG_NOTICE,
"built with %s", named_g_configargs);
+#endif +#endif
isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN, isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL,
ISC_LOG_NOTICE, NAMED_LOGMODULE_MAIN, ISC_LOG_NOTICE,