summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta-networking/recipes-support/unbound/unbound/0001-contrib-add-yocto-compatible-init-script.patch78
-rw-r--r--meta-networking/recipes-support/unbound/unbound/0001-contrib-add-yocto-compatible-startup-scripts.patch78
-rw-r--r--meta-networking/recipes-support/unbound/unbound_1.12.0.bb (renamed from meta-networking/recipes-support/unbound/unbound_1.9.4.bb)4
3 files changed, 80 insertions, 80 deletions
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
new file mode 100644
index 0000000000..7168a352f7
--- /dev/null
+++ b/meta-networking/recipes-support/unbound/unbound/0001-contrib-add-yocto-compatible-init-script.patch
@@ -0,0 +1,78 @@
1From 26614b6578056ec30b95013592e308bf24d924c2 Mon Sep 17 00:00:00 2001
2From: Beniamin Sandu <beniaminsandu@gmail.com>
3Date: Fri, 20 Nov 2020 23:00:20 +0200
4Subject: [PATCH] contrib: add yocto compatible init script
5
6Signed-off-by: Beniamin Sandu <beniaminsandu@gmail.com>
7---
8 contrib/unbound.init | 20 ++++++++++----------
9 1 file changed, 10 insertions(+), 10 deletions(-)
10
11diff --git a/contrib/unbound.init b/contrib/unbound.init
12index c5bb52bb..4eba752b 100644
13--- a/contrib/unbound.init
14+++ b/contrib/unbound.init
15@@ -19,11 +19,11 @@
16 ### END INIT INFO
17
18 # Source function library.
19-. /etc/rc.d/init.d/functions
20+. /etc/init.d/functions
21
22 exec="/usr/sbin/unbound"
23 prog="unbound"
24-config="/var/unbound/unbound.conf"
25+config="/etc/unbound/unbound.conf"
26 pidfile="/var/unbound/unbound.pid"
27 rootdir="/var/unbound"
28
29@@ -54,14 +54,14 @@ start() {
30 [ -e ${rootdir}/dev/log ] || touch ${rootdir}/dev/log
31 mount --bind -n /dev/log ${rootdir}/dev/log >/dev/null 2>&1;
32 fi;
33- if ! egrep -q '^/[^[:space:]]+[[:space:]]+'${rootdir}'/dev/urandom' /proc/mounts; then
34+ if ! egrep -q '^/[^[:space:]]+[[:space:]]+'${rootdir}'/dev/random' /proc/mounts; then
35 [ -d ${rootdir}/dev ] || mkdir -p ${rootdir}/dev ;
36- [ -e ${rootdir}/dev/urandom ] || touch ${rootdir}/dev/urandom
37- mount --bind -n /dev/urandom ${rootdir}/dev/urandom >/dev/null 2>&1;
38+ [ -e ${rootdir}/dev/random ] || touch ${rootdir}/dev/random
39+ mount --bind -n /dev/random ${rootdir}/dev/random >/dev/null 2>&1;
40 fi;
41
42 # if not running, start it up here
43- daemon $exec
44+ daemonize $exec
45 retval=$?
46 echo
47 [ $retval -eq 0 ] && touch $lockfile
48@@ -71,15 +71,15 @@ start() {
49 stop() {
50 echo -n $"Stopping $prog: "
51 # stop it here, often "killproc $prog"
52- killproc -p $pidfile $prog
53+ killproc $prog
54 retval=$?
55 echo
56 [ $retval -eq 0 ] && rm -f $lockfile
57 if egrep -q '^/[^[:space:]]+[[:space:]]+'${rootdir}'/dev/log' /proc/mounts; then
58 umount ${rootdir}/dev/log >/dev/null 2>&1
59 fi;
60- if egrep -q '^/[^[:space:]]+[[:space:]]+'${rootdir}'/dev/urandom' /proc/mounts; then
61- umount ${rootdir}/dev/urandom >/dev/null 2>&1
62+ if egrep -q '^/[^[:space:]]+[[:space:]]+'${rootdir}'/dev/random' /proc/mounts; then
63+ umount ${rootdir}/dev/random >/dev/null 2>&1
64 fi;
65 return $retval
66 }
67@@ -99,7 +99,7 @@ force_reload() {
68
69 rh_status() {
70 # run checks to determine if the service is running or use generic status
71- status -p $pidfile $prog
72+ status $prog
73 }
74
75 rh_status_q() {
76--
772.25.1
78
diff --git a/meta-networking/recipes-support/unbound/unbound/0001-contrib-add-yocto-compatible-startup-scripts.patch b/meta-networking/recipes-support/unbound/unbound/0001-contrib-add-yocto-compatible-startup-scripts.patch
deleted file mode 100644
index 46f6a7b3fc..0000000000
--- a/meta-networking/recipes-support/unbound/unbound/0001-contrib-add-yocto-compatible-startup-scripts.patch
+++ /dev/null
@@ -1,78 +0,0 @@
1From 186ac39de8eb9aedcf3d87cdbe389d10cde03d66 Mon Sep 17 00:00:00 2001
2From: Beniamin Sandu <beniaminsandu@gmail.com>
3Date: Tue, 16 Jul 2019 19:59:23 +0300
4Subject: [PATCH] contrib: add yocto compatible startup scripts
5
6Signed-off-by: Beniamin Sandu <beniaminsandu@gmail.com>
7---
8 contrib/unbound.init | 10 +++++-----
9 contrib/unbound.service.in | 4 ++--
10 2 files changed, 7 insertions(+), 7 deletions(-)
11 mode change 100644 => 100755 contrib/unbound.init
12
13diff --git a/contrib/unbound.init b/contrib/unbound.init
14old mode 100644
15new mode 100755
16index cccadecc..4eba752b
17--- a/contrib/unbound.init
18+++ b/contrib/unbound.init
19@@ -19,11 +19,11 @@
20 ### END INIT INFO
21
22 # Source function library.
23-. /etc/rc.d/init.d/functions
24+. /etc/init.d/functions
25
26 exec="/usr/sbin/unbound"
27 prog="unbound"
28-config="/var/unbound/unbound.conf"
29+config="/etc/unbound/unbound.conf"
30 pidfile="/var/unbound/unbound.pid"
31 rootdir="/var/unbound"
32
33@@ -61,7 +61,7 @@ start() {
34 fi;
35
36 # if not running, start it up here
37- daemon $exec
38+ daemonize $exec
39 retval=$?
40 echo
41 [ $retval -eq 0 ] && touch $lockfile
42@@ -71,7 +71,7 @@ start() {
43 stop() {
44 echo -n $"Stopping $prog: "
45 # stop it here, often "killproc $prog"
46- killproc -p $pidfile $prog
47+ killproc $prog
48 retval=$?
49 echo
50 [ $retval -eq 0 ] && rm -f $lockfile
51@@ -99,7 +99,7 @@ force_reload() {
52
53 rh_status() {
54 # run checks to determine if the service is running or use generic status
55- status -p $pidfile $prog
56+ status $prog
57 }
58
59 rh_status_q() {
60diff --git a/contrib/unbound.service.in b/contrib/unbound.service.in
61index 95976dd9..0e7f79a9 100644
62--- a/contrib/unbound.service.in
63+++ b/contrib/unbound.service.in
64@@ -10,9 +10,9 @@ WantedBy=multi-user.target
65
66 [Service]
67 ExecReload=/bin/kill -HUP $MAINPID
68-ExecStart=@UNBOUND_SBIN_DIR@/unbound
69+ExecStart=@UNBOUND_SBIN_DIR@/unbound -d
70 NotifyAccess=main
71-Type=notify
72+Type=simple
73 CapabilityBoundingSet=CAP_IPC_LOCK CAP_NET_BIND_SERVICE CAP_SETGID CAP_SETUID CAP_SYS_CHROOT CAP_SYS_RESOURCE
74 MemoryDenyWriteExecute=true
75 NoNewPrivileges=true
76--
772.17.1
78
diff --git a/meta-networking/recipes-support/unbound/unbound_1.9.4.bb b/meta-networking/recipes-support/unbound/unbound_1.12.0.bb
index 6200214acb..6fc1631714 100644
--- a/meta-networking/recipes-support/unbound/unbound_1.9.4.bb
+++ b/meta-networking/recipes-support/unbound/unbound_1.12.0.bb
@@ -10,9 +10,9 @@ LICENSE = "BSD-3-Clause"
10LIC_FILES_CHKSUM = "file://LICENSE;md5=5308494bc0590c0cb036afd781d78f06" 10LIC_FILES_CHKSUM = "file://LICENSE;md5=5308494bc0590c0cb036afd781d78f06"
11 11
12SRC_URI = "git://github.com/NLnetLabs/unbound.git;protocol=http;branch=master \ 12SRC_URI = "git://github.com/NLnetLabs/unbound.git;protocol=http;branch=master \
13 file://0001-contrib-add-yocto-compatible-startup-scripts.patch \ 13 file://0001-contrib-add-yocto-compatible-init-script.patch \
14" 14"
15SRCREV="b60c4a472c856f0a98120b7259e991b3a6507eb5" 15SRCREV="52b04806f4236c37acd10179ab465a54adc7e86a"
16 16
17inherit autotools pkgconfig systemd update-rc.d 17inherit autotools pkgconfig systemd update-rc.d
18 18
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-12-01 16:50:51 +0000