Merge branch '3.6' into 3.7

3 files changed, 21 insertions, 9 deletions

diff --git a/dnsmasq/.signature b/dnsmasq/.signature
index 172f30857..7d7459874 100644
--- a/dnsmasq/.signature
+++ b/dnsmasq/.signature
@@ -1,7 +1,7 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/UVJnPKXBV8vc4vMK9VCfm+oRWuz/JRlH+835sWy3lT70OEJRbzd2+OZGVVs0QBCQT8TpNHjqWmVP05hrmI+hAY=
-SHA256 (Pkgfile) = bb9cf4ba7de4c3ac954514ff22fdc7f4285c111ad273504600bffbc8a42df8c2
+RWSE3ohX2g5d/exgOCpjfYqqmaPKmcasRp6v+VF6EOKEhhnvJOLbCEV+Jd5sZnr8nehsgWn7li7BeK/cmMLlxEsF//aQuzunbwE=
+SHA256 (Pkgfile) = fdbb616dd1a3bc97ab42b0e3faf8cc04a6aafbdc06e6f2d4d13a3b880b7309e7
 SHA256 (.footprint) = a9b2926c49f21dee91cc4b4186a4abc2494b610a40941467c281573e2f9c76d9
-SHA256 (dnsmasq-2.86.tar.xz) = 28d52cfc9e2004ac4f85274f52b32e1647b4dbc9761b82e7de1e41c49907eb08
-SHA256 (dnsmasq-config.patch) = 251536d779c4d9333c3ac13153948cfc4dea599548f8ff6f4ad3488193cc0716
+SHA256 (dnsmasq-2.87.tar.xz) = 0228c0364a7f2356fd7e7f1549937cbf3099a78d3b2eb1ba5bb0c31e2b89de7a
+SHA256 (dnsmasq-config.patch) = 24c96e3a1b1098f5a305aebf921a54e1b3ca15bbe7bc5692ce372bc1ab19492b
 SHA256 (dnsmasq) = af4d81797efb286246be33880bafdbd6691172d01179592eb95a637a86d3fa1b
diff --git a/dnsmasq/Pkgfile b/dnsmasq/Pkgfile
index fc32d8230..37476bc41 100644
--- a/dnsmasq/Pkgfile
+++ b/dnsmasq/Pkgfile
@@ -4,8 +4,8 @@
 # Depends on: nettle
 
 name=dnsmasq
-version=2.86
-release=2
+version=2.87
+release=1
 source=(http://www.thekelleys.org.uk/$name/$name-$version.tar.xz \
 	$name-config.patch dnsmasq)
 
diff --git a/dnsmasq/dnsmasq-config.patch b/dnsmasq/dnsmasq-config.patch
index 035dfa75d..8a05eda37 100644
--- a/dnsmasq/dnsmasq-config.patch
+++ b/dnsmasq/dnsmasq-config.patch
@@ -1,6 +1,12 @@
+<<<<<<< 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
 @@ -22,7 +22,7 @@
  
  # Uncomment these to enable DNSSEC validation and caching:
@@ -10,7 +16,7 @@ diff -Nru dnsmasq-2.86.orig/dnsmasq.conf.example dnsmasq-2.86/dnsmasq.conf.examp
  #dnssec
  
  # Replies which are not DNSSEC signed may be legitimate, because the domain
-@@ -96,8 +96,8 @@
+@@ -106,8 +106,8 @@
  
  # If you want dnsmasq to change uid and gid to something other
  # than the default, edit the following lines.
@@ -21,7 +27,7 @@ diff -Nru dnsmasq-2.86.orig/dnsmasq.conf.example dnsmasq-2.86/dnsmasq.conf.examp
  
  # If you want dnsmasq to listen for DHCP and DNS requests only on
  # specified interfaces (and the loopback) give the name of the
-@@ -535,7 +535,7 @@
+@@ -545,7 +545,7 @@
  # The DHCP server needs somewhere on disk to keep its lease database.
  # This defaults to a sane location, but if you want to change it, use
  # the line below.
@@ -30,9 +36,15 @@ diff -Nru dnsmasq-2.86.orig/dnsmasq.conf.example dnsmasq-2.86/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 @@
  #define DEFLEASE 3600 /* default DHCPv4 lease time, one hour */
  #define DEFLEASE6 (3600*24) /* default lease time for DHCPv6. One day. */
@@ -42,7 +54,7 @@ diff -Nru dnsmasq-2.86.orig/src/config.h dnsmasq-2.86/src/config.h
  #define TFTP_MAX_CONNECTIONS 50 /* max simultaneous connections */
  #define LOG_MAX 5 /* log-queue length */
  #define RANDFILE "/dev/urandom"
-@@ -204,7 +204,7 @@
+@@ -208,7 +208,7 @@
  #   elif defined(__ANDROID__)
  #      define LEASEFILE "/data/misc/dhcp/dnsmasq.leases"
  #   else