1) Upgrade bind from 9.10.3-P3 to 9.11.0b2.
2) Delete some patchers, since they are no use.
    bind-confgen-build-unix.o-once.patch
    CVE-2016-1285.patch
    CVE-2016-1286_1.patch
    CVE-2016-1286_2.patch
    CVE-2016-2088.patch
3) Modify LIC_FILES_CHKSUM, since the date in it has been changed, But the 
LICENSE has not been changed.
4) Modify EXTRA_OECONF, enable python3.

Signed-off-by: Wang Xin <wangxin2015.f...@cn.fujitsu.com>
---
 .../bind/{bind_9.10.3-P3.bb => bind_9.11.0b2.bb}        | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)
 rename meta/recipes-connectivity/bind/{bind_9.10.3-P3.bb => bind_9.11.0b2.bb} 
(85%)

diff --git a/meta/recipes-connectivity/bind/bind_9.10.3-P3.bb 
b/meta/recipes-connectivity/bind/bind_9.11.0b2.bb
similarity index 85%
rename from meta/recipes-connectivity/bind/bind_9.10.3-P3.bb
rename to meta/recipes-connectivity/bind/bind_9.11.0b2.bb
index a99f0dd..7747494 100644
--- a/meta/recipes-connectivity/bind/bind_9.10.3-P3.bb
+++ b/meta/recipes-connectivity/bind/bind_9.11.0b2.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.isc.org/sw/bind/";
 SECTION = "console/network"
 
 LICENSE = "ISC & BSD"
-LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=0a95f52a0ab6c5f52dedc9a45e7abb3f"
+LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=26895b6b2e11695fb4756065b885d5d9"
 
 DEPENDS = "openssl libcap"
 
@@ -16,22 +16,17 @@ 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://bind-confgen-build-unix.o-once.patch \
            file://0001-build-use-pkg-config-to-find-libxml2.patch \
            file://bind-ensure-searching-for-json-headers-searches-sysr.patch \
            file://0001-gen.c-extend-DIRNAMESIZE-from-256-to-512.patch \
            file://0001-lib-dns-gen.c-fix-too-long-error.patch \
-           file://CVE-2016-1285.patch \
-           file://CVE-2016-1286_1.patch \
-           file://CVE-2016-1286_2.patch \
-           file://CVE-2016-2088.patch \
            "
 
-SRC_URI[md5sum] = "bcf7e772b616f7259420a3edc5df350a"
-SRC_URI[sha256sum] = 
"690810d1fbb72afa629e74638d19cd44e28d2b2e5eb63f55c705ad85d1a4cb83"
+SRC_URI[md5sum] = "30db652baa5c227a61f8f4ca9b7ad9c2"
+SRC_URI[sha256sum] = 
"440e7fa7c4e241c13028699ab107fc4c3efd1719012b1af356d39db5ab49109d"
 
 ENABLE_IPV6 = "--enable-ipv6=${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 
'yes', 'no', d)}"
-EXTRA_OECONF = " ${ENABLE_IPV6} --with-randomdev=/dev/random --disable-threads 
\
+EXTRA_OECONF = " ${ENABLE_IPV6} --with-python=python 
--with-randomdev=/dev/random --disable-threads \
                  --disable-devpoll --disable-epoll --with-gost=no \
                  --with-gssapi=no --with-ecdsa=yes \
                  --sysconfdir=${sysconfdir}/bind \
@@ -62,7 +57,7 @@ RDEPENDS_${PN}-dev = ""
 PACKAGE_BEFORE_PN += "${PN}-utils"
 FILES_${PN}-utils = "${bindir}/host ${bindir}/dig"
 FILES_${PN}-dev += "${bindir}/isc-config.h"
-FILES_${PN} += "${sbindir}/generate-rndc-key.sh"
+FILES_${PN} += "${sbindir}/generate-rndc-key.sh ${libdir}/*"
 
 do_install_prepend() {
        # clean host path in isc-config.sh before the hardlink created
@@ -81,7 +76,7 @@ do_install_append() {
        install -d "${D}${sysconfdir}/init.d"
        install -m 644 ${S}/conf/* "${D}${sysconfdir}/bind/"
        install -m 755 "${S}/init.d" "${D}${sysconfdir}/init.d/bind"
-       sed -i -e '1s,#!.*python,#! /usr/bin/python3,' 
${D}${sbindir}/dnssec-coverage ${D}${sbindir}/dnssec-checkds
+       sed -i -e '1s,#!.*python,#! /usr/bin/python3,' 
${D}${sbindir}/dnssec-coverage ${D}${sbindir}/dnssec-checkds 
${D}${sbindir}/dnssec-keymgr
 
        # Install systemd related files
        install -d ${D}${sbindir}
-- 
2.7.4



-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Reply via email to