rpms/bind
7
0
Fork 1
Code Issues Pull Requests Releases Activity

Update to 9.11.4

Browse Source 
- Use more recent kyua, upstream bind now requires parallelism.
- Make global so version variables for libraries with multiple builds.

Signed-off-by: Petr Menšík <pemensik@redhat.com>
This commit is contained in:
Petr Menšík 2018-06-18 12:24:42 +02:00
parent 89e5350e43
commit a38c250807
10 changed files with 112 additions and 1747 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -82,3 +82,5 @@ bind-9.7.2b1.tar.gz
/bind-9.11.3b1.tar.gz /bind-9.11.3b1.tar.gz
/bind-9.11.3.tar.gz /bind-9.11.3.tar.gz
/config-18.tar.bz2 /config-18.tar.bz2
/bind-9.11.4rc1.tar.gz
/bind-9.11.4.tar.gz

102
bind-9.10-dist-native-pkcs11.patch
View File

@ -1,21 +1,23 @@
diff --git a/bin/Makefile.in b/bin/Makefile.in diff --git a/bin/Makefile.in b/bin/Makefile.in
index f3cbed3..7d21984 100644 index f0c504a..ce7a2da 100644
--- a/bin/Makefile.in --- a/bin/Makefile.in
+++ b/bin/Makefile.in +++ b/bin/Makefile.in
@@ -10,7 +10,7 @@ srcdir = @srcdir@ @@ -11,8 +11,8 @@ srcdir = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
-SUBDIRS = named rndc dig delv dnssec tools tests nsupdate \ -SUBDIRS = named rndc dig delv dnssec tools nsupdate check confgen \
+SUBDIRS = named named-pkcs11 rndc dig delv dnssec dnssec-pkcs11 tools tests nsupdate \ - @NZD_TOOLS@ @PYTHON_TOOLS@ @PKCS11_TOOLS@ tests
check confgen @NZD_TOOLS@ @PYTHON_TOOLS@ @PKCS11_TOOLS@ +SUBDIRS = named named-pkcs11 rndc dig delv dnssec dnssec-pkcs11 tools nsupdate \
+ check confgen @NZD_TOOLS@ @PYTHON_TOOLS@ @PKCS11_TOOLS@ tests
TARGETS = TARGETS =
@BIND9_MAKE_RULES@
diff --git a/bin/dnssec-pkcs11/Makefile.in b/bin/dnssec-pkcs11/Makefile.in diff --git a/bin/dnssec-pkcs11/Makefile.in b/bin/dnssec-pkcs11/Makefile.in
index 8c6627a..0427349 100644 index 1be1d5f..0f09216 100644
--- a/bin/dnssec-pkcs11/Makefile.in --- a/bin/dnssec-pkcs11/Makefile.in
+++ b/bin/dnssec-pkcs11/Makefile.in +++ b/bin/dnssec-pkcs11/Makefile.in
@@ -14,18 +14,18 @@ VERSION=@BIND9_VERSION@ @@ -17,18 +17,18 @@ VERSION=@BIND9_VERSION@
@BIND9_MAKE_INCLUDES@ @BIND9_MAKE_INCLUDES@
@ -41,7 +43,7 @@ index 8c6627a..0427349 100644
DEPLIBS = ${DNSDEPLIBS} ${ISCDEPLIBS} DEPLIBS = ${DNSDEPLIBS} ${ISCDEPLIBS}
@@ -34,10 +34,10 @@ LIBS = ${DNSLIBS} ${ISCLIBS} @LIBS@ @@ -37,10 +37,10 @@ LIBS = ${DNSLIBS} ${ISCLIBS} @LIBS@
NOSYMLIBS = ${DNSLIBS} ${ISCNOSYMLIBS} @LIBS@ NOSYMLIBS = ${DNSLIBS} ${ISCNOSYMLIBS} @LIBS@
# Alphabetically # Alphabetically
@ -56,7 +58,7 @@ index 8c6627a..0427349 100644
OBJS = dnssectool.@O@ OBJS = dnssectool.@O@
@@ -58,15 +58,15 @@ MANOBJS = ${MANPAGES} ${HTMLPAGES} @@ -61,15 +61,15 @@ MANOBJS = ${MANPAGES} ${HTMLPAGES}
@BIND9_MAKE_RULES@ @BIND9_MAKE_RULES@
@ -75,7 +77,7 @@ index 8c6627a..0427349 100644
export BASEOBJS="dnssec-keygen.@O@ ${OBJS}"; \ export BASEOBJS="dnssec-keygen.@O@ ${OBJS}"; \
${FINALBUILDCMD} ${FINALBUILDCMD}
@@ -74,7 +74,7 @@ dnssec-signzone.@O@: dnssec-signzone.c @@ -77,7 +77,7 @@ dnssec-signzone.@O@: dnssec-signzone.c
${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} -DVERSION=\"${VERSION}\" \ ${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} -DVERSION=\"${VERSION}\" \
-c ${srcdir}/dnssec-signzone.c -c ${srcdir}/dnssec-signzone.c
@ -84,7 +86,7 @@ index 8c6627a..0427349 100644
export BASEOBJS="dnssec-signzone.@O@ ${OBJS}"; \ export BASEOBJS="dnssec-signzone.@O@ ${OBJS}"; \
${FINALBUILDCMD} ${FINALBUILDCMD}
@@ -82,19 +82,19 @@ dnssec-verify.@O@: dnssec-verify.c @@ -85,19 +85,19 @@ dnssec-verify.@O@: dnssec-verify.c
${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} -DVERSION=\"${VERSION}\" \ ${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} -DVERSION=\"${VERSION}\" \
-c ${srcdir}/dnssec-verify.c -c ${srcdir}/dnssec-verify.c
@ -108,7 +110,7 @@ index 8c6627a..0427349 100644
${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \ ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \
dnssec-importkey.@O@ ${OBJS} ${LIBS} dnssec-importkey.@O@ ${OBJS} ${LIBS}
@@ -105,14 +105,11 @@ docclean manclean maintainer-clean:: @@ -108,14 +108,11 @@ docclean manclean maintainer-clean::
installdirs: installdirs:
$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${sbindir} $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${sbindir}
@ -124,10 +126,10 @@ index 8c6627a..0427349 100644
clean distclean:: clean distclean::
diff --git a/bin/dnssec/Makefile.in b/bin/dnssec/Makefile.in diff --git a/bin/dnssec/Makefile.in b/bin/dnssec/Makefile.in
index 8c6627a..c070881 100644 index 1be1d5f..fc983bf 100644
--- a/bin/dnssec/Makefile.in --- a/bin/dnssec/Makefile.in
+++ b/bin/dnssec/Makefile.in +++ b/bin/dnssec/Makefile.in
@@ -16,7 +16,7 @@ VERSION=@BIND9_VERSION@ @@ -19,7 +19,7 @@ VERSION=@BIND9_VERSION@
CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES} @DST_OPENSSL_INC@ CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES} @DST_OPENSSL_INC@
@ -137,10 +139,10 @@ index 8c6627a..c070881 100644
CWARNINGS = CWARNINGS =
diff --git a/bin/named-pkcs11/Makefile.in b/bin/named-pkcs11/Makefile.in diff --git a/bin/named-pkcs11/Makefile.in b/bin/named-pkcs11/Makefile.in
index 83bce80..5170f47 100644 index e1f85a9..2effa69 100644
--- a/bin/named-pkcs11/Makefile.in --- a/bin/named-pkcs11/Makefile.in
+++ b/bin/named-pkcs11/Makefile.in +++ b/bin/named-pkcs11/Makefile.in
@@ -40,26 +40,26 @@ DLZDRIVER_INCLUDES = @DLZ_DRIVER_INCLUDES@ @@ -43,26 +43,26 @@ DLZDRIVER_INCLUDES = @DLZ_DRIVER_INCLUDES@
DLZDRIVER_LIBS = @DLZ_DRIVER_LIBS@ DLZDRIVER_LIBS = @DLZ_DRIVER_LIBS@
CINCLUDES = -I${srcdir}/include -I${srcdir}/unix/include -I. \ CINCLUDES = -I${srcdir}/include -I${srcdir}/unix/include -I. \
@ -174,7 +176,7 @@ index 83bce80..5170f47 100644
LWRESDEPLIBS = ../../lib/lwres/liblwres.@A@ LWRESDEPLIBS = ../../lib/lwres/liblwres.@A@
BIND9DEPLIBS = ../../lib/bind9/libbind9.@A@ BIND9DEPLIBS = ../../lib/bind9/libbind9.@A@
@@ -68,15 +68,15 @@ DEPLIBS = ${LWRESDEPLIBS} ${DNSDEPLIBS} ${BIND9DEPLIBS} \ @@ -71,15 +71,15 @@ DEPLIBS = ${LWRESDEPLIBS} ${DNSDEPLIBS} ${BIND9DEPLIBS} \
LIBS = ${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \ LIBS = ${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \
${ISCCFGLIBS} ${ISCCCLIBS} ${ISCLIBS} \ ${ISCCFGLIBS} ${ISCCCLIBS} ${ISCLIBS} \
@ -193,7 +195,7 @@ index 83bce80..5170f47 100644
GEOIPLINKOBJS = geoip.@O@ GEOIPLINKOBJS = geoip.@O@
@@ -87,8 +87,7 @@ OBJS = builtin.@O@ client.@O@ config.@O@ control.@O@ \ @@ -90,8 +90,7 @@ OBJS = builtin.@O@ client.@O@ config.@O@ control.@O@ \
tkeyconf.@O@ tsigconf.@O@ update.@O@ xfrout.@O@ \ tkeyconf.@O@ tsigconf.@O@ update.@O@ xfrout.@O@ \
zoneconf.@O@ \ zoneconf.@O@ \
lwaddr.@O@ lwresd.@O@ lwdclient.@O@ lwderror.@O@ lwdgabn.@O@ \ lwaddr.@O@ lwresd.@O@ lwdclient.@O@ lwderror.@O@ lwdgabn.@O@ \
@ -203,7 +205,7 @@ index 83bce80..5170f47 100644
UOBJS = unix/os.@O@ unix/dlz_dlopen_driver.@O@ UOBJS = unix/os.@O@ unix/dlz_dlopen_driver.@O@
@@ -103,8 +102,7 @@ SRCS = builtin.c client.c config.c control.c \ @@ -106,8 +105,7 @@ SRCS = builtin.c client.c config.c control.c \
tkeyconf.c tsigconf.c update.c xfrout.c \ tkeyconf.c tsigconf.c update.c xfrout.c \
zoneconf.c \ zoneconf.c \
lwaddr.c lwresd.c lwdclient.c lwderror.c lwdgabn.c \ lwaddr.c lwresd.c lwdclient.c lwderror.c lwdgabn.c \
@ -213,7 +215,7 @@ index 83bce80..5170f47 100644
MANPAGES = named.8 lwresd.8 named.conf.5 MANPAGES = named.8 lwresd.8 named.conf.5
@@ -143,14 +141,14 @@ server.@O@: server.c @@ -146,14 +144,14 @@ server.@O@: server.c
-DPRODUCT=\"${PRODUCT}\" \ -DPRODUCT=\"${PRODUCT}\" \
-DVERSION=\"${VERSION}\" -c ${srcdir}/server.c -DVERSION=\"${VERSION}\" -c ${srcdir}/server.c
@ -231,7 +233,7 @@ index 83bce80..5170f47 100644
doc man:: ${MANOBJS} doc man:: ${MANOBJS}
@@ -170,22 +168,12 @@ statschannel.@O@: bind9.xsl.h @@ -173,22 +171,12 @@ statschannel.@O@: bind9.xsl.h
installdirs: installdirs:
$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${sbindir} $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${sbindir}
@ -258,10 +260,10 @@ index 83bce80..5170f47 100644
@DLZ_DRIVER_RULES@ @DLZ_DRIVER_RULES@
diff --git a/bin/named/Makefile.in b/bin/named/Makefile.in diff --git a/bin/named/Makefile.in b/bin/named/Makefile.in
index 83bce80..f217965 100644 index e1f85a9..b7493c5 100644
--- a/bin/named/Makefile.in --- a/bin/named/Makefile.in
+++ b/bin/named/Makefile.in +++ b/bin/named/Makefile.in
@@ -44,7 +44,7 @@ CINCLUDES = -I${srcdir}/include -I${srcdir}/unix/include -I. \ @@ -47,7 +47,7 @@ CINCLUDES = -I${srcdir}/include -I${srcdir}/unix/include -I. \
${ISCCFG_INCLUDES} ${ISCCC_INCLUDES} ${ISC_INCLUDES} \ ${ISCCFG_INCLUDES} ${ISCCC_INCLUDES} ${ISC_INCLUDES} \
${DLZDRIVER_INCLUDES} ${DBDRIVER_INCLUDES} @DST_OPENSSL_INC@ ${DLZDRIVER_INCLUDES} ${DBDRIVER_INCLUDES} @DST_OPENSSL_INC@
@ -271,10 +273,10 @@ index 83bce80..f217965 100644
CWARNINGS = CWARNINGS =
diff --git a/bin/pkcs11/Makefile.in b/bin/pkcs11/Makefile.in diff --git a/bin/pkcs11/Makefile.in b/bin/pkcs11/Makefile.in
index d9aa66b..1900e3c 100644 index ae90616..4bc1256 100644
--- a/bin/pkcs11/Makefile.in --- a/bin/pkcs11/Makefile.in
+++ b/bin/pkcs11/Makefile.in +++ b/bin/pkcs11/Makefile.in
@@ -12,13 +12,13 @@ top_srcdir = @top_srcdir@ @@ -15,13 +15,13 @@ top_srcdir = @top_srcdir@
@BIND9_MAKE_INCLUDES@ @BIND9_MAKE_INCLUDES@
@ -292,10 +294,10 @@ index d9aa66b..1900e3c 100644
DEPLIBS = ${ISCDEPLIBS} DEPLIBS = ${ISCDEPLIBS}
diff --git a/configure.in b/configure.in diff --git a/configure.in b/configure.in
index 71dadbf..127de9b 100644 index 9a1d16d..2f13059 100644
--- a/configure.in --- a/configure.in
+++ b/configure.in +++ b/configure.in
@@ -1152,12 +1152,14 @@ AC_SUBST(USE_GSSAPI) @@ -1164,12 +1164,14 @@ AC_SUBST(USE_GSSAPI)
AC_SUBST(DST_GSSAPI_INC) AC_SUBST(DST_GSSAPI_INC)
AC_SUBST(DNS_GSSAPI_LIBS) AC_SUBST(DNS_GSSAPI_LIBS)
DNS_CRYPTO_LIBS="$DNS_GSSAPI_LIBS $DNS_CRYPTO_LIBS" DNS_CRYPTO_LIBS="$DNS_GSSAPI_LIBS $DNS_CRYPTO_LIBS"
@ -310,7 +312,7 @@ index 71dadbf..127de9b 100644
# #
# was --with-randomdev specified? # was --with-randomdev specified?
@@ -1542,11 +1544,11 @@ fi @@ -1554,11 +1556,11 @@ fi
AC_MSG_CHECKING(for OpenSSL library) AC_MSG_CHECKING(for OpenSSL library)
OPENSSL_WARNING= OPENSSL_WARNING=
openssldirs="/usr /usr/local /usr/local/ssl /usr/pkg /usr/sfw" openssldirs="/usr /usr/local /usr/local/ssl /usr/pkg /usr/sfw"
@ -327,7 +329,7 @@ index 71dadbf..127de9b 100644
if test "auto" = "$use_openssl" if test "auto" = "$use_openssl"
then then
@@ -1559,6 +1561,7 @@ then @@ -1571,6 +1573,7 @@ then
fi fi
done done
fi fi
@ -335,7 +337,7 @@ index 71dadbf..127de9b 100644
OPENSSL_ECDSA="" OPENSSL_ECDSA=""
OPENSSL_GOST="" OPENSSL_GOST=""
OPENSSL_ED25519="" OPENSSL_ED25519=""
@@ -1580,11 +1583,10 @@ case "$with_gost" in @@ -1592,11 +1595,10 @@ case "$with_gost" in
;; ;;
esac esac
@ -350,7 +352,7 @@ index 71dadbf..127de9b 100644
OPENSSLECDSALINKOBJS="" OPENSSLECDSALINKOBJS=""
OPENSSLECDSALINKSRCS="" OPENSSLECDSALINKSRCS=""
OPENSSLEDDSALINKOBJS="" OPENSSLEDDSALINKOBJS=""
@@ -1593,7 +1595,9 @@ case "$use_openssl" in @@ -1605,7 +1607,9 @@ case "$use_openssl" in
OPENSSLGOSTLINKSRCS="" OPENSSLGOSTLINKSRCS=""
OPENSSLLINKOBJS="" OPENSSLLINKOBJS=""
OPENSSLLINKSRCS="" OPENSSLLINKSRCS=""
@ -361,7 +363,7 @@ index 71dadbf..127de9b 100644
no) no)
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
DST_OPENSSL_INC="" DST_OPENSSL_INC=""
@@ -1623,11 +1627,11 @@ case "$use_openssl" in @@ -1635,11 +1639,11 @@ case "$use_openssl" in
If you don't want OpenSSL, use --without-openssl]) If you don't want OpenSSL, use --without-openssl])
;; ;;
*) *)
@ -378,7 +380,7 @@ index 71dadbf..127de9b 100644
if test "yes" = "$use_openssl" if test "yes" = "$use_openssl"
then then
# User did not specify a path - guess it # User did not specify a path - guess it
@@ -2085,6 +2089,7 @@ AC_SUBST(OPENSSL_ED25519) @@ -2062,6 +2066,7 @@ AC_SUBST(OPENSSL_ED25519)
AC_SUBST(OPENSSL_GOST) AC_SUBST(OPENSSL_GOST)
DNS_CRYPTO_LIBS="$DNS_CRYPTO_LIBS $DST_OPENSSL_LIBS" DNS_CRYPTO_LIBS="$DNS_CRYPTO_LIBS $DST_OPENSSL_LIBS"
@ -386,7 +388,7 @@ index 71dadbf..127de9b 100644
ISC_PLATFORM_WANTAES="#undef ISC_PLATFORM_WANTAES" ISC_PLATFORM_WANTAES="#undef ISC_PLATFORM_WANTAES"
if test "yes" = "$with_aes" if test "yes" = "$with_aes"
@@ -2404,6 +2409,7 @@ esac @@ -2381,6 +2386,7 @@ esac
AC_SUBST(PKCS11LINKOBJS) AC_SUBST(PKCS11LINKOBJS)
AC_SUBST(PKCS11LINKSRCS) AC_SUBST(PKCS11LINKSRCS)
AC_SUBST(CRYPTO) AC_SUBST(CRYPTO)
@ -394,7 +396,7 @@ index 71dadbf..127de9b 100644
AC_SUBST(PKCS11_ECDSA) AC_SUBST(PKCS11_ECDSA)
AC_SUBST(PKCS11_GOST) AC_SUBST(PKCS11_GOST)
AC_SUBST(PKCS11_ED25519) AC_SUBST(PKCS11_ED25519)
@@ -5398,8 +5404,11 @@ AC_CONFIG_FILES([ @@ -5434,8 +5440,11 @@ AC_CONFIG_FILES([
bin/delv/Makefile bin/delv/Makefile
bin/dig/Makefile bin/dig/Makefile
bin/dnssec/Makefile bin/dnssec/Makefile
@ -406,7 +408,7 @@ index 71dadbf..127de9b 100644
bin/nsupdate/Makefile bin/nsupdate/Makefile
bin/pkcs11/Makefile bin/pkcs11/Makefile
bin/python/Makefile bin/python/Makefile
@@ -5500,6 +5509,10 @@ AC_CONFIG_FILES([ @@ -5509,6 +5518,10 @@ AC_CONFIG_FILES([
lib/dns/include/dns/Makefile lib/dns/include/dns/Makefile
lib/dns/include/dst/Makefile lib/dns/include/dst/Makefile
lib/dns/tests/Makefile lib/dns/tests/Makefile
@ -417,7 +419,7 @@ index 71dadbf..127de9b 100644
lib/irs/Makefile lib/irs/Makefile
lib/irs/include/Makefile lib/irs/include/Makefile
lib/irs/include/irs/Makefile lib/irs/include/irs/Makefile
@@ -5524,6 +5537,24 @@ AC_CONFIG_FILES([ @@ -5533,6 +5546,24 @@ AC_CONFIG_FILES([
lib/isc/unix/include/Makefile lib/isc/unix/include/Makefile
lib/isc/unix/include/isc/Makefile lib/isc/unix/include/isc/Makefile
lib/isc/unix/include/pkcs11/Makefile lib/isc/unix/include/pkcs11/Makefile
@ -443,23 +445,23 @@ index 71dadbf..127de9b 100644
lib/isccc/include/Makefile lib/isccc/include/Makefile
lib/isccc/include/isccc/Makefile lib/isccc/include/isccc/Makefile
diff --git a/lib/Makefile.in b/lib/Makefile.in diff --git a/lib/Makefile.in b/lib/Makefile.in
index 318450c..87cde21 100644 index 81270a0..bcb5312 100644
--- a/lib/Makefile.in --- a/lib/Makefile.in
+++ b/lib/Makefile.in +++ b/lib/Makefile.in
@@ -14,7 +14,7 @@ top_srcdir = @top_srcdir@ @@ -15,7 +15,7 @@ top_srcdir = @top_srcdir@
# Attempt to disable parallel processing. # Attempt to disable parallel processing.
.NOTPARALLEL: .NOTPARALLEL:
.NO_PARALLEL: .NO_PARALLEL:
-SUBDIRS = isc isccc dns isccfg bind9 lwres irs tests samples -SUBDIRS = isc isccc dns isccfg bind9 lwres irs samples
+SUBDIRS = isc isc-pkcs11 isccc dns dns-pkcs11 isccfg bind9 lwres irs tests samples +SUBDIRS = isc isc-pkcs11 isccc dns dns-pkcs11 isccfg bind9 lwres irs samples
TARGETS = TARGETS =
@BIND9_MAKE_RULES@ @BIND9_MAKE_RULES@
diff --git a/lib/dns-pkcs11/Makefile.in b/lib/dns-pkcs11/Makefile.in diff --git a/lib/dns-pkcs11/Makefile.in b/lib/dns-pkcs11/Makefile.in
index f7556f3..8e29a5c 100644 index 4a8549e..6a19906 100644
--- a/lib/dns-pkcs11/Makefile.in --- a/lib/dns-pkcs11/Makefile.in
+++ b/lib/dns-pkcs11/Makefile.in +++ b/lib/dns-pkcs11/Makefile.in
@@ -23,16 +23,16 @@ VERSION=@BIND9_VERSION@ @@ -26,16 +26,16 @@ VERSION=@BIND9_VERSION@
USE_ISC_SPNEGO = @USE_ISC_SPNEGO@ USE_ISC_SPNEGO = @USE_ISC_SPNEGO@
@ -481,7 +483,7 @@ index f7556f3..8e29a5c 100644
LIBS = @LIBS@ LIBS = @LIBS@
@@ -142,15 +142,15 @@ version.@O@: version.c @@ -146,15 +146,15 @@ version.@O@: version.c
-DLIBAGE=${LIBAGE} \ -DLIBAGE=${LIBAGE} \
-c ${srcdir}/version.c -c ${srcdir}/version.c
@ -501,7 +503,7 @@ index f7556f3..8e29a5c 100644
include: gen include: gen
${MAKE} include/dns/enumtype.h ${MAKE} include/dns/enumtype.h
@@ -176,25 +176,25 @@ code.h: gen @@ -180,25 +180,25 @@ code.h: gen
./gen -s ${srcdir} > code.h || { rm -f $@ ; exit 1; } ./gen -s ${srcdir} > code.h || { rm -f $@ ; exit 1; }
gen: gen.c gen: gen.c
@ -534,10 +536,10 @@ index f7556f3..8e29a5c 100644
rm -f include/dns/rdatastruct.h rm -f include/dns/rdatastruct.h
rm -f dnstap.pb-c.c dnstap.pb-c.h include/dns/dnstap.pb-c.h rm -f dnstap.pb-c.c dnstap.pb-c.h include/dns/dnstap.pb-c.h
diff --git a/lib/isc-pkcs11/Makefile.in b/lib/isc-pkcs11/Makefile.in diff --git a/lib/isc-pkcs11/Makefile.in b/lib/isc-pkcs11/Makefile.in
index bd8b109..3a6665f 100644 index ba53ef1..d1f1771 100644
--- a/lib/isc-pkcs11/Makefile.in --- a/lib/isc-pkcs11/Makefile.in
+++ b/lib/isc-pkcs11/Makefile.in +++ b/lib/isc-pkcs11/Makefile.in
@@ -20,8 +20,8 @@ CINCLUDES = -I${srcdir}/unix/include \ @@ -23,8 +23,8 @@ CINCLUDES = -I${srcdir}/unix/include \
-I${srcdir}/@ISC_THREAD_DIR@/include \ -I${srcdir}/@ISC_THREAD_DIR@/include \
-I${srcdir}/@ISC_ARCH_DIR@/include \ -I${srcdir}/@ISC_ARCH_DIR@/include \
-I./include \ -I./include \
@ -548,7 +550,7 @@ index bd8b109..3a6665f 100644
CWARNINGS = CWARNINGS =
# Alphabetically # Alphabetically
@@ -104,40 +104,40 @@ version.@O@: version.c @@ -107,40 +107,40 @@ version.@O@: version.c
-DLIBAGE=${LIBAGE} \ -DLIBAGE=${LIBAGE} \
-c ${srcdir}/version.c -c ${srcdir}/version.c
@ -602,10 +604,10 @@ index bd8b109..3a6665f 100644
+ rm -f libisc-pkcs11.@A@ libisc-pkcs11-nosymtbl.@A@ libisc-pkcs11.la \ + rm -f libisc-pkcs11.@A@ libisc-pkcs11-nosymtbl.@A@ libisc-pkcs11.la \
+ libisc-pkcs11-nosymtbl.la timestamp + libisc-pkcs11-nosymtbl.la timestamp
diff --git a/make/includes.in b/make/includes.in diff --git a/make/includes.in b/make/includes.in
index f41e3cd..b97534c 100644 index fa86ad1..3cfbe9f 100644
--- a/make/includes.in --- a/make/includes.in
+++ b/make/includes.in +++ b/make/includes.in
@@ -40,3 +40,13 @@ BIND9_INCLUDES = @BIND9_BIND9_BUILDINCLUDE@ \ @@ -43,3 +43,13 @@ BIND9_INCLUDES = @BIND9_BIND9_BUILDINCLUDE@ \
TEST_INCLUDES = \ TEST_INCLUDES = \
-I${top_srcdir}/lib/tests/include -I${top_srcdir}/lib/tests/include

54
bind-9.10-sdb.patch
View File

@ -1,23 +1,23 @@
diff --git a/bin/Makefile.in b/bin/Makefile.in diff --git a/bin/Makefile.in b/bin/Makefile.in
index 7d21984..015ff45 100644 index ce7a2da..4e6a824 100644
--- a/bin/Makefile.in --- a/bin/Makefile.in
+++ b/bin/Makefile.in +++ b/bin/Makefile.in
@@ -10,8 +10,8 @@ srcdir = @srcdir@ @@ -11,8 +11,8 @@ srcdir = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
-SUBDIRS = named named-pkcs11 rndc dig delv dnssec dnssec-pkcs11 tools tests nsupdate \ -SUBDIRS = named named-pkcs11 rndc dig delv dnssec dnssec-pkcs11 tools nsupdate \
- check confgen @NZD_TOOLS@ @PYTHON_TOOLS@ @PKCS11_TOOLS@ - check confgen @NZD_TOOLS@ @PYTHON_TOOLS@ @PKCS11_TOOLS@ tests
+SUBDIRS = named named-sdb named-pkcs11 rndc dig delv dnssec dnssec-pkcs11 tools tests nsupdate \ +SUBDIRS = named named-sdb named-pkcs11 rndc dig delv dnssec dnssec-pkcs11 tools nsupdate \
+ check confgen @NZD_TOOLS@ @PYTHON_TOOLS@ @PKCS11_TOOLS@ sdb_tools + check confgen @NZD_TOOLS@ @PYTHON_TOOLS@ @PKCS11_TOOLS@ sdb_tools tests
TARGETS = TARGETS =
@BIND9_MAKE_RULES@ @BIND9_MAKE_RULES@
diff --git a/bin/named-sdb/Makefile.in b/bin/named-sdb/Makefile.in diff --git a/bin/named-sdb/Makefile.in b/bin/named-sdb/Makefile.in
index f217965..b79d6fe 100644 index b7493c5..93f9a33 100644
--- a/bin/named-sdb/Makefile.in --- a/bin/named-sdb/Makefile.in
+++ b/bin/named-sdb/Makefile.in +++ b/bin/named-sdb/Makefile.in
@@ -27,10 +27,10 @@ VERSION=@BIND9_VERSION@ @@ -30,10 +30,10 @@ VERSION=@BIND9_VERSION@
# #
# Add database drivers here. # Add database drivers here.
# #
@ -31,7 +31,7 @@ index f217965..b79d6fe 100644
DLZ_DRIVER_DIR = ${top_srcdir}/contrib/dlz/drivers DLZ_DRIVER_DIR = ${top_srcdir}/contrib/dlz/drivers
@@ -76,7 +76,7 @@ NOSYMLIBS = ${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \ @@ -79,7 +79,7 @@ NOSYMLIBS = ${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \
SUBDIRS = unix SUBDIRS = unix
@ -40,7 +40,7 @@ index f217965..b79d6fe 100644
GEOIPLINKOBJS = geoip.@O@ GEOIPLINKOBJS = geoip.@O@
@@ -143,7 +143,7 @@ server.@O@: server.c @@ -146,7 +146,7 @@ server.@O@: server.c
-DPRODUCT=\"${PRODUCT}\" \ -DPRODUCT=\"${PRODUCT}\" \
-DVERSION=\"${VERSION}\" -c ${srcdir}/server.c -DVERSION=\"${VERSION}\" -c ${srcdir}/server.c
@ -49,7 +49,7 @@ index f217965..b79d6fe 100644
export MAKE_SYMTABLE="yes"; \ export MAKE_SYMTABLE="yes"; \
export BASEOBJS="${OBJS} ${UOBJS}"; \ export BASEOBJS="${OBJS} ${UOBJS}"; \
${FINALBUILDCMD} ${FINALBUILDCMD}
@@ -170,22 +170,12 @@ statschannel.@O@: bind9.xsl.h @@ -173,22 +173,12 @@ statschannel.@O@: bind9.xsl.h
installdirs: installdirs:
$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${sbindir} $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${sbindir}
@ -76,10 +76,10 @@ index f217965..b79d6fe 100644
@DLZ_DRIVER_RULES@ @DLZ_DRIVER_RULES@
diff --git a/bin/named-sdb/main.c b/bin/named-sdb/main.c diff --git a/bin/named-sdb/main.c b/bin/named-sdb/main.c
index 64ee3ce..218d9b0 100644 index 1227ea9..febbdf5 100644
--- a/bin/named-sdb/main.c --- a/bin/named-sdb/main.c
+++ b/bin/named-sdb/main.c +++ b/bin/named-sdb/main.c
@@ -88,6 +88,10 @@ @@ -91,6 +91,10 @@
* Include header files for database drivers here. * Include header files for database drivers here.
*/ */
/* #include "xxdb.h" */ /* #include "xxdb.h" */
@ -90,7 +90,7 @@ index 64ee3ce..218d9b0 100644
#ifdef CONTRIB_DLZ #ifdef CONTRIB_DLZ
/* /*
@@ -1060,6 +1064,11 @@ setup(void) { @@ -1061,6 +1065,11 @@ setup(void) {
ns_main_earlyfatal("isc_app_start() failed: %s", ns_main_earlyfatal("isc_app_start() failed: %s",
isc_result_totext(result)); isc_result_totext(result));
@ -102,7 +102,7 @@ index 64ee3ce..218d9b0 100644
isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN, isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
ISC_LOG_NOTICE, "starting %s %s%s%s <id:%s>", ISC_LOG_NOTICE, "starting %s %s%s%s <id:%s>",
ns_g_product, ns_g_version, ns_g_product, ns_g_version,
@@ -1181,6 +1190,75 @@ setup(void) { @@ -1182,6 +1191,75 @@ setup(void) {
isc_result_totext(result)); isc_result_totext(result));
#endif #endif
@ -178,7 +178,7 @@ index 64ee3ce..218d9b0 100644
ns_server_create(ns_g_mctx, &ns_g_server); ns_server_create(ns_g_mctx, &ns_g_server);
#ifdef HAVE_LIBSECCOMP #ifdef HAVE_LIBSECCOMP
@@ -1223,6 +1301,11 @@ cleanup(void) { @@ -1224,6 +1302,11 @@ cleanup(void) {
dns_name_destroy(); dns_name_destroy();
@ -191,10 +191,10 @@ index 64ee3ce..218d9b0 100644
ISC_LOG_NOTICE, "exiting"); ISC_LOG_NOTICE, "exiting");
ns_log_shutdown(); ns_log_shutdown();
diff --git a/bin/named/Makefile.in b/bin/named/Makefile.in diff --git a/bin/named/Makefile.in b/bin/named/Makefile.in
index f217965..05b8699 100644 index b7493c5..8231d24 100644
--- a/bin/named/Makefile.in --- a/bin/named/Makefile.in
+++ b/bin/named/Makefile.in +++ b/bin/named/Makefile.in
@@ -42,9 +42,9 @@ DLZDRIVER_LIBS = @DLZ_DRIVER_LIBS@ @@ -45,9 +45,9 @@ DLZDRIVER_LIBS = @DLZ_DRIVER_LIBS@
CINCLUDES = -I${srcdir}/include -I${srcdir}/unix/include -I. \ CINCLUDES = -I${srcdir}/include -I${srcdir}/unix/include -I. \
${LWRES_INCLUDES} ${DNS_INCLUDES} ${BIND9_INCLUDES} \ ${LWRES_INCLUDES} ${DNS_INCLUDES} ${BIND9_INCLUDES} \
${ISCCFG_INCLUDES} ${ISCCC_INCLUDES} ${ISC_INCLUDES} \ ${ISCCFG_INCLUDES} ${ISCCC_INCLUDES} ${ISC_INCLUDES} \
@ -206,7 +206,7 @@ index f217965..05b8699 100644
CWARNINGS = CWARNINGS =
@@ -68,11 +68,11 @@ DEPLIBS = ${LWRESDEPLIBS} ${DNSDEPLIBS} ${BIND9DEPLIBS} \ @@ -71,11 +71,11 @@ DEPLIBS = ${LWRESDEPLIBS} ${DNSDEPLIBS} ${BIND9DEPLIBS} \
LIBS = ${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \ LIBS = ${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \
${ISCCFGLIBS} ${ISCCCLIBS} ${ISCLIBS} \ ${ISCCFGLIBS} ${ISCCCLIBS} ${ISCLIBS} \
@ -220,7 +220,7 @@ index f217965..05b8699 100644
SUBDIRS = unix SUBDIRS = unix
@@ -87,8 +87,7 @@ OBJS = builtin.@O@ client.@O@ config.@O@ control.@O@ \ @@ -90,8 +90,7 @@ OBJS = builtin.@O@ client.@O@ config.@O@ control.@O@ \
tkeyconf.@O@ tsigconf.@O@ update.@O@ xfrout.@O@ \ tkeyconf.@O@ tsigconf.@O@ update.@O@ xfrout.@O@ \
zoneconf.@O@ \ zoneconf.@O@ \
lwaddr.@O@ lwresd.@O@ lwdclient.@O@ lwderror.@O@ lwdgabn.@O@ \ lwaddr.@O@ lwresd.@O@ lwdclient.@O@ lwderror.@O@ lwdgabn.@O@ \
@ -230,7 +230,7 @@ index f217965..05b8699 100644
UOBJS = unix/os.@O@ unix/dlz_dlopen_driver.@O@ UOBJS = unix/os.@O@ unix/dlz_dlopen_driver.@O@
@@ -103,8 +102,7 @@ SRCS = builtin.c client.c config.c control.c \ @@ -106,8 +105,7 @@ SRCS = builtin.c client.c config.c control.c \
tkeyconf.c tsigconf.c update.c xfrout.c \ tkeyconf.c tsigconf.c update.c xfrout.c \
zoneconf.c \ zoneconf.c \
lwaddr.c lwresd.c lwdclient.c lwderror.c lwdgabn.c \ lwaddr.c lwresd.c lwdclient.c lwderror.c lwdgabn.c \
@ -240,7 +240,7 @@ index f217965..05b8699 100644
MANPAGES = named.8 lwresd.8 named.conf.5 MANPAGES = named.8 lwresd.8 named.conf.5
@@ -187,7 +185,5 @@ uninstall:: @@ -190,7 +188,5 @@ uninstall::
rm -f ${DESTDIR}${sbindir}/lwresd@EXEEXT@ rm -f ${DESTDIR}${sbindir}/lwresd@EXEEXT@
${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${sbindir}/named@EXEEXT@ ${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${sbindir}/named@EXEEXT@
@ -284,10 +284,10 @@ index c7e0868..95ab742 100644
+ ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} zone2sqlite@EXEEXT@ ${DESTDIR}${sbindir} + ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} zone2sqlite@EXEEXT@ ${DESTDIR}${sbindir}
${INSTALL_DATA} ${srcdir}/zone2ldap.1 ${DESTDIR}${mandir}/man1/zone2ldap.1 ${INSTALL_DATA} ${srcdir}/zone2ldap.1 ${DESTDIR}${mandir}/man1/zone2ldap.1
diff --git a/configure.in b/configure.in diff --git a/configure.in b/configure.in
index 1a0cc5f..b59a549 100644 index 62536a6..f571a4f 100644
--- a/configure.in --- a/configure.in
+++ b/configure.in +++ b/configure.in
@@ -5409,6 +5409,8 @@ AC_CONFIG_FILES([ @@ -5445,6 +5445,8 @@ AC_CONFIG_FILES([
bin/named/unix/Makefile bin/named/unix/Makefile
bin/named-pkcs11/Makefile bin/named-pkcs11/Makefile
bin/named-pkcs11/unix/Makefile bin/named-pkcs11/unix/Makefile
@ -296,11 +296,11 @@ index 1a0cc5f..b59a549 100644
bin/nsupdate/Makefile bin/nsupdate/Makefile
bin/pkcs11/Makefile bin/pkcs11/Makefile
bin/python/Makefile bin/python/Makefile
@@ -5433,6 +5435,7 @@ AC_CONFIG_FILES([ @@ -5469,6 +5471,7 @@ AC_CONFIG_FILES([
bin/python/isc/tests/dnskey_test.py bin/python/isc/tests/dnskey_test.py
bin/python/isc/tests/policy_test.py bin/python/isc/tests/policy_test.py
bin/rndc/Makefile bin/rndc/Makefile
+ bin/sdb_tools/Makefile + bin/sdb_tools/Makefile
bin/tests/Makefile bin/tests/Makefile
bin/tests/atomic/Makefile bin/tests/headerdep_test.sh
bin/tests/db/Makefile bin/tests/optional/Makefile

176
bind-9.11-CVE-2018-5738.patch
View File

@ -1,176 +0,0 @@
From 7983015dfa58be21526a01300b9e13a84278266a Mon Sep 17 00:00:00 2001
From: Evan Hunt <each@isc.org>
Date: Mon, 4 Jun 2018 21:55:41 -0700
Subject: [PATCH] allow-recursion could incorrectly inherit from the default
allow-query
---
bin/named/server.c | 50 ++++++++++++++++++++++++++++++++++++--------------
doc/arm/notes.xml | 41 +++++------------------------------------
2 files changed, 41 insertions(+), 50 deletions(-)
diff --git a/bin/named/server.c b/bin/named/server.c
index 64a5180..41a1826 100644
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -3376,10 +3376,6 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist,
dns_acache_setcachesize(view->acache, max_acache_size);
}
- CHECK(configure_view_acl(vconfig, config, ns_g_config,
- "allow-query", NULL, actx,
- ns_g_mctx, &view->queryacl));
-
/*
* Make the list of response policy zone names for a view that
* is used for real lookups and so cares about hints.
@@ -4258,9 +4254,6 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist,
INSIST(result == ISC_R_SUCCESS);
view->trust_anchor_telemetry = cfg_obj_asboolean(obj);
- CHECK(configure_view_acl(vconfig, config, ns_g_config,
- "allow-query-cache-on", NULL, actx,
- ns_g_mctx, &view->cacheonacl));
/*
* Set sources where additional data and CNAME/DNAME
* targets for authoritative answers may be found.
@@ -4287,22 +4280,40 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist,
view->additionalfromcache = ISC_TRUE;
}
+ CHECK(configure_view_acl(vconfig, config, ns_g_config,
+ "allow-query-cache-on", NULL, actx,
+ ns_g_mctx, &view->cacheonacl));
+
/*
- * Set "allow-query-cache", "allow-recursion", and
- * "allow-recursion-on" acls if configured in named.conf.
- * (Ignore the global defaults for now, because these ACLs
- * can inherit from each other when only some of them set at
- * the options/view level.)
+ * Set the "allow-query", "allow-query-cache", "allow-recursion",
+ * and "allow-recursion-on" ACLs if configured in named.conf, but
+ * NOT from the global defaults. This is done by leaving the third
+ * argument to configure_view_acl() NULL.
+ *
+ * We ignore the global defaults here because these ACLs
+ * can inherit from each other. If any are still unset after
+ * applying the inheritance rules, we'll look up the defaults at
+ * that time.
*/
- CHECK(configure_view_acl(vconfig, config, NULL, "allow-query-cache",
- NULL, actx, ns_g_mctx, &view->cacheacl));
+
+ /* named.conf only */
+ CHECK(configure_view_acl(vconfig, config, NULL,
+ "allow-query", NULL, actx,
+ ns_g_mctx, &view->queryacl));
+
+ /* named.conf only */
+ CHECK(configure_view_acl(vconfig, config, NULL,
+ "allow-query-cache", NULL, actx,
+ ns_g_mctx, &view->cacheacl));
if (strcmp(view->name, "_bind") != 0 &&
view->rdclass != dns_rdataclass_chaos)
{
+ /* named.conf only */
CHECK(configure_view_acl(vconfig, config, NULL,
"allow-recursion", NULL, actx,
ns_g_mctx, &view->recursionacl));
+ /* named.conf only */
CHECK(configure_view_acl(vconfig, config, NULL,
"allow-recursion-on", NULL, actx,
ns_g_mctx, &view->recursiononacl));
@@ -4340,18 +4351,21 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist,
* the global config.
*/
if (view->recursionacl == NULL) {
+ /* global default only */
CHECK(configure_view_acl(NULL, NULL, ns_g_config,
"allow-recursion", NULL,
actx, ns_g_mctx,
&view->recursionacl));
}
if (view->recursiononacl == NULL) {
+ /* global default only */
CHECK(configure_view_acl(NULL, NULL, ns_g_config,
"allow-recursion-on", NULL,
actx, ns_g_mctx,
&view->recursiononacl));
}
if (view->cacheacl == NULL) {
+ /* global default only */
CHECK(configure_view_acl(NULL, NULL, ns_g_config,
"allow-query-cache", NULL,
actx, ns_g_mctx,
@@ -4365,6 +4379,14 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist,
CHECK(dns_acl_none(mctx, &view->cacheacl));
}
+ if (view->queryacl == NULL) {
+ /* global default only */
+ CHECK(configure_view_acl(NULL, NULL, ns_g_config,
+ "allow-query", NULL,
+ actx, ns_g_mctx,
+ &view->queryacl));
+ }
+
/*
* Ignore case when compressing responses to the specified
* clients. This causes case not always to be preserved,
diff --git a/doc/arm/notes.xml b/doc/arm/notes.xml
index ea9b61f..9a1832d 100644
--- a/doc/arm/notes.xml
+++ b/doc/arm/notes.xml
@@ -103,42 +103,11 @@
<itemizedlist>
<listitem>
<para>
- An error in TSIG handling could permit unauthorized zone
- transfers or zone updates. These flaws are disclosed in
- CVE-2017-3142 and CVE-2017-3143. [RT #45383]
- </para>
- </listitem>
- <listitem>
- <para>
- The BIND installer on Windows used an unquoted service path,
- which can enable privilege escalation. This flaw is disclosed
- in CVE-2017-3141. [RT #45229]
- </para>
- </listitem>
- <listitem>
- <para>
- With certain RPZ configurations, a response with TTL 0
- could cause <command>named</command> to go into an infinite
- query loop. This flaw is disclosed in CVE-2017-3140.
- [RT #45181]
- </para>
- </listitem>
- <listitem>
- <para>
- Addresses could be referenced after being freed during resolver
- processing, causing an assertion failure. The chances of this
- happening were remote, but the introduction of a delay in
- resolution increased them. This bug is disclosed in
- CVE-2017-3145. [RT #46839]
- </para>
- </listitem>
- <listitem>
- <para>
- update-policy rules that otherwise ignore the name field now
- require that it be set to "." to ensure that any type list
- present is properly interpreted. If the name field was omitted
- from the rule declaration and a type list was present it wouldn't
- be interpreted as expected.
+ When recursion is enabled but the <command>allow-recursion</command>
+ and <command>allow-query-cache</command> ACLs are not specified, they
+ should be limited to local networks, but they were inadvertently set
+ to match the default <command>allow-query</command>, thus allowing
+ remote queries. This flaw is disclosed in CVE-2018-5738. [GL #309]
</para>
</listitem>
</itemizedlist>
--
2.14.4

95
bind-9.11-kyua-unit-oot.patch
View File

@ -1,95 +0,0 @@
diff --git a/Makefile.in b/Makefile.in
index e1b2ff3..ff82f29 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -7,6 +7,7 @@
srcdir = @srcdir@
VPATH = @srcdir@
top_srcdir = @top_srcdir@
+top_builddir = @top_builddir@
VERSION=@BIND9_VERSION@
@@ -86,7 +87,8 @@ force-test: test-force
test-force:
status=0; \
(cd bin/tests && ${MAKE} ${MAKEDEFS} test) || status=1; \
- (test -f unit/unittest.sh && $(SHELL) unit/unittest.sh) || status=1; \
+ (test -f ${top_builddir}/unit/unittest.sh && \
+ $(SHELL) ${top_builddir}/unit/unittest.sh) || status=1; \
exit $$status
README: README.md
@@ -110,6 +112,6 @@ CONTRIBUTING: CONTRIBUTING.md
sed -e '$${/^$$/d;}' > $@
unit::
- sh ${top_srcdir}/unit/unittest.sh
+ sh ${top_builddir}/unit/unittest.sh
clean::
diff --git a/lib/dns/tests/Makefile.in b/lib/dns/tests/Makefile.in
index c7fd4ed..2a6571b 100644
--- a/lib/dns/tests/Makefile.in
+++ b/lib/dns/tests/Makefile.in
@@ -234,7 +234,7 @@ tsig_test@EXEEXT@: tsig_test.@O@ dnstest.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
${ISCLIBS} ${LIBS}
unit::
- sh ${top_srcdir}/unit/unittest.sh
+ sh ${top_builddir}/unit/unittest.sh
clean distclean::
rm -f ${TARGETS}
diff --git a/lib/irs/tests/Makefile.in b/lib/irs/tests/Makefile.in
index 2ecf8b0..38bf342 100644
--- a/lib/irs/tests/Makefile.in
+++ b/lib/irs/tests/Makefile.in
@@ -45,7 +45,7 @@ resconf_test@EXEEXT@: resconf_test.@O@ ${CFGDEPLIBS} ${DNSDEPLIBS} ${IRSDEPLIBS}
resconf_test.@O@ ${LIBS}
unit::
- sh ${top_srcdir}/unit/unittest.sh
+ sh ${top_builddir}/unit/unittest.sh
clean distclean::
rm -f ${TARGETS}
diff --git a/lib/isc/tests/Makefile.in b/lib/isc/tests/Makefile.in
index 20c7e25..f7fa538 100644
--- a/lib/isc/tests/Makefile.in
+++ b/lib/isc/tests/Makefile.in
@@ -159,7 +159,7 @@ time_test@EXEEXT@: time_test.@O@ ${ISCDEPLIBS}
time_test.@O@ ${ISCLIBS} ${LIBS}
unit::
- sh ${top_srcdir}/unit/unittest.sh
+ sh ${top_builddir}/unit/unittest.sh
clean distclean::
rm -f ${TARGETS}
diff --git a/lib/isccfg/tests/Makefile.in b/lib/isccfg/tests/Makefile.in
index be64b92..cbd444a 100644
--- a/lib/isccfg/tests/Makefile.in
+++ b/lib/isccfg/tests/Makefile.in
@@ -44,7 +44,7 @@ parser_test@EXEEXT@: parser_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS} ${ISCCFGDEPLIBS
${ISCLIBS} ${LIBS}
unit::
- sh ${top_srcdir}/unit/unittest.sh
+ sh ${top_builddir}/unit/unittest.sh
clean distclean::
rm -f ${TARGETS}
diff --git a/lib/lwres/tests/Makefile.in b/lib/lwres/tests/Makefile.in
index 7166d44..10db3e7 100644
--- a/lib/lwres/tests/Makefile.in
+++ b/lib/lwres/tests/Makefile.in
@@ -39,7 +39,7 @@ config_test@EXEEXT@: config_test.@O@ ${LWRESDEPLIBS}
config_test.@O@ ${LWRESLIBS} ${LIBS}
unit::
- sh ${top_srcdir}/unit/unittest.sh
+ sh ${top_builddir}/unit/unittest.sh
clean distclean::
rm -f ${TARGETS}

122
bind-9.11-libidn2-exportfix.patch
View File

@ -1,122 +0,0 @@
From a296141a45e5bea4e08358801011397c778bcc96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
Date: Tue, 3 Apr 2018 20:35:29 +0200
Subject: [PATCH] Remove -lidn2 from exported LIBS. Do not propagate it from
isc-config.sh --libs isc.
---
configure | 18 +++++++++++++-----
configure.in | 20 ++++++++++++++------
2 files changed, 27 insertions(+), 11 deletions(-)
diff --git a/configure b/configure
index ce9f393..afec327 100755
--- a/configure
+++ b/configure
@@ -22856,6 +22856,7 @@ fi
#
LIBIDN2_CFLAGS=
+LIBIDN2_LDFLAGS=
LIBIDN2_LIBS=
# Check whether --with-libidn2 was given.
@@ -22869,20 +22870,23 @@ case $use_libidn2 in #(
no) :
: ;; #(
yes) :
-
- LIBIDN2_LIBS="-lidn2"
- ;; #(
+ : ;; #(
*) :
LIBIDN2_CFLAGS="-I$use_libidn2/include"
- LIBIDN2_LIBS="-L$use_libidn2/lib -lidn2"
+ LIBIDN2_LDFLAGS="-L$use_libidn2/lib"
;; #(
*) :
;;
esac
if test "$use_libidn2" != "no"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing idn2_to_ascii_8z" >&5
+ save_CFLAGS="$CFLAGS"
+ save_LIBS="$LIBS"
+ save_LDFLAGS="$LDFLAGS"
+ CFLAGS="$LIBIDN2_CFLAGS $CFLAGS"
+ LDFLAGS="$LIBIDN2_LDFLAGS $LDFLAGS"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing idn2_to_ascii_8z" >&5
$as_echo_n "checking for library containing idn2_to_ascii_8z... " >&6; }
if ${ac_cv_search_idn2_to_ascii_8z+:} false; then :
$as_echo_n "(cached) " >&6
@@ -22938,6 +22942,7 @@ if test "$ac_res" != no; then :
$as_echo "#define WITH_LIBIDN2 1" >>confdefs.h
+ LIBIDN2_LIBS="$LIBIDN2_LDFLAGS -lidn2"
else
as_fn_error $? "libidn2 requested, but not found" "$LINENO" 5
fi
@@ -22967,6 +22972,9 @@ $as_echo "no" >&6; }
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$save_CFLAGS"
+ LIBS="$save_LIBS"
+ LDFLAGS="$save_LDFLAGS"
fi
diff --git a/configure.in b/configure.in
index 63988c9..873e14d 100644
--- a/configure.in
+++ b/configure.in
@@ -4904,23 +4904,28 @@ AC_SUBST(IDNKIT_LIBS)
#
LIBIDN2_CFLAGS=
+LIBIDN2_LDFLAGS=
LIBIDN2_LIBS=
AC_ARG_WITH(libidn2,
AS_HELP_STRING([--with-libidn2[=PATH]], [enable IDN support using GNU libidn2 [yes|no|path]]),
use_libidn2="$withval", use_libidn2="no")
AS_CASE([$use_libidn2],
[no],[:],
- [yes],[
- LIBIDN2_LIBS="-lidn2"
- ],
+ [yes],[:],
[*],[
LIBIDN2_CFLAGS="-I$use_libidn2/include"
- LIBIDN2_LIBS="-L$use_libidn2/lib -lidn2"
+ LIBIDN2_LDFLAGS="-L$use_libidn2/lib"
])
AS_IF([test "$use_libidn2" != "no"],
- [AC_SEARCH_LIBS([idn2_to_ascii_8z], [idn2],
- [AC_DEFINE(WITH_LIBIDN2, 1, [define if libidn2 support is to be included.])],
+ [save_CFLAGS="$CFLAGS"
+ save_LIBS="$LIBS"
+ save_LDFLAGS="$LDFLAGS"
+ CFLAGS="$LIBIDN2_CFLAGS $CFLAGS"
+ LDFLAGS="$LIBIDN2_LDFLAGS $LDFLAGS"
+ AC_SEARCH_LIBS([idn2_to_ascii_8z], [idn2],
+ [AC_DEFINE(WITH_LIBIDN2, 1, [define if libidn2 support is to be included.])
+ LIBIDN2_LIBS="$LIBIDN2_LDFLAGS -lidn2"],
[AC_MSG_ERROR([libidn2 requested, but not found])])
AC_MSG_CHECKING(whether libidn2 supports idn2_to_unicode_8zlz)
AC_TRY_LINK([#include <idn2.h>],
@@ -4928,6 +4933,9 @@ AS_IF([test "$use_libidn2" != "no"],
[AC_MSG_RESULT(yes)
AC_DEFINE(WITH_IDN_OUT_SUPPORT, 1, [define if IDN output support is to be included.])],
[AC_MSG_RESULT([no])])
+ CFLAGS="$save_CFLAGS"
+ LIBS="$save_LIBS"
+ LDFLAGS="$save_LDFLAGS"
])
AC_SUBST([LIBIDN2_CFLAGS])
AC_SUBST([LIBIDN2_LIBS])
--
2.14.3

1189
bind-9.11-libidn2.patch
View File

File diff suppressed because it is too large Load Diff

67
bind-9.5-dlz-64bit.patch
View File

@ -1,5 +1,5 @@
diff --git a/contrib/dlz/config.dlz.in b/contrib/dlz/config.dlz.in diff --git a/contrib/dlz/config.dlz.in b/contrib/dlz/config.dlz.in
index 5d65a85..2677b26 100644 index 47525af..eefe3c3 100644
--- a/contrib/dlz/config.dlz.in --- a/contrib/dlz/config.dlz.in
+++ b/contrib/dlz/config.dlz.in +++ b/contrib/dlz/config.dlz.in
@@ -17,6 +17,13 @@ @@ -17,6 +17,13 @@
@ -16,66 +16,7 @@ index 5d65a85..2677b26 100644
# #
# Private autoconf macro to simplify configuring drivers: # Private autoconf macro to simplify configuring drivers:
# #
@@ -152,23 +159,11 @@ then @@ -292,9 +299,9 @@ case "$use_dlz_bdb" in
then
use_dlz_mysql=$d
mysql_include=$d/include/mysql
- if test -d $d/lib/mysql
- then
- mysql_lib=$d/lib/mysql
- else
- mysql_lib=$d/lib
- fi
break
elif test -f $d/include/mysql.h
then
use_dlz_mysql=$d
mysql_include=$d/include
- if test -d $d/lib/mysql
- then
- mysql_lib=$d/lib/mysql
- else
- mysql_lib=$d/lib
- fi
break
fi
done
@@ -179,21 +174,9 @@ then
if test -f $d/include/mysql/mysql.h
then
mysql_include=$d/include/mysql
- if test -d $d/lib/mysql
- then
- mysql_lib=$d/lib/mysql
- else
- mysql_lib=$d/lib
- fi
elif test -f $d/include/mysql.h
then
mysql_include=$d/include
- if test -d $d/lib/mysql
- then
- mysql_lib=$d/lib/mysql
- else
- mysql_lib=$d/lib
- fi
fi
fi
@@ -217,6 +200,12 @@ case "$use_dlz_mysql" in
[using mysql with libs ${mysql_lib} and includes ${mysql_include}])
;;
*)
+ if test -d $use_dlz_mysql/${target_lib}/mysql
+ then
+ mysql_lib=$use_dlz_mysql/${target_lib}/mysql
+ else
+ mysql_lib=$use_dlz_mysql/${target_lib}
+ fi
DLZ_ADD_DRIVER(MYSQL, dlz_mysql_driver,
[-I${mysql_include}],
[-L${mysql_lib} -lmysqlclient -lz -lcrypt -lm])
@@ -310,9 +299,9 @@ case "$use_dlz_bdb" in
then then
break break
fi fi
@ -87,7 +28,7 @@ index 5d65a85..2677b26 100644
break break
fi fi
done done
@@ -414,7 +403,7 @@ case "$use_dlz_ldap" in @@ -396,7 +403,7 @@ case "$use_dlz_ldap" in
*) *)
DLZ_ADD_DRIVER(LDAP, dlz_ldap_driver, DLZ_ADD_DRIVER(LDAP, dlz_ldap_driver,
[-I$use_dlz_ldap/include], [-I$use_dlz_ldap/include],
@ -96,7 +37,7 @@ index 5d65a85..2677b26 100644
AC_MSG_RESULT( AC_MSG_RESULT(
[using LDAP from $use_dlz_ldap/lib and $use_dlz_ldap/include]) [using LDAP from $use_dlz_ldap/lib and $use_dlz_ldap/include])
@@ -450,11 +439,11 @@ then @@ -432,11 +439,11 @@ then
odbcdirs="/usr /usr/local /usr/pkg" odbcdirs="/usr /usr/local /usr/pkg"
for d in $odbcdirs for d in $odbcdirs
do do

50
bind.spec
View File

@ -3,7 +3,7 @@
# #
#%%global PATCHVER P1 #%%global PATCHVER P1
#%%global PREVER b1 #%%global PREVER rc1
%global BINDVERSION %{version}%{?PREVER}%{?PATCHVER:-%{PATCHVER}} %global BINDVERSION %{version}%{?PREVER}%{?PATCHVER:-%{PATCHVER}}
# bcond_without is built by default, unless --without X is passed # bcond_without is built by default, unless --without X is passed
@ -41,11 +41,18 @@
# Visit https://bugzilla.redhat.com/show_bug.cgi?id=1540300 # Visit https://bugzilla.redhat.com/show_bug.cgi?id=1540300
%undefine _strict_symbol_defs_build %undefine _strict_symbol_defs_build
# #
# lib*.so.X versions of selected libraries
%global sover_dns 1102
%global sover_isc 169
%global sover_irs 160
%global sover_isccfg 160
Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) server Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) server
Name: bind Name: bind
License: MPLv2.0 License: MPLv2.0
Version: 9.11.3 Version: 9.11.4
Release: 15%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist} Release: 1%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist}
Epoch: 32 Epoch: 32
Url: http://www.isc.org/products/BIND/ Url: http://www.isc.org/products/BIND/
# #
@ -102,9 +109,7 @@ Patch140:bind-9.11-rh1410433.patch
Patch145:bind-9.11-rh1205168.patch Patch145:bind-9.11-rh1205168.patch
# [ISC-Bugs #46853] commit cb616c6d5c2ece1fac37fa6e0bca2b53d4043098 ISC 4851 # [ISC-Bugs #46853] commit cb616c6d5c2ece1fac37fa6e0bca2b53d4043098 ISC 4851
Patch149:bind-9.11-kyua-pkcs11.patch Patch149:bind-9.11-kyua-pkcs11.patch
Patch152:bind-9.11-kyua-unit-oot.patch
Patch153:bind-9.11-export-suffix.patch Patch153:bind-9.11-export-suffix.patch
Patch154:bind-9.11-CVE-2018-5738.patch
# SDB patches # SDB patches
Patch11: bind-9.3.2b2-sdbsrc.patch Patch11: bind-9.3.2b2-sdbsrc.patch
@ -116,12 +121,8 @@ Patch135:bind-9.11-export-isc-config.patch
# needs inpection # needs inpection
Patch17: bind-9.3.2b1-fix_sdb_ldap.patch Patch17: bind-9.3.2b1-fix_sdb_ldap.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=1098783
Patch73: bind-9.11-libidn2.patch
# make +noidnout default # make +noidnout default
Patch74: bind-9.11-libidn2-noout.patch Patch74: bind-9.11-libidn2-noout.patch
# link libidn2 only to utils
Patch75: bind-9.11-libidn2-exportfix.patch
Requires(post): systemd Requires(post): systemd
@ -157,7 +158,7 @@ BuildRequires: libdb-devel
%endif %endif
%if %{with KYUA} %if %{with KYUA}
# make unit dependencies # make unit dependencies
BuildRequires: libatf-c-devel kyua-cli BuildRequires: libatf-c-devel kyua
%else %else
# shipped atf library requires c++ # shipped atf library requires c++
BuildRequires: gcc-c++ BuildRequires: gcc-c++
@ -432,9 +433,7 @@ are used for building ISC DHCP.
%ifnarch alpha ia64 %ifnarch alpha ia64
%patch72 -p1 -b .64bit %patch72 -p1 -b .64bit
%endif %endif
%patch73 -p1 -b .libidn
%patch74 -p1 -b .idn-noout %patch74 -p1 -b .idn-noout
%patch75 -p1 -b .idn-noexport
%patch102 -p1 -b .rh452060 %patch102 -p1 -b .rh452060
%patch106 -p0 -b .rh490837 %patch106 -p0 -b .rh490837
%patch109 -p1 -b .rh478718 %patch109 -p1 -b .rh478718
@ -443,9 +442,7 @@ are used for building ISC DHCP.
%patch131 -p1 -b .multlib-conflict %patch131 -p1 -b .multlib-conflict
%patch140 -p1 -b .rh1410433 %patch140 -p1 -b .rh1410433
%patch145 -p1 -b .rh1205168 %patch145 -p1 -b .rh1205168
%patch152 -p1 -b .kyua-unit-oot
%patch153 -p1 -b .export_suffix %patch153 -p1 -b .export_suffix
%patch154 -p1 -b .CVE-2018-5738
%if %{with PKCS11} %if %{with PKCS11}
cp -r bin/named{,-pkcs11} cp -r bin/named{,-pkcs11}
@ -507,6 +504,7 @@ done
find lib -name 'Kyuafile' -exec cp -uv '{}' "%{1}/{}" ';' \ find lib -name 'Kyuafile' -exec cp -uv '{}' "%{1}/{}" ';' \
find lib -name 'Atffile' -exec cp -uv '{}' "%{1}/{}" ';' \ find lib -name 'Atffile' -exec cp -uv '{}' "%{1}/{}" ';' \
find lib -name 'testdata' -type d -exec cp -Tav '{}' "%{1}/{}" ';' \ find lib -name 'testdata' -type d -exec cp -Tav '{}' "%{1}/{}" ';' \
find lib -name 'testkeys' -type d -exec cp -Tav '{}' "%{1}/{}" ';' \
%define systemtest_prepare_build() \ %define systemtest_prepare_build() \
cp -Tuav bin/tests "%{1}/bin/tests/" \ cp -Tuav bin/tests "%{1}/bin/tests/" \
@ -1156,10 +1154,10 @@ rm -rf ${RPM_BUILD_ROOT}
%{_libdir}/liblwres.so.160* %{_libdir}/liblwres.so.160*
%files libs-lite %files libs-lite
%{_libdir}/libdns.so.1100* %{_libdir}/libdns.so.%{sover_dns}*
%{_libdir}/libirs.so.160* %{_libdir}/libirs.so.%{sover_irs}*
%{_libdir}/libisc.so.169* %{_libdir}/libisc.so.%{sover_isc}*
%{_libdir}/libisccfg.so.160* %{_libdir}/libisccfg.so.%{sover_isccfg}*
%files license %files license
%{!?_licensedir:%global license %%doc} %{!?_licensedir:%global license %%doc}
@ -1325,8 +1323,8 @@ rm -rf ${RPM_BUILD_ROOT}
%{_mandir}/man8/dnssec*-pkcs11.8* %{_mandir}/man8/dnssec*-pkcs11.8*
%files pkcs11-libs %files pkcs11-libs
%{_libdir}/libdns-pkcs11.so.1100* %{_libdir}/libdns-pkcs11.so.%{sover_dns}*
%{_libdir}/libisc-pkcs11.so.169* %{_libdir}/libisc-pkcs11.so.%{sover_isc}*
%files pkcs11-devel %files pkcs11-devel
%{_includedir}/bind9/pk11/*.h %{_includedir}/bind9/pk11/*.h
@ -1339,10 +1337,10 @@ rm -rf ${RPM_BUILD_ROOT}
%if %{with EXPORT_LIBS} %if %{with EXPORT_LIBS}
%files export-libs %files export-libs
%dir %{_libdir}/%{_export_dir} %dir %{_libdir}/%{_export_dir}
%{_libdir}/%{_export_dir}/libdns-export.so.1100* %{_libdir}/%{_export_dir}/libdns-export.so.%{sover_dns}*
%{_libdir}/%{_export_dir}/libirs-export.so.160* %{_libdir}/%{_export_dir}/libirs-export.so.%{sover_irs}*
%{_libdir}/%{_export_dir}/libisc-export.so.169* %{_libdir}/%{_export_dir}/libisc-export.so.%{sover_isc}*
%{_libdir}/%{_export_dir}/libisccfg-export.so.160* %{_libdir}/%{_export_dir}/libisccfg-export.so.%{sover_isccfg}*
%config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-export-%{_arch}.conf %config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-export-%{_arch}.conf
# This subpackage has to distribute its own license. Do not conflict with # This subpackage has to distribute its own license. Do not conflict with
# other subpackages of different version # other subpackages of different version
@ -1402,6 +1400,10 @@ rm -rf ${RPM_BUILD_ROOT}
%changelog %changelog
* Thu Jul 12 2018 Petr Menšík <pemensik@redhat.com> - 32:9.11.4-1
- Update to 9.11.4
- Use kyua instead of kyua-cli for unit tests
* Thu Jul 12 2018 Petr Menšík <pemensik@redhat.com> - 32:9.11.3-15 * Thu Jul 12 2018 Petr Menšík <pemensik@redhat.com> - 32:9.11.3-15
- Use new config file named-chroot.files for chroot setup (#1429656) - Use new config file named-chroot.files for chroot setup (#1429656)
- Fix chroot devices file verification (#1592873) - Fix chroot devices file verification (#1592873)

2
sources
View File

@ -1,2 +1,2 @@
SHA512 (bind-9.11.3.tar.gz) = 1f0da13165d1ee872800fe10bb8b0f69c6c76515f9861c1528fb6005213bb71b21a1270906d2ea9ded3eaf6df1a1bac0f2c80aa511683b8d57dcff4f278d8c35 SHA512 (bind-9.11.4.tar.gz) = e27b7730ddb2ff7ccece9b47bc79fdc91f87c74fff47c549dec1383bc663aa68796596aef0c42682f8a7c32469acf69e1946087a29b91997676fa78bd8364980
SHA512 (config-18.tar.bz2) = c0a0a1fd58a7e2c09fe69915b9a4c682d1b6c96e78583f63ce5355f663c9509d28facfd3aa078b228b69954d0af4bfa484ef661a9568aaafe6eade97dda3c3d9 SHA512 (config-18.tar.bz2) = c0a0a1fd58a7e2c09fe69915b9a4c682d1b6c96e78583f63ce5355f663c9509d28facfd3aa078b228b69954d0af4bfa484ef661a9568aaafe6eade97dda3c3d9