git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #98663 from delroth/bind-9.16.7

bind: 9.14.12 -> 9.16.7

commit207e962c96457484c9c869480f1b02a8c29ed373 authorPeter Simons <simons@cryp.to> dateThu 24 Sep 2020, 19:58 (6 years ago) parent3c535792a4e6a9
2 files changed+33−37
pkgs/servers/dns/bind/default.nix+11−12 pkgs/servers/dns/bind/dont-keep-configure-flags.patch+22−25
pkgs/servers/dns/bind/default.nix+11−12
@@ -1,8 +1,8 @@
11{ config, stdenv, lib, fetchurl, fetchpatch
2−, perl
3−, libcap, libtool, libxml2, openssl
2+, perl, pkg-config
3+, libcap, libtool, libxml2, openssl, libuv
44, enablePython ? config.bind.enablePython or false, python3 ? null
5−, enableSeccomp ? false, libseccomp ? null, buildPackages
5+, enableSeccomp ? false, libseccomp ? null, buildPackages, nixosTests
66}:
77
88assert enableSeccomp -> libseccomp != null;
@@ -10,11 +10,11 @@ assert enablePython -> python3 != null;
1010
1111stdenv.mkDerivation rec {
1212 pname = "bind";
13− version = "9.14.12";
13+ version = "9.16.7";
1414
1515 src = fetchurl {
16− url = "https://ftp.isc.org/isc/bind9/${version}/${pname}-${version}.tar.gz";
17− sha256 = "1j7ldvdschmvzxrbajjhmdsl2iqxc1lm64vk0a5sdykxpy9y8kcw";
16+ url = "https://downloads.isc.org/isc/bind9/${version}/${pname}-${version}.tar.xz";
17+ sha256 = "1l8lhgnkj3fnl1101bs3pzj5gv2x5m9ahvrbyscsc9mxxc91hzcz";
1818 };
1919
2020 outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ];
@@ -24,8 +24,8 @@ stdenv.mkDerivation rec {
2424 ./remove-mkdir-var.patch
2525 ];
2626
27− nativeBuildInputs = [ perl ];
28− buildInputs = [ libtool libxml2 openssl ]
27+ nativeBuildInputs = [ perl pkg-config ];
28+ buildInputs = [ libtool libxml2 openssl libuv ]
2929 ++ lib.optional stdenv.isLinux libcap
3030 ++ lib.optional enableSeccomp libseccomp
3131 ++ lib.optional enablePython (python3.withPackages (ps: with ps; [ ply ]));
@@ -35,8 +35,6 @@ stdenv.mkDerivation rec {
3535 configureFlags = [
3636 "--localstatedir=/var"
3737 "--with-libtool"
38− "--with-libxml2=${libxml2.dev}"
39− "--with-openssl=${openssl.dev}"
4038 (if enablePython then "--with-python" else "--without-python")
4139 "--without-atf"
4240 "--without-dlopen"
@@ -59,7 +57,6 @@ stdenv.mkDerivation rec {
5957
6058 postInstall = ''
6159 moveToOutput bin/bind9-config $dev
62− moveToOutput bin/isc-config.sh $dev
6360
6461 moveToOutput bin/host $host
6562
@@ -68,13 +65,15 @@ stdenv.mkDerivation rec {
6865 moveToOutput bin/nslookup $dnsutils
6966 moveToOutput bin/nsupdate $dnsutils
7067
71− for f in "$lib/lib/"*.la "$dev/bin/"{isc-config.sh,bind*-config}; do
68+ for f in "$lib/lib/"*.la "$dev/bin/"bind*-config; do
7269 sed -i "$f" -e 's|-L${openssl.dev}|-L${openssl.out}|g'
7370 done
7471 '';
7572
7673 doCheck = false; # requires root and the net
7774
75+ passthru.tests = { inherit (nixosTests) bind; };
76+
7877 meta = with stdenv.lib; {
7978 homepage = "https://www.isc.org/downloads/bind/";
8079 description = "Domain name server";
pkgs/servers/dns/bind/dont-keep-configure-flags.patch+22−25
@@ -1,40 +1,37 @@
1−diff --git a/bin/named/include/named/globals.h b/bin/named/include/named/globals.h
2−index b8e356b..cbe6c94 100644
3−--- a/bin/named/include/named/globals.h
4−+++ b/bin/named/include/named/globals.h
5−@@ -68,7 +68,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);
1+diff -ru a/bin/named/include/named/globals.h b/bin/named/include/named/globals.h
2+--- a/bin/named/include/named/globals.h 2020-09-24 17:43:49.398977491 +0200
3++++ b/bin/named/include/named/globals.h 2020-09-24 17:44:36.826590553 +0200
4+@@ -69,7 +69,9 @@
5+ EXTERN const char *named_g_product INIT(PRODUCT);
6+ EXTERN const char *named_g_description INIT(DESCRIPTION);
7+ EXTERN const char *named_g_srcid INIT(SRCID);
98+#if 0
10− EXTERN const char * named_g_configargs INIT(CONFIGARGS);
9+ EXTERN const char *named_g_configargs INIT(CONFIGARGS);
1110+#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);
15−diff --git a/bin/named/main.c b/bin/named/main.c
16−index 62d9ce3..342abdc 100644
17−--- a/bin/named/main.c
18−+++ b/bin/named/main.c
19−@@ -459,8 +459,10 @@ printversion(bool verbose) {
11+ EXTERN const char *named_g_builder INIT(BUILDER);
12+ EXTERN in_port_t named_g_port INIT(0);
13+ EXTERN isc_dscp_t named_g_dscp INIT(-1);
14+diff -ru a/bin/named/main.c b/bin/named/main.c
15+--- a/bin/named/main.c 2020-09-24 17:43:49.399977504 +0200
16++++ b/bin/named/main.c 2020-09-24 17:44:24.102426273 +0200
17+@@ -506,7 +506,9 @@
2018 }
2119
2220 printf("running on %s\n", named_os_uname());
2321+#if 0
24− printf("built by %s with %s\n",
25− named_g_builder, named_g_configargs);
22+ printf("built by %s with %s\n", named_g_builder, named_g_configargs);
2623+#endif
2724 #ifdef __clang__
2825 printf("compiled by CLANG %s\n", __VERSION__);
29− #else
30−@@ -1001,9 +1003,11 @@ setup(void) {
31− NAMED_LOGMODULE_MAIN, ISC_LOG_NOTICE,
32− "running on %s", named_os_uname());
26+ #else /* ifdef __clang__ */
27+@@ -1102,9 +1104,11 @@
28+ NAMED_LOGMODULE_MAIN, ISC_LOG_NOTICE, "running on %s",
29+ named_os_uname());
3330
3431+#if 0
3532 isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL,
36− NAMED_LOGMODULE_MAIN, ISC_LOG_NOTICE,
37− "built with %s", named_g_configargs);
33+ NAMED_LOGMODULE_MAIN, ISC_LOG_NOTICE, "built with %s",
34+ named_g_configargs);
3835+#endif
3936
4037 isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL,