pyrox.dev / nixpkgs
lol
fork atom

bind: 9.18.28 -> 9.20.6

liberodark 589ff831 aae42bee

+19 -15
unified split
+14 -13
pkgs/by-name/bi/bind/dont-keep-configure-flags.patch
··· 1 diff --git a/bin/named/include/named/globals.h b/bin/named/include/named/globals.h 2 - index 82b632ef04..dedfd4d33b 100644 3 --- a/bin/named/include/named/globals.h 4 +++ b/bin/named/include/named/globals.h 5 - @@ -69,7 +69,9 @@ EXTERN const char *named_g_version INIT(PACKAGE_VERSION); 6 - EXTERN const char *named_g_product INIT(PACKAGE_NAME); 7 - EXTERN const char *named_g_description INIT(PACKAGE_DESCRIPTION); 8 - EXTERN const char *named_g_srcid INIT(PACKAGE_SRCID); 9 +#if 0 10 - EXTERN const char *named_g_configargs INIT(PACKAGE_CONFIGARGS); 11 +#endif 12 - EXTERN const char *named_g_builder INIT(PACKAGE_BUILDER); 13 - EXTERN in_port_t named_g_port INIT(0); 14 - EXTERN in_port_t named_g_tlsport INIT(0); 15 diff --git a/bin/named/main.c b/bin/named/main.c 16 - index 9ad2d0e277..9729a2b3fc 100644 17 --- a/bin/named/main.c 18 +++ b/bin/named/main.c 19 - @@ -481,7 +481,9 @@ printversion(bool verbose) { 20 } 21 22 printf("running on %s\n", named_os_uname()); ··· 26 #ifdef __clang__ 27 printf("compiled by CLANG %s\n", __VERSION__); 28 #else /* ifdef __clang__ */ 29 - @@ -1027,9 +1029,11 @@ setup(void) { 30 NAMED_LOGMODULE_MAIN, ISC_LOG_NOTICE, "running on %s", 31 named_os_uname()); 32 - 33 +#if 0 34 isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, 35 NAMED_LOGMODULE_MAIN, ISC_LOG_NOTICE, "built with %s",
··· 1 diff --git a/bin/named/include/named/globals.h b/bin/named/include/named/globals.h 2 + index 25d03fff60..c1920c3a80 100644 3 --- a/bin/named/include/named/globals.h 4 +++ b/bin/named/include/named/globals.h 5 + @@ -71,7 +71,9 @@ EXTERN const char *named_g_version INIT(PACKAGE_VERSION); 6 + EXTERN const char *named_g_product INIT(PACKAGE_NAME); 7 + EXTERN const char *named_g_description INIT(PACKAGE_DESCRIPTION); 8 + EXTERN const char *named_g_srcid INIT(PACKAGE_SRCID); 9 +#if 0 10 + EXTERN const char *named_g_configargs INIT(PACKAGE_CONFIGARGS); 11 +#endif 12 + EXTERN const char *named_g_builder INIT(PACKAGE_BUILDER); 13 + EXTERN in_port_t named_g_port INIT(0); 14 + EXTERN in_port_t named_g_tlsport INIT(0); 15 diff --git a/bin/named/main.c b/bin/named/main.c 16 + index be3c629f30..58325fc1b5 100644 17 --- a/bin/named/main.c 18 +++ b/bin/named/main.c 19 + @@ -574,7 +574,9 @@ printversion(bool verbose) { 20 } 21 22 printf("running on %s\n", named_os_uname()); ··· 26 #ifdef __clang__ 27 printf("compiled by CLANG %s\n", __VERSION__); 28 #else /* ifdef __clang__ */ 29 + @@ -1124,10 +1126,11 @@ setup(void) { 30 + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, 31 NAMED_LOGMODULE_MAIN, ISC_LOG_NOTICE, "running on %s", 32 named_os_uname()); 33 + - 34 +#if 0 35 isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, 36 NAMED_LOGMODULE_MAIN, ISC_LOG_NOTICE, "built with %s",
+5 -2
pkgs/by-name/bi/bind/package.nix
··· 11 libtool, 12 libxml2, 13 openssl, 14 libuv, 15 nghttp2, 16 jemalloc, ··· 27 28 stdenv.mkDerivation (finalAttrs: { 29 pname = "bind"; 30 - version = "9.18.33"; 31 32 src = fetchurl { 33 url = "https://downloads.isc.org/isc/bind9/${finalAttrs.version}/${finalAttrs.pname}-${finalAttrs.version}.tar.xz"; 34 - hash = "sha256-+zc/rF67xBxkUWCv1an7RRkY9sDmmrHZR0FU4rUV3kA="; 35 }; 36 37 outputs = [ ··· 58 libtool 59 libxml2 60 openssl 61 libuv 62 nghttp2 63 jemalloc ··· 92 sed -i "$f" -e 's|-L${openssl.dev}|-L${lib.getLib openssl}|g' 93 done 94 95 cat <<EOF >$out/etc/rndc.conf 96 include "/etc/bind/rndc.key"; 97 options {
··· 11 libtool, 12 libxml2, 13 openssl, 14 + liburcu, 15 libuv, 16 nghttp2, 17 jemalloc, ··· 28 29 stdenv.mkDerivation (finalAttrs: { 30 pname = "bind"; 31 + version = "9.20.6"; 32 33 src = fetchurl { 34 url = "https://downloads.isc.org/isc/bind9/${finalAttrs.version}/${finalAttrs.pname}-${finalAttrs.version}.tar.xz"; 35 + hash = "sha256-7X9UtE+EpyAaL6epSfMCHqVoUpv62Q/KZk/VXAUQQTQ="; 36 }; 37 38 outputs = [ ··· 59 libtool 60 libxml2 61 openssl 62 + liburcu 63 libuv 64 nghttp2 65 jemalloc ··· 94 sed -i "$f" -e 's|-L${openssl.dev}|-L${lib.getLib openssl}|g' 95 done 96 97 + mkdir -p $out/etc 98 cat <<EOF >$out/etc/rndc.conf 99 include "/etc/bind/rndc.key"; 100 options {