diff --git a/meta-networking/recipes-support/unbound/unbound/0001-contrib-add-yocto-compatible-init-script.patch b/meta-networking/recipes-support/unbound/unbound/0001-contrib-add-yocto-compatible-init-script.patch deleted file mode 100644 index 7bcf972612..0000000000 --- a/meta-networking/recipes-support/unbound/unbound/0001-contrib-add-yocto-compatible-init-script.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 26614b6578056ec30b95013592e308bf24d924c2 Mon Sep 17 00:00:00 2001 -From: Beniamin Sandu -Date: Fri, 20 Nov 2020 23:00:20 +0200 -Subject: [PATCH] contrib: add yocto compatible init script - -Signed-off-by: Beniamin Sandu ---- -Upstream-Status: Pending - - contrib/unbound.init | 20 ++++++++++---------- - 1 file changed, 10 insertions(+), 10 deletions(-) - -diff --git a/contrib/unbound.init b/contrib/unbound.init -index c5bb52bb..4eba752b 100644 ---- a/contrib/unbound.init -+++ b/contrib/unbound.init -@@ -19,11 +19,11 @@ - ### END INIT INFO - - # Source function library. --. /etc/rc.d/init.d/functions -+. /etc/init.d/functions - - exec="/usr/sbin/unbound" - prog="unbound" --config="/var/unbound/unbound.conf" -+config="/etc/unbound/unbound.conf" - pidfile="/var/unbound/unbound.pid" - rootdir="/var/unbound" - -@@ -54,14 +54,14 @@ start() { - [ -e ${rootdir}/dev/log ] || touch ${rootdir}/dev/log - mount --bind -n /dev/log ${rootdir}/dev/log >/dev/null 2>&1; - fi; -- if ! egrep -q '^/[^[:space:]]+[[:space:]]+'${rootdir}'/dev/urandom' /proc/mounts; then -+ if ! egrep -q '^/[^[:space:]]+[[:space:]]+'${rootdir}'/dev/random' /proc/mounts; then - [ -d ${rootdir}/dev ] || mkdir -p ${rootdir}/dev ; -- [ -e ${rootdir}/dev/urandom ] || touch ${rootdir}/dev/urandom -- mount --bind -n /dev/urandom ${rootdir}/dev/urandom >/dev/null 2>&1; -+ [ -e ${rootdir}/dev/random ] || touch ${rootdir}/dev/random -+ mount --bind -n /dev/random ${rootdir}/dev/random >/dev/null 2>&1; - fi; - - # if not running, start it up here -- daemon $exec -+ daemonize $exec - retval=$? - echo - [ $retval -eq 0 ] && touch $lockfile -@@ -71,15 +71,15 @@ start() { - stop() { - echo -n $"Stopping $prog: " - # stop it here, often "killproc $prog" -- killproc -p $pidfile $prog -+ killproc $prog - retval=$? - echo - [ $retval -eq 0 ] && rm -f $lockfile - if egrep -q '^/[^[:space:]]+[[:space:]]+'${rootdir}'/dev/log' /proc/mounts; then - umount ${rootdir}/dev/log >/dev/null 2>&1 - fi; -- if egrep -q '^/[^[:space:]]+[[:space:]]+'${rootdir}'/dev/urandom' /proc/mounts; then -- umount ${rootdir}/dev/urandom >/dev/null 2>&1 -+ if egrep -q '^/[^[:space:]]+[[:space:]]+'${rootdir}'/dev/random' /proc/mounts; then -+ umount ${rootdir}/dev/random >/dev/null 2>&1 - fi; - return $retval - } -@@ -99,7 +99,7 @@ force_reload() { - - rh_status() { - # run checks to determine if the service is running or use generic status -- status -p $pidfile $prog -+ status $prog - } - - rh_status_q() { --- -2.25.1 - diff --git a/meta-networking/recipes-support/unbound/unbound_1.17.1.bb b/meta-networking/recipes-support/unbound/unbound_1.18.0.bb similarity index 87% rename from meta-networking/recipes-support/unbound/unbound_1.17.1.bb rename to meta-networking/recipes-support/unbound/unbound_1.18.0.bb index ff3d879ea9..179af8050a 100644 --- a/meta-networking/recipes-support/unbound/unbound_1.17.1.bb +++ b/meta-networking/recipes-support/unbound/unbound_1.18.0.bb @@ -9,10 +9,8 @@ SECTION = "net" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=5308494bc0590c0cb036afd781d78f06" -SRC_URI = "git://github.com/NLnetLabs/unbound.git;protocol=https;branch=master \ - file://0001-contrib-add-yocto-compatible-init-script.patch \ -" -SRCREV = "90831af981221bbce1cd7b15055562336760e484" +SRC_URI = "git://github.com/NLnetLabs/unbound.git;protocol=https;branch=master" +SRCREV = "3795e374107ac7a5a977c516e144a3cd9b0da998" inherit autotools pkgconfig systemd update-rc.d @@ -39,7 +37,7 @@ do_install:append() { install -m 0644 ${B}/contrib/unbound.service ${D}${systemd_unitdir}/system install -d ${D}${sysconfdir}/init.d - install -m 0755 ${S}/contrib/unbound.init ${D}${sysconfdir}/init.d/unbound + install -m 0755 ${S}/contrib/unbound.init_yocto ${D}${sysconfdir}/init.d/unbound } SYSTEMD_SERVICE:${PN} = "${BPN}.service"