All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] bind: 9.10.3-P3 -> 9.11.0b2
@ 2016-08-16  1:17 Wang Xin
  2016-08-16 10:26 ` Burton, Ross
  0 siblings, 1 reply; 11+ messages in thread
From: Wang Xin @ 2016-08-16  1:17 UTC (permalink / raw)
  To: openembedded-core

1) Upgrade bind from 9.10.3-P3 to 9.11.0b2.
2) Delete some patches, 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

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

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 86%
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..c02d19a 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,19 +16,14 @@ 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 \
@@ -81,7 +76,6 @@ 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
 
 	# Install systemd related files
 	install -d ${D}${sbindir}
-- 
2.7.4





^ permalink raw reply related	[flat|nested] 11+ messages in thread

* Re: [PATCH] bind: 9.10.3-P3 -> 9.11.0b2
  2016-08-16  1:17 [PATCH] bind: 9.10.3-P3 -> 9.11.0b2 Wang Xin
@ 2016-08-16 10:26 ` Burton, Ross
  2016-08-17 10:01   ` [PATCH v2] " Wang Xin
  0 siblings, 1 reply; 11+ messages in thread
From: Burton, Ross @ 2016-08-16 10:26 UTC (permalink / raw)
  To: Wang Xin; +Cc: OE-core

[-- Attachment #1: Type: text/plain, Size: 759 bytes --]

On 16 August 2016 at 02:17, Wang Xin <wangxin2015.fnst@cn.fujitsu.com>
wrote:

>  LICENSE = "ISC & BSD"
> -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=0a95f52a0ab6c5f52dedc9a45e7abb
> 3f"
> +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=26895b6b2e11695fb4756065b885d5
> d9"
>

Please say why this changes in the commit message.


> @@ -81,7 +76,6 @@ 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-checkd


Stating why this isn't required anymore would be helpful too.

Ross

[-- Attachment #2: Type: text/html, Size: 1366 bytes --]

^ permalink raw reply	[flat|nested] 11+ messages in thread

* [PATCH v2] bind: 9.10.3-P3 -> 9.11.0b2
  2016-08-16 10:26 ` Burton, Ross
@ 2016-08-17 10:01   ` Wang Xin
  2016-08-18 13:59     ` Burton, Ross
  0 siblings, 1 reply; 11+ messages in thread
From: Wang Xin @ 2016-08-17 10:01 UTC (permalink / raw)
  To: openembedded-core

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 do_install_append(), since the dnssec-coverage file and dnssec-checkds file do not exist.

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

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 86%
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..c02d19a 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,19 +16,14 @@ 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 \
@@ -81,7 +76,6 @@ 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
 
 	# Install systemd related files
 	install -d ${D}${sbindir}
-- 
2.7.4





^ permalink raw reply related	[flat|nested] 11+ messages in thread

* Re: [PATCH v2] bind: 9.10.3-P3 -> 9.11.0b2
  2016-08-17 10:01   ` [PATCH v2] " Wang Xin
@ 2016-08-18 13:59     ` Burton, Ross
  2016-08-19  8:00       ` Wang, Xin
  0 siblings, 1 reply; 11+ messages in thread
From: Burton, Ross @ 2016-08-18 13:59 UTC (permalink / raw)
  To: Wang Xin; +Cc: OE-core

[-- Attachment #1: Type: text/plain, Size: 2118 bytes --]

On 17 August 2016 at 11:01, Wang Xin <wangxin2015.fnst@cn.fujitsu.com>
wrote:

> 4) Modify do_install_append(), since the dnssec-coverage file and
> dnssec-checkds file do not exist.
>

When I build bind this happens:

ERROR: bind-9.11.0b2-r0 do_package: QA Issue: bind: Files/directories were
installed but not shipped in any package:
  /usr/lib
  /usr/lib/python2.7
  /usr/lib/python2.7/site-packages
  /usr/lib/python2.7/site-packages/isc-2.0-py2.7.egg-info
  /usr/lib/python2.7/site-packages/isc
  /usr/lib/python2.7/site-packages/isc/parsetab.py
  /usr/lib/python2.7/site-packages/isc/coverage.pyc
  /usr/lib/python2.7/site-packages/isc/keyevent.py
  /usr/lib/python2.7/site-packages/isc/rndc.pyc
  /usr/lib/python2.7/site-packages/isc/keyseries.pyc
  /usr/lib/python2.7/site-packages/isc/keyevent.pyc
  /usr/lib/python2.7/site-packages/isc/checkds.py
  /usr/lib/python2.7/site-packages/isc/__init__.py
  /usr/lib/python2.7/site-packages/isc/keymgr.pyc
  /usr/lib/python2.7/site-packages/isc/keydict.pyc
  /usr/lib/python2.7/site-packages/isc/keymgr.py
  /usr/lib/python2.7/site-packages/isc/__init__.pyc
  /usr/lib/python2.7/site-packages/isc/rndc.py
  /usr/lib/python2.7/site-packages/isc/keyzone.py
  /usr/lib/python2.7/site-packages/isc/eventlist.pyc
  /usr/lib/python2.7/site-packages/isc/checkds.pyc
  /usr/lib/python2.7/site-packages/isc/coverage.py
  /usr/lib/python2.7/site-packages/isc/keyseries.py
  /usr/lib/python2.7/site-packages/isc/keydict.py
  /usr/lib/python2.7/site-packages/isc/eventlist.py
  /usr/lib/python2.7/site-packages/isc/utils.py
  /usr/lib/python2.7/site-packages/isc/policy.py
  /usr/lib/python2.7/site-packages/isc/dnskey.pyc
  /usr/lib/python2.7/site-packages/isc/keyzone.pyc
  /usr/lib/python2.7/site-packages/isc/utils.pyc
  /usr/lib/python2.7/site-packages/isc/policy.pyc
  /usr/lib/python2.7/site-packages/isc/parsetab.pyc
  /usr/lib/python2.7/site-packages/isc/dnskey.py

I'm guessing there's a non-deterministic dependency on python which is why
you thought those tools were not installed, and why I see a build error.

Ross

[-- Attachment #2: Type: text/html, Size: 3776 bytes --]

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH v2] bind: 9.10.3-P3 -> 9.11.0b2
  2016-08-18 13:59     ` Burton, Ross
@ 2016-08-19  8:00       ` Wang, Xin
  2016-08-19  8:59         ` Jussi Kukkonen
  0 siblings, 1 reply; 11+ messages in thread
From: Wang, Xin @ 2016-08-19  8:00 UTC (permalink / raw)
  To: Burton, Ross; +Cc: OE-core

[-- Attachment #1: Type: text/plain, Size: 2524 bytes --]

I checked the build directory, and didn’t find those files that you refer to. I guess my configuration may be different with yours. Can I see your log.do_configure file, thanks.
From: Burton, Ross [mailto:ross.burton@intel.com]
Sent: Thursday, August 18, 2016 10:00 PM
To: Wang, Xin/王 鑫
Cc: OE-core
Subject: Re: [OE-core] [PATCH v2] bind: 9.10.3-P3 -> 9.11.0b2


On 17 August 2016 at 11:01, Wang Xin <wangxin2015.fnst@cn.fujitsu.com<mailto:wangxin2015.fnst@cn.fujitsu.com>> wrote:
4) Modify do_install_append(), since the dnssec-coverage file and dnssec-checkds file do not exist.

When I build bind this happens:

