[PATCH 0/8] Consolidated package updates

[PATCH 0/8] Consolidated package updates

[Armin Kuster]

From: Armin Kuster <akuster@mvista.com>

Conver letter only

The following changes since commit cf5c44ac611c2c2657e6fd3c1f723bcb20b812dd:

  python-scons: upgrade to v3.0.1; use pypi.bbclass (2017-12-13 13:59:46 +0000)

are available in the git repository at:

  git://git.openembedded.org/openembedded-core-contrib akuster/master-updates
  http://cgit.openembedded.org/openembedded-core-contrib/log/?h=akuster/master-updates

Armin Kuster (8):
  nss: update to 3.34.1
  pinentry: update to 1.1.0
  libassuan: update to 2.5.1
  libxfont: update 1.5.4 with sec fix
  libxfont2: update to 2.0.3 with sec fix
  libxcursor: update to 1.1.15 plus sec fixes
  kexec-tools: update to 2.0.16 and simplify
  bind: Update to 9.11.2

 .../bind/bind/dont-test-on-host.patch              | 13 ++--
 .../bind/{bind_9.10.6.bb => bind_9.11.2.bb}        | 10 +--
 .../{libxcursor_1.1.14.bb => libxcursor_1.1.15.bb} |  4 +-
 .../{libxfont2_2.0.2.bb => libxfont2_2.0.3.bb}     |  4 +-
 .../{libxfont_1.5.3.bb => libxfont_1.5.4.bb}       |  4 +-
 meta/recipes-kernel/kexec/kexec-tools.inc          | 38 ----------
 ...kexec-tools_2.0.15.bb => kexec-tools_2.0.16.bb} | 84 +++++++++++++++-------
 .../{libassuan_2.4.4.bb => libassuan_2.5.1.bb}     |  4 +-
 .../nss/{nss_3.34.bb => nss_3.34.1.bb}             |  4 +-
 .../gpg-error_pkconf.patch                         |  0
 .../libassuan_pkgconf.patch                        |  0
 .../{pinentry_1.0.0.bb => pinentry_1.1.0.bb}       |  4 +-
 12 files changed, 84 insertions(+), 85 deletions(-)
 rename meta/recipes-connectivity/bind/{bind_9.10.6.bb => bind_9.11.2.bb} (92%)
 rename meta/recipes-graphics/xorg-lib/{libxcursor_1.1.14.bb => libxcursor_1.1.15.bb} (80%)
 rename meta/recipes-graphics/xorg-lib/{libxfont2_2.0.2.bb => libxfont2_2.0.3.bb} (80%)
 rename meta/recipes-graphics/xorg-lib/{libxfont_1.5.3.bb => libxfont_1.5.4.bb} (81%)
 delete mode 100644 meta/recipes-kernel/kexec/kexec-tools.inc
 rename meta/recipes-kernel/kexec/{kexec-tools_2.0.15.bb => kexec-tools_2.0.16.bb} (44%)
 rename meta/recipes-support/libassuan/{libassuan_2.4.4.bb => libassuan_2.5.1.bb} (88%)
 rename meta/recipes-support/nss/{nss_3.34.bb => nss_3.34.1.bb} (98%)
 rename meta/recipes-support/pinentry/{pinentry-1.0.0 => pinentry-1.1.0}/gpg-error_pkconf.patch (100%)
 rename meta/recipes-support/pinentry/{pinentry-1.0.0 => pinentry-1.1.0}/libassuan_pkgconf.patch (100%)
 rename meta/recipes-support/pinentry/{pinentry_1.0.0.bb => pinentry_1.1.0.bb} (90%)

-- 
2.7.4

[PATCH 1/8] nss: update to 3.34.1

[Armin Kuster]

From: Armin Kuster <akuster@mvista.com>

The following CA certificate was Re-Added. It was removed in NSS 3.34, but has been re-added with only the Email trust bit set. (bug 1418678)

CN = Certum CA, O=Unizeto Sp. z o.o.
SHA-256 Fingerprint: D8:E0:FE:BC:1D:B2:E3:8D:00:94:0F:37:D2:7D:41:34:4D:99:3E:73:4B:99:D5:65:6D:97:78:D4:D8:14:36:24

