[OE-core] [v2][PATCH] bind: update to 9.12.1

Wed May 23 08:13:42 UTC 2018

Hi Armin,

Thanks for picking this up.

On 2018-05-23 05:07, Armin Kuster wrote:
> [v2]
> Remove python3 in default PACKACKECONFIG
> include https://patchwork.openembedded.org/patch/148257/
> Break the hard runtime dependency on python3-core by adding a
> (default-on) packageconfig option for python.

Because of the newly added dependency on meta-python, the python(3) 
packageconfig is no longer "default-on".

> 
> Signed-off-by: Martin Hundebøll <mnhu at prevas.dk>
> 
> LIC_FILES_CHKSUM changed do to updated year
> Requires python-ply package in core
> 
> removed:
> dont-test-on-host.patch, no longer impliemented
> drop use-python3-and-fix-install-lib-path.patch, they added the ability to pass in lib dir loctions
> drop bind-confgen-build-unix.o-once.patch, fix included in update
> 
> Refresh other patches:
> add python3 flag for PACKAGECONFIG to pull in python
> add new config option --with-eddsa=
> 
> Signed-off-by: Armin Kuster <akuster808 at gmail.com>
> ---
>   ...0001-build-use-pkg-config-to-find-libxml2.patch | 13 +++---
>   ...-gen.c-extend-DIRNAMESIZE-from-256-to-512.patch | 13 +++---
>   .../0001-lib-dns-gen.c-fix-too-long-error.patch    | 13 +++---
>   .../bind/bind/bind-confgen-build-unix.o-once.patch | 48 ----------------------
>   ...-searching-for-json-headers-searches-sysr.patch | 13 +++---
>   .../bind/bind/dont-test-on-host.patch              | 17 --------
>   .../use-python3-and-fix-install-lib-path.patch     | 36 ----------------
>   .../bind/{bind_9.10.6.bb => bind_9.12.1.bb}        | 31 ++++++++------
>   8 files changed, 39 insertions(+), 145 deletions(-)
>   delete mode 100644 meta/recipes-connectivity/bind/bind/bind-confgen-build-unix.o-once.patch
>   delete mode 100644 meta/recipes-connectivity/bind/bind/dont-test-on-host.patch
>   delete mode 100644 meta/recipes-connectivity/bind/bind/use-python3-and-fix-install-lib-path.patch
>   rename meta/recipes-connectivity/bind/{bind_9.10.6.bb => bind_9.12.1.bb} (79%)
> 

<snip>

> diff --git a/meta/recipes-connectivity/bind/bind_9.10.6.bb b/meta/recipes-connectivity/bind/bind_9.12.1.bb
> similarity index 79%
> rename from meta/recipes-connectivity/bind/bind_9.10.6.bb
> rename to meta/recipes-connectivity/bind/bind_9.12.1.bb
> index 20c8d7b..52480f4 100644
> --- a/meta/recipes-connectivity/bind/bind_9.10.6.bb
> +++ b/meta/recipes-connectivity/bind/bind_9.12.1.bb
> @@ -3,42 +3,38 @@ HOMEPAGE = "http://www.isc.org/sw/bind/"
>   SECTION = "console/network"
>   
>   LICENSE = "ISC & BSD"
> -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=dba46507446198119bcde32a4feaab43"
> +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=6ba7c9fe0c888a943c79c93e6de744fb"
>   
> -DEPENDS = "openssl libcap"
> +DEPENDS = "openssl libcap zlib"
>   
>   SRC_URI = "https://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.gz \
>              file://conf.patch \
>              file://make-etc-initd-bind-stop-work.patch \
> -           file://dont-test-on-host.patch \
>              file://generate-rndc-key.sh \
>              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://use-python3-and-fix-install-lib-path.patch \
>              "
>   
> -SRC_URI[md5sum] = "84e663284b17aee0df1ce6f248b137d7"
> -SRC_URI[sha256sum] = "17bbcd2bd7b1d32f5ba4b30d5dbe8a39bce200079048073d1e0d050fdf47e69d"
> +SRC_URI[md5sum] = "ec20f2d6aff50651296fad962d19ccfa"
> +SRC_URI[sha256sum] = "16e446425c35e48b651ddf1171d2115ebf32b07670b652e1030a174038937510"
>   
>   UPSTREAM_CHECK_URI = "https://ftp.isc.org/isc/bind9/"
>   UPSTREAM_CHECK_REGEX = "(?P<pver>9(\.\d+)+(-P\d+)*)/"
>   
> -
>   ENABLE_IPV6 = "--enable-ipv6=${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'yes', 'no', d)}"
>   EXTRA_OECONF = " ${ENABLE_IPV6} --with-libtool --enable-threads \
>                    --disable-devpoll --enable-epoll --with-gost=no \
> -                 --with-gssapi=no --with-ecdsa=yes \
> +                 --with-gssapi=no --with-ecdsa=yes --with-eddsa=no\
>                    --sysconfdir=${sysconfdir}/bind \
>                    --with-openssl=${STAGING_DIR_HOST}${prefix} \
>                  "
>   
> -inherit autotools update-rc.d systemd useradd pkgconfig python3-dir
> +inherit autotools update-rc.d systemd useradd pkgconfig
>   
>   export PYTHON_SITEPACKAGES_DIR
>   
> @@ -48,6 +44,13 @@ 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,,"
> +#
> +# If python3 is enabled you will need to inlcude the meta-python
> +# layer to include the dependancy package python-ply

We might as well fix the spelling of "dependancy" here :)

> +#
> +PACKAGECONFIG[python3] = "--with-python=${PYTHON}, --without-python, python3-native python3-ply-native, python3-core"
> +
> +inherit ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3native', '', d)}
>   
>   USERADD_PACKAGES = "${PN}"
>   USERADD_PARAM_${PN} = "--system --home ${localstatedir}/cache/bind --no-create-home \
> @@ -60,7 +63,6 @@ SYSTEMD_SERVICE_${PN} = "named.service"
>   
>   PARALLEL_MAKE = ""
>   
> -RDEPENDS_${PN} = "python3-core"
>   RDEPENDS_${PN}-dev = ""
>   
>   PACKAGE_BEFORE_PN += "${PN}-utils"
> @@ -88,8 +90,13 @@ 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
>   
> +	if ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'true', 'false', d)}; then
> +	        sed -i -e '1s,#!.*python3,#! /usr/bin/python3,' \
> +                ${D}${sbindir}/dnssec-coverage \
> +                ${D}${sbindir}/dnssec-checkds \
> +                ${D}${sbindir}/dnssec-keymgr
> +        fi

You have mixed tabs and spaces here. The surrounding lines use tabs, so 
do that too.

>   	# Install systemd related files
>   	install -d ${D}${sbindir}
>   	install -m 755 ${WORKDIR}/generate-rndc-key.sh ${D}${sbindir}
> 

With the requested changes fixed:

Acked-by: Martin Hundebøll <mnhu at prevas.dk>