dnsmasq: update to 2.88

This commit is contained in:
Juergen Daubert 2022-12-05 13:46:36 +01:00
parent 4f5766ba0f
commit 7518c6cc53
3 changed files with 14 additions and 26 deletions

View File

@ -1,7 +1,7 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/exgOCpjfYqqmaPKmcasRp6v+VF6EOKEhhnvJOLbCEV+Jd5sZnr8nehsgWn7li7BeK/cmMLlxEsF//aQuzunbwE=
SHA256 (Pkgfile) = fdbb616dd1a3bc97ab42b0e3faf8cc04a6aafbdc06e6f2d4d13a3b880b7309e7
RWSE3ohX2g5d/aNk3w2CHiV+cRliCHoDdBsy/AyNA4UOm1VperPCSuxGBBPB8y0mAjZ29Pa28Pc1LFrePP5DKMgbcXzXrDxW8A4=
SHA256 (Pkgfile) = af194f0554a207a24b67400d9c04b73a030c1e1f4b56c59d6804a65aa17f3578
SHA256 (.footprint) = a9b2926c49f21dee91cc4b4186a4abc2494b610a40941467c281573e2f9c76d9
SHA256 (dnsmasq-2.87.tar.xz) = 0228c0364a7f2356fd7e7f1549937cbf3099a78d3b2eb1ba5bb0c31e2b89de7a
SHA256 (dnsmasq-config.patch) = 24c96e3a1b1098f5a305aebf921a54e1b3ca15bbe7bc5692ce372bc1ab19492b
SHA256 (dnsmasq-2.88.tar.xz) = 23544deda10340c053bea6f15a93fed6ea7f5aaa85316bfc671ffa6d22fbc1b3
SHA256 (dnsmasq-config.patch) = c4dd7c241366e20ffeb199965124d037743de39be6d87b43be76b5aab2c0bb80
SHA256 (dnsmasq) = af4d81797efb286246be33880bafdbd6691172d01179592eb95a637a86d3fa1b

View File

@ -4,7 +4,7 @@
# Depends on: nettle
name=dnsmasq
version=2.87
version=2.88
release=1
source=(http://www.thekelleys.org.uk/$name/$name-$version.tar.xz \
$name-config.patch dnsmasq)

View File

@ -1,12 +1,6 @@
<<<<<<< HEAD
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
=======
diff -Nru dnsmasq-2.87.orig/dnsmasq.conf.example dnsmasq-2.87/dnsmasq.conf.example
--- dnsmasq-2.87.orig/dnsmasq.conf.example 2022-09-26 13:02:40.145014750 +0200
+++ dnsmasq-2.87/dnsmasq.conf.example 2022-09-26 13:02:54.071352953 +0200
>>>>>>> 0abfa391af2ddc9a13b1c97b59ec0c1e4bbe4a61
diff -Nru dnsmasq-2.88.orig/dnsmasq.conf.example dnsmasq-2.88/dnsmasq.conf.example
--- dnsmasq-2.88.orig/dnsmasq.conf.example 2022-12-05 08:16:20.476784879 +0100
+++ dnsmasq-2.88/dnsmasq.conf.example 2022-12-05 08:16:47.219423244 +0100
@@ -22,7 +22,7 @@
# Uncomment these to enable DNSSEC validation and caching:
@ -36,16 +30,10 @@ diff -Nru dnsmasq-2.87.orig/dnsmasq.conf.example dnsmasq-2.87/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,
<<<<<<< HEAD
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
=======
diff -Nru dnsmasq-2.87.orig/src/config.h dnsmasq-2.87/src/config.h
--- dnsmasq-2.87.orig/src/config.h 2022-09-26 13:02:40.145014750 +0200
+++ dnsmasq-2.87/src/config.h 2022-09-26 13:02:54.071352953 +0200
>>>>>>> 0abfa391af2ddc9a13b1c97b59ec0c1e4bbe4a61
@@ -45,7 +45,7 @@
diff -Nru dnsmasq-2.88.orig/src/config.h dnsmasq-2.88/src/config.h
--- dnsmasq-2.88.orig/src/config.h 2022-12-05 08:16:20.476784879 +0100
+++ dnsmasq-2.88/src/config.h 2022-12-05 08:16:47.219423244 +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"
@ -54,7 +42,7 @@ diff -Nru dnsmasq-2.87.orig/src/config.h dnsmasq-2.87/src/config.h
#define TFTP_MAX_CONNECTIONS 50 /* max simultaneous connections */
#define LOG_MAX 5 /* log-queue length */
#define RANDFILE "/dev/urandom"
@@ -208,7 +208,7 @@
@@ -211,7 +211,7 @@
# elif defined(__ANDROID__)
# define LEASEFILE "/data/misc/dhcp/dnsmasq.leases"
# else
@ -63,7 +51,7 @@ diff -Nru dnsmasq-2.87.orig/src/config.h dnsmasq-2.87/src/config.h
# endif
#endif
@@ -228,7 +228,7 @@
@@ -235,7 +235,7 @@
# if defined(__ANDROID__)
# define RUNFILE "/data/dnsmasq.pid"
# else