diff options
| -rw-r--r-- | pkgs/servers/dns/bind/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/servers/dns/bind/dont-keep-configure-flags.patch | 24 |
2 files changed, 18 insertions, 18 deletions
diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index 5aa702e28d6..2601266f4d7 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -1,6 +1,6 @@ { config, stdenv, lib, fetchurl, fetchpatch , perl, pkg-config -, libcap, libtool, libxml2, openssl, libuv +, libcap, libtool, libxml2, openssl, libuv, nghttp2, jemalloc , enableGSSAPI ? true, libkrb5 , enablePython ? false, python3 , enableSeccomp ? false, libseccomp @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "bind"; - version = "9.16.25"; + version = "9.18.0"; src = fetchurl { url = "https://downloads.isc.org/isc/bind9/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-n6MohQ+ChD74t78f9TIstosRAnOjPzdbpB81Jw9eH/M="; + sha256 = "sha256-VlJb9crwH9j9nZCRCIDMD4qQonqX0WkYfWUdTs8MQRw="; }; outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ perl pkg-config ]; - buildInputs = [ libtool libxml2 openssl libuv ] + buildInputs = [ libtool libxml2 openssl libuv nghttp2 jemalloc ] ++ lib.optional stdenv.isLinux libcap ++ lib.optional enableSeccomp libseccomp ++ lib.optional enableGSSAPI libkrb5 @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { "--with-aes" ] ++ lib.optional stdenv.isLinux "--with-libcap=${libcap.dev}" ++ lib.optional enableSeccomp "--enable-seccomp" - ++ lib.optional enableGSSAPI "--with-gssapi=${libkrb5.dev}" + ++ lib.optional enableGSSAPI "--with-gssapi=${libkrb5.dev}/bin/krb5-config" ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "BUILD_CC=$(CC_FOR_BUILD)"; postInstall = '' @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { passthru.tests = { inherit (nixosTests) bind; }; meta = with lib; { - homepage = "https://www.isc.org/downloads/bind/"; + homepage = "https://www.isc.org/bind/"; description = "Domain name server"; license = licenses.mpl20; diff --git a/pkgs/servers/dns/bind/dont-keep-configure-flags.patch b/pkgs/servers/dns/bind/dont-keep-configure-flags.patch index 89c58226573..b1677da434f 100644 --- a/pkgs/servers/dns/bind/dont-keep-configure-flags.patch +++ b/pkgs/servers/dns/bind/dont-keep-configure-flags.patch @@ -2,38 +2,38 @@ diff --git a/bin/named/include/named/globals.h b/bin/named/include/named/globals index 82b632ef04..dedfd4d33b 100644 --- a/bin/named/include/named/globals.h +++ b/bin/named/include/named/globals.h -@@ -71,7 +71,9 @@ EXTERN const char *named_g_version INIT(VERSION); - EXTERN const char *named_g_product INIT(PRODUCT); - EXTERN const char *named_g_description INIT(DESCRIPTION); - EXTERN const char *named_g_srcid INIT(SRCID); +@@ -69,7 +69,9 @@ EXTERN const char *named_g_version INIT(PACKAGE_VERSION); + EXTERN const char *named_g_product INIT(PACKAGE_NAME); + EXTERN const char *named_g_description INIT(PACKAGE_DESCRIPTION); + EXTERN const char *named_g_srcid INIT(PACKAGE_SRCID); +#if 0 - EXTERN const char *named_g_configargs INIT(CONFIGARGS); + EXTERN const char *named_g_configargs INIT(PACKAGE_CONFIGARGS); +#endif - EXTERN const char *named_g_builder INIT(BUILDER); - EXTERN in_port_t named_g_port INIT(0); - EXTERN isc_dscp_t named_g_dscp INIT(-1); + EXTERN const char *named_g_builder INIT(PACKAGE_BUILDER); + EXTERN in_port_t named_g_port INIT(0); + EXTERN in_port_t named_g_tlsport INIT(0); diff --git a/bin/named/main.c b/bin/named/main.c index 9ad2d0e277..9729a2b3fc 100644 --- a/bin/named/main.c +++ b/bin/named/main.c -@@ -521,7 +521,9 @@ printversion(bool verbose) { +@@ -481,7 +481,9 @@ printversion(bool verbose) { } printf("running on %s\n", named_os_uname()); +#if 0 - printf("built by %s with %s\n", named_g_builder, named_g_configargs); + printf("built by %s with %s\n", PACKAGE_BUILDER, PACKAGE_CONFIGARGS); +#endif #ifdef __clang__ printf("compiled by CLANG %s\n", __VERSION__); #else /* ifdef __clang__ */ -@@ -1089,9 +1091,11 @@ setup(void) { +@@ -1027,9 +1029,11 @@ setup(void) { NAMED_LOGMODULE_MAIN, ISC_LOG_NOTICE, "running on %s", named_os_uname()); +#if 0 isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, NAMED_LOGMODULE_MAIN, ISC_LOG_NOTICE, "built with %s", - named_g_configargs); + PACKAGE_CONFIGARGS); +#endif isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, |