summaryrefslogtreecommitdiff
path: root/dnsmasq
diff options
context:
space:
mode:
authorJuergen Daubert <jue@jue.li>2022-02-16 17:15:59 +0100
committerJuergen Daubert <jue@jue.li>2022-02-16 17:15:59 +0100
commit84ade6190246901166f1165913105dd493bca7f7 (patch)
tree5d4dcbbd2a6022d9931739ef87ab806868dfc45c /dnsmasq
parent48db8cf842a0e2bd28687187e70d57e6dead7a7d (diff)
downloadopt-84ade6190246901166f1165913105dd493bca7f7.tar.gz
opt-84ade6190246901166f1165913105dd493bca7f7.tar.xz
dnsmasq: move pidfile to /run
Diffstat (limited to 'dnsmasq')
-rw-r--r--dnsmasq/.signature8
-rw-r--r--dnsmasq/Pkgfile2
-rw-r--r--dnsmasq/dnsmasq2
-rw-r--r--dnsmasq/dnsmasq-config.patch23
4 files changed, 22 insertions, 13 deletions
diff --git a/dnsmasq/.signature b/dnsmasq/.signature
index c84392a38..172f30857 100644
--- a/dnsmasq/.signature
+++ b/dnsmasq/.signature
@@ -1,7 +1,7 @@
untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/cPXK/DMB9lNx2o4hyoyJUwlv9zp3VUEg0ZErNCeIeGug3Ig+x+ZPTjBY4/DeEKijApThc2O8DXjlkmN2bH3Lgg=
-SHA256 (Pkgfile) = 0e58f340624796795665723978e21536d324e66d5500720fffc18e0860ed1331
+RWSE3ohX2g5d/UVJnPKXBV8vc4vMK9VCfm+oRWuz/JRlH+835sWy3lT70OEJRbzd2+OZGVVs0QBCQT8TpNHjqWmVP05hrmI+hAY=
+SHA256 (Pkgfile) = bb9cf4ba7de4c3ac954514ff22fdc7f4285c111ad273504600bffbc8a42df8c2
SHA256 (.footprint) = a9b2926c49f21dee91cc4b4186a4abc2494b610a40941467c281573e2f9c76d9
SHA256 (dnsmasq-2.86.tar.xz) = 28d52cfc9e2004ac4f85274f52b32e1647b4dbc9761b82e7de1e41c49907eb08
-SHA256 (dnsmasq-config.patch) = bf7b680b43e8711e10762be6ca9c5c42e03c6c538392fd32beb2bbcc219f568d
-SHA256 (dnsmasq) = 3c5425d2662177614a9f79a89027e03d2622687c1b387f62d6bf73326fbd59b1
+SHA256 (dnsmasq-config.patch) = 251536d779c4d9333c3ac13153948cfc4dea599548f8ff6f4ad3488193cc0716
+SHA256 (dnsmasq) = af4d81797efb286246be33880bafdbd6691172d01179592eb95a637a86d3fa1b
diff --git a/dnsmasq/Pkgfile b/dnsmasq/Pkgfile
index 42bb746be..fc32d8230 100644
--- a/dnsmasq/Pkgfile
+++ b/dnsmasq/Pkgfile
@@ -5,7 +5,7 @@
name=dnsmasq
version=2.86
-release=1
+release=2
source=(http://www.thekelleys.org.uk/$name/$name-$version.tar.xz \
$name-config.patch dnsmasq)
diff --git a/dnsmasq/dnsmasq b/dnsmasq/dnsmasq
index 1f551830f..58a46d0d7 100644
--- a/dnsmasq/dnsmasq
+++ b/dnsmasq/dnsmasq
@@ -6,7 +6,7 @@
SSD=/sbin/start-stop-daemon
PROG=/usr/sbin/dnsmasq
NAME=dnsmasq
-PID=/var/run/dnsmasq.pid
+PID=/run/dnsmasq.pid
case $1 in
start)
diff --git a/dnsmasq/dnsmasq-config.patch b/dnsmasq/dnsmasq-config.patch
index 1bd9b51b6..035dfa75d 100644
--- a/dnsmasq/dnsmasq-config.patch
+++ b/dnsmasq/dnsmasq-config.patch
@@ -1,6 +1,6 @@
-diff -Nru dnsmasq-2.84.orig/dnsmasq.conf.example dnsmasq-2.84/dnsmasq.conf.example
---- dnsmasq-2.84.orig/dnsmasq.conf.example 2021-01-27 10:45:11.611244801 +0100
-+++ dnsmasq-2.84/dnsmasq.conf.example 2021-01-27 10:45:32.883980677 +0100
+diff -Nru dnsmasq-2.86.orig/dnsmasq.conf.example dnsmasq-2.86/dnsmasq.conf.example
+--- dnsmasq-2.86.orig/dnsmasq.conf.example 2022-02-16 15:33:26.622970564 +0100
++++ dnsmasq-2.86/dnsmasq.conf.example 2022-02-16 15:34:00.675532744 +0100
@@ -22,7 +22,7 @@
# Uncomment these to enable DNSSEC validation and caching:
@@ -30,10 +30,10 @@ diff -Nru dnsmasq-2.84.orig/dnsmasq.conf.example dnsmasq-2.84/dnsmasq.conf.examp
# Set the DHCP server to authoritative mode. In this mode it will barge in
# and take over the lease for any client which broadcasts on the network,
-diff -Nru dnsmasq-2.84.orig/src/config.h dnsmasq-2.84/src/config.h
---- dnsmasq-2.84.orig/src/config.h 2021-01-27 10:45:11.614578042 +0100
-+++ dnsmasq-2.84/src/config.h 2021-01-27 10:45:32.883980677 +0100
-@@ -46,7 +46,7 @@
+diff -Nru dnsmasq-2.86.orig/src/config.h dnsmasq-2.86/src/config.h
+--- dnsmasq-2.86.orig/src/config.h 2022-02-16 15:33:26.626303822 +0100
++++ dnsmasq-2.86/src/config.h 2022-02-16 15:34:45.014534363 +0100
+@@ -45,7 +45,7 @@
#define DEFLEASE 3600 /* default DHCPv4 lease time, one hour */
#define DEFLEASE6 (3600*24) /* default lease time for DHCPv6. One day. */
#define CHUSER "nobody"
@@ -51,3 +51,12 @@ diff -Nru dnsmasq-2.84.orig/src/config.h dnsmasq-2.84/src/config.h
# endif
#endif
+@@ -228,7 +228,7 @@
+ # if defined(__ANDROID__)
+ # define RUNFILE "/data/dnsmasq.pid"
+ # else
+-# define RUNFILE "/var/run/dnsmasq.pid"
++# define RUNFILE "/run/dnsmasq.pid"
+ # endif
+ #endif
+

Generated by cgit