- release 3, fix build against nettle-3.5

diff --git a/dnsmasq-nettle-3.5.patch b/dnsmasq-nettle-3.5.patch
new file mode 100644 (file)
index 0000000..cbcb5cd
--- /dev/null
+++ b/dnsmasq-nettle-3.5.patch
@@ -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;

diff --git a/dnsmasq.spec b/dnsmasq.spec
index 639817bb1fdcf695436318465926a7e733064f40..9692114b50c678821759fb1921903f441471d295 100644 (file)
--- a/dnsmasq.spec
+++ b/dnsmasq.spec
@@ -5,7 +5,7 @@ Summary:        A lightweight caching server (DNS, DHCP)
 Summary(pl.UTF-8):     Lekki buforujący serwer nazw (DNS) i DHCP
 Name:          dnsmasq
 Version:       2.80
-Release:       2
+Release:       3
 License:       GPL v2
 Group:         Networking/Daemons
 #Source0:      http://thekelleys.org.uk/dnsmasq/test-releases/%{name}-%{version}%{_rc}.tar.gz
@@ -14,6 +14,7 @@ Source0:      http://thekelleys.org.uk/dnsmasq/%{name}-%{version}.tar.gz
 Source1:       %{name}.init
 Source2:       %{name}.sysconfig
 Source3:       %{name}.service
+Patch0:                %{name}-nettle-3.5.patch
 URL:           http://www.thekelleys.org.uk/dnsmasq/doc.html
 BuildRequires: gettext-tools
 BuildRequires: gmp-devel
@@ -63,6 +64,7 @@ małe wykorzystanie zasobów i łatwa konfiguracja.
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch0 -p1
 
 %build
 %{__make} all-i18n \