Signed-off-by: Armin Kuster <akuster@mvista.com>
---
 meta/recipes-support/nss/{nss_3.34.bb => nss_3.34.1.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-support/nss/{nss_3.34.bb => nss_3.34.1.bb} (98%)

diff --git a/meta/recipes-support/nss/nss_3.34.bb b/meta/recipes-support/nss/nss_3.34.1.bb
similarity index 98%
rename from meta/recipes-support/nss/nss_3.34.bb
rename to meta/recipes-support/nss/nss_3.34.1.bb
index 6243f0a..ae52a95 100644
--- a/meta/recipes-support/nss/nss_3.34.bb
+++ b/meta/recipes-support/nss/nss_3.34.1.bb
@@ -28,8 +28,8 @@ SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${VERSIO
            file://Fix-compilation-for-X32.patch \
            "
 
-SRC_URI[md5sum] = "1e30b8e5b13b5b08bbc489c265948d82"
-SRC_URI[sha256sum] = "0d45954181373023c7cfc33e77c8c636d394ec7e55b93e059149ed7888652af5"
+SRC_URI[md5sum] = "5922468bb1c54e4c8067f153fcf467e5"
+SRC_URI[sha256sum] = "a3c15d367caf784f33d96dbafbdffc16a8e42fb8c8aedfce97bf92a9f918dda0"
 
 UPSTREAM_CHECK_URI = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Releases"
 UPSTREAM_CHECK_REGEX = "NSS_(?P<pver>.+)_release_notes"
-- 
2.7.4

[PATCH 2/8] pinentry: update to 1.1.0

[Armin Kuster]

From: Armin Kuster <akuster@mvista.com>

Signed-off-by: Armin Kuster <akuster@mvista.com>
---
 .../{pinentry-1.0.0 => pinentry-1.1.0}/gpg-error_pkconf.patch         | 0
 .../{pinentry-1.0.0 => pinentry-1.1.0}/libassuan_pkgconf.patch        | 0
 .../recipes-support/pinentry/{pinentry_1.0.0.bb => pinentry_1.1.0.bb} | 4 ++--
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-support/pinentry/{pinentry-1.0.0 => pinentry-1.1.0}/gpg-error_pkconf.patch (100%)
 rename meta/recipes-support/pinentry/{pinentry-1.0.0 => pinentry-1.1.0}/libassuan_pkgconf.patch (100%)
 rename meta/recipes-support/pinentry/{pinentry_1.0.0.bb => pinentry_1.1.0.bb} (90%)

diff --git a/meta/recipes-support/pinentry/pinentry-1.0.0/gpg-error_pkconf.patch b/meta/recipes-support/pinentry/pinentry-1.1.0/gpg-error_pkconf.patch
similarity index 100%
rename from meta/recipes-support/pinentry/pinentry-1.0.0/gpg-error_pkconf.patch
rename to meta/recipes-support/pinentry/pinentry-1.1.0/gpg-error_pkconf.patch
diff --git a/meta/recipes-support/pinentry/pinentry-1.0.0/libassuan_pkgconf.patch b/meta/recipes-support/pinentry/pinentry-1.1.0/libassuan_pkgconf.patch
similarity index 100%
rename from meta/recipes-support/pinentry/pinentry-1.0.0/libassuan_pkgconf.patch
rename to meta/recipes-support/pinentry/pinentry-1.1.0/libassuan_pkgconf.patch
diff --git a/meta/recipes-support/pinentry/pinentry_1.0.0.bb b/meta/recipes-support/pinentry/pinentry_1.1.0.bb
similarity index 90%
rename from meta/recipes-support/pinentry/pinentry_1.0.0.bb
rename to meta/recipes-support/pinentry/pinentry_1.1.0.bb
index 319acd3..3b77709 100644
--- a/meta/recipes-support/pinentry/pinentry_1.0.0.bb
+++ b/meta/recipes-support/pinentry/pinentry_1.1.0.bb
@@ -18,8 +18,8 @@ SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \
            file://gpg-error_pkconf.patch \
 "
 
-SRC_URI[md5sum] = "4a3fad8b31f9b4c5526c8837495015dc"
-SRC_URI[sha256sum] = "1672c2edc1feb036075b187c0773787b2afd0544f55025c645a71b4c2f79275a"
+SRC_URI[md5sum] = "3829315cb0a1e9cedc05ffe6def7a2c6"
+SRC_URI[sha256sum] = "68076686fa724a290ea49cdf0d1c0c1500907d1b759a3bcbfbec0293e8f56570"
 
 EXTRA_OECONF = "--disable-rpath --disable-dependency-tracking \
                 --disable-pinentry-qt5  \
-- 
2.7.4

[PATCH 3/8] libassuan: update to 2.5.1

[Armin Kuster]

From: Armin Kuster <akuster@mvista.com>

Signed-off-by: Armin Kuster <akuster@mvista.com>
---
 .../libassuan/{libassuan_2.4.4.bb => libassuan_2.5.1.bb}              | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-support/libassuan/{libassuan_2.4.4.bb => libassuan_2.5.1.bb} (88%)

diff --git a/meta/recipes-support/libassuan/libassuan_2.4.4.bb b/meta/recipes-support/libassuan/libassuan_2.5.1.bb
similarity index 88%
rename from meta/recipes-support/libassuan/libassuan_2.4.4.bb
rename to meta/recipes-support/libassuan/libassuan_2.5.1.bb
index 7921c1d..34d5f16 100644
--- a/meta/recipes-support/libassuan/libassuan_2.4.4.bb
+++ b/meta/recipes-support/libassuan/libassuan_2.5.1.bb
@@ -17,8 +17,8 @@ SRC_URI = "${GNUPG_MIRROR}/libassuan/libassuan-${PV}.tar.bz2 \
            file://libassuan-add-pkgconfig-support.patch \
           "
 
-SRC_URI[md5sum] = "52385ec8d34f258bf10165d32c486002"
-SRC_URI[sha256sum] = "9e69a102272324de0bb56025779f84fd44901afcc6eac51505f6a63ea5737ca1"
+SRC_URI[md5sum] = "4354b7ae296894f232ada226a062d7d7"
+SRC_URI[sha256sum] = "47f96c37b4f2aac289f0bc1bacfa8bd8b4b209a488d3d15e2229cb6cc9b26449"
 
 BINCONFIG = "${bindir}/libassuan-config"
 
-- 
2.7.4

[PATCH 4/8] libxfont: update 1.5.4 with sec fix

[Armin Kuster]

From: Armin Kuster <akuster@mvista.com>

Includes CVE-2017-16611

Signed-off-by: Armin Kuster <akuster@mvista.com>
---
 .../xorg-lib/{libxfont_1.5.3.bb => libxfont_1.5.4.bb}                 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-graphics/xorg-lib/{libxfont_1.5.3.bb => libxfont_1.5.4.bb} (81%)

diff --git a/meta/recipes-graphics/xorg-lib/libxfont_1.5.3.bb b/meta/recipes-graphics/xorg-lib/libxfont_1.5.4.bb
similarity index 81%
rename from meta/recipes-graphics/xorg-lib/libxfont_1.5.3.bb
rename to meta/recipes-graphics/xorg-lib/libxfont_1.5.4.bb
index 5b15a4e..79f77fc 100644
--- a/meta/recipes-graphics/xorg-lib/libxfont_1.5.3.bb
+++ b/meta/recipes-graphics/xorg-lib/libxfont_1.5.4.bb
@@ -18,8 +18,8 @@ XORG_PN = "libXfont"
 
 BBCLASSEXTEND = "native"
 
-SRC_URI[md5sum] = "9ba75bf38ba62a6ad52550ab716da9b3"
-SRC_URI[sha256sum] = "ab85c10fd2683481dfef672a77fe60e6a2039558cbc0e9bf56b5e1df471c93d0"
+SRC_URI[md5sum] = "16eaf156edd79b68038b6a7c44aa9e9b"
+SRC_URI[sha256sum] = "1a7f7490774c87f2052d146d1e0e64518d32e6848184a18654e8d0bb57883242"
 
 PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"
 PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
-- 
2.7.4

[PATCH 5/8] libxfont2: update to 2.0.3 with sec fix

[Armin Kuster]

From: Armin Kuster <akuster@mvista.com>

Includes:
Open files with O_NOFOLLOW. (CVE-2017-16611)

Signed-off-by: Armin Kuster <akuster@mvista.com>
---
 .../xorg-lib/{libxfont2_2.0.2.bb => libxfont2_2.0.3.bb}               | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-graphics/xorg-lib/{libxfont2_2.0.2.bb => libxfont2_2.0.3.bb} (80%)

diff --git a/meta/recipes-graphics/xorg-lib/libxfont2_2.0.2.bb b/meta/recipes-graphics/xorg-lib/libxfont2_2.0.3.bb
similarity index 80%
rename from meta/recipes-graphics/xorg-lib/libxfont2_2.0.2.bb
rename to meta/recipes-graphics/xorg-lib/libxfont2_2.0.3.bb
index 08d1123..5f27a55 100644
--- a/meta/recipes-graphics/xorg-lib/libxfont2_2.0.2.bb
+++ b/meta/recipes-graphics/xorg-lib/libxfont2_2.0.3.bb
@@ -15,8 +15,8 @@ XORG_PN = "libXfont2"
 
 BBCLASSEXTEND = "native"
 
-SRC_URI[md5sum] = "d39e6446e46f939486d1a8b856e8b67b"
-SRC_URI[sha256sum] = "94088d3b87f7d42c7116d9adaad155859e93330c6e47f5989f2de600b9a6c111"
+SRC_URI[md5sum] = "b7ca87dfafeb5205b28a1e91ac3efe85"
+SRC_URI[sha256sum] = "0e8ab7fd737ccdfe87e1f02b55f221f0bd4503a1c5f28be4ed6a54586bac9c4e"
 
 PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"
 PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
-- 
2.7.4

[PATCH 6/8] libxcursor: update to 1.1.15 plus sec fixes

[Armin Kuster]

From: Armin Kuster <akuster@mvista.com>

This update includes:
CVE-2017-16612
and some clan warning fixes

Signed-off-by: Armin Kuster <akuster@mvista.com>
---
 .../xorg-lib/{libxcursor_1.1.14.bb => libxcursor_1.1.15.bb}           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-graphics/xorg-lib/{libxcursor_1.1.14.bb => libxcursor_1.1.15.bb} (80%)

diff --git a/meta/recipes-graphics/xorg-lib/libxcursor_1.1.14.bb b/meta/recipes-graphics/xorg-lib/libxcursor_1.1.15.bb
similarity index 80%
rename from meta/recipes-graphics/xorg-lib/libxcursor_1.1.14.bb
rename to meta/recipes-graphics/xorg-lib/libxcursor_1.1.15.bb
index 1762904..dc9af23 100644
--- a/meta/recipes-graphics/xorg-lib/libxcursor_1.1.14.bb
+++ b/meta/recipes-graphics/xorg-lib/libxcursor_1.1.15.bb
@@ -18,5 +18,5 @@ PE = "1"
 
 XORG_PN = "libXcursor"
 
-SRC_URI[md5sum] = "1e7c17afbbce83e2215917047c57d1b3"
-SRC_URI[sha256sum] = "9bc6acb21ca14da51bda5bc912c8955bc6e5e433f0ab00c5e8bef842596c33df"
+SRC_URI[md5sum] = "58fe3514e1e7135cf364101e714d1a14"
+SRC_URI[sha256sum] = "294e670dd37cd23995e69aae626629d4a2dfe5708851bbc13d032401b7a3df6b"
-- 
2.7.4

[PATCH 7/8] kexec-tools: update to 2.0.16 and simplify

[Armin Kuster]

From: Armin Kuster <akuster@mvista.com>

combine .inc with bb file

Signed-off-by: Armin Kuster <akuster@mvista.com>
---
 meta/recipes-kernel/kexec/kexec-tools.inc          | 38 ----------
 ...kexec-tools_2.0.15.bb => kexec-tools_2.0.16.bb} | 84 +++++++++++++++-------
 2 files changed, 59 insertions(+), 63 deletions(-)
 delete mode 100644 meta/recipes-kernel/kexec/kexec-tools.inc
 rename meta/recipes-kernel/kexec/{kexec-tools_2.0.15.bb => kexec-tools_2.0.16.bb} (44%)

diff --git a/meta/recipes-kernel/kexec/kexec-tools.inc b/meta/recipes-kernel/kexec/kexec-tools.inc
deleted file mode 100644
index c689bec..0000000
--- a/meta/recipes-kernel/kexec/kexec-tools.inc
+++ /dev/null
@@ -1,38 +0,0 @@
-SUMMARY = "Kexec fast reboot tools"
-DESCRIPTION = "Kexec is a fast reboot feature that lets you reboot to a new Linux kernel"
-AUTHOR = "Eric Biederman"
-HOMEPAGE = "http://kernel.org/pub/linux/utils/kernel/kexec/"
-SECTION = "kernel/userland"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=ea5bed2f60d357618ca161ad539f7c0a \
-                    file://kexec/kexec.c;beginline=1;endline=20;md5=af10f6ae4a8715965e648aa687ad3e09"
-DEPENDS = "zlib xz"
-
-SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/kexec/kexec-tools-${PV}.tar.gz \
-           file://kdump \
-           file://kdump.conf \
-           file://kdump.service \
-"
-
-PR = "r1"
-
-inherit autotools
-
-COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|aarch64.*|powerpc.*|mips.*)-(linux|freebsd.*)'
-
-INSANE_SKIP_${PN} = "arch"
-
-do_compile_prepend() {
-    # Remove the prepackaged config.h from the source tree as it overrides
-    # the same file generated by configure and placed in the build tree
-    rm -f ${S}/include/config.h
-
-    # Remove the '*.d' file to make sure the recompile is OK
-    for dep in `find ${B} -type f -name '*.d'`; do
-        dep_no_d="`echo $dep | sed 's#.d$##'`"
-        # Remove file.d when there is a file.o
-        if [ -f "$dep_no_d.o" ]; then
-            rm -f $dep
-        fi
-    done
-}
diff --git a/meta/recipes-kernel/kexec/kexec-tools_2.0.15.bb b/meta/recipes-kernel/kexec/kexec-tools_2.0.16.bb
similarity index 44%
rename from meta/recipes-kernel/kexec/kexec-tools_2.0.15.bb
rename to meta/recipes-kernel/kexec/kexec-tools_2.0.16.bb
index 6bd9025..ebb4832 100644
--- a/meta/recipes-kernel/kexec/kexec-tools_2.0.15.bb
+++ b/meta/recipes-kernel/kexec/kexec-tools_2.0.16.bb
@@ -1,19 +1,64 @@
-require kexec-tools.inc
+
+SUMMARY = "Kexec fast reboot tools"
+DESCRIPTION = "Kexec is a fast reboot feature that lets you reboot to a new Linux kernel"
+AUTHOR = "Eric Biederman"
+HOMEPAGE = "http://kernel.org/pub/linux/utils/kernel/kexec/"
+SECTION = "kernel/userland"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=ea5bed2f60d357618ca161ad539f7c0a \
+                    file://kexec/kexec.c;beginline=1;endline=20;md5=af10f6ae4a8715965e648aa687ad3e09"
+DEPENDS = "zlib xz"
+
+PR = "r1"
+
+SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/kexec/kexec-tools-${PV}.tar.gz \
+           file://kdump \
+           file://kdump.conf \
+           file://kdump.service \
+           file://0002-powerpc-change-the-memory-size-limit.patch \
+           file://0001-purgatory-Pass-r-directly-to-linker.patch \
+           file://0010-kexec-ARM-Fix-add_buffer_phys_virt-align-issue.patch \
+           file://kexec-x32.patch \
+           file://0001-Disable-PIE-during-link.patch \
+         "
+
+SRC_URI[md5sum] = "5198968de79b5ded96f97f3c2ea9637b"
+SRC_URI[sha256sum] = "cf17fc99bf77c9b39f06ee88ac0e86d0349c4a0c3f8214a3cc78eece872f6f3a"
+
+inherit autotools update-rc.d systemd
+
 export LDFLAGS = "-L${STAGING_LIBDIR}"
 EXTRA_OECONF = " --with-zlib=yes"
 
-SRC_URI += "${KERNELORG_MIRROR}/linux/utils/kernel/kexec/kexec-tools-${PV}.tar.gz \
-            file://0002-powerpc-change-the-memory-size-limit.patch \
-            file://0001-purgatory-Pass-r-directly-to-linker.patch \
-            file://0010-kexec-ARM-Fix-add_buffer_phys_virt-align-issue.patch \
-            file://kexec-x32.patch \
-            file://0001-Disable-PIE-during-link.patch \
-         "
+do_compile_prepend() {
+    # Remove the prepackaged config.h from the source tree as it overrides
+    # the same file generated by configure and placed in the build tree
+    rm -f ${S}/include/config.h
+
+    # Remove the '*.d' file to make sure the recompile is OK
+    for dep in `find ${B} -type f -name '*.d'`; do
+        dep_no_d="`echo $dep | sed 's#.d$##'`"
+        # Remove file.d when there is a file.o
+        if [ -f "$dep_no_d.o" ]; then
+            rm -f $dep
+        fi
+    done
+}
 
-SRC_URI[md5sum] = "78906fdc255656fa2b9996c8acb3ef62"
-SRC_URI[sha256sum] = "42dbd0dab9964cd1ed89fa4571c8d13191eb7132b361ade5ac44517c91ecb97e"
+do_install_append () {
+        install -d ${D}${sysconfdir}/sysconfig
+        install -m 0644 ${WORKDIR}/kdump.conf ${D}${sysconfdir}/sysconfig
 
-SECURITY_PIE_CFLAGS_remove = "-fPIE -pie"
+        if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
+                install -D -m 0755 ${WORKDIR}/kdump ${D}${sysconfdir}/init.d/kdump
+        fi
+
+        if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
+                install -D -m 0755 ${WORKDIR}/kdump ${D}${libexecdir}/kdump-helper
+                install -D -m 0644 ${WORKDIR}/kdump.service ${D}${systemd_unitdir}/system/kdump.service
+                sed -i -e 's,@LIBEXECDIR@,${libexecdir},g' ${D}${systemd_unitdir}/system/kdump.service
+        fi
+}
 
 PACKAGES =+ "kexec kdump vmcore-dmesg"
 
