diff --git a/dnsmasq-2.81.tar.xz b/dnsmasq-2.81.tar.xz deleted file mode 100644 index 7341429..0000000 --- a/dnsmasq-2.81.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:749ca903537c5197c26444ac24b0dce242cf42595fdfe6b9a5b9e4c7ad32f8fb -size 510648 diff --git a/dnsmasq-2.81.tar.xz.asc b/dnsmasq-2.81.tar.xz.asc deleted file mode 100644 index 3cd008e..0000000 --- a/dnsmasq-2.81.tar.xz.asc +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iQIcBAABCAAGBQJekkKsAAoJEBXN2mrhkTWiPIUQAKn8QayVwrx7G9H6iY8cMp6p -yTmZ7XZyKUb+RY5ZZr1dUV9vdv5nNDbkNYOdViwjlzNficaxwJk+9jW7fz4lxGuS -eIU5BdejCKoRJH2L6JAnUwRz742O7/TfoyyjyDLGW52qx3tlWyD5VMCsYmu5/7Mb -yVLifBCgvOKCGhXxJV7cWU/zCWGR0vDKu1kYvMbRnz3HzNVtOPLHA8PjQ6aDGbRf -PBygCQzyvsNIpEDmCfWwgSp8WBenpHmcR9amPIrTPUAmZ3TLtF7yBhZ1sGPqd+Sn -RXnjc5LyZw0MdK/3/g1SLt8z1kgvl1eNQIVvonG0sxg3m7RqWIcrM76uw03voW9B -Fkx+xe+nIKgu8fTSnvJxWE7j4d4pDjte/uQoZhr8RxqRnmOpz+NteC5hzGS5Qk1p -a+Nt3MjW1sfKHHtLwszgwHjnqLGHOFNE6BQjKuQj1WQ+SJv16sele/gKRo8J8hMG -HRfH1JTr48ikvXLBrUOJ8zCcw/HBcimvv4Awmw6pyIVup5zYztjVDPLXcjINj8t4 -UXji3WcEjevZ0LA4Dz/S4jlz5NR/ne5Grqvsv42FKXBn7AoOVzHmQqiX1rZL8G5u -1aCiM8FdUJaoysSxSNGMpISE4lAhO/vjbZD0tCzCQSpfW8erYPKKBYG/dY9p/Di1 -Bysh+4glD6m578lOw67q -=EWoa ------END PGP SIGNATURE----- diff --git a/dnsmasq-2.82.tar.xz b/dnsmasq-2.82.tar.xz new file mode 100644 index 0000000..43f5f3a --- /dev/null +++ b/dnsmasq-2.82.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:84523646f3116bb5e1151efb66e645030f6e6a8256f29aab444777a343ebc132 +size 509904 diff --git a/dnsmasq-2.82.tar.xz.asc b/dnsmasq-2.82.tar.xz.asc new file mode 100644 index 0000000..59012e3 --- /dev/null +++ b/dnsmasq-2.82.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEE1urL1u5GuDQkjRESFc3aauGRNaIFAl8UwTUACgkQFc3aauGR +NaLN9A/7BwXyk9I50Xgct/25lzXBU8E3apZXNfsHS3NBIRudNzVEKU6pqdqXIWmF +Neiq7zzgSF4n6azP8tIfoLrMtmblK+6qetd/zyLLqMCp/xwuriX9IGrYdXfYSn8F +mqBrCsppww+mBhbV+trbjBdpfqG+5Vf2o9Crx41bdNMeYVq8ZeZbD+SDRZCU8OtF +PvoKYEtJicycWrHdSObpl1ky/huB9zuawPRsMIQZ2pDaFkC1CzBGaBmd6i/B1kcP +oDN+c6pBCCi2FKingiUiNNxSGuvhfT6eiAQaVdL0hHpSzSR+POezn7UulJg2c1OM +sR+mL8dReIjUItLjJCknovoGBxGpchNfSSLuj1UxfeetZUf5uVs8ZRec1+n9+tVw +gweFpE3k7Xwy8IGMT1TAFpP2HhMahkUg1MO1VXOgu4yoIq6g7q1i6O/kFPXyRFz/ +N6V/laJz1oLFtrVW+zQtvLpXJIIc473+Xkpf4DoD2BRmnqr2Ufg2Dk19sdktBbw+ +Xz8YqIUDR781uMy3+N/EQRlQ3+NDjGgA/qJEzpSsUa5E0BHTyfRPLV9kOkJ+IdU5 +SVFgSRek7LBW9zp113xt4dWWoccaWGf5Cdt30Dycknc3PTLgBRRbrJKRz7N2/3by +c6HvcQYkEdEl9QgUQ7nxFlpK+y9zn8AGRb1lt91Qwj4BI2JGgBA= +=umZ9 +-----END PGP SIGNATURE----- diff --git a/dnsmasq.changes b/dnsmasq.changes index 090391e..05511d1 100644 --- a/dnsmasq.changes +++ b/dnsmasq.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Tue Jul 28 08:00:51 UTC 2020 - Martin Rey + +- Update to 2.82: + * Improve behaviour in the face of network interfaces which come + and go and change index. + * Convert hard startup failure on NETLINK_NO_ENOBUFS under + qemu-user to a warning. + * Allow IPv6 addresses ofthe form [::ffff:1.2.3.4] in + --dhcp-option. + * Fix crash under heavy TCP connection load introduced in 2.81. + * Change default lease time for DHCPv6 to one day. + * Alter calculation of preferred and valid times in router + advertisements, so that these do not have a floor applied of + the lease time in the dhcp-range if this is not explicitly + specified and is merely the default. +- Reformat spec file with spec-cleaner + ------------------------------------------------------------------- Tue May 5 11:26:55 UTC 2020 - Paolo Stivanin diff --git a/dnsmasq.spec b/dnsmasq.spec index bca71d3..a902915 100644 --- a/dnsmasq.spec +++ b/dnsmasq.spec @@ -21,14 +21,12 @@ %else %bcond_without tftp_user_package %endif - Name: dnsmasq +Version: 2.82 +Release: 0 Summary: DNS Forwarder and DHCP Server License: GPL-2.0-only OR GPL-3.0-only Group: Productivity/Networking/DNS/Servers -Version: 2.81 -Release: 0 -Provides: dns_daemon 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 @@ -38,20 +36,20 @@ Source4: dnsmasq.service Source5: rc.dnsmasq-suse Source8: %{name}-rpmlintrc Patch0: dnsmasq-groups.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: dbus-1-devel BuildRequires: dos2unix BuildRequires: libidn2-devel BuildRequires: libnettle-devel BuildRequires: lua-devel -BuildRequires: pkg-config +BuildRequires: pkgconfig BuildRequires: pkgconfig(libnetfilter_conntrack) BuildRequires: pkgconfig(systemd) Requires(pre): group(nogroup) +Provides: dns_daemon %if %{with tftp_user_package} Requires(pre): user(tftp) %else -Requires(pre): /usr/sbin/useradd +Requires(pre): %{_sbindir}/useradd %endif %description @@ -83,7 +81,7 @@ find contrib -name *.py -exec chmod a-x '{}' + dos2unix contrib/systemd/dbus_activation # SED-FIX-UPSTREAM -- Fix paths -sed -i -e 's|\(PREFIX *= *\)/usr/local|\1/usr|; +sed -i -e 's|\(PREFIX *= *\)%{_prefix}/local|\1/usr|; s|$(LDFLAGS)|$(CFLAGS) $(LDFLAGS)|' \ Makefile @@ -101,31 +99,31 @@ sed -i -e 's|CACHESIZ 150|CACHESIZ 2000|; src/config.h # Fix trust-anchor.conf location and include /etc/dnsmasq.d/*.conf by default -sed -i -e '/trust-anchors.conf/c\#conf-file=/etc/dnsmasq.d/trust-anchors.conf' \ +sed -i -e '/trust-anchors.conf/c\#conf-file=%{_sysconfdir}/dnsmasq.d/trust-anchors.conf' \ -e '/conf-dir=.*conf/s/^\#//' \ dnsmasq.conf.example %build mv po/no.po po/nb.po -export CFLAGS="%optflags -std=gnu99 -fPIC -DPIC -fpie" +export CFLAGS="%{optflags} -std=gnu99 -fPIC -DPIC -fpie" export LDFLAGS="-Wl,-z,relro,-z,now -pie" # the dnsmasq make system hashes the configuration flags, so we have to supply the # same flags for make and make install, else everything gets recompiled %define _copts "-DHAVE_DBUS -DHAVE_CONNTRACK -DHAVE_LIBIDN2 -DHAVE_DNSSEC -DHAVE_LUASCRIPT" -make %{?_smp_mflags} AWK=gawk all-i18n CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" COPTS=%{_copts} +%make_build AWK=gawk all-i18n CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" COPTS=%{_copts} %pre %if %{without tftp_user_package} -if ! /usr/bin/getent group tftp >/dev/null; then +if ! %{_bindir}/getent group tftp >/dev/null; then %{_sbindir}/groupadd -r tftp fi -if ! /usr/bin/getent passwd tftp >/dev/null; then +if ! %{_bindir}/getent passwd tftp >/dev/null; then %{_sbindir}/useradd -c "TFTP account" -d /srv/tftpboot -G tftp -g tftp \ -r -s /bin/false tftp fi %endif -if ! /usr/bin/getent passwd dnsmasq >/dev/null; then - /usr/sbin/useradd -r -d /var/lib/empty -s /bin/false -c "dnsmasq" -g nogroup -G tftp dnsmasq +if ! %{_bindir}/getent passwd dnsmasq >/dev/null; then + %{_sbindir}/useradd -r -d %{_localstatedir}/lib/empty -s /bin/false -c "dnsmasq" -g nogroup -G tftp dnsmasq fi %service_add_pre %{name}.service @@ -133,8 +131,8 @@ fi %post %service_add_post %{name}.service # reload dbus after install or upgrade to apply new policies -if [ -z "${TRANSACTIONAL_UPDATE}" -a -x /usr/bin/systemctl ]; then - /usr/bin/systemctl reload dbus.service 2>/dev/null || : +if [ -z "${TRANSACTIONAL_UPDATE}" -a -x %{_bindir}/systemctl ]; then + %{_bindir}/systemctl reload dbus.service 2>/dev/null || : fi %preun @@ -144,22 +142,22 @@ fi %service_del_postun %{name}.service # reload dbus after uninstall, our policies are gone again if [ $1 -eq 0 -a -z "${TRANSACTIONAL_UPDATE}" \ - -a -x /usr/bin/systemctl ]; then - /usr/bin/systemctl reload dbus.service 2>/dev/null || : + -a -x %{_bindir}/systemctl ]; then + %{_bindir}/systemctl reload dbus.service 2>/dev/null || : fi %install -make install-i18n DESTDIR=%{buildroot} PREFIX=/usr AWK=gawk COPTS=%{_copts} +make install-i18n DESTDIR=%{buildroot} PREFIX=%{_prefix} AWK=gawk COPTS=%{_copts} install -d -m 755 %{buildroot}/%{_sysconfdir}/slp.reg.d install -m 644 dnsmasq.conf.example %{buildroot}/%{_sysconfdir}/dnsmasq.conf -install -m 644 %SOURCE3 %{buildroot}/%{_sysconfdir}/slp.reg.d/ -install -d 755 %{buildroot}/etc/dbus-1/system.d/ -install -m 644 dbus/dnsmasq.conf %{buildroot}/etc/dbus-1/system.d/dnsmasq.conf -install -D -m 0644 %SOURCE4 %{buildroot}%{_unitdir}/dnsmasq.service +install -m 644 %{SOURCE3} %{buildroot}/%{_sysconfdir}/slp.reg.d/ +install -d 755 %{buildroot}%{_sysconfdir}/dbus-1/system.d/ +install -m 644 dbus/dnsmasq.conf %{buildroot}%{_sysconfdir}/dbus-1/system.d/dnsmasq.conf +install -D -m 0644 %{SOURCE4} %{buildroot}%{_unitdir}/dnsmasq.service %if %{without tftp_user_package} install -d -m 0755 %{buildroot}/srv/tftpboot %endif -ln -sf %{_sbindir}/service %{buildroot}/usr/sbin/rcdnsmasq +ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rcdnsmasq install -d -m 755 %{buildroot}/%{_sysconfdir}/dnsmasq.d install -m 644 trust-anchors.conf %{buildroot}/%{_sysconfdir}/dnsmasq.d/trust-anchors.conf @@ -189,8 +187,8 @@ rm -rf contrib/MacOSX-launchd %{_sbindir}/rcdnsmasq %dir %{_sysconfdir}/slp.reg.d/ %config %attr(0644,root,root) /%{_sysconfdir}/slp.reg.d/dnsmasq.reg -%{_mandir}/man8/dnsmasq.8.gz -%config(noreplace) /etc/dbus-1/system.d/dnsmasq.conf +%{_mandir}/man8/dnsmasq.8%{?ext_man} +%config(noreplace) %{_sysconfdir}/dbus-1/system.d/dnsmasq.conf %{_unitdir}/dnsmasq.service %dir %{_sysconfdir}/dnsmasq.d %config(noreplace) %{_sysconfdir}/dnsmasq.d/trust-anchors.conf