git.iko.soy/typeable/nixpkgs
on master help sign in
bind: 9.16.16 -> 9.16.25

Fixes CVE-2021-25219. https://downloads.isc.org/isc/bind9/9.16.25/doc/arm/html/notes.html

commit4cfcbac24a1e0e57a6a5af28e12438137b93214c authorThomas Gerbet <thomas@gerbet.me> dateFri 28 Jan 2022, 12:53 (5 years ago) parentae79b7b
3 files changed+20−31
compare with master
unifiedsplit
pkgs/servers/dns/bind/default.nix+2−3 pkgs/servers/dns/bind/dont-keep-configure-flags.patch+18−16 pkgs/servers/dns/bind/remove-mkdir-var.patch−12
pkgs/servers/dns/bind/default.nix+2−3
@@ -9,18 +9,17 @@
99
1010stdenv.mkDerivation rec {
1111 pname = "bind";
12− version = "9.16.16";
12+ version = "9.16.25";
1313
1414 src = fetchurl {
1515 url = "https://downloads.isc.org/isc/bind9/${version}/${pname}-${version}.tar.xz";
16− sha256 = "sha256-bJE5Aq34eOfcXiKc6pT678nUD0R3WjAhPt0Ihg92HXs=";
16+ sha256 = "sha256-n6MohQ+ChD74t78f9TIstosRAnOjPzdbpB81Jw9eH/M=";
1717 };
1818
1919 outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ];
2020
2121 patches = [
2222 ./dont-keep-configure-flags.patch
23− ./remove-mkdir-var.patch
2423 ];
2524
2625 nativeBuildInputs = [ perl pkg-config ];
pkgs/servers/dns/bind/dont-keep-configure-flags.patch+18−16
@@ -1,20 +1,22 @@
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);
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+@@ -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);
89+#if 0
9− EXTERN const char *named_g_configargs INIT(CONFIGARGS);
10+ EXTERN const char *named_g_configargs INIT(CONFIGARGS);
1011+#endif
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 @@
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 9ad2d0e277..9729a2b3fc 100644
17+--- a/bin/named/main.c
18++++ b/bin/named/main.c
19+@@ -521,7 +521,9 @@ printversion(bool verbose) {
1820 }
1921
2022 printf("running on %s\n", named_os_uname());
@@ -24,7 +26,7 @@ diff -ru a/bin/named/main.c b/bin/named/main.c
2426 #ifdef __clang__
2527 printf("compiled by CLANG %s\n", __VERSION__);
2628 #else /* ifdef __clang__ */
27−@@ -1102,9 +1104,11 @@
29+@@ -1089,9 +1091,11 @@ setup(void) {
2830 NAMED_LOGMODULE_MAIN, ISC_LOG_NOTICE, "running on %s",
2931 named_os_uname());
3032
pkgs/servers/dns/bind/remove-mkdir-var.patchdeleted−12
@@ -1,12 +0,0 @@
1−--- a/Makefile.in
2−+++ b/Makefile.in
3−@@ -53,8 +53,7 @@ docclean manclean maintainer-clean::
4− doc man:: ${MANOBJS}
5−
6− installdirs:
7−- $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${bindir} \
8−- ${DESTDIR}${localstatedir}/run ${DESTDIR}${sysconfdir}
9−+ $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${bindir} ${DESTDIR}${sysconfdir}
10− $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man1
11−
12− install:: isc-config.sh installdirs