diff options
| author | Juergen Daubert <jue@jue.li> | 2021-01-27 10:48:06 +0100 |
|---|---|---|
| committer | Juergen Daubert <jue@jue.li> | 2021-01-27 10:48:42 +0100 |
| commit | 6a767570d216fd3006911e7d314ae0f4c16a5577 (patch) | |
| tree | 63b91766e224fd33e83ab049a05fdc2d550ad8cf | |
| parent | 8deccf3b1f3f10bcb46c4becf0e3ea7487defe57 (diff) | |
| download | opt-6a767570d216fd3006911e7d314ae0f4c16a5577.tar.gz opt-6a767570d216fd3006911e7d314ae0f4c16a5577.tar.xz | |
dnsmasq: update to 2.84
| -rw-r--r-- | dnsmasq/.signature | 8 | ||||
| -rw-r--r-- | dnsmasq/Pkgfile | 21 | ||||
| -rw-r--r-- | dnsmasq/dnsmasq-config.patch | 20 |
3 files changed, 25 insertions, 24 deletions
diff --git a/dnsmasq/.signature b/dnsmasq/.signature index bb7eff3a1..d901de9c7 100644 --- a/dnsmasq/.signature +++ b/dnsmasq/.signature @@ -1,7 +1,7 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/aPv/eg5sSl9SMhLDr+oPK24SJWS3DjjJpIhghvvSwlggqCgUJUaspptp6FlZcygn9kCFsVqOmLXRDL0uwxKtgs= -SHA256 (Pkgfile) = 83564ade2d88ed109d4c728bf9d9099dcaafd725f88ba2c62ed10e85699eeaa1 +RWSE3ohX2g5d/Z0aIzO+K8huuHZ/sm8j3o3va+esqAg87VYQ+Q3a+9i/3DpC8VjjkVOSIYhHm2R7iIhXS0mnXLHNVTFRdHokGwg= +SHA256 (Pkgfile) = dfd6e83af5b00d175d84303988e2d1b0a5399ccdbf1b3bd3aee0e839bb781510 SHA256 (.footprint) = a9b2926c49f21dee91cc4b4186a4abc2494b610a40941467c281573e2f9c76d9 -SHA256 (dnsmasq-2.83.tar.xz) = ffc1f7e8b05e22d910b9a71d09f1128197292766dc7c54cb7018a1b2c3af4aea -SHA256 (dnsmasq-config.patch) = bfbf4e3e327f404d87052bbe37a8da064cc59dce3835532652569455d811ef69 +SHA256 (dnsmasq-2.84.tar.xz) = 603195c64b73137609b07e1024ae0b37f652b2f5fe467dce66985b3d1850050c +SHA256 (dnsmasq-config.patch) = bf7b680b43e8711e10762be6ca9c5c42e03c6c538392fd32beb2bbcc219f568d SHA256 (dnsmasq) = 3c5425d2662177614a9f79a89027e03d2622687c1b387f62d6bf73326fbd59b1 diff --git a/dnsmasq/Pkgfile b/dnsmasq/Pkgfile index 536408262..d2b5ae047 100644 --- a/dnsmasq/Pkgfile +++ b/dnsmasq/Pkgfile @@ -4,22 +4,23 @@ # Depends on: nettle name=dnsmasq -version=2.83 +version=2.84 release=1 source=(http://www.thekelleys.org.uk/$name/$name-$version.tar.xz \ - $name-config.patch dnsmasq) + $name-config.patch dnsmasq) build () { - cd $name-$version + cd $name-$version - patch -p1 -i $SRC/$name-config.patch + sed 's/rc2//' -i VERSION + patch -p1 -i $SRC/$name-config.patch - make COPTS="-DHAVE_DNSSEC" CFLAGS="$CFLAGS -Wall -W" - make COPTS="-DHAVE_DNSSEC" PREFIX=$PKG/usr install + make COPTS="-DHAVE_DNSSEC" CFLAGS="$CFLAGS -W -Wall" + make PREFIX=$PKG/usr install-common - install -d $PKG/{var/lib/dhcp,etc/rc.d,usr/share/dnsmasq} + install -d $PKG/{var/lib/dhcp,etc/rc.d,usr/share/dnsmasq} - install -m 755 $SRC/dnsmasq $PKG/etc/rc.d/ - install -m 644 dnsmasq.conf.example $PKG/etc/dnsmasq.conf - install -m 644 trust-anchors.conf $PKG/usr/share/dnsmasq + install -m 755 $SRC/dnsmasq $PKG/etc/rc.d/ + install -m 644 dnsmasq.conf.example $PKG/etc/dnsmasq.conf + install -m 644 trust-anchors.conf $PKG/usr/share/dnsmasq } diff --git a/dnsmasq/dnsmasq-config.patch b/dnsmasq/dnsmasq-config.patch index ebe62dbd3..1bd9b51b6 100644 --- a/dnsmasq/dnsmasq-config.patch +++ b/dnsmasq/dnsmasq-config.patch @@ -1,6 +1,6 @@ -diff -Nru dnsmasq-2.80.orig/dnsmasq.conf.example dnsmasq-2.80/dnsmasq.conf.example ---- dnsmasq-2.80.orig/dnsmasq.conf.example 2019-06-27 16:28:48.474960428 +0200 -+++ dnsmasq-2.80/dnsmasq.conf.example 2019-06-27 16:29:07.744482075 +0200 +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 @@ -22,7 +22,7 @@ # Uncomment these to enable DNSSEC validation and caching: @@ -30,19 +30,19 @@ diff -Nru dnsmasq-2.80.orig/dnsmasq.conf.example dnsmasq-2.80/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.80.orig/src/config.h dnsmasq-2.80/src/config.h ---- dnsmasq-2.80.orig/src/config.h 2019-06-27 16:28:48.474960428 +0200 -+++ dnsmasq-2.80/src/config.h 2019-06-27 16:29:07.744482075 +0200 -@@ -44,7 +44,7 @@ - #define ETHERSFILE "/etc/ethers" - #define DEFLEASE 3600 /* default lease time, 1 hour */ +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 @@ + #define DEFLEASE 3600 /* default DHCPv4 lease time, one hour */ + #define DEFLEASE6 (3600*24) /* default lease time for DHCPv6. One day. */ #define CHUSER "nobody" -#define CHGRP "dip" +#define CHGRP "nobody" #define TFTP_MAX_CONNECTIONS 50 /* max simultaneous connections */ #define LOG_MAX 5 /* log-queue length */ #define RANDFILE "/dev/urandom" -@@ -198,7 +198,7 @@ +@@ -204,7 +204,7 @@ # elif defined(__ANDROID__) # define LEASEFILE "/data/misc/dhcp/dnsmasq.leases" # else |