ERROR: bind-9.11.0b2-r0 do_package: QA Issue: bind: Files/directories were installed but not shipped in any package:
  /usr/lib
  /usr/lib/python2.7
  /usr/lib/python2.7/site-packages
  /usr/lib/python2.7/site-packages/isc-2.0-py2.7.egg-info
  /usr/lib/python2.7/site-packages/isc
  /usr/lib/python2.7/site-packages/isc/parsetab.py
  /usr/lib/python2.7/site-packages/isc/coverage.pyc
  /usr/lib/python2.7/site-packages/isc/keyevent.py
  /usr/lib/python2.7/site-packages/isc/rndc.pyc
  /usr/lib/python2.7/site-packages/isc/keyseries.pyc
  /usr/lib/python2.7/site-packages/isc/keyevent.pyc
  /usr/lib/python2.7/site-packages/isc/checkds.py
  /usr/lib/python2.7/site-packages/isc/__init__.py
  /usr/lib/python2.7/site-packages/isc/keymgr.pyc
  /usr/lib/python2.7/site-packages/isc/keydict.pyc
  /usr/lib/python2.7/site-packages/isc/keymgr.py
  /usr/lib/python2.7/site-packages/isc/__init__.pyc
  /usr/lib/python2.7/site-packages/isc/rndc.py
  /usr/lib/python2.7/site-packages/isc/keyzone.py
  /usr/lib/python2.7/site-packages/isc/eventlist.pyc
  /usr/lib/python2.7/site-packages/isc/checkds.pyc
  /usr/lib/python2.7/site-packages/isc/coverage.py
  /usr/lib/python2.7/site-packages/isc/keyseries.py
  /usr/lib/python2.7/site-packages/isc/keydict.py
  /usr/lib/python2.7/site-packages/isc/eventlist.py
  /usr/lib/python2.7/site-packages/isc/utils.py
  /usr/lib/python2.7/site-packages/isc/policy.py
  /usr/lib/python2.7/site-packages/isc/dnskey.pyc
  /usr/lib/python2.7/site-packages/isc/keyzone.pyc
  /usr/lib/python2.7/site-packages/isc/utils.pyc
  /usr/lib/python2.7/site-packages/isc/policy.pyc
  /usr/lib/python2.7/site-packages/isc/parsetab.pyc
  /usr/lib/python2.7/site-packages/isc/dnskey.py

I'm guessing there's a non-deterministic dependency on python which is why you thought those tools were not installed, and why I see a build error.

Ross



