Hello community, here is the log from the commit of package dnsmasq.1490 for openSUSE:12.3:Update checked in at 2013-04-02 15:53:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3:Update/dnsmasq.1490 (Old) and /work/SRC/openSUSE:12.3:Update/.dnsmasq.1490.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dnsmasq.1490", Maintainer is "" Changes: -------- New Changes file: --- /dev/null 2013-02-26 18:15:11.936010755 +0100 +++ /work/SRC/openSUSE:12.3:Update/.dnsmasq.1490.new/dnsmasq.changes 2013-04-02 15:53:38.000000000 +0200 @@ -0,0 +1,790 @@ +------------------------------------------------------------------- +Mon Mar 25 09:27:45 UTC 2013 - [email protected] + +- Create a utils subpackage to include DHCP lease management utils + (that are living in contrib/wrt) (bnc#808993): + + Explicitly build them in %build and install the files in + %install. + + Summary and description of the new subpackage are taken from + Fedora. + +------------------------------------------------------------------- +Fri Feb 22 12:53:03 UTC 2013 - [email protected] + +- Install dnsmasq.service accordingly (/usr/lib/systemd for 12.3 + and up or /lib/systemd for older versions). + +------------------------------------------------------------------- +Fri Dec 14 15:32:27 UTC 2012 - [email protected] + +- Update to version 2.65. For other changes relating to other + versions in between please see the CHANGELOG + + * Fix regression which broke forwarding orgf queries sent via + TCP which are not for A and AAAA and which were directed to + non-default servers. Thanks to Niax for the bug reportst. + + Fix failure to build with DHCP support excluded. Thanks to + Gustavo Zacarias for the patch. + + Fix nasty regression in 27.64 which completely broke cacheing. + +- renamed group_and_isc.diff to group_and_isc.patch rebasinp to -p1 + level as outlined in the documentation at + http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines + +------------------------------------------------------------------- +Thu Oct 4 07:32:36 UTC 2012 - [email protected] + +- license update: GPL-2.0 + Most of the source code files give a choice of either GPL-2.0 or GPL-3.0 + (not GPL-2.0+). The website states that the COPYING file in the + distribution is the official license - in this case it is GPL-2.0. This + is consistent with what Fedora state about the package. Accordingly, I^d + be ok with License: GPL-2.0 or License: (GPL-2.0 or GPL-3.0) but not + License: GPL-2.0+ + +------------------------------------------------------------------- +Sun Jun 24 03:51:58 UTC 2012 - [email protected] + +- Update to version 2.62, misc bugfixes +- Fix CFLAGS/LDFLAGS usage +- fix the small cache size problem in a different way by tweaking + the build config instead. + +------------------------------------------------------------------- +Sat Jun 23 03:53:32 UTC 2012 - [email protected] + +- The default cache size is way too small (150 entries) use a sane + default of 2000 as used in *WRT embeeded routers which is still + very conservative for a desktop/server machine. +- use async logging + +------------------------------------------------------------------- +Sun Apr 29 19:16:43 UTC 2012 - [email protected] + +- update to 2.61: + * add ra-names, ra-stateless and slaac keywords for DHCPv6: dnsmasq can now + synthesise AAAA records for dual-stack hosts which get IPv6 addresses via + SLAAC; it is also now possible to use SLAAC and stateless DHCPv6, and to + tell clients to use SLAAC addresses as well as DHCP ones + * add --dhcp-duid to allow DUID-EN uids to be used + * explicity send DHCPv6 replies to the correct port, instead of relying on + clients to send requests with the correct source address, since at least + one client in the wild gets this wrong + * send a preference value of 255 in DHCPv6 replies when --dhcp-authoritative + is in effect: his tells clients not to wait around for other DHCP servers + * better logging of DHCPv6 options + * add --host-record + * invoke the DHCP script with action "tftp" when a TFTP file transfer + completes: the size of the file, address to which it was sent and complete + pathname are supplied; note that version 2.60 introduced some script + incompatibilties associated with DHCPv6, and this is a further change; to + be safe, scripts should ignore unknown actions, and if not IPv6-aware, + should exit if the environment variable DNSMASQ_IAID is set; the use-case + for this is to track netboot/install + * update contrib/port-forward/dnsmasq-portforward to reflect the above + * set the environment variable DNSMASQ_LOG_DHCP when running the script id + --log-dhcp is in effect, so that script can taylor their logging verbosity + * arrange that addresses specified with --listen-address work even if there + is no interface carrying the address; this is chiefly useful for IPv4 + loopback addresses, where any address in 127.0.0.0/8 is a valid loopback + address, but normally only 127.0.0.1 appears on the lo interface + * fix crash, introduced in 2.60, when a DHCPINFORM is received from a network + which has no valid dhcp-range + * add a new DHCP lease time keyword, "deprecated" for --dhcp-range: this is + only valid for IPv6, and sets the preffered lease time for both DHCP and RA + to zero; the effect is that clients can continue to use the address for + existing connections, but new connections will use other addresses, if they + exist; this makes hitless renumbering at least possible + * fix bug in address6_available() which caused DHCPv6 lease aquistion to fail + if more than one dhcp-range in use + * provide RDNSS and DNSSL data in router advertisements, using the settings + provided for DHCP options option6:domain-search and option6:dns-server + * don't cache data from non-recursive nameservers, since it may erroneously + look like a valid CNAME to a non-exitant name + * call SO_BINDTODEVICE on the DHCP socket(s) when doing DHCP on exacly one + interface and --bind-interfaces is set; this makes the OpenStack use-case + of one dnsmasq per virtual interface work + * give correct from-cache answers to explict CNAME queries + * add --tftp-lowercase option + * ensure that the DBus DhcpLeaseUpdated events are generated when a lease + goes through INIT_REBOOT state, even if the dhcp-script is not in use + +------------------------------------------------------------------- +Tue Mar 6 10:13:09 CET 2012 - [email protected] + +- some dhcp fixes +- Add Lua integration +- Set TOS on DHCP sockets +- Improve start-up speed when reading large hosts files +- Fix problem if dnsmasq is started without the stdin +- Allow the TFP server or boot server in --pxe-service +- Support DHCPv6. Support is there for the sort of things + the existing v4 server does, including tags, options, + static addresses and relay support +- Support IPv6 router advertisements +- Fix long-standing wrinkle with --localise-queries that + could result in wrong answers when DNS packets arrive + via an interface other than the expected one +- 2.60 + +------------------------------------------------------------------- +Wed Feb 8 16:56:35 CET 2012 - [email protected] + +- added correct group for tftp + (bnc#738905) + +------------------------------------------------------------------- +Mon Feb 6 22:25:05 UTC 2012 - [email protected] + +- Use systemd macros correctly +- build with PIE and full RELRO. + +------------------------------------------------------------------- +Thu Jan 19 04:22:44 UTC 2012 - [email protected] + +- --enable-dbus must be explicit in systemd unit +- default user is provided in config file or takes defaults on + group_and_isc.diff + +------------------------------------------------------------------- +Wed Jan 18 21:34:25 UTC 2012 - [email protected] + +- dnsmasq has dbus support, use it for systemd service. + +------------------------------------------------------------------- +Fri Nov 25 13:14:41 CET 2011 - [email protected] + +- removed systemd config for pre-12.1 + +------------------------------------------------------------------- +Thu Nov 24 20:45:37 UTC 2011 - [email protected] + +- Must be of type forking and change uid to dnsmasq + +------------------------------------------------------------------- +Thu Nov 24 20:19:11 UTC 2011 - [email protected] + +- Add systemd startup script + +------------------------------------------------------------------- +Thu Oct 20 15:58:50 CEST 2011 - [email protected] + +- dnsmasq still announced itself as 2.59-RC1 + no other code changes than just the correct version string + +------------------------------------------------------------------- +Tue Oct 18 23:13:12 CEST 2011 - [email protected] + +- fixed binding to IPv6 link-local addresses + (regression from 2.58) +- 2.59 + +------------------------------------------------------------------- +Sun Sep 18 17:17:12 UTC 2011 - [email protected] + +- Remove redundant tags/sections from specfile + (cf. packaging guidelines) +- Use %_smp_mflags for parallel build + +------------------------------------------------------------------- +Fri Aug 26 21:12:04 CEST 2011 - [email protected] + +- Support scope-ids in IPv6 addresses of nameservers from + /etc/resolv.conf and in --server options +- Fix bug which resulted in truncated files and timeouts for + some TFTP transfers ++++ 593 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:12.3:Update/.dnsmasq.1490.new/dnsmasq.changes New: ---- dnsmasq-2.65.tar.gz dnsmasq.changes dnsmasq.service dnsmasq.spec group_and_isc.patch vendor-files.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dnsmasq.spec ++++++ # # spec file for package dnsmasq # # Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # 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/ # Name: dnsmasq Summary: Lightweight, Easy-to-Configure DNS Forwarder and DHCP Server License: GPL-2.0 Group: Productivity/Networking/DNS/Servers Version: 2.65 Release: 0 Provides: dns_daemon PreReq: /usr/sbin/useradd %fillup_prereq %insserv_prereq /bin/mkdir Url: http://www.thekelleys.org.uk/dnsmasq/ Source: http://www.thekelleys.org.uk/dnsmasq/dnsmasq-%{version}.tar.gz Source1: vendor-files.tar.bz2 Source2: dnsmasq.service Patch1: group_and_isc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: dbus-1-devel BuildRequires: libidn BuildRequires: libidn-devel BuildRequires: pkg-config BuildRequires: systemd BuildRequires: pkgconfig(libnetfilter_conntrack) %{?systemd_requires} %if %suse_version > 1220 %define _unitdir /usr/lib/systemd %else %define _unitdir /lib/systemd %endif %description Dnsmasq is a lightweight, easy-to-configure DNS forwarder and DHCP server. It is designed to provide DNS and, optionally, DHCP, to a small network. It can serve the names of local machines that are not in the global DNS. The DHCP server integrates with the DNS server and allows machines with DHCP-allocated addresses to appear in DNS with names configured either in each host or in a central configuration file. Dnsmasq supports static and dynamic DHCP leases and BOOTP for network booting of diskless machines. %package utils Summary: Utilities for manipulating DHCP server leases Group: Productivity/Networking/DNS/Servers %description utils Utilities that use the standard DHCP protocol to query/remove a DHCP server's leases. %prep %setup -q -n dnsmasq-%{version} %setup -q -T -D -a1 -n dnsmasq-%{version} %patch1 -p1 %build echo "#define HAVE_DBUS" >> src/config.h echo "#define HAVE_CONNTRACK" >> src/config.h echo "#define HAVE_IDN" >> src/config.h mv po/no.po po/nb.po export CFLAGS="%optflags -std=gnu99 -fPIC -DPIC -fpie" export LDFLAGS="-Wl,-z,relro,-z,now -pie" make %{?_smp_mflags} AWK=gawk all-i18n make -C contrib/wrt %{?_smp_mflags} %pre if ! /usr/bin/getent group tftp >/dev/null; then %{_sbindir}/groupadd -r tftp 2>/dev/null || : fi if ! /usr/bin/getent passwd tftp >/dev/null; then %{_sbindir}/useradd -c "TFTP account" -d /srv/tftpboot -G tftp -g tftp \ -r -s /bin/false tftp 2>/dev/null || : fi 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 || : fi %service_add_pre %{name}.service %post %{fillup_and_insserv dnsmasq} %service_add_post %{name}.service %preun %stop_on_removal dnsmasq %service_del_preun %{name}.service %postun %restart_on_update dnsmasq %{insserv_cleanup} %service_del_postun %{name}.service %install make install-i18n DESTDIR=$RPM_BUILD_ROOT PREFIX=/usr AWK=gawk 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-dns ${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/dnsmasq-dns install -m 644 SuSEFirewall.dnsmasq-dhcp ${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/dnsmasq-dhcp install -d 755 ${RPM_BUILD_ROOT}/etc/dbus-1/system.d/ install -m 644 dbus/dnsmasq.conf ${RPM_BUILD_ROOT}/etc/dbus-1/system.d/dnsmasq.conf install -D -m 0644 %SOURCE2 %{buildroot}%{_unitdir}/system/dnsmasq.service install -d -m 0750 ${RPM_BUILD_ROOT}/srv/tftpboot # utils subpackage mkdir -p $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{_mandir}/man1 install -m 755 contrib/wrt/dhcp_release ${RPM_BUILD_ROOT}%{_bindir}/dhcp_release install -m 644 contrib/wrt/dhcp_release.1 ${RPM_BUILD_ROOT}%{_mandir}/man1/dhcp_release.1 install -m 755 contrib/wrt/dhcp_lease_time ${RPM_BUILD_ROOT}%{_bindir}/dhcp_lease_time install -m 644 contrib/wrt/dhcp_lease_time.1 ${RPM_BUILD_ROOT}%{_mandir}/man1/dhcp_lease_time.1 rm contrib/wrt/{dhcp_release,dhcp_lease_time} %find_lang %{name} --with-man %files -f %{name}.lang %defattr(-,root,root) %doc CHANGELOG COPYING FAQ doc.html setup.html dnsmasq.conf.example contrib README.SUSE dbus %config(noreplace) %{_sysconfdir}/dnsmasq.conf %{_sysconfdir}/init.d/dnsmasq %{_sbindir}/rcdnsmasq %{_sbindir}/dnsmasq %config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/dnsmasq-dns %config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/dnsmasq-dhcp %dir %{_sysconfdir}/slp.reg.d/ %config %attr(0644,root,root) /%{_sysconfdir}/slp.reg.d/dnsmasq.reg %{_mandir}/man8/dnsmasq.8.gz /etc/dbus-1/system.d/dnsmasq.conf %{_unitdir}/system/dnsmasq.service %dir %attr(0750,root,tftp) /srv/tftpboot %files utils %{_bindir}/dhcp_* %{_mandir}/man1/dhcp_* %changelog ++++++ dnsmasq.service ++++++ [Unit] Description=DNS caching server. After=syslog.target network.target [Service] Type=dbus BusName=uk.org.thekelleys.dnsmasq ExecStartPre=/usr/sbin/dnsmasq --test ExecStart=/usr/sbin/dnsmasq --log-async --enable-dbus --keep-in-foreground ExecReload=/bin/kill -HUP $MAINPID [Install] WantedBy=multi-user.target ++++++ group_and_isc.patch ++++++ --- Makefile | 4 ++-- man/dnsmasq.8 | 1 + src/config.h | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-) --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ # Variables you may well want to override. -PREFIX = /usr/local +PREFIX = /usr BINDIR = $(PREFIX)/sbin MANDIR = $(PREFIX)/share/man LOCALEDIR = $(PREFIX)/share/locale @@ -127,7 +127,7 @@ $(objs:.o=.c) $(hdrs): $(CC) $(CFLAGS) $(COPTS) $(i18n) $(build_cflags) $(RPM_OPT_FLAGS) -c $< dnsmasq : .configured $(hdrs) $(objs) - $(CC) $(LDFLAGS) -o $@ $(objs) $(build_libs) $(LIBS) + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(objs) $(build_libs) $(LIBS) dnsmasq.pot : $(objs:.o=.c) $(hdrs) $(XGETTEXT) -d dnsmasq --foreign-user --omit-header --keyword=_ -o $@ -i $(objs:.o=.c) --- a/man/dnsmasq.8 +++ b/man/dnsmasq.8 @@ -125,6 +125,7 @@ can be over-ridden with this switch. Specify the group which dnsmasq will run as. The defaults to "dip", if available, to facilitate access to /etc/ppp/resolv.conf which is not normally world readable. +as. The defaults to "nogroup" .TP .B \-v, --version Print the version number. --- a/src/config.h +++ b/src/config.h @@ -24,7 +24,7 @@ #define FORWARD_TIME 20 /* or 20 seconds */ #define RANDOM_SOCKS 64 /* max simultaneous random ports */ #define LEASE_RETRY 60 /* on error, retry writing leasefile after LEASE_RETRY seconds */ -#define CACHESIZ 150 /* default cache size */ +#define CACHESIZ 2000 /* default cache size */ #define MAXLEASES 1000 /* maximum number of DHCP leases */ #define PING_WAIT 3 /* wait for ping address-in-use test */ #define PING_CACHE_TIME 30 /* Ping test assumed to be valid this long. */ @@ -34,8 +34,8 @@ #define HOSTSFILE "/etc/hosts" #define ETHERSFILE "/etc/ethers" #define DEFLEASE 3600 /* default lease time, 1 hour */ -#define CHUSER "nobody" -#define CHGRP "dip" +#define CHUSER "dnsmasq" +#define CHGRP "nogroup" #define TFTP_MAX_CONNECTIONS 50 /* max simultaneous connections */ #define LOG_MAX 5 /* log-queue length */ #define RANDFILE "/dev/urandom" -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
