git.iko.soy/typeable/nixpkgs
on master help sign in
bind: 9.16.25 -> 9.18.0 (#161427)
commit65b2a742675f684bfdcc1368884f8116ff6b2c99 authorLuflosi <Luflosi@users.noreply.github.com> dateMon 7 Mar 2022, 12:54 (5 years ago) parentbea64c8
2 files changed+18−18
compare with master
unifiedsplit
pkgs/servers/dns/bind/default.nix+6−6 pkgs/servers/dns/bind/dont-keep-configure-flags.patch+12−12
pkgs/servers/dns/bind/default.nix+6−6
@@ -1,6 +1,6 @@
11{ config, stdenv, lib, fetchurl, fetchpatch
22, perl, pkg-config
3−, libcap, libtool, libxml2, openssl, libuv
3+, libcap, libtool, libxml2, openssl, libuv, nghttp2, jemalloc
44, enableGSSAPI ? true, libkrb5
55, enablePython ? false, python3
66, enableSeccomp ? false, libseccomp
@@ -9,11 +9,11 @@
99
1010stdenv.mkDerivation rec {
1111 pname = "bind";
12− version = "9.16.25";
12+ version = "9.18.0";
1313
1414 src = fetchurl {
1515 url = "https://downloads.isc.org/isc/bind9/${version}/${pname}-${version}.tar.xz";
16− sha256 = "sha256-n6MohQ+ChD74t78f9TIstosRAnOjPzdbpB81Jw9eH/M=";
16+ sha256 = "sha256-VlJb9crwH9j9nZCRCIDMD4qQonqX0WkYfWUdTs8MQRw=";
1717 };
1818
1919 outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ];
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
2323 ];
2424
2525 nativeBuildInputs = [ perl pkg-config ];
26− buildInputs = [ libtool libxml2 openssl libuv ]
26+ buildInputs = [ libtool libxml2 openssl libuv nghttp2 jemalloc ]
2727 ++ lib.optional stdenv.isLinux libcap
2828 ++ lib.optional enableSeccomp libseccomp
2929 ++ lib.optional enableGSSAPI libkrb5
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
5151 "--with-aes"
5252 ] ++ lib.optional stdenv.isLinux "--with-libcap=${libcap.dev}"
5353 ++ lib.optional enableSeccomp "--enable-seccomp"
54− ++ lib.optional enableGSSAPI "--with-gssapi=${libkrb5.dev}"
54+ ++ lib.optional enableGSSAPI "--with-gssapi=${libkrb5.dev}/bin/krb5-config"
5555 ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "BUILD_CC=$(CC_FOR_BUILD)";
5656
5757 postInstall = ''
@@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
7474 passthru.tests = { inherit (nixosTests) bind; };
7575
7676 meta = with lib; {
77− homepage = "https://www.isc.org/downloads/bind/";
77+ homepage = "https://www.isc.org/bind/";
7878 description = "Domain name server";
7979 license = licenses.mpl20;
8080
pkgs/servers/dns/bind/dont-keep-configure-flags.patch+12−12
@@ -2,38 +2,38 @@ diff --git a/bin/named/include/named/globals.h b/bin/named/include/named/globals
22index 82b632ef04..dedfd4d33b 100644
33--- a/bin/named/include/named/globals.h
44+++ b/bin/named/include/named/globals.h
5−@@ -71,7 +71,9 @@ EXTERN const char *named_g_version INIT(VERSION);
6− EXTERN const char *named_g_product INIT(PRODUCT);
7− EXTERN const char *named_g_description INIT(DESCRIPTION);
8− EXTERN const char *named_g_srcid INIT(SRCID);
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);
99+#if 0
10− EXTERN const char *named_g_configargs INIT(CONFIGARGS);
10+ EXTERN const char *named_g_configargs INIT(PACKAGE_CONFIGARGS);
1111+#endif
12− EXTERN const char *named_g_builder INIT(BUILDER);
13− EXTERN in_port_t named_g_port INIT(0);
14− EXTERN isc_dscp_t named_g_dscp INIT(-1);
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);
1515diff --git a/bin/named/main.c b/bin/named/main.c
1616index 9ad2d0e277..9729a2b3fc 100644
1717--- a/bin/named/main.c
1818+++ b/bin/named/main.c
19−@@ -521,7 +521,9 @@ printversion(bool verbose) {
19+@@ -481,7 +481,9 @@ printversion(bool verbose) {
2020 }
2121
2222 printf("running on %s\n", named_os_uname());
2323+#if 0
24− printf("built by %s with %s\n", named_g_builder, named_g_configargs);
24+ printf("built by %s with %s\n", PACKAGE_BUILDER, PACKAGE_CONFIGARGS);
2525+#endif
2626 #ifdef __clang__
2727 printf("compiled by CLANG %s\n", __VERSION__);
2828 #else /* ifdef __clang__ */
29−@@ -1089,9 +1091,11 @@ setup(void) {
29+@@ -1027,9 +1029,11 @@ setup(void) {
3030 NAMED_LOGMODULE_MAIN, ISC_LOG_NOTICE, "running on %s",
3131 named_os_uname());
3232
3333+#if 0
3434 isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL,
3535 NAMED_LOGMODULE_MAIN, ISC_LOG_NOTICE, "built with %s",
36− named_g_configargs);
36+ PACKAGE_CONFIGARGS);
3737+#endif
3838
3939 isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL,