Merge commit '98e3b90b6c8f400ae5438ef868eb992a64b75ce5'

5 files changed, 29 insertions, 57 deletions

diff --git a/nixpkgs/pkgs/servers/dns/bind/darwin-openssl-linking-fix.patch b/nixpkgs/pkgs/servers/dns/bind/darwin-openssl-linking-fix.patch
deleted file mode 100644
index 8276c28c3f4b..000000000000
--- a/nixpkgs/pkgs/servers/dns/bind/darwin-openssl-linking-fix.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/configure b/configure
-index b9ad66b..a2a7382 100755
---- a/configure
-+++ b/configure
-@@ -16033,21 +16033,6 @@ $as_echo "not found" >&6; }
- 			*-hp-hpux*)
- 				DST_OPENSSL_LIBS="-L$use_openssl/lib -Wl,+b: -lcrypto"
- 				;;
--			*-apple-darwin*)
--				#
--				# Apple's ld seaches for serially for dynamic
--				# then static libraries.  This means you can't
--				# use -L to override dynamic system libraries
--				# with static ones when linking.  Instead
--				# we specify a absolute path.
--				#
--				if test -f "$use_openssl/lib/libcrypto.dylib"
--				then
--					DST_OPENSSL_LIBS="-L$use_openssl/lib -lcrypto"
--				else
--					DST_OPENSSL_LIBS="$use_openssl/lib/libcrypto.a"
--				fi
--				;;
- 			*)
- 				DST_OPENSSL_LIBS="-L$use_openssl/lib -lcrypto"
- 				;;
diff --git a/nixpkgs/pkgs/servers/dns/bind/default.nix b/nixpkgs/pkgs/servers/dns/bind/default.nix
index 068834140048..3ffd12a34a86 100644
--- a/nixpkgs/pkgs/servers/dns/bind/default.nix
+++ b/nixpkgs/pkgs/servers/dns/bind/default.nix
@@ -8,30 +8,28 @@
 assert enableSeccomp -> libseccomp != null;
 assert enablePython -> python3 != null;
 
-let version = "9.12.4-P1"; in
+let version = "9.14.2"; in
 
 stdenv.mkDerivation rec {
   name = "bind-${version}";
 
   src = fetchurl {
     url = "https://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz";
-    sha256 = "1if7zc5gzrfd28csc63v9bjwrc0rgvm1x9yx058946hc5gp5lyp2";
+    sha256 = "033zqajnj5ys45g899132xkhh9f0hsh76ffv7302wl166xbjfh0f";
   };
 
   outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ];
 
-  patches = [ ./dont-keep-configure-flags.patch ./remove-mkdir-var.patch ] ++
-    [
-      # Workaround for missing atomic operations on aarch64. Upstream added the
-      # below patch after the release. Can probably be dropped with the next
-      # version.
-      (fetchpatch {
-        name = "client-atomics-as-refcount.patch";
-        url = https://gitlab.isc.org/isc-projects/bind9/commit/d72f436b7d7c697b262968c48c2d7643069ab17f.diff;
-        sha256 = "0sidlab9wcv21751fbq3h9m4wy6hk7frag9ar2jndw8rn3axr2qy";
-      })
-    ] ++
-    stdenv.lib.optional stdenv.isDarwin ./darwin-openssl-linking-fix.patch;
+  patches = [
+    ./dont-keep-configure-flags.patch
+    ./remove-mkdir-var.patch
+    # Fix build on armv6l
+    (fetchpatch {
+      url = "https://gitlab.isc.org/isc-projects/bind9/commit/f546769b8b1077a0ebfe270b8a283469ea3158d0.patch";
+      sha256 = "060f35lj6rr2qg7sy9pwy3946q2bsps4m9knmw15x6n6nmzvxrcv";
+      excludes = [ "CHANGES" ];
+    })
+  ];
 
   nativeBuildInputs = [ perl ];
   buildInputs = [ libtool libxml2 openssl ]
diff --git a/nixpkgs/pkgs/servers/dns/bind/dont-keep-configure-flags.patch b/nixpkgs/pkgs/servers/dns/bind/dont-keep-configure-flags.patch
index 5a934056d13d..17fdb15ad460 100644
--- a/nixpkgs/pkgs/servers/dns/bind/dont-keep-configure-flags.patch
+++ b/nixpkgs/pkgs/servers/dns/bind/dont-keep-configure-flags.patch
@@ -1,8 +1,8 @@
 diff --git a/bin/named/include/named/globals.h b/bin/named/include/named/globals.h
-index 388dc97..3c6135c 100644
+index b8e356b..cbe6c94 100644
 --- a/bin/named/include/named/globals.h
 +++ b/bin/named/include/named/globals.h
-@@ -65,7 +65,9 @@ EXTERN const char *		named_g_version		INIT(VERSION);
+@@ -68,7 +68,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);
@@ -13,21 +13,21 @@ index 388dc97..3c6135c 100644
  EXTERN in_port_t		named_g_port		INIT(0);
  EXTERN isc_dscp_t		named_g_dscp		INIT(-1);
 diff --git a/bin/named/main.c b/bin/named/main.c
-index 4fb0566..60d56cd 100644
+index 62d9ce3..342abdc 100644
 --- a/bin/named/main.c
 +++ b/bin/named/main.c
-@@ -672,8 +672,10 @@ parse_command_line(int argc, char *argv[]) {
- 			       (*named_g_description != '\0') ? " " : "",
- 			       named_g_description, named_g_srcid);
- 			printf("running on %s\n", named_os_uname());
-+			#if 0
- 			printf("built by %s with %s\n",
- 			       named_g_builder, named_g_configargs);
-+			#endif
+@@ -459,8 +459,10 @@ 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);
++#endif
  #ifdef __clang__
- 			printf("compiled by CLANG %s\n", __VERSION__);
+ 	printf("compiled by CLANG %s\n", __VERSION__);
  #else
-@@ -1075,9 +1077,11 @@ setup(void) {
+@@ -1001,9 +1003,11 @@ setup(void) {
  		      NAMED_LOGMODULE_MAIN, ISC_LOG_NOTICE,
  		      "running on %s", named_os_uname());
  
diff --git a/nixpkgs/pkgs/servers/dns/knot-dns/default.nix b/nixpkgs/pkgs/servers/dns/knot-dns/default.nix
index 9ef49309dbb7..a646fb0b7a46 100644
--- a/nixpkgs/pkgs/servers/dns/knot-dns/default.nix
+++ b/nixpkgs/pkgs/servers/dns/knot-dns/default.nix
@@ -7,11 +7,11 @@ let inherit (stdenv.lib) optional optionals; in
 # Note: ATM only the libraries have been tested in nixpkgs.
 stdenv.mkDerivation rec {
   name = "knot-dns-${version}";
-  version = "2.8.1";
+  version = "2.8.2";
 
   src = fetchurl {
     url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz";
-    sha256 = "b21bf03e5cb6804df4e0e8b3898446349e86ddae5bf110edaf240d0ad1e2a2c6";
+    sha256 = "00d24361a2406392c508904fad943536bae6369981686b4951378fc1c9a5a137";
   };
 
   outputs = [ "bin" "out" "dev" ];
diff --git a/nixpkgs/pkgs/servers/dns/pdns-recursor/default.nix b/nixpkgs/pkgs/servers/dns/pdns-recursor/default.nix
index 0e5ea98f30e8..a3c704ede7db 100644
--- a/nixpkgs/pkgs/servers/dns/pdns-recursor/default.nix
+++ b/nixpkgs/pkgs/servers/dns/pdns-recursor/default.nix
@@ -8,11 +8,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "pdns-recursor-${version}";
-  version = "4.1.12";
+  version = "4.1.13";
 
   src = fetchurl {
     url = "https://downloads.powerdns.com/releases/pdns-recursor-${version}.tar.bz2";
-    sha256 = "1j5hrpz4c9dqd30piqd8xyjmirdxp4dy71nx9rwq8l4i4nc0l774";
+    sha256 = "0vs6sv8pyd69jrzzhbdzh6vgva64swypknwpl070ppzk3xdvfa0k";
   };
 
   nativeBuildInputs = [ pkgconfig ];