bind: upgrade to version 9.10.1
PATCH 1/1 bind: upgrade to version 9.10.1
Upgrade bind to version 9.10.1.
* remove bind9_9_5-CVE-2014-8500.patch which is merged and documented in file CHANGES
* remove cross-build-fix.patch which is fixed by upstream
* update dont-test-on-host.patch
* add backported bind-fix-autoheader-2.69.patch to fix configure error
* remove unrecognised configure options --with-export-includedir --enable-exportlib and --with-export-libdir
* add runtime dependency procps which is required by init script
---
.../bind/bind/bind-fix-autoheader-2.69.patch | 48 +
.../bind/bind/bind9_9_5-CVE-2014-8500.patch | 990 ---------------------
.../bind/bind/cross-build-fix.patch | 21 -
.../bind/bind/dont-test-on-host.patch | 11 +-
.../bind/{bind_9.9.5.bb => bind_9.10.1.bb} | 17 +-
5 files changed, 64 insertions(+), 1023 deletions(-)
create mode 100644 meta/recipes-connectivity/bind/bind/bind-fix-autoheader-2.69.patch
delete mode 100644 meta/recipes-connectivity/bind/bind/bind9_9_5-CVE-2014-8500.patch
delete mode 100644 meta/recipes-connectivity/bind/bind/cross-build-fix.patch
rename meta/recipes-connectivity/bind/{bind_9.9.5.bb => bind_9.10.1.bb} (86%)meta/recipes-connectivity/bind/bind/bind-fix-autoheader-2.69.patch new file +48 -0
@@ -0,0 +1,48 @@ +Fix a problem with autoheader 2.69. And backport from: + +https://source.isc.org/cgi-bin/gitweb.cgi?p=bind9.git;a=commit;h=75edd46095c6c99d6d9f894c1873acb28a19e751 + +Upstream-Status: Backport + +Signed-off-by: Kai Kang <[email protected]> + +From 75edd46095c6c99d6d9f894c1873acb28a19e751 Mon Sep 17 00:00:00 2001 +From: Evan Hunt <[email protected]> +Date: Wed, 17 Dec 2014 14:19:28 -0800 +Subject: [PATCH 1/1] [v9_10] fix a problem with autoheader 2.69 + +--- + config.h.in | 2 +- + configure.in | 4 +++- + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/config.h.in b/config.h.in +index d373077..86639be 100644 +--- a/config.h.in ++++ b/config.h.in +@@ -242,7 +242,7 @@ int sigwait(const unsigned int *set, int *sig); + /* Define to 1 if you have the <gssapi_krb5.h> header file. */ + #undef HAVE_GSSAPI_KRB5_H + +-/* Define to 1 if you have the `if_nametoindex' function. */ ++/* Define to 1 if you have the if_nametoindex function. */ + #undef HAVE_IF_NAMETOINDEX + + /* Define to 1 if you have the <inttypes.h> header file. */ +diff --git a/configure.in b/configure.in +index 0574315..82817fc 100644 +--- a/configure.in ++++ b/configure.in +@@ -3494,7 +3494,9 @@ esac + case $ac_cv_have_if_nametoindex in + yes) + ISC_PLATFORM_HAVEIFNAMETOINDEX="#define ISC_PLATFORM_HAVEIFNAMETOINDEX 1" +- AC_DEFINE(HAVE_IF_NAMETOINDEX, 1) ++ AC_DEFINE(HAVE_IF_NAMETOINDEX, 1, ++ [Define to 1 if you have the if_nametoindex function.]) ++ + ;; + *) + ISC_PLATFORM_HAVEIFNAMETOINDEX="#undef ISC_PLATFORM_HAVEIFNAMETOINDEX" +-- +1.8.2.3
meta/recipes-connectivity/bind/bind/bind9_9_5-CVE-2014-8500.patch deleted +0 -990
990 lines not on this page · raw message
meta/recipes-connectivity/bind/bind/cross-build-fix.patch deleted +0 -21
@@ -1,21 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - -11/30/2010 -gen.c should be build by ${BUILD_CC} - -Signed-off-by: Qing He <[email protected]> - -diff --git a/lib/export/dns/Makefile.in b/lib/export/dns/Makefile.in -index aeadf57..d3fae74 100644 ---- a/lib/export/dns/Makefile.in -+++ b/lib/export/dns/Makefile.in -@@ -166,7 +166,8 @@ code.h: gen - ./gen -s ${srcdir} > code.h - - gen: ${srcdir}/gen.c -- ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o $@ ${srcdir}/gen.c ${LIBS} -+ ${BUILD_CC} ${BUILD_CFLAGS} -I${top_srcdir}/lib/isc/include \ -+ ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} -o $@ ${srcdir}/gen.c ${BUILD_LIBS} - - #We don't need rbtdb64 for this library - #rbtdb64.@O@: rbtdb.c
meta/recipes-connectivity/bind/bind/dont-test-on-host.patch +8 -3
@@ -2,16 +2,21 @@ Upstream-Status: Pending Signed-off-by Saul Wold <[email protected]> + +Update for version 9.10.1 + +Signed-off-by: Kai Kang <[email protected]> + Index: bind-9.9.5/bin/Makefile.in =================================================================== --- bind-9.9.5.orig/bin/Makefile.in +++ bind-9.9.5/bin/Makefile.in -@@ -19,7 +19,7 @@ srcdir = @srcdir@ +@@ -19,7 +19,7 @@ VPATH = @srcdir@ top_srcdir = @top_srcdir@ --SUBDIRS = named rndc dig dnssec tools tests nsupdate \ -+SUBDIRS = named rndc dig dnssec tools nsupdate \ +-SUBDIRS = named rndc dig delv dnssec tools tests nsupdate \ ++SUBDIRS = named rndc dig delv dnssec tools nsupdate \ check confgen @PYTHON_TOOLS@ @PKCS11_TOOLS@ TARGETS =
meta/recipes-connectivity/bind/bind_9.10.1.bb renamed from meta/recipes-connectivity/bind/bind_9.9.5.bb +8 -9
@@ -7,9 +7,8 @@ LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=a3df5f651469919a0e6cb42f84fb6ff1" DEPENDS = "openssl libcap" -SRC_URI = "ftp://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.gz \ +SRC_URI = "ftp://ftp.isc.org/isc/bind9/${PV}-P1/${BPN}-${PV}-P1.tar.gz \ file://conf.patch \ - file://cross-build-fix.patch \ file://make-etc-initd-bind-stop-work.patch \ file://mips1-not-support-opcode.diff \ file://dont-test-on-host.patch \
@@ -17,21 +16,21 @@ SRC_URI = "ftp://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.gz \ file://named.service \ file://bind9 \ file://init.d-add-support-for-read-only-rootfs.patch \ - file://bind9_9_5-CVE-2014-8500.patch \ file://bind-add-crosscripts-search-path-for-xml2-config.patch \ - " + file://bind-fix-autoheader-2.69.patch \ + " -SRC_URI[md5sum] = "e676c65cad5234617ee22f48e328c24e" -SRC_URI[sha256sum] = "d4b64c1dde442145a316679acff2df4008aa117ae52dfa3a6bc69efecc7840d1" +SRC_URI[md5sum] = "bdb9af9db9d389f8b8b3db6e0bc1bfee" +SRC_URI[sha256sum] = "974343108d32f253a130383d0ba51290fb7bf372092f1451f264a9e3ac09898d" + +S = "${WORKDIR}/${BPN}-${PV}-P1" -# --enable-exportlib is necessary for building dhcp ENABLE_IPV6 = "--enable-ipv6=${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'yes', 'no', d)}" EXTRA_OECONF = " ${ENABLE_IPV6} --with-randomdev=/dev/random --disable-threads \ --disable-devpoll --disable-epoll --with-gost=no \ --with-gssapi=no --with-ecdsa=yes \ --sysconfdir=${sysconfdir}/bind \ --with-openssl=${STAGING_LIBDIR}/.. \ - --enable-exportlib --with-export-includedir=${includedir} --with-export-libdir=${libdir} \ " inherit autotools-brokensep update-rc.d systemd useradd pkgconfig
@@ -50,7 +49,7 @@ SYSTEMD_SERVICE_${PN} = "named.service" PARALLEL_MAKE = "" -RDEPENDS_${PN} = "python-core" +RDEPENDS_${PN} = "python-core procps" PACKAGE_BEFORE_PN += "${PN}-utils" FILES_${PN}-utils = "${bindir}/host ${bindir}/dig"
Signature · 1 line
2.1.1
Quoted 11 lines · Kai Kang
Upgrade bind to version 9.10.1.
* remove bind9_9_5-CVE-2014-8500.patch which is merged and documented in file CHANGES
* remove cross-build-fix.patch which is fixed by upstream
* update dont-test-on-host.patch
* add backported bind-fix-autoheader-2.69.patch to fix configure error
* remove unrecognised configure options --with-export-includedir --enable-exportlib and --with-export-libdir
* add runtime dependency procps which is required by init scriptSigned-off-by Kai Kang <[email protected]>
Quoted 11 lines
---
.../bind/bind/bind-fix-autoheader-2.69.patch | 48 +
.../bind/bind/bind9_9_5-CVE-2014-8500.patch | 990 ---------------------
.../bind/bind/cross-build-fix.patch | 21 -
.../bind/bind/dont-test-on-host.patch | 11 +-
.../bind/{bind_9.9.5.bb => bind_9.10.1.bb} | 17 +-
5 files changed, 64 insertions(+), 1023 deletions(-)
create mode 100644 meta/recipes-connectivity/bind/bind/bind-fix-autoheader-2.69.patch
delete mode 100644 meta/recipes-connectivity/bind/bind/bind9_9_5-CVE-2014-8500.patch
delete mode 100644 meta/recipes-connectivity/bind/bind/cross-build-fix.patch
rename meta/recipes-connectivity/bind/{bind_9.9.5.bb => bind_9.10.1.bb} (86%)This causes a build failure in dhcp:
http://errors.yoctoproject.org/Errors/Search/Args/?items=10&query=31984ee6f39d6ef74c1b5257f204cdea4d031fe4
and
http://errors.yoctoproject.org/Errors/Search/Args/?items=10&query=36b3cb431a0dd06b898b5f1d50bc22a60ffd14f7
Cheers,
Richard
Quoted 23 lines · Richard Purdie
Quoted 18 lines · Kai Kang
Upgrade bind to version 9.10.1.
* remove bind9_9_5-CVE-2014-8500.patch which is merged and documented in file CHANGES
* remove cross-build-fix.patch which is fixed by upstream
* update dont-test-on-host.patch
* add backported bind-fix-autoheader-2.69.patch to fix configure error
* remove unrecognised configure options --with-export-includedir --enable-exportlib and --with-export-libdir
* add runtime dependency procps which is required by init scriptSigned-off-by Kai Kang <[email protected]>--- .../bind/bind/bind-fix-autoheader-2.69.patch | 48 + .../bind/bind/bind9_9_5-CVE-2014-8500.patch | 990 --------------------- .../bind/bind/cross-build-fix.patch | 21 - .../bind/bind/dont-test-on-host.patch | 11 +- .../bind/{bind_9.9.5.bb => bind_9.10.1.bb} | 17 +- 5 files changed, 64 insertions(+), 1023 deletions(-)Quoted 4 lines
create mode 100644
meta/recipes-connectivity/bind/bind/bind-fix-autoheader-2.69.patchdelete mode 100644meta/recipes-connectivity/bind/bind/bind9_9_5-CVE-2014-8500.patchdelete mode 100644meta/recipes-connectivity/bind/bind/cross-build-fix.patchrename meta/recipes-connectivity/bind/{bind_9.9.5.bb => bind_9.10.1.bb} (86%)
Quoted 5 lines
This causes a build failure in dhcp:
http://errors.yoctoproject.org/Errors/Search/Args/?items=10&query=31984ee6f39d6ef74c1b5257f204cdea4d031fe4
and
http://errors.yoctoproject.org/Errors/Search/Args/?items=10&query=36b3cb431a0dd06b898b5f1d50bc22a60ffd14f7
I'll check it. Thanks.
--Kai
Quoted 7 lines
Cheers,
Richard
Signature · 2 lines
Regards, Neil | Kai Kang