@@ -30,23 +75,12 @@ FILES_kdump = "${sbindir}/kdump \
 
 FILES_vmcore-dmesg = "${sbindir}/vmcore-dmesg"
 
-inherit update-rc.d systemd
-
 INITSCRIPT_PACKAGES = "kdump"
 INITSCRIPT_NAME_kdump = "kdump"
 INITSCRIPT_PARAMS_kdump = "start 56 2 3 4 5 . stop 56 0 1 6 ."
 
-do_install_append () {
-        install -d ${D}${sysconfdir}/sysconfig
-        install -m 0644 ${WORKDIR}/kdump.conf ${D}${sysconfdir}/sysconfig
+SECURITY_PIE_CFLAGS_remove = "-fPIE -pie"
 
-        if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
-                install -D -m 0755 ${WORKDIR}/kdump ${D}${sysconfdir}/init.d/kdump
-        fi
+COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|aarch64.*|powerpc.*|mips.*)-(linux|freebsd.*)'
 
-        if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
-                install -D -m 0755 ${WORKDIR}/kdump ${D}${libexecdir}/kdump-helper
-                install -D -m 0644 ${WORKDIR}/kdump.service ${D}${systemd_unitdir}/system/kdump.service
-                sed -i -e 's,@LIBEXECDIR@,${libexecdir},g' ${D}${systemd_unitdir}/system/kdump.service
-        fi
-}
+INSANE_SKIP_${PN} = "arch"
-- 
2.7.4

