cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

bind: 9.16.16 -> 9.16.25

Browse source 
Fixes CVE-2021-25219.
https://downloads.isc.org/isc/bind9/9.16.25/doc/arm/html/notes.html
This commit is contained in:
Thomas Gerbet 2022-01-28 12:53:41 +01:00
parent ae79b7bf40
commit 4cfcbac24a
3 changed files with 20 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/servers/dns/bind/default.nix
View file

@ -9,18 +9,17 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "bind"; pname = "bind";
version = "9.16.16"; version = "9.16.25";
src = fetchurl { src = fetchurl {
url = "https://downloads.isc.org/isc/bind9/${version}/${pname}-${version}.tar.xz"; url = "https://downloads.isc.org/isc/bind9/${version}/${pname}-${version}.tar.xz";
sha256 = "sha256-bJE5Aq34eOfcXiKc6pT678nUD0R3WjAhPt0Ihg92HXs="; sha256 = "sha256-n6MohQ+ChD74t78f9TIstosRAnOjPzdbpB81Jw9eH/M=";
}; };
outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ]; outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ];
patches = [ patches = [
./dont-keep-configure-flags.patch ./dont-keep-configure-flags.patch
./remove-mkdir-var.patch
]; ];
nativeBuildInputs = [ perl pkg-config ]; nativeBuildInputs = [ perl pkg-config ];

34
pkgs/servers/dns/bind/dont-keep-configure-flags.patch
View file

@ -1,20 +1,22 @@
diff -ru a/bin/named/include/named/globals.h b/bin/named/include/named/globals.h diff --git a/bin/named/include/named/globals.h b/bin/named/include/named/globals.h
--- a/bin/named/include/named/globals.h 2020-09-24 17:43:49.398977491 +0200 index 82b632ef04..dedfd4d33b 100644
+++ b/bin/named/include/named/globals.h 2020-09-24 17:44:36.826590553 +0200 --- a/bin/named/include/named/globals.h
@@ -69,7 +69,9 @@ +++ b/bin/named/include/named/globals.h
EXTERN const char *named_g_product INIT(PRODUCT); @@ -71,7 +71,9 @@ EXTERN const char *named_g_version INIT(VERSION);
EXTERN const char *named_g_description INIT(DESCRIPTION); EXTERN const char *named_g_product INIT(PRODUCT);
EXTERN const char *named_g_srcid INIT(SRCID); EXTERN const char *named_g_description INIT(DESCRIPTION);
EXTERN const char *named_g_srcid INIT(SRCID);
+#if 0 +#if 0
EXTERN const char *named_g_configargs INIT(CONFIGARGS); EXTERN const char *named_g_configargs INIT(CONFIGARGS);
+#endif +#endif
EXTERN const char *named_g_builder INIT(BUILDER); EXTERN const char *named_g_builder INIT(BUILDER);
EXTERN in_port_t named_g_port INIT(0); EXTERN in_port_t named_g_port INIT(0);
EXTERN isc_dscp_t named_g_dscp INIT(-1); EXTERN isc_dscp_t named_g_dscp INIT(-1);
diff -ru a/bin/named/main.c b/bin/named/main.c diff --git a/bin/named/main.c b/bin/named/main.c
--- a/bin/named/main.c 2020-09-24 17:43:49.399977504 +0200 index 9ad2d0e277..9729a2b3fc 100644
+++ b/bin/named/main.c 2020-09-24 17:44:24.102426273 +0200 --- a/bin/named/main.c
@@ -506,7 +506,9 @@ +++ b/bin/named/main.c
@@ -521,7 +521,9 @@ printversion(bool verbose) {
} }
printf("running on %s\n", named_os_uname()); printf("running on %s\n", named_os_uname());
@ -24,7 +26,7 @@ diff -ru a/bin/named/main.c b/bin/named/main.c
#ifdef __clang__ #ifdef __clang__
printf("compiled by CLANG %s\n", __VERSION__); printf("compiled by CLANG %s\n", __VERSION__);
#else /* ifdef __clang__ */ #else /* ifdef __clang__ */
@@ -1102,9 +1104,11 @@ @@ -1089,9 +1091,11 @@ setup(void) {
NAMED_LOGMODULE_MAIN, ISC_LOG_NOTICE, "running on %s", NAMED_LOGMODULE_MAIN, ISC_LOG_NOTICE, "running on %s",
named_os_uname()); named_os_uname());

12
pkgs/servers/dns/bind/remove-mkdir-var.patch
View file

@ -1,12 +0,0 @@
--- a/Makefile.in
+++ b/Makefile.in
@@ -53,8 +53,7 @@ docclean manclean maintainer-clean::
doc man:: ${MANOBJS}
installdirs:
- $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${bindir} \
- ${DESTDIR}${localstatedir}/run ${DESTDIR}${sysconfdir}
+ $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${bindir} ${DESTDIR}${sysconfdir}
$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man1
install:: isc-config.sh installdirs