Hello community, here is the log from the commit of package dnsmasq for openSUSE:Factory checked in at 2019-09-11 10:21:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dnsmasq (Old) and /work/SRC/openSUSE:Factory/.dnsmasq.new.7948 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dnsmasq" Wed Sep 11 10:21:32 2019 rev:74 rq:728482 version:2.80 Changes: -------- --- /work/SRC/openSUSE:Factory/dnsmasq/dnsmasq.changes 2019-07-31 14:14:18.750867508 +0200 +++ /work/SRC/openSUSE:Factory/.dnsmasq.new.7948/dnsmasq.changes 2019-09-11 10:21:34.503501965 +0200 @@ -1,0 +2,5 @@ +Wed Sep 4 18:47:39 UTC 2019 - Stefan Brüns <stefan.bru...@rwth-aachen.de> + +- Add Fix-build-with-libnettle-3.5.patch + +------------------------------------------------------------------- New: ---- Fix-build-with-libnettle-3.5.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dnsmasq.spec ++++++ --- /var/tmp/diff_new_pack.9PmgzH/_old 2019-09-11 10:21:35.567501833 +0200 +++ /var/tmp/diff_new_pack.9PmgzH/_new 2019-09-11 10:21:35.567501833 +0200 @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -23,7 +23,6 @@ Version: 2.80 Release: 0 Provides: dns_daemon -PreReq: /usr/sbin/useradd /bin/mkdir Url: http://www.thekelleys.org.uk/dnsmasq/ Source0: http://www.thekelleys.org.uk/%{name}/%{name}-%{version}.tar.xz Source1: http://www.thekelleys.org.uk/%{name}/%{name}-%{version}.tar.xz.asc @@ -34,6 +33,8 @@ Source8: %{name}-rpmlintrc Patch0: dnsmasq-groups.patch Patch1: 0001-fix-build-after-y2038-changes-in-glibc.patch +# PATCH-FIX-UPSTREAM -- http://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=ab73a746a0d6fcac2e682c5548eeb87fb9c9c82e +Patch2: Fix-build-with-libnettle-3.5.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: dbus-1-devel BuildRequires: dos2unix @@ -42,11 +43,9 @@ BuildRequires: lua-devel BuildRequires: pkg-config BuildRequires: pkgconfig(libnetfilter_conntrack) -Requires(pre): group(nogroup) -%if 0%{?suse_version} >= 1210 BuildRequires: pkgconfig(systemd) -%endif Requires(pre): group(nogroup) +Requires(pre): /usr/sbin/useradd %description Dnsmasq provides network infrastructure for small networks: DNS, @@ -69,6 +68,7 @@ %setup -q %patch0 %patch1 -p1 +%patch2 -p1 # Remove the executable bit from python example files to # avoid unwanted automatic dependencies @@ -82,7 +82,7 @@ s|$(LDFLAGS)|$(CFLAGS) $(LDFLAGS)|' \ Makefile -# use lua5.3 instead of lua5.3 +# use lua5.3 instead of lua5.2 sed -i -e 's|lua5.2|lua5.3|' Makefile # SED-FIX-UPSTREAM -- Fix man page @@ -170,7 +170,6 @@ %find_lang %{name} --with-man %files -f %{name}.lang -%defattr(-,root,root,-) %license COPYING COPYING-v3 %doc CHANGELOG FAQ doc.html setup.html dnsmasq.conf.example contrib dbus %config(noreplace) %{_sysconfdir}/dnsmasq.conf @@ -187,7 +186,6 @@ %dir %attr(0755,tftp,tftp) /srv/tftpboot %files utils -%defattr(-,root,root,-) %{_bindir}/dhcp_* %{_mandir}/man1/dhcp_* ++++++ Fix-build-with-libnettle-3.5.patch ++++++ From: Vladislav Grishenko <themi...@mail.ru> Date: Wed, 26 Jun 2019 15:27:11 +0000 (+0500) Subject: Fix build with libnettle 3.5 X-Git-Url: http://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commitdiff_plain;h=ab73a746a0d6fcac2e682c5548eeb87fb9c9c82e;hp=69bc94779c2f035a9fffdb5327a54c3aeca73ed5 Fix build with libnettle 3.5 --- diff --git a/src/crypto.c b/src/crypto.c index ebb871e..fecc64a 100644 --- a/src/crypto.c +++ b/src/crypto.c @@ -275,6 +275,10 @@ static int dnsmasq_ecdsa_verify(struct blockdata *key_data, unsigned int key_len 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 < 4 +#define nettle_get_secp_256r1() (&nettle_secp_256r1) +#define nettle_get_secp_384r1() (&nettle_secp_384r1) +#endif if (!sig_struct) { @@ -294,7 +298,7 @@ static int dnsmasq_ecdsa_verify(struct blockdata *key_data, unsigned int key_len 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 @@ static int dnsmasq_ecdsa_verify(struct blockdata *key_data, unsigned int key_len 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;