[-- Attachment #2: Type: text/html, Size: 7628 bytes --]

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH v2] bind: 9.10.3-P3 -> 9.11.0b2
  2016-08-19  8:00       ` Wang, Xin
@ 2016-08-19  8:59         ` Jussi Kukkonen
  2016-08-22  9:52           ` [PATCH v3] " Wang Xin
  0 siblings, 1 reply; 11+ messages in thread
From: Jussi Kukkonen @ 2016-08-19  8:59 UTC (permalink / raw)
  To: Wang, Xin; +Cc: OE-core

[-- Attachment #1: Type: text/plain, Size: 3379 bytes --]

On 19 August 2016 at 11:00, Wang, Xin <wangxin2015.fnst@cn.fujitsu.com>
wrote:

> I checked the build directory, and didn’t find those files that you refer
> to. I guess my configuration may be different with yours. Can I see your
> log.do_configure file, thanks.
>
>
You should not need that. configure.in clearly enables/disables things at
build time based on availability of python and some specific modules. I
don't know if new bind should be built with python or not but the decision
should be explicit in the recipe: --with-python / --without-python look
like the correct options.

Jussi


> *From:* Burton, Ross [mailto:ross.burton@intel.com]
> *Sent:* Thursday, August 18, 2016 10:00 PM
> *To:* Wang, Xin/王 鑫
> *Cc:* OE-core
> *Subject:* Re: [OE-core] [PATCH v2] bind: 9.10.3-P3 -> 9.11.0b2
>
>
>
>
>
> On 17 August 2016 at 11:01, Wang Xin <wangxin2015.fnst@cn.fujitsu.com>
> wrote:
>
> 4) Modify do_install_append(), since the dnssec-coverage file and
> dnssec-checkds file do not exist.
>
>
>
> When I build bind this happens:
>
>
>
> ERROR: bind-9.11.0b2-r0 do_package: QA Issue: bind: Files/directories were
> installed but not shipped in any package:
>
>   /usr/lib
>
>   /usr/lib/python2.7
>
>   /usr/lib/python2.7/site-packages
>
>   /usr/lib/python2.7/site-packages/isc-2.0-py2.7.egg-info
>
>   /usr/lib/python2.7/site-packages/isc
>
>   /usr/lib/python2.7/site-packages/isc/parsetab.py
>
>   /usr/lib/python2.7/site-packages/isc/coverage.pyc
>
>   /usr/lib/python2.7/site-packages/isc/keyevent.py
>
>   /usr/lib/python2.7/site-packages/isc/rndc.pyc
>
>   /usr/lib/python2.7/site-packages/isc/keyseries.pyc
>
>   /usr/lib/python2.7/site-packages/isc/keyevent.pyc
>
>   /usr/lib/python2.7/site-packages/isc/checkds.py
>
>   /usr/lib/python2.7/site-packages/isc/__init__.py
>
>   /usr/lib/python2.7/site-packages/isc/keymgr.pyc
>
>   /usr/lib/python2.7/site-packages/isc/keydict.pyc
>
>   /usr/lib/python2.7/site-packages/isc/keymgr.py
>
>   /usr/lib/python2.7/site-packages/isc/__init__.pyc
>
>   /usr/lib/python2.7/site-packages/isc/rndc.py
>
>   /usr/lib/python2.7/site-packages/isc/keyzone.py
>
>   /usr/lib/python2.7/site-packages/isc/eventlist.pyc
>
>   /usr/lib/python2.7/site-packages/isc/checkds.pyc
>
>   /usr/lib/python2.7/site-packages/isc/coverage.py
>
>   /usr/lib/python2.7/site-packages/isc/keyseries.py
>
>   /usr/lib/python2.7/site-packages/isc/keydict.py
>
>   /usr/lib/python2.7/site-packages/isc/eventlist.py
>
>   /usr/lib/python2.7/site-packages/isc/utils.py
>
>   /usr/lib/python2.7/site-packages/isc/policy.py
>
>   /usr/lib/python2.7/site-packages/isc/dnskey.pyc
>
>   /usr/lib/python2.7/site-packages/isc/keyzone.pyc
>
>   /usr/lib/python2.7/site-packages/isc/utils.pyc
>
>   /usr/lib/python2.7/site-packages/isc/policy.pyc
>
>   /usr/lib/python2.7/site-packages/isc/parsetab.pyc
>
>   /usr/lib/python2.7/site-packages/isc/dnskey.py
>
>
>
> I'm guessing there's a non-deterministic dependency on python which is why
> you thought those tools were not installed, and why I see a build error.
>
>
>
> Ross
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
>

[-- Attachment #2: Type: text/html, Size: 7657 bytes --]

^ permalink raw reply	[flat|nested] 11+ messages in thread

* [PATCH v3] bind: 9.10.3-P3 -> 9.11.0b2
  2016-08-19  8:59         ` Jussi Kukkonen
@ 2016-08-22  9:52           ` Wang Xin
  2016-08-24 21:12             ` Burton, Ross
  0 siblings, 1 reply; 11+ messages in thread
From: Wang Xin @ 2016-08-22  9:52 UTC (permalink / raw)
  To: openembedded-core

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.fnst@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





^ permalink raw reply related	[flat|nested] 11+ messages in thread