[PATCH 8/8] bind: Update to 9.11.2

[Armin Kuster]

From: Armin Kuster <akuster@mvista.com>

New License (mpl-2.0) and LICESE file.

New features in bind 9.11
see: https://www.isc.org/wp-content/uploads/2016/09/BIND9.11NewFeatures.pdf

add zlib PACKAGECONF

Signed-off-by: Armin Kuster <akuster@mvista.com>
---
 meta/recipes-connectivity/bind/bind/dont-test-on-host.patch | 13 ++++++++-----
 .../bind/{bind_9.10.6.bb => bind_9.11.2.bb}                 | 10 +++++-----
 2 files changed, 13 insertions(+), 10 deletions(-)
 rename meta/recipes-connectivity/bind/{bind_9.10.6.bb => bind_9.11.2.bb} (92%)

diff --git a/meta/recipes-connectivity/bind/bind/dont-test-on-host.patch b/meta/recipes-connectivity/bind/bind/dont-test-on-host.patch
index b02ecb1..7fbd1f5 100644
--- a/meta/recipes-connectivity/bind/bind/dont-test-on-host.patch
+++ b/meta/recipes-connectivity/bind/bind/dont-test-on-host.patch
@@ -2,16 +2,19 @@ Upstream-Status: Pending
 
 Signed-off-by: Saul Wold <sgw@linux.intel.com>
 
