dnsmasq: fix build with nettle 3.5.1

4 files changed, 50 insertions, 13 deletions

diff --git a/dnsmasq/.signature b/dnsmasq/.signature
index c11f42255..d60dc4368 100644
--- a/dnsmasq/.signature
+++ b/dnsmasq/.signature
@@ -1,7 +1,8 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/a10NE/906MeFUdkYqSMMVMoikBGwWj75r0ZIComIy92fR+iNNuvSYkphcHU9GW1cQJuy1lKTId2CLjZshhvpwo=
-SHA256 (Pkgfile) = 731459703b0d3f2f884bea0c4f9b9b573007b5684d2f388d2dd534227913cb5b
+RWSE3ohX2g5d/V41bI1t4g+BJe2mQZfPWIxQgRYu9CoOW88721dHm7xg3sR4oIA8r815cyeKmXQjPd3LXVud58bLjR9GYGesmw8=
+SHA256 (Pkgfile) = 31deb1032beac3dafc884f80943ffcf9e49a8f34f287748e1457d2f6c8c1d2e4
 SHA256 (.footprint) = a9b2926c49f21dee91cc4b4186a4abc2494b610a40941467c281573e2f9c76d9
 SHA256 (dnsmasq-2.80.tar.xz) = cdaba2785e92665cf090646cba6f94812760b9d7d8c8d0cfb07ac819377a63bb
-SHA256 (dnsmasq-config.patch) = be6179b484cd8f37f6bdcdb14c119bcc2ff31901c0e5a22eab8f5feffedf542f
+SHA256 (dnsmasq-config.patch) = bfbf4e3e327f404d87052bbe37a8da064cc59dce3835532652569455d811ef69
 SHA256 (dnsmasq) = 3c5425d2662177614a9f79a89027e03d2622687c1b387f62d6bf73326fbd59b1
+SHA256 (nettle-3.5.patch) = 1d9f577b796a95a6e363739f03fb5b2173255af7ab595430624e998ff86ac411
diff --git a/dnsmasq/Pkgfile b/dnsmasq/Pkgfile
index 53a6bae6f..78d76542c 100644
--- a/dnsmasq/Pkgfile
+++ b/dnsmasq/Pkgfile
@@ -5,15 +5,17 @@
 
 name=dnsmasq
 version=2.80
-release=2
+release=3
 source=(http://www.thekelleys.org.uk/$name/$name-$version.tar.xz \
-        $name-config.patch dnsmasq)
+        $name-config.patch dnsmasq \
+        nettle-3.5.patch)
 
 build () {
     cd $name-$version
 
     patch -p1 -i $SRC/$name-config.patch
-    
+    patch -p1 -i $SRC/nettle-3.5.patch
+
     make COPTS="-DHAVE_DNSSEC" CFLAGS="$CFLAGS -Wall -W"
     make COPTS="-DHAVE_DNSSEC" PREFIX=$PKG/usr install
 
diff --git a/dnsmasq/dnsmasq-config.patch b/dnsmasq/dnsmasq-config.patch
index 31fe58072..ebe62dbd3 100644
--- a/dnsmasq/dnsmasq-config.patch
+++ b/dnsmasq/dnsmasq-config.patch
@@ -1,6 +1,6 @@
-diff -Nru dnsmasq-2.79.orig/dnsmasq.conf.example dnsmasq-2.79/dnsmasq.conf.example
---- dnsmasq-2.79.orig/dnsmasq.conf.example	2018-04-04 12:11:55.871714531 +0200
-+++ dnsmasq-2.79/dnsmasq.conf.example	2018-04-04 12:14:52.416900426 +0200
+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
 @@ -22,7 +22,7 @@
  
  # Uncomment these to enable DNSSEC validation and caching:
@@ -30,9 +30,9 @@ diff -Nru dnsmasq-2.79.orig/dnsmasq.conf.example dnsmasq-2.79/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.79.orig/src/config.h dnsmasq-2.79/src/config.h
---- dnsmasq-2.79.orig/src/config.h	2018-04-04 12:11:55.868381226 +0200
-+++ dnsmasq-2.79/src/config.h	2018-04-04 12:12:12.708240101 +0200
+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 */
@@ -42,7 +42,7 @@ diff -Nru dnsmasq-2.79.orig/src/config.h dnsmasq-2.79/src/config.h
  #define TFTP_MAX_CONNECTIONS 50 /* max simultaneous connections */
  #define LOG_MAX 5 /* log-queue length */
  #define RANDFILE "/dev/urandom"
-@@ -190,7 +190,7 @@
+@@ -198,7 +198,7 @@
  #   elif defined(__ANDROID__)
  #      define LEASEFILE "/data/misc/dhcp/dnsmasq.leases"
  #   else
diff --git a/dnsmasq/nettle-3.5.patch b/dnsmasq/nettle-3.5.patch
new file mode 100644
index 000000000..9c28755cc
--- /dev/null
+++ b/dnsmasq/nettle-3.5.patch
@@ -0,0 +1,34 @@
+# http://lists.thekelleys.org.uk/pipermail/dnsmasq-discuss/2019q2/013096.html
+
+diff -Nru dnsmasq-2.80.orig/src/crypto.c dnsmasq-2.80/src/crypto.c
+--- dnsmasq-2.80.orig/src/crypto.c	2019-06-27 16:28:48.474960428 +0200
++++ dnsmasq-2.80/src/crypto.c	2019-06-27 16:33:45.004283079 +0200
+@@ -275,6 +275,10 @@
+   static struct ecc_point *key_256 = NULL, *key_384 = NULL;
+   static mpz_t x, y;
+   static struct dsa_signature *sig_struct;
++#if NETTLE_VERSION_MAJOR == 3 && NETTLE_VERSION_MINOR < 5
++#define nettle_get_secp_256r1() (&nettle_secp_256r1)
++#define nettle_get_secp_384r1() (&nettle_secp_384r1)
++#endif
+   
+   if (!sig_struct)
+     {
+@@ -294,7 +298,7 @@
+ 	  if (!(key_256 = whine_malloc(sizeof(struct ecc_point))))
+ 	    return 0;
+ 	  
+-	  nettle_ecc_point_init(key_256, &nettle_secp_256r1);
++	  nettle_ecc_point_init(key_256, nettle_get_secp_256r1());
+ 	}
+       
+       key = key_256;
+@@ -307,7 +311,7 @@
+ 	  if (!(key_384 = whine_malloc(sizeof(struct ecc_point))))
+ 	    return 0;
+ 	  
+-	  nettle_ecc_point_init(key_384, &nettle_secp_384r1);
++	  nettle_ecc_point_init(key_384, nettle_get_secp_384r1());
+ 	}
+       
+       key = key_384;