diff --git a/dnsmasq-2.35.tar.gz b/dnsmasq-2.35.tar.gz deleted file mode 100644 index d23cb8d..0000000 --- a/dnsmasq-2.35.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:af29bdb1c669b44b32bcf6f9d531f83100b0eb36716d862ebac1862c0e6aefa7 -size 256122 diff --git a/dnsmasq.changes b/dnsmasq.changes index 571ec41..6441465 100644 --- a/dnsmasq.changes +++ b/dnsmasq.changes @@ -1,3 +1,85 @@ +------------------------------------------------------------------- +Tue Mar 6 11:55:37 CET 2007 - ug@suse.de + +- SuSEFirewall service file added + +------------------------------------------------------------------- +Tue Feb 13 09:33:37 CET 2007 - ug@suse.de + +- version 2.38 + + Don't send length zero DHCP option 43 and cope with + encapsulated options whose total length exceeds 255 octets + by splitting them into multiple option 43 pieces. + + Avoid queries being retried forever when --strict-order is + set and an upstream server returns a SERVFAIL + error. Thanks to Johannes Stezenbach for spotting this. + + Fix BOOTP support, broken in version 2.37. + + Add example dhcp-options for Etherboot. + + Add \e (for ASCII ESCape) to the set of valid escapes + in config-file strings. + + Added --dhcp-option-force flag and examples in the + configuration file which use this to control PXELinux. + + Added --tftp-no-blocksize option. + + Set netid tag "bootp" when BOOTP (rather than DHCP) is in + use. This makes it easy to customise which options are + sent to BOOTP clients. (BOOTP allows only 64 octets for + options, so it can be necessary to trim things.) + + Fix rare hang in cache code, a 2.37 regression. This + probably needs an infinite DHCP lease and some bad luck to + trigger. Thanks to Detlef Reichelt for bug reports and + testing. + +------------------------------------------------------------------- +Mon Feb 5 16:29:39 CET 2007 - ug@suse.de + + Add better support for RFC-2855 DHCP-over-firewire and RFC +-4390 DHCP-over-InfiniBand. A good suggestion from Karl Svec. + + Some efficiency tweaks to the cache code for very large + /etc/hosts files. Should improve reverse (address->name) + lookups and garbage collection. Thanks to Jan 'RedBully' + Seiffert for input on this. + + Fix regression in 2.36 which made bogus-nxdomain + and DNS caching unreliable. Thanks to Dennis DeDonatis + and Jan Seiffert for bug reports. + + Make DHCP encapsulated vendor-class options sane. Be + warned that some conceivable existing configurations + using these may break, but they work in a much + simpler and more logical way now. Prepending + "vendor:" to an option encapsulates it + in option 43, and the option is sent only if the + client-supplied vendor-class substring-matches with + the given client-id. Thanks to Dennis DeDonatis for + help with this. + + Apply patch from Jan Seiffert to tidy up tftp.c + + Add support for overloading the filename and servername + fields in DHCP packet. This gives extra option-space when + these fields are not being used or with a modern client + which supports moving them into options. + + Added a LIMITS section to the man-page, with guidance on + maximum numbers of clients, file sizes and tuning. + +- version 2.37 + +------------------------------------------------------------------- +Mon Jan 22 15:20:06 CET 2007 - ug@suse.de + +- version 2.36 + ------------------------------------------------------------------- Mon Oct 30 09:28:53 CET 2006 - ug@suse.de diff --git a/dnsmasq.spec b/dnsmasq.spec index fe7f3cc..e2e0f4e 100644 --- a/dnsmasq.spec +++ b/dnsmasq.spec @@ -1,7 +1,7 @@ # -# spec file for package dnsmasq (Version 2.35) +# spec file for package dnsmasq (Version 2.38) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -12,15 +12,15 @@ Name: dnsmasq Summary: Lightweight, Easy-to-Configure DNS Forwarder and DHCP Server -Version: 2.35 +Version: 2.38 Release: 1 -License: GNU General Public License (GPL) - all versions +License: GNU General Public License (GPL) Group: Productivity/Networking/DNS/Servers Provides: dns_daemon PreReq: %fillup_prereq %insserv_prereq /bin/mkdir Autoreqprov: on URL: http://www.thekelleys.org.uk/dnsmasq/ -Source: %{name}-%{version}.tar.gz +Source: %{name}_%{version}.orig.tar.gz Source1: vendor-files.tar.bz2 patch1: group_and_isc.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -42,13 +42,13 @@ Authors: simon@thekelleys.org.uk %prep -%setup -%setup -T -D -a1 +%setup -n dnsmasq-%{version}.orig +%setup -T -D -a1 -n dnsmasq-%{version}.orig %patch1 -p0 %build mv po/no.po po/nb.po -CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing " make +CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" make %post %{fillup_and_insserv dnsmasq} @@ -68,10 +68,12 @@ rm -rf $RPM_BUILD_ROOT make install-i18n DESTDIR=$RPM_BUILD_ROOT PREFIX=/usr install -d -m 755 ${RPM_BUILD_ROOT}/%{_sysconfdir}/init.d install -d -m 755 ${RPM_BUILD_ROOT}/%{_sysconfdir}/slp.reg.d +install -d -m 755 ${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services install -m 755 rc.dnsmasq-suse $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/dnsmasq ln -sf ../../etc/init.d/dnsmasq $RPM_BUILD_ROOT/usr/sbin/rcdnsmasq install -m 644 dnsmasq.conf.example $RPM_BUILD_ROOT/%{_sysconfdir}/dnsmasq.conf install -m 644 dnsmasq.reg $RPM_BUILD_ROOT/%{_sysconfdir}/slp.reg.d/ +install -m 644 SuSEFirewall.dnsmasq ${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/dnsmasq %files %defattr(-,root,root) @@ -81,12 +83,67 @@ install -m 644 dnsmasq.reg $RPM_BUILD_ROOT/%{_sysconfdir}/slp.reg.d/ /usr/sbin/rcdnsmasq /usr/sbin/dnsmasq /usr/share/locale/*/LC_MESSAGES/* +/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/dnsmasq /%{_sysconfdir}/slp.reg.d/ %attr(0644,root,root) /%{_sysconfdir}/slp.reg.d/dnsmasq.reg %doc %{_mandir}/man8/dnsmasq.8.gz %doc %{_mandir}/es/man8/dnsmasq.8.gz -%changelog -n dnsmasq +%changelog +* Tue Mar 06 2007 - ug@suse.de +- SuSEFirewall service file added +* Tue Feb 13 2007 - ug@suse.de +- version 2.38 + Don't send length zero DHCP option 43 and cope with + encapsulated options whose total length exceeds 255 octets + by splitting them into multiple option 43 pieces. + Avoid queries being retried forever when --strict-order is + set and an upstream server returns a SERVFAIL + error. Thanks to Johannes Stezenbach for spotting this. + Fix BOOTP support, broken in version 2.37. + Add example dhcp-options for Etherboot. + Add \e (for ASCII ESCape) to the set of valid escapes + in config-file strings. + Added --dhcp-option-force flag and examples in the + configuration file which use this to control PXELinux. + Added --tftp-no-blocksize option. + Set netid tag "bootp" when BOOTP (rather than DHCP) is in + use. This makes it easy to customise which options are + sent to BOOTP clients. (BOOTP allows only 64 octets for + options, so it can be necessary to trim things.) + Fix rare hang in cache code, a 2.37 regression. This + probably needs an infinite DHCP lease and some bad luck to + trigger. Thanks to Detlef Reichelt for bug reports and + testing. +* Mon Feb 05 2007 - ug@suse.de + Add better support for RFC-2855 DHCP-over-firewire and RFC +-4390 DHCP-over-InfiniBand. A good suggestion from Karl Svec. + Some efficiency tweaks to the cache code for very large + /etc/hosts files. Should improve reverse (address->name) + lookups and garbage collection. Thanks to Jan 'RedBully' + Seiffert for input on this. + Fix regression in 2.36 which made bogus-nxdomain + and DNS caching unreliable. Thanks to Dennis DeDonatis + and Jan Seiffert for bug reports. + Make DHCP encapsulated vendor-class options sane. Be + warned that some conceivable existing configurations + using these may break, but they work in a much + simpler and more logical way now. Prepending + "vendor:" to an option encapsulates it + in option 43, and the option is sent only if the + client-supplied vendor-class substring-matches with + the given client-id. Thanks to Dennis DeDonatis for + help with this. + Apply patch from Jan Seiffert to tidy up tftp.c + Add support for overloading the filename and servername + fields in DHCP packet. This gives extra option-space when + these fields are not being used or with a modern client + which supports moving them into options. + Added a LIMITS section to the man-page, with guidance on + maximum numbers of clients, file sizes and tuning. +- version 2.37 +* Mon Jan 22 2007 - ug@suse.de +- version 2.36 * Mon Oct 30 2006 - ug@suse.de - version 2.35 - better performance on parsing huge /etc/hosts files diff --git a/dnsmasq_2.38.orig.tar.gz b/dnsmasq_2.38.orig.tar.gz new file mode 100644 index 0000000..1fad07f --- /dev/null +++ b/dnsmasq_2.38.orig.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0ee930302701c6c53c9e829f44baaad0066beb6ec2c055c2fc6f59083aff366c +size 269691 diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 92a46df..4aa6124 100644 --- a/vendor-files.tar.bz2 +++ b/vendor-files.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3e1b4b89aa529276feb89c3b46ddc7b5722dec85bdb921a27e39b58beccad11f -size 1029 +oid sha256:08b9007f4734782b0d66d2f117024be48ed510ab0b81389d4f6f968e61a9b3ac +size 1354