-Index: bind-9.9.5/bin/Makefile.in
+refactored for 9.11
+Signed-off-by: Armin Kuster <akuster@mvista.com>
+
+Index: bind-9.11.2/bin/Makefile.in
 ===================================================================
---- bind-9.9.5.orig/bin/Makefile.in
-+++ bind-9.9.5/bin/Makefile.in
-@@ -19,7 +19,7 @@ srcdir =	@srcdir@
+--- bind-9.11.2.orig/bin/Makefile.in
++++ bind-9.11.2/bin/Makefile.in
+@@ -10,7 +10,7 @@ srcdir =	@srcdir@
  VPATH =		@srcdir@
  top_srcdir =	@top_srcdir@
  
 -SUBDIRS =	named rndc dig delv dnssec tools tests nsupdate \
 +SUBDIRS =	named rndc dig delv dnssec tools nsupdate \
- 		check confgen @PYTHON_TOOLS@ @PKCS11_TOOLS@
+ 		check confgen @NZD_TOOLS@ @PYTHON_TOOLS@ @PKCS11_TOOLS@
  TARGETS =
  
diff --git a/meta/recipes-connectivity/bind/bind_9.10.6.bb b/meta/recipes-connectivity/bind/bind_9.11.2.bb
similarity index 92%
rename from meta/recipes-connectivity/bind/bind_9.10.6.bb
rename to meta/recipes-connectivity/bind/bind_9.11.2.bb
index 8b8835b..0bbc4df 100644
--- a/meta/recipes-connectivity/bind/bind_9.10.6.bb
+++ b/meta/recipes-connectivity/bind/bind_9.11.2.bb
@@ -2,8 +2,8 @@ SUMMARY = "ISC Internet Domain Name Server"
 HOMEPAGE = "http://www.isc.org/sw/bind/"
 SECTION = "console/network"
 
-LICENSE = "ISC & BSD"
-LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=dba46507446198119bcde32a4feaab43"
+LICENSE = "ISC & MPL-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=f27a50d2e878867827842f2c60e30bfc"
 
 DEPENDS = "openssl libcap"
 
@@ -23,8 +23,8 @@ SRC_URI = "https://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.gz \
            file://use-python3-and-fix-install-lib-path.patch \
            "
 
-SRC_URI[md5sum] = "84e663284b17aee0df1ce6f248b137d7"
-SRC_URI[sha256sum] = "17bbcd2bd7b1d32f5ba4b30d5dbe8a39bce200079048073d1e0d050fdf47e69d"
+SRC_URI[md5sum] = "efca7e5a63a07efba264da9be2fbb57f"
+SRC_URI[sha256sum] = "7f46ad8620f7c3b0ac375d7a5211b15677708fda84ce25d7aeb7222fe2e3c77a"
 
 UPSTREAM_CHECK_URI = "https://ftp.isc.org/isc/bind9/"
 UPSTREAM_CHECK_REGEX = "(?P<pver>9(\.\d+)+(-P\d+)*)/"
@@ -48,6 +48,7 @@ PACKAGECONFIG[httpstats] = "--with-libxml2,--without-libxml2,libxml2"
 PACKAGECONFIG[readline] = "--with-readline=-lreadline,,readline"
 PACKAGECONFIG[libedit] = "--with-readline=-ledit,,libedit"
 PACKAGECONFIG[urandom] = "--with-randomdev=/dev/urandom,--with-randomdev=/dev/random,,"
