From 4b7ea7ea04ab4c223c922365b92e3950881425c1 Mon Sep 17 00:00:00 2001 From: Petr Menšík Date: Jun 07 2017 09:35:10 +0000 Subject: Update to 2.77 --- diff --git a/dnsmasq-2.77rc3-fix-dhcp.patch b/dnsmasq-2.77rc3-fix-dhcp.patch deleted file mode 100644 index 23f5265..0000000 --- a/dnsmasq-2.77rc3-fix-dhcp.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 7ab78b937fc1b98a1e47a63b2cc1f8451cd7c5fa Mon Sep 17 00:00:00 2001 -From: Simon Kelley -Date: Thu, 11 May 2017 20:33:21 +0100 -Subject: [PATCH] Fix c7be0164ce6ae89d6f2f0ffea14e2612418dd5da - ---- - src/dhcp.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/dhcp.c b/src/dhcp.c -index 232e344..f995f0e 100644 ---- a/src/dhcp.c -+++ b/src/dhcp.c -@@ -224,7 +224,7 @@ void dhcp_packet(time_t now, int pxe_fd) - #endif - - if (!indextoname(daemon->dhcpfd, iface_index, ifr.ifr_name) || -- ioctl(daemon->dhcpfd, SIOCGIFFLAGS, &ifr) != -1) -+ ioctl(daemon->dhcpfd, SIOCGIFFLAGS, &ifr) != 0) - return; - - mess = (struct dhcp_packet *)daemon->dhcp_packet.iov_base; --- -2.9.3 - diff --git a/dnsmasq.spec b/dnsmasq.spec index d0c47a5..1122d3b 100644 --- a/dnsmasq.spec +++ b/dnsmasq.spec @@ -1,5 +1,5 @@ %define testrelease 0 -%define releasecandidate 2 +%define releasecandidate 0 %if 0%{testrelease} %define extrapath test-releases/ %define extraversion test%{testrelease} @@ -13,7 +13,7 @@ Name: dnsmasq Version: 2.77 -Release: 2%{?extraversion:.%{extraversion}}%{?dist} +Release: 3%{?extraversion:.%{extraversion}}%{?dist} Summary: A lightweight DHCP/caching DNS server Group: System Environment/Daemons @@ -22,8 +22,6 @@ URL: http://www.thekelleys.org.uk/dnsmasq/ Source0: http://www.thekelleys.org.uk/dnsmasq/%{?extrapath}%{name}-%{version}%{?extraversion}.tar.xz Source1: %{name}.service -Patch1: dnsmasq-2.77rc3-fix-dhcp.patch - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: dbus-devel @@ -57,7 +55,6 @@ query/remove a DHCP server's leases. %prep %setup -q -n %{name}-%{version}%{?extraversion} -%patch1 -p1 # use /var/lib/dnsmasq instead of /var/lib/misc for file in dnsmasq.conf.example man/dnsmasq.8 man/es/dnsmasq.8 src/config.h; do @@ -143,6 +140,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/dhcp_* %changelog +* Wed Jun 07 2017 Petr Menšík - 2.77-3 +- Update to 2.77 + * Fri May 12 2017 Petr Menšík - 2.77-2.rc2 - Fix dhcp