* Re: [PATCH v3] bind: 9.10.3-P3 -> 9.11.0b2
  2016-08-22  9:52           ` [PATCH v3] " Wang Xin
@ 2016-08-24 21:12             ` Burton, Ross
  2016-08-26  3:11               ` [PATCH v4] " Wang Xin
  0 siblings, 1 reply; 11+ messages in thread
From: Burton, Ross @ 2016-08-24 21:12 UTC (permalink / raw)
  To: Wang Xin; +Cc: OE-core

[-- Attachment #1: Type: text/plain, Size: 783 bytes --]

On 22 August 2016 at 10:52, Wang Xin <wangxin2015.fnst@cn.fujitsu.com>
wrote:

> +EXTRA_OECONF = " ${ENABLE_IPV6} --with-python=python
> --with-randomdev=/dev/random --disable-threads \
> @@ -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
>

Would passing --with-python=python3 mean you can remove the sed entirely?

Ross

[-- Attachment #2: Type: text/html, Size: 1335 bytes --]

^ permalink raw reply	[flat|nested] 11+ messages in thread

* [PATCH v4] bind: 9.10.3-P3 -> 9.11.0b2
  2016-08-24 21:12             ` Burton, Ross
@ 2016-08-26  3:11               ` Wang Xin
  2016-09-22  1:36                 ` Wang, Xin
  0 siblings, 1 reply; 11+ messages in thread
From: Wang Xin @ 2016-08-26  3:11 UTC (permalink / raw)
  To: openembedded-core

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.
5) Modify do_install_append(), since the data has changed.

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

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 83%
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..4919de7 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=python3 --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,6 @@ 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
 
 	# Install systemd related files
 	install -d ${D}${sbindir}
-- 
2.7.4





^ permalink raw reply related	[flat|nested] 11+ messages in thread

* Re: [PATCH v4] bind: 9.10.3-P3 -> 9.11.0b2
  2016-08-26  3:11               ` [PATCH v4] " Wang Xin
@ 2016-09-22  1:36                 ` Wang, Xin
  2016-09-22 15:11                   ` Burton, Ross
  0 siblings, 1 reply; 11+ messages in thread
From: Wang, Xin @ 2016-09-22  1:36 UTC (permalink / raw)
  To: openembedded-core

ping

-----Original Message-----
From: Wang, Xin/王 鑫 
Sent: Friday, August 26, 2016 11:12 AM
To: openembedded-core@lists.openembedded.org
Cc: Wang, Xin/王 鑫
Subject: [OE-core][PATCH v4] bind: 9.10.3-P3 -> 9.11.0b2

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.
5) Modify do_install_append(), since the data has changed.

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

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 83%
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..4919de7 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=python3 
+--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,6 @@ 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
 
 	# Install systemd related files
 	install -d ${D}${sbindir}
--
2.7.4




^ permalink raw reply related	[flat|nested] 11+ messages in thread

* Re: [PATCH v4] bind: 9.10.3-P3 -> 9.11.0b2
  2016-09-22  1:36                 ` Wang, Xin
@ 2016-09-22 15:11                   ` Burton, Ross
  0 siblings, 0 replies; 11+ messages in thread
From: Burton, Ross @ 2016-09-22 15:11 UTC (permalink / raw)
  To: Wang, Xin; +Cc: openembedded-core

[-- Attachment #1: Type: text/plain, Size: 222 bytes --]

On 22 September 2016 at 02:36, Wang, Xin <wangxin2015.fnst@cn.fujitsu.com>
wrote:

> ping
>

Sorry, this missed the M3 cutoff for features so will have to wait for
master to open again (after 2.3 release).

Ross

[-- Attachment #2: Type: text/html, Size: 651 bytes --]

^ permalink raw reply	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2016-09-22 15:12 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-08-16  1:17 [PATCH] bind: 9.10.3-P3 -> 9.11.0b2 Wang Xin
2016-08-16 10:26 ` Burton, Ross
2016-08-17 10:01   ` [PATCH v2] " Wang Xin
2016-08-18 13:59     ` Burton, Ross
2016-08-19  8:00       ` Wang, Xin
2016-08-19  8:59         ` Jussi Kukkonen
2016-08-22  9:52           ` [PATCH v3] " Wang Xin
2016-08-24 21:12             ` Burton, Ross
2016-08-26  3:11               ` [PATCH v4] " Wang Xin
2016-09-22  1:36                 ` Wang, Xin
2016-09-22 15:11                   ` Burton, Ross

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.