+PACKAGECONFIG[zlib] = "--with-zlib=${STAGING_LIBDIR}/.., --without-zlib, zlib, zlib"
 
 USERADD_PACKAGES = "${PN}"
 USERADD_PARAM_${PN} = "--system --home ${localstatedir}/cache/bind --no-create-home \
@@ -88,7 +89,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,#!.*python3,#! /usr/bin/python3,' ${D}${sbindir}/dnssec-coverage ${D}${sbindir}/dnssec-checkds
 
 	# Install systemd related files
 	install -d ${D}${sbindir}
-- 
2.7.4

Re: [PATCH 8/8] bind: Update to 9.11.2

[Burton, Ross]

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

On 17 December 2017 at 16:34, Armin Kuster <akuster808@gmail.com> wrote:

> From: Armin Kuster <akuster@mvista.com>
>
> New License (mpl-2.0) and LICESE file.
>
> New features in bind 9.11
> see: https://www.isc.org/wp-content/uploads/2016/09/BIND9.
> 11NewFeatures.pdf
>
> add zlib PACKAGECONF
>

packages/corei7-64-poky-linux/bind/bind-doc: FILELIST: removed
"/usr/share/man/man8/dnssec-checkds.8
/usr/share/man/man8/dnssec-coverage.8", added "/usr/share/man/man1/mdig.1"

I see you're removing those binaries from a sed, so have they been removed
entirely?  Are they somewhere else, or just disabled?

packages/corei7-64-poky-linux/bind/bind: FILELIST: removed
"/usr/lib/python3.5/site-packages/isc/__pycache__/dnskey.cpython-35.pyc
/usr/lib/python3.5/site-packages/isc/__pycache__/coverage.cpython-35.pyc
/usr/lib/python3.5/site-packages/isc/eventlist.py
/usr/lib/python3.5/site-packages/isc/keyevent.py
/usr/lib/python3.5/site-packages/isc-1.0-py3.5.egg-info
/usr/lib/python3.5/site-packages/isc/__pycache__/eventlist.cpython-35.pyc
/usr/lib/python3.5/site-packages/isc/keydict.py
/usr/lib/python3.5/site-packages/isc/__pycache__/keyzone.cpython-35.pyc
/usr/lib/python3.5/site-packages/isc/__pycache__/keydict.cpython-35.pyc
/usr/lib/python3.5/site-packages/isc/__pycache__/checkds.cpython-35.pyc
/usr/lib/python3.5/site-packages/isc/checkds.py /usr/sbin/dnssec-coverage
/usr/lib/python3.5/site-packages/isc/keyzone.py
/usr/lib/python3.5/site-packages/isc/__init__.py
/usr/lib/python3.5/site-packages/isc/__pycache__/utils.cpython-35.pyc
/usr/sbin/dnssec-checkds
/usr/lib/python3.5/site-packages/isc/__pycache__/keyevent.cpython-35.pyc
/usr/lib/python3.5/site-packages/isc/__pycache__/__init__.cpython-35.pyc
/usr/lib/python3.5/site-packages/isc/dnskey.py
/usr/lib/python3.5/site-packages/isc/coverage.py
/usr/lib/python3.5/site-packages/isc/utils.py", added "/usr/bin/mdig"

All the Python bindings have disappeared, is this intentional?

Ross

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

Re: [PATCH 8/8] bind: Update to 9.11.2

[akuster808]

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



On 12/18/2017 07:05 AM, Burton, Ross wrote:
> On 17 December 2017 at 16:34, Armin Kuster <akuster808@gmail.com
> <mailto:akuster808@gmail.com>> wrote:
>
>     From: Armin Kuster <akuster@mvista.com <mailto:akuster@mvista.com>>
>
>     New License (mpl-2.0) and LICESE file.
>
>     New features in bind 9.11
>     see:
>     https://www.isc.org/wp-content/uploads/2016/09/BIND9.11NewFeatures.pdf
>     <https://www.isc.org/wp-content/uploads/2016/09/BIND9.11NewFeatures.pdf>
>
>     add zlib PACKAGECONF
>
>
> packages/corei7-64-poky-linux/bind/bind-doc: FILELIST: removed
> "/usr/share/man/man8/dnssec-checkds.8
> /usr/share/man/man8/dnssec-coverage.8", added "/usr/share/man/man1/mdig.1"
>
> I see you're removing those binaries from a sed, so have they been
> removed entirely?  Are they somewhere else, or just disabled?

 hmm, let me double check. I know there where no longer there.

