[arch-commits] Commit in dnsmasq/trunk (PKGBUILD nettle-3.5.patch)

[Evangelos Foutras]

    Date: Sunday, June 30, 2019 @ 11:34:25
  Author: foutrelis
Revision: 357108

Fix build with nettle 3.5

Added:
  dnsmasq/trunk/nettle-3.5.patch
Modified:
  dnsmasq/trunk/PKGBUILD

------------------+
 PKGBUILD         |    9 +++++++++
 nettle-3.5.patch |   20 ++++++++++++++++++++
 2 files changed, 29 insertions(+)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-06-30 11:14:55 UTC (rev 357107)
+++ PKGBUILD	2019-06-30 11:34:25 UTC (rev 357108)
@@ -14,15 +14,24 @@
 backup=('etc/dnsmasq.conf')
 validpgpkeys=('D6EACBD6EE46B834248D111215CDDA6AE19135A2') # Simon Kelley <simon at thekelleys.org.uk>
 source=("http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.xz"{,.asc}
+        'nettle-3.5.patch'
         'dnsmasq-sysusers.conf'
         'dnsmasq.service')
 sha256sums=('cdaba2785e92665cf090646cba6f94812760b9d7d8c8d0cfb07ac819377a63bb'
             'SKIP'
+            'd9e54439eb20ccd99c263d9c80013002fecb60b387fb8fefd787c7958fdb96c6'
             '7f6ff6a709038ae580758f4b6a754451d7f7ce22957b88a36b97f7b643d3c2ab'
             '983a3c7a68ce114cf7b44f0d9c59b74c266647a9e5ac34c1d1d5161610bc57fe')
 
 _build_copts="-DHAVE_DNSSEC -DHAVE_DBUS -DHAVE_LIBIDN2 -DHAVE_CONNTRACK"
 
+prepare() {
+  cd "$pkgname-$pkgver"
+
+  # fix build with nettle 3.5 (patch from PLD Linux)
+  patch -Np1 -i ../nettle-3.5.patch
+}
+
 build() {
   cd "$pkgname-$pkgver"
 

Added: nettle-3.5.patch
===================================================================
--- nettle-3.5.patch	                        (rev 0)
+++ nettle-3.5.patch	2019-06-30 11:34:25 UTC (rev 357108)
@@ -0,0 +1,20 @@
+--- dnsmasq-2.80/src/crypto.c~	2018-10-18 20:21:55.000000000 +0200
++++ dnsmasq-2.80/src/crypto.c	2019-06-27 09:32:24.587948846 +0200
+@@ -294,7 +294,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 +307,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;