>
> packages/corei7-64-poky-linux/bind/bind: FILELIST: removed
> "/usr/lib/python3.5/site-packages/isc/__pycache__/dnskey.cpython-35.pyc
> /usr/lib/python3.5/site-packages/isc/__pycache__/coverage.cpython-35.pyc
> /usr/lib/python3.5/site-packages/isc/eventlist.py
> /usr/lib/python3.5/site-packages/isc/keyevent.py
> /usr/lib/python3.5/site-packages/isc-1.0-py3.5.egg-info
> /usr/lib/python3.5/site-packages/isc/__pycache__/eventlist.cpython-35.pyc
> /usr/lib/python3.5/site-packages/isc/keydict.py
> /usr/lib/python3.5/site-packages/isc/__pycache__/keyzone.cpython-35.pyc
> /usr/lib/python3.5/site-packages/isc/__pycache__/keydict.cpython-35.pyc
> /usr/lib/python3.5/site-packages/isc/__pycache__/checkds.cpython-35.pyc
> /usr/lib/python3.5/site-packages/isc/checkds.py
> /usr/sbin/dnssec-coverage
> /usr/lib/python3.5/site-packages/isc/keyzone.py
> /usr/lib/python3.5/site-packages/isc/__init__.py
> /usr/lib/python3.5/site-packages/isc/__pycache__/utils.cpython-35.pyc
> /usr/sbin/dnssec-checkds
> /usr/lib/python3.5/site-packages/isc/__pycache__/keyevent.cpython-35.pyc
> /usr/lib/python3.5/site-packages/isc/__pycache__/__init__.cpython-35.pyc
> /usr/lib/python3.5/site-packages/isc/dnskey.py
> /usr/lib/python3.5/site-packages/isc/coverage.py
> /usr/lib/python3.5/site-packages/isc/utils.py", added "/usr/bin/mdig"
>
> All the Python bindings have disappeared, is this intentional?

hmm.. let me check.

- armin
>
> Ross 


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

Re: [PATCH 8/8] bind: Update to 9.11.2

[Burton, Ross]

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

Related, the musl autobuilder failed like this:

ERROR: bind-9.11.2-r0 do_package_qa: QA Issue: /usr/sbin/dnssec-keymgr
contained in package bind requires
/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-musl-x86-64/build/build/tmp/hosttools/python3,
but no providers found in RDEPENDS_bind? [file-rdeps]

I suspect the python3 check is looking at the host?

Ross

On 18 December 2017 at 17:11, akuster808 <akuster808@gmail.com> wrote:

>
>
> On 12/18/2017 07:05 AM, Burton, Ross wrote:
>
> On 17 December 2017 at 16:34, Armin Kuster <akuster808@gmail.com> wrote:
>
>> From: Armin Kuster <akuster@mvista.com>
>>
>> New License (mpl-2.0) and LICESE file.
>>
>> New features in bind 9.11
>> see: https://www.isc.org/wp-content/uploads/2016/09/BIND9.11NewFe
>> atures.pdf
>>
>> add zlib PACKAGECONF
>>
>
> packages/corei7-64-poky-linux/bind/bind-doc: FILELIST: removed
> "/usr/share/man/man8/dnssec-checkds.8 /usr/share/man/man8/dnssec-coverage.8",
> added "/usr/share/man/man1/mdig.1"
>
> I see you're removing those binaries from a sed, so have they been removed
> entirely?  Are they somewhere else, or just disabled?
>
>
>  hmm, let me double check. I know there where no longer there.
>
>
> packages/corei7-64-poky-linux/bind/bind: FILELIST: removed
> "/usr/lib/python3.5/site-packages/isc/__pycache__/dnskey.cpython-35.pyc
> /usr/lib/python3.5/site-packages/isc/__pycache__/coverage.cpython-35.pyc
> /usr/lib/python3.5/site-packages/isc/eventlist.py /usr/lib/python3.5/site-packages/isc/keyevent.py
> /usr/lib/python3.5/site-packages/isc-1.0-py3.5.egg-info
> /usr/lib/python3.5/site-packages/isc/__pycache__/eventlist.cpython-35.pyc
> /usr/lib/python3.5/site-packages/isc/keydict.py /usr/lib/python3.5/site-
> packages/isc/__pycache__/keyzone.cpython-35.pyc /usr/lib/python3.5/site-
> packages/isc/__pycache__/keydict.cpython-35.pyc /usr/lib/python3.5/site-
> packages/isc/__pycache__/checkds.cpython-35.pyc /usr/lib/python3.5/site-packages/isc/checkds.py
> /usr/sbin/dnssec-coverage /usr/lib/python3.5/site-packages/isc/keyzone.py
> /usr/lib/python3.5/site-packages/isc/__init__.py /usr/lib/python3.5/site-
> packages/isc/__pycache__/utils.cpython-35.pyc /usr/sbin/dnssec-checkds
> /usr/lib/python3.5/site-packages/isc/__pycache__/keyevent.cpython-35.pyc
> /usr/lib/python3.5/site-packages/isc/__pycache__/__init__.cpython-35.pyc
> /usr/lib/python3.5/site-packages/isc/dnskey.py /usr/lib/python3.5/site-packages/isc/coverage.py
> /usr/lib/python3.5/site-packages/isc/utils.py", added "/usr/bin/mdig"
>
> All the Python bindings have disappeared, is this intentional?
>
>
> hmm.. let me check.
>
> - armin
>
>
> Ross
>
>
>

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