--- dnsmasq-2.89.orig/debian/changelog +++ dnsmasq-2.89/debian/changelog @@ -0,0 +1,1471 @@ +dnsmasq (2.89-1) unstable; urgency=low + + * New upstream. + + -- Simon Kelley Fri, 13 Jan 2023 21:57:01 +0000 + +dnsmasq (2.88-1) unstable; urgency=low + + * New upstream. + * Fix loss of server configuration (closes: #1020830) + Git commit 930428fb970f4991e5c2933fd5a5d2504c18a551 + + -- Simon Kelley Wed, 2 Nov 2022 22:15:45 +0000 + +dnsmasq (2.87-1) unstable; urgency=low + + * New upstream. (closes: #1001209, #1003156) + * Include new NFTset support in the build. + * Fix crash on netboot with DNS server disabled. (closes: #996332) + * Fix rare lockup in DNSSEC. (closes: #1001576) + * Close old bug. (closes: #902963) + + -- Simon Kelley Wed, 25 Sep 2022 23:11:25 +0000 + +dnsmasq (2.86-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Fix --address=/#/...... which was lost in 2.86. (closes: #995655) + + -- Michael Biebl Wed, 10 Nov 2021 22:05:45 +0100 + +dnsmasq (2.86-1) unstable; urgency=low + + * Fix debian/changelog format error. (closes: #986626) + + -- Simon Kelley Thu, 08 Apr 2021 22:39:00 +0100 + +dnsmasq (2.85-1) unstable; urgency=low + + * New upstream. + * Includes fix to CVE-2021-3448. + * Fix manpage typos. (closes: #986150) + + -- Simon Kelley Sat, 03 Apr 2021 22:17:23 +0100 + +dnsmasq (2.84-1.2) unstable; urgency=medium + + * Non-maintainer upload. + * Bump old-version in dpkg-maintscript-helper dir_to_symlink calls to also + clean up after upgrades to an earlier version in testing. + + -- Andreas Beckmann Thu, 01 Apr 2021 16:01:51 +0200 + +dnsmasq (2.84-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Fix symlink to directory conversion for /usr/share/doc/dnsmasq. + This is achieved by directly calling dpkg-maintscript-helper in the preinst, + postinst, and postrm scripts, since the package does not use debhelper. + (Closes: #985282) + + -- Sébastien Villemot Sun, 28 Mar 2021 10:55:07 +0200 + +dnsmasq (2.84-1) unstable; urgency=low + + * New upstream. + + -- Simon Kelley Sun, 24 Jan 2021 22:02:01 +0000 + +dnsmasq (2.83-1) unstable; urgency=high + + * New upstream. + * Includes fixes to CVE-2020-25681 - CVE-2020-25687 inclusive. + + -- Simon Kelley Fri, 15 Jan 2021 22:22:41 +0000 + +dnsmasq (2.82-1) unstable; urgency=low + + * New upstream. + + -- Simon Kelley Fri, 26 Jun 2020 22:22:41 +0000 + +dnsmasq (2.81-4) unstable; urgency=low + + * Remove runit support when building for Ubuntu. (closes: #960401) + + -- Simon Kelley Fri, 26 Jun 2020 21:52:44 +0000 + +dnsmasq (2.81-3) unstable; urgency=low + + * Fixes to control file for bug 958100 + + -- Simon Kelley Sun, 19 Apr 2020 21:44:12 +0000 + +dnsmasq (2.81-2) unstable; urgency=low + + * Fix FTBFS on kFreeBSD. (closes: #958100) + + -- Simon Kelley Sat, 18 Apr 2020 18:34:15 +0000 + +dnsmasq (2.81-1) unstable; urgency=low + + * New upstream. + * Fix nodocs/nodoc confusion in rules. (closes: #922758) + * Add Vcs-* fields to control. (closes: #922422) + * Add systemd support for multiple daemon instances. (closes: #914305) + * Add note explaining that ENABLED is SYSV-init only. (closes: #914755) + * Replace ash with dash in contrib/reverse-dns. (closes: #920224) + * Move to libidn2. (closes: #932695) + * Fix RA problem with two interfaces on same net, but RA service on + only one of the interfaces. (closes: #949565) + * Fix breakage of dig +trace. (closes: #942363) + * Fix build faliure with newer Nettle libraries. (closes: #940985) + * Support runscript init-system (closes: #929884) + * Security fix for CVE-2019-14834 (closes: #948373) + + -- Simon Kelley Wed, 8 Apr 2020 17:33:15 +0000 + +dnsmasq (2.80-1) unstable; urgency=low + + * New upstream. (closes: #837602) (closes: #794640) (closes: #794636) + * Close old bugs, long agp fixed. (closes: #802845) (closes: #754299) + * Provide usr/lib/tmpfiles.d/dnsmasq.conf. (closes: #872396) + * Run restorecon on /run/dnsmasq for SE Linux. (closes: #872397) + + -- Simon Kelley Mon, 17 Sep 2018 23:11:25 +0000 + +dnsmasq (2.79-1) unstable; urgency=low + + * New upstream. (closes: #888200) + * Fix trust-anchor regex in init script. (closes: #884347) + * Fix exit code for dhcp_release6 (closes: #883596) + * Add project homepage to control file. (closes: #887764) + * New binary package dnsmasq-base-lua, includes Lua support. + * Remove hardwired shlibs dependency for libnettle 3.3 and + fix code to avoid ABI breakage as long as compiled against + libnettle 3.4 or later. (closes: #891315) + + -- Simon Kelley Fri, 16 Feb 2018 19:54:22 +0000 + +dnsmasq (2.78-3) unstable; urgency=high + + * Make failure of pidfile chown a warning. (closes: #889857) + + -- Simon Kelley Thu, 8 Feb 2018 21:26:30 +0000 + +dnsmasq (2.78-2) unstable; urgency=high + + * Change ownership of pid file, to keep systemd happy. (closes: #889336) + + -- Simon Kelley Tue, 6 Feb 2018 17:21:30 +0000 + +dnsmasq (2.78-1) unstable; urgency=high + + * New upstream. + Security fixes for CVE-2017-13704 (closes: #877102) + Security fixes for CVE-2017-14491 - CVE-2017-14496 inclusive. + + -- Simon Kelley Sun, 29 Sep 2017 21:34:00 +0000 + +dnsmasq (2.77-2) unstable; urgency=low + + * Improve sed regexp for parsing root.ds. + + -- Simon Kelley Mon, 5 Jun 2017 20:46:32 +0000 + +dnsmasq (2.77-1) unstable; urgency=low + + * New upstream. + * Don't register as a resolvconf source when config file + includes port=0 to disable DNS. + * Handle gratuitous format change in /usr/share/dns/root.ds + (closes: #858506) (closes: #860064) + * Add lsb-base dependency. + + -- Simon Kelley Tue, 11 Apr 2017 14:19:20 +0000 + +dnsmasq (2.76-5) unstable; urgency=medium + + * Nail libnettle dependency to avoid ABI incompatibility. + (closes: #846642) + + -- Simon Kelley Wed, 14 Dec 2016 17:58:10 +0000 + +dnsmasq (2.76-4.1) unstable; urgency=medium + + * Non-maintainer upload. + * Add two upstream patches to fix binding to an interface being + destroyed and recreated. Closes: #834722. + + 2675f2061525bc954be14988d64384b74aa7bf8b + + 16800ea072dd0cdf14d951c4bb8d2808b3dfe53d + + -- Vincent Bernat Sat, 26 Nov 2016 20:15:34 +0100 + +dnsmasq (2.76-4) unstable; urgency=medium + + * Non-maintainer upload. + * Fix FTCBFS: Use triplet-prefixed tools. (closes: #836072) + + -- Helmut Grohne Tue, 30 Aug 2016 13:59:12 +0200 + +dnsmasq (2.76-3) unstable; urgency=medium + + * Bump auth zone serial on SIGHUP. (closes: #833733) + + -- Simon Kelley Sat, 13 Aug 2016 21:43:10 +0000 + +dnsmasq (2.76-2) unstable; urgency=medium + + * Fix to systemd to fix failure to start with bridge interface. + (Closes: #831372) + + -- Simon Kelley Sat, 16 Jul 2016 22:09:10 +0000 + +dnsmasq (2.76-1.2) unstable; urgency=medium + + * Non-maintainer upload. + * dnsmasq: Install marker file to determine package installed state, + for the benefit of the init script. (Closes: #819856) + + -- Christian Hofstaedtler Sat, 16 Jul 2016 00:17:57 +0000 + +dnsmasq (2.76-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Provide nss-lookup.target for systemd, without relying on insserv. + Patch from Michael Biebl . (Closes: #826242) + + -- Christian Hofstaedtler Fri, 01 Jul 2016 13:41:11 +0000 + +dnsmasq (2.76-1) unstable; urgency=low + + * New upstream. (closes: #798586) + * Use /run/dnsmasq directly, rather than relying on link from /var/run + to avoid problems before /var is mounted. (closes: #800351) + * Test for the existence of /usr/share/doc/dnsmasq rather then + /etc/dnsmasq.d/README in the daemon startup script. (closes: #819856) + * Add --help to manpage and mention dhcp6 in summary. (closes: #821226) + + -- Simon Kelley Thu, 10 Sep 2015 23:07:21 +0000 + +dnsmasq (2.75-1) unstable; urgency=low + + * New upstream. (closes: #794095) + + -- Simon Kelley Thu, 30 Jul 2015 20:58:31 +0000 + +dnsmasq (2.74-1) unstable; urgency=low + + * New upstream. (LP: #1468611) + + -- Simon Kelley Wed, 15 Jul 2015 21:54:11 +0000 + +dnsmasq (2.73-2) unstable; urgency=low + + * Fix behaviour of empty --conf-file (closes: #790341) + + -- Simon Kelley Thu, 7 Jul 2015 21:46:42 +0000 + +dnsmasq (2.73-1) unstable; urgency=low + + * New upstream. (closes: #786996) + * Tweak field width in cache dump to avoid truncating IPv6 + addresses. (closes: #771557) + * Add newline at the end of example config file. (LP: #1416895) + * Make Debian package build reproducible. (closes: #777323) + * Add Requires=network.target to systemd unit. + + -- Simon Kelley Thu, 4 Jun 2015 22:31:42 +0000 + +dnsmasq (2.72-3) unstable; urgency=medium + + * debian/systemd.service: switch from Type=dbus to Type=forking. + dnsmasq does not depend on dbus, but Type=dbus systemd services cannot + work without it. (Closes: #769486, #776530) + - debian/init: when called with systemd-exec argument, let dnsmasq + go into the background, so Type=forking can detect when it is ready + * Remove line containing only whitespace in debian/control. + (closes: #777571) + + -- Simon Kelley Wed, 11 Feb 2015 21:56:12 +0000 + +dnsmasq (2.72-2) unstable; urgency=low + + * Fix build in Debian-kFreeBSD. (closes: #763693) + + -- Simon Kelley Thu, 02 Oct 2014 22:34:12 +0000 + +dnsmasq (2.72-1) unstable; urgency=low + + * New upstream. + * If dns-root-data package is installed, use it to set the DNSSEC + trust anchor(s). Recommend dns-root-data. (closes: #760460) + * Handle AD bit correctly in replies from cache. (closes: #761654) + + -- Simon Kelley Tue, 20 May 2014 21:01:11 +0000 + +dnsmasq (2.71-1) unstable; urgency=low + + * New upstream. + * Fix 100% CPU-usage bug when dnsmasq started with cachesize + set to zero. (LP: #1314697) + + -- Simon Kelley Fri, 16 May 2014 20:17:10 +0000 + +dnsmasq (2.70-3) unstable; urgency=medium + + * Write a pid-file, even when being started using systemd, since + other components may wish to signal dnsmasq. + * Enable dnsmasq systemd unit on install. Otherwise dnsmasq does not run on + fresh installations (without administrator handholding) and even worse it + is disabled on systems switching from sysv to systemd. Modify + postinst/postrm exactly as dh_systemd would, add dependency on + init-system-helpers. Closes: #724602 + + -- Simon Kelley Sun, 11 May 2014 17:45:21 +0000 + +dnsmasq (2.70-2) unstable; urgency=low + + * Ensure daemon not stared if dnsmasq package has been removed, + even if dnsmasq-base is still installed. (closes: #746941) + * Tidy cruft in initscript. (closes: #746940) + + -- Simon Kelley Sun, 04 May 2014 21:34:11 +0000 + +dnsmasq (2.70-1) unstable; urgency=low + + * New upstream. + + -- Simon Kelley Wed, 23 Apr 2014 15:14:42 +0000 + +dnsmasq (2.69-1) unstable; urgency=low + + * New upstream. + * Set --local-service. (closes: #732610) + This tells dnsmasq to ignore DNS requests that don't come + from a local network. It's automatically ignored if + --interface --except-interface, --listen-address or + --auth-server exist in the configuration, so for most + installations, it will have no effect, but for + otherwise-unconfigured installations, it stops dnsmasq + from being vulnerable to DNS-reflection attacks. + + -- Simon Kelley Tue, 4 Feb 2014 16:28:12 +0000 + +dnsmasq (2.68-1) unstable; urgency=low + + * New upstream. (closes: #730553) + + -- Simon Kelley Sun, 8 Dec 2013 15:57:32 +0000 + +dnsmasq (2.67-1) unstable; urgency=low + + * New upstream. + * Update resolvconf script. (closes: #720732) + + -- Simon Kelley Wed, 4 Aug 2013 14:53:22 +0000 + +dnsmasq (2.66-4) unstable; urgency=low + + * Update resolvconf script. (closes: #716908) + + -- Simon Kelley Wed, 4 Aug 2013 14:48:21 +0000 + +dnsmasq (2.66-3) unstable; urgency=low + + * Update resolvconf script for dnscrypt-proxy integration. (closes: #709179) + + -- Simon Kelley Tue, 28 May 2013 14:39:51 +0000 + +dnsmasq (2.66-2) unstable; urgency=low + + * Fix error on startup with some configs. (closes: #709010) + + -- Simon Kelley Mon, 20 May 2013 11:46:11 +0000 + +dnsmasq (2.66-1) unstable; urgency=low + + * New upstream. + * Add support for noipset in DEB_BUILD_OPTIONS. + + -- Simon Kelley Fri, 22 Feb 2013 21:52:13 +0000 + +dnsmasq (2.65-1) unstable; urgency=low + + * New upstream. + + -- Simon Kelley Fri, 14 Dec 2012 11:34:12 +0000 + +dnsmasq (2.64-1) unstable; urgency=low + + * New upstream. + + -- Simon Kelley Fri, 21 Sep 2012 17:17:22 +0000 + +dnsmasq (2.63-4) unstable; urgency=low + + * Make pid-file creation immune to symlink attacks. (closes: #686484) + + -- Simon Kelley Fri, 21 Sep 2012 17:16:34 +0000 + +dnsmasq (2.63-3) unstable; urgency=low + + * Move adduser dependency to dnsmasq-base. (closes: #686694) + + -- Simon Kelley Tue, 4 Sep 2012 21:44:15 +0000 + +dnsmasq (2.63-2) unstable; urgency=low + + * Fix version script to report correct version. + * Unbotch move of dbus config file by using correct versions in + Replaces: and Breaks: lines. (closes: #685204) + * Create dnsmasq user in dnsmasq-base so that Dbus doesn't complain if + only dnsmasq-base is installed. (closes: #685987) + + -- Simon Kelley Tue, 28 Aug 2012 16:18:35 +0000 + +dnsmasq (2.63-1) unstable; urgency=low + + * New upstream. + * Move /etc/dbus-1/system.d/dnsmasq.conf from dnsmasq to dnsmasq-base. + + -- Simon Kelley Mon, 11 Jun 2012 21:55:35 +0000 + +dnsmasq (2.62-3) unstable; urgency=low + + * Do resolvconf and /etc/default startup logic when + starting with systemd. (closes: #675854) + + -- Simon Kelley Mon, 11 Jun 2012 21:50:11 +0000 + +dnsmasq (2.62-2) unstable; urgency=low + + * Pass LDFLAGS to make to get hardening in linker. + + -- Simon Kelley Thu, 7 Jun 2012 09:53:43 +0000 + +dnsmasq (2.62-1) unstable; urgency=low + + * New upstream. + * Use dpkg-buildflags. (Enables hardening). + + -- Simon Kelley Sat, 12 May 2012 15:25:23 +0000 + +dnsmasq (2.61-1) unstable; urgency=low + + * New upstream. + * Provide "dump-stats" initscript method. (closes: #654656) + * Add (empty) build-indep and build-arch rules targets. + * Bump standards-version to 3.9.3 + * Add port option to example dnsmasq.conf (closes: #668386) + + -- Simon Kelley Tue, 6 Mar 2012 19:45:43 +0000 + +dnsmasq (2.60-2) unstable; urgency=high + + * Fix DHCPv4 segfault. (closes: #665008) + + -- Simon Kelley Fri, 23 Mar 2012 09:37:23 +0000 + +dnsmasq (2.60-1) unstable; urgency=low + + * New upstream. + * Bump standards-version to 3.9.2 + * Fix typo in example config file. (closes: #654897) + + -- Simon Kelley Thu, 1 Dec 2011 15:49:33 +0000 + +dnsmasq (2.59-4) unstable; urgency=low + + * Supply /etc/insserv.conf.d/dnsmasq (closes: #650540) + + -- Simon Kelley Thu, 1 Dec 2011 11:35:13 +0000 + +dnsmasq (2.59-3) unstable; urgency=low + + * Stop daemon at runlevels 0, 1 and 6. (closes: #647726) + + -- Simon Kelley Sat, 26 Nov 2011 15:28:33 +0000 + +dnsmasq (2.59-2) unstable; urgency=low + + * Fix reported version number. + + -- Simon Kelley Wed, 19 Oct 2011 09:25:53 +0000 + +dnsmasq (2.59-1) unstable; urgency=low + + * New upstream. + * Fix IPv6 bind problem (closes: #644345) + + -- Simon Kelley Sat, 8 Oct 2011 16:34:13 +0000 + +dnsmasq (2.58-3) unstable; urgency=low + + * Fix resolvconf script location. (closes: #641717) + * Update systemd service file. (closes: #640095) + + -- Simon Kelley Thu, 15 Sep 2011 16:33:23 +0000 + +dnsmasq (2.58-2) unstable; urgency=low + + * Fix resolvconf script. (closes: #639963) + + -- Simon Kelley Thu, 1 Sep 2011 10:05:23 +0000 + +dnsmasq (2.58-1) unstable; urgency=low + + * New upstream. + * Add noconntrack DEB_BUILD_OPTIONS flag. + * Improve error message when tag:xxx appears + in --dhcp-host (closes: #627986) + * Add /usr/lib/resolvconf/packaging-event.d/dnsmasq (closes: #628003) + * Update resolvconf hook script to sleep only + when necessary. (closes: #627789) + * Tweak behaviour of --domain-needed to avoid problems with recursive + nameservers _downstream_ of dnsmasq. (closes: #630637) + * Allow processes running as uid dnsmasq to send messages on the DBus, + so that dnsmasq can return errors. (closes: #635017) + * Add /lib/systemd/system/dnsmasq.service (closes: #635753) + * New binary package, dnsmasq-utils, containing dhcp_release and + dhcp_lease_time from contrib/wrt. Note that these are Linux-specific + so this package is Architecture: linux-any (closes: #638136) + + -- Simon Kelley Mon, 22 Aug 2011 14:57:03 +0000 + +dnsmasq (2.57-1) unstable; urgency=low + + * New upstream. + * Fix typos in example config file. (closes: #606615) + * Bump standards-version to 3.9.1 + * Add noidn DEB_BUILD_OPTIONS flag. + * Don't complain about extra command line arguments if + they are empty, as this breaks libvirt. (closes: #613915) + + -- Simon Kelley Fri, 18 Feb 2011 09:54:13 +0000 + +dnsmasq (2.56-1) unstable; urgency=low + + * New upstream. + * Die if non-option args present on the command-line. (closes: #589885) + * Tighten up use of IGNORE_RESOLVCONF in initscript. (closes: #575345) + * Update URL of ISC's explanation of dhcp-authoritative in the example + configuration file. (closes: #604870) + * Cosmetic changes to dnsmasq.conf.example. (closes: #598790) + * More dnsmasq.conf.example fixes. (closes: #606615) + * Add other resolv.conf locations to FILES section of the manual + page. (closes: #603505) + * Clarify configuration for static IP addresses in the absence of + resolvconf in the Debian readme file. (closes: #604035) + * Fix handling of obsolete DNSMASQ_INTERFACE and DNSMASQ_EXCEPT + variables in /etc/default/dnsmasq. (LP: #691329) + * Provide debian/source/format. + + -- Simon Kelley Fri, 17 Dec 2010 13:17:33 +0000 + +dnsmasq (2.55-2) unstable; urgency=high + + * Fix crash on double free. (closes: #597205) + + -- Simon Kelley Sun, 19 Sep 2010 21:45:33 +0000 + +dnsmasq (2.55-1) unstable; urgency=low + + * New upstream. + * Fix crash when /etc/ethers in use. (closes: #584754) + + -- Simon Kelley Sun, 6 Jun 2010 20:33:13 +0000 + +dnsmasq (2.53-1) unstable; urgency=low + + * New upstream. + * Fix FTBFS on kFreeBSD. (closes: #566334) + * Teach initscript to check the config file syntax before + restarting dnsmasq. An error will leave the old dnsmasq still + running, rather than killing the old daemon and then failing to start + a new one. + * Tweak DHCP behaviour when a physical interface has two addresses on + the same subnet. (closes: #581064) + + -- Simon Kelley Thu, 20 May 2010 11:41:23 +0000 + +dnsmasq (2.52-1) unstable; urgency=low + + * New upstream. + * Be more conservative with "A for A" processing. (closes: #553337) + * Add README file in /etc/dnsmasq.d to explain what's going on. + + -- Simon Kelley Thu, 14 Jan 2010 09:53:13 +0000 + +dnsmasq (2.51-1) unstable; urgency=low + + * New upstream. + * Bump standards-version to 3.8.2 (no changes needed). + * Ignore files named *.dpkg-old, *.dpkg-new and *.dpkg-dist + in /etc/dnsmasq.d + * Provide a facility in /etc/default/dnsmasq to disable dnsmasq's + interaction with the resolvconf package. This is needed because + setting "resolv-file" in /etc/dnsmasq.conf won't override a + file given on the command line from resolvconf. (closes: #528762) + * Check for duplicate names/addresses in /etc/ethers. (closes: #523787) + * Set the system locale in the environment before invoking dnsmasq, + so that translated messages work, and IDN uses the correct charset. + + -- Simon Kelley Fri, 4 Oct 2009 14:01:14 +0000 + + +dnsmasq (2.50-1) unstable; urgency=high + + * New upstream, fixes remote vulns in TFTP server. + Bugtraq id: 36120,36121 CVE: 2009-2957,2009-2958 + + -- Simon Kelley Fri, 21 Aug 2009 10:25:13 +0000 + + +dnsmasq (2.49-1) unstable; urgency=low + + * New upstream. + * Log TFTP "file not found" errors. (closes: #532201) + + -- Simon Kelley Mon, 8 Jun 2009 22:03:23 +0000 + +dnsmasq (2.48-2) unstable; urgency=low + + * Change dnsmasq -> dnsmasq-base dependency to >= to allow binNMU, + fixes Lintian error. + * Bump standards-version to 3.8.1 + + -- Simon Kelley Fri, 5 Jun 2009 10:58:33 +0000 + +dnsmasq (2.48-1) unstable; urgency=low + + * New upstream. + * Detect and ignore duplicate configuration files. (closes: #516234) + * Add 2 second sleep between stop and start during initscript restart. + * Make dependency on dnsmasq-base in dnsmasq package versioned, so that + installing the latest dnsmasq will install the latest dnsmasq-base + too. (closes: #523955) + * Add nodhcp DEB_BUILD_OPTIONS option. + + -- Simon Kelley Fri, 29 May 2009 10:20:23 +0000 + +dnsmasq (2.47-3) unstable; urgency=low + + * Fix bashism in init script. (closes: #514397) + * Tweak logging in init script. + + -- Simon Kelley Sat, 7 Feb 2009 19:25:23 +0000 + +dnsmasq (2.47-2) unstable; urgency=low + + * Check that /etc/init.d/dnsmasq is executable in postinst in case + the daemon has been disabled that way. (closes: #514314) + * Ensure that /var/run/dnsmasq exists and has the right permissions + before running dnsmasq. On some systems /var/run is cleared over + reboot. (closes: #514317) + + -- Simon Kelley Fri, 6 Feb 2009 09:38:21 +0000 + +dnsmasq (2.47-1) unstable; urgency=low + + * New upstream. + * Handle the "ENABLED" flag in the init script a bit more + intelligently. The "stop" and "status" functions continue + to work even when disabled, but a failed "stop" becomes + silent and returns zero exit code. + * Don't explicitly kill dnsmasq at system shutdown, rely on the + sendsigs script instead which is quicker. (closes: #506734) + * Store the PID-file in /var/run/dnsmasq. This directory is owned by + user "dnsmasq", so that dnsmasq can delete the PID-file on + shutdown. This ensures that the the PID-file goes even when dnsmasq + is stopped by sendsigs. (closes: #508560) + * Bump standards-version to 3.8.0 (no changes required.) + * /usr/sbin/adduser -> adduser in postinst. Lintian fix. + * Handle IPv6 addresses in "tentative" state better. (closes: #507646) + * Add DBus introspection support. (closes: #508774) + * Fix Dbus configuration. (closes: #510649) + + -- Simon Kelley Mon, 2 Feb 2009 13:39:11 +0000 + +dnsmasq (2.46-1) unstable; urgency=low + + * New upstream. (closes: #499162) (closes: #499007) + * Remove from init script start-stop-daemon call to kill + child processes. This is not needed since dnsmasq is + carefully written to kill child processes, and it interacts + badly with "private" instances of dnsmasq. (closes: #505523) + * Provide /etc/dnsmasq.d and alter the installed /etc/default/dnsmasq + so that /etc/dnsmasq.d is read. This provides a drop-directory where + libvirt can add options to make the system dnsmasq automatically + play nice with libvirt's private instances. (closes: #505522) + + -- Simon Kelley Thu, 13 Nov 2008 20:15:31 +0000 + +dnsmasq (2.45-1) unstable; urgency=high + + * New upstream - fixes regression when min-port not set. + + -- Simon Kelley Sun, 20 Jul 2008 19:27:11 +0000 + +dnsmasq (2.44-1) unstable; urgency=high + + * New upstream - bugfix release for 2.43. + * Fix crash in netlink code. (closes: #491289) + + -- Simon Kelley Fri, 11 Jul 2008 19:39:10 +0000 + +dnsmasq (2.43-1) unstable; urgency=high + + * New upstream. + * Implement source-port randomisation and better random + number generator as defence against CVE-2008-1447 (closes: #490123) + + -- Simon Kelley Tue, 17 Jun 2008 11:55:38 +0000 + +dnsmasq (2.42-4) unstable; urgency=low + + * Fix botch in postinst introduced in 2.42-2. (closes: #486616) + + -- Simon Kelley Tue, 17 Jun 2008 11:39:10 +0000 + +dnsmasq (2.42-3) unstable; urgency=low + + * Fix thinko in init script, breaks status command. (closes: #486455) + + -- Simon Kelley Mon, 16 Jun 2008 11:26:20 +0000 + +dnsmasq (2.42-2) unstable; urgency=low + + * Error check in postinst file (closes: #485645) + + -- Simon Kelley Tue, 10 Jun 2008 20:25:10 +0000 + +dnsmasq (2.42-1) unstable; urgency=low + + * New upstream. + * Fix manpage typos. (closes: #468762) + * Use LSB log_*_msg rather than echo in init script. (closes: #473117) + * Fix agent-id echo problem. (closes: #473015) + * Fixup changing /usr/share/doc/dnsmasq to symlink. (closes: #468763) + + -- Simon Kelley Wed, 27 Feb 2008 21:15:28 +0000 + +dnsmasq (2.41-2) unstable; urgency=low + + * Fix rules to build binary-arch and binary-indep correctly. + + -- Simon Kelley Wed, 27 Feb 2008 19:57:10 +0000 + +dnsmasq (2.41-1) unstable; urgency=low + + * New upstream. + * Fix typo. (closes: #448038) + * Fix DHCP problem interoperating with Sony Ericsson K610i (closes: #451871) + * Split binary packages into dnsmasq and dnsmasq-base (closes: #463407) + * Add warnings about bad effects of --filterwin2k to default config + file. (closes: #464357) + * Don't declare Provides: $named in LSB header. (closes: #464512) + * Remove conflict with pdnsd. (closes: #464691) + * Add ability to disable dnsmasq in /etc/default/dnsmasq. (closes: #465062) + + -- Simon Kelley Thu, 31 Jan 2008 20:25:28 +0000 + +dnsmasq (2.40-1) unstable; urgency=low + + * New upstream. + * Fix manpage typo. (closes: #429412) + * Fix dnsmasq.conf typos (closes: #429929) + * Handle DEB_BUILD_OPTIONS nostrip and noopt (closes: #436784) + * Add DEB_BUILD_OPTIONS for nodocs, notftp, noipv6, + nodbus, noi18n and nortc. + * Create DEBIAN/md5sums file in package. + * Add status function to init script. (closes: #439316) + + -- Simon Kelley Thu, 9 Aug 2007 10:24:18 +0000 + +dnsmasq (2.39-1) unstable; urgency=low + + * New upstream. + * Provide example config file in /usr/share/doc/dnsmasq/examples + as well as /etc/dnsmasq.conf, so it's available for reference. + + -- Simon Kelley Thu, 13 Feb 2007 10:02:38 +0000 + +dnsmasq (2.38-1) unstable; urgency=low + + * New upstream (closes: #410185) + + -- Simon Kelley Tue, 6 Feb 2007 21:14:58 +0000 + +dnsmasq (2.37-1) unstable; urgency=low + + * New upstream. + + -- Simon Kelley Thu, 25 Jan 2007 10:44:18 +0000 + +dnsmasq (2.36-1) unstable; urgency=low + + * New upstream. (closes: #400037) + * Don't fail to purge if deluser command is not available. + * Add one second sleep to resolvconf script. (closes: #398961) + * Fix dnsmasq.conf typo (closes: #405314) + + -- Simon Kelley Tue, 31 Oct 2006 10:24:58 +0000 + +dnsmasq (2.35-1) unstable; urgency=low + + * New upstream. + + -- Simon Kelley Wed, 18 Oct 2006 09:23:28 +0000 + +dnsmasq (2.34-1) unstable; urgency=low + + * New upstream. + * Includes --clear-on-reload flag. (loses: #391654) + * Don't any longer set the "domain-needed" and "bogus-priv" flags in the + * the default-installed dnsmasq.conf. These can generate puzzling + * behaviour for people who get them without asking. + + -- Simon Kelley Wed, 9 Aug 2006 09:23:28 +0000 + +dnsmasq (2.33-1) unstable; urgency=low + + * New upstream. + * Remove bashism from Makefile (closes: #375409) + * Added Provides: $named to LSB header in init script. + * Add --dns-forward-max flag. (closes: #377506) + + -- Simon Kelley Sun, 25 June 2006 18:03:13 +0000 + +dnsmasq (2.32-2) unstable; urgency=low + + * Added LSB tags to init.d startup script. (closes: #374650) + + -- Simon Kelley Sun, 25 June 2006 17:55:11 +0000 + +dnsmasq (2.32-1) unstable; urgency=low + + * New upstream. + + -- Simon Kelley Mon, 8 May 2006 09:23:28 +0000 + +dnsmasq (2.31-1) unstable; urgency=high + + * New upstream. (closes: #364800) + * Compile in Dbus support now that suitable Dbus packages exist. + * Don't stop an old dnsmasq process, until a new one is ready, + when upgrading. (closes: #366224) + * Move to standards-version 3.7.2 (no changes needed). + + -- Simon Kelley Sat, 6 May 2006 11:58:22 +0000 + +dnsmasq (2.30-1) unstable; urgency=low + + * New upstream, fixes crash with DHCP broadcast replies. + + -- Simon Kelley Sun, 23 Apr 2006 14:58:22 +0000 + +dnsmasq (2.29-1) unstable; urgency=low + + * New upstream. (closes: #363244) (closes: #363340) + * Made config options clearer in src/config.h and + clarify ISC integration status in Debian readme. (closes: #364250) + + -- Simon Kelley Tue, 18 Apr 2006 10:26:12 +0000 + +dnsmasq (2.28-1) unstable; urgency=low + + * New upstream. (closes: #359956) (closes: #362499) + * Added firestarter info to FAQ. (closes: #359139) + + -- Simon Kelley Tue, 14 Mar 2006 19:20:12 +0000 + +dnsmasq (2.27-1) unstable; urgency=low + + * New upstream. + * Workaround buggy Microsoft DHCP clients. (closes: #355008) + + -- Simon Kelley Wed, 1 Feb 2006 17:05:12 +0000 + +dnsmasq (2.26-1) unstable; urgency=high + + * New upstream. (Fixes possible crash in 2.25, hence urgency). + + -- Simon Kelley Sun, 22 Jan 2006 11:05:22 +0000 + +dnsmasq (2.25-1) unstable; urgency=low + + * Remove bashisms in postinst and prerm scripts. + * Remove misconceived dependency on locales. + * Depend on adduser. + + -- Simon Kelley Thu, 01 Dec 2005 21:02:12 +0000 + +dnsmasq (2.24-1) unstable; urgency=low + + * New upstream. (closes: #330422) + * Fix typo and clean up dnsmasq.conf (closes: #326057) (closes: #304446) + * Add build support for I18N and gettext. + * Fixed manpage typos. (closes: #336413) + * Create a dnsmasq-unique userid for the daemon to run as. (closes: #338353) + + -- Simon Kelley Sat, 03 Sep 2005 20:02:32 +0000 + +dnsmasq (2.23-1) unstable; urgency=low + + * New upstream. (closes: #302501) (closes: #315794) + * Fix manpage typos. (closes: #304984) + * Add support for DNSMASQ_EXCEPT in /etc/defaults/dnsmasq. + putting "lo" in this also disables resolvconf support. + * No longer delete pre-existing /etc/init.d symlinks. The + change in default runlevels which necessitated this + is now ancient history and anyway the startup script now + behaves when called twice. (closes: #312111) + * Tightened config-file parser. (closes: #317030) + + -- Simon Kelley Tue, 02 Aug 2005 13:17:22 +0000 + +dnsmasq (2.22-2) unstable; urgency=low + + * Make the resolv.conf polling code resistant to + backwards-moving system clocks. (closes: #306117) (closes: #300694) + + -- Simon Kelley Wed, 04 May 2005 13:25:23 +0000 + +dnsmasq (2.22-1) unstable; urgency=low + + * New upstream. + * Fixed broken-ness when read /etc/ethers. (closes: #301999) + + -- Simon Kelley Thur, 24 Mar 2005 17:10:13 +0000 + +dnsmasq (2.21-1) unstable; urgency=low + + * New upstream. + + -- Simon Kelley Sat, 29 Jan 2005 16:05:13 +0000 + +dnsmasq (2.20-1) unstable; urgency=low + + * New upstream. + * Fix shadowed CNAME-target problem. (closes: #286654) + * Add --localise-queries option. (closes: #291367) + + -- Simon Kelley Fri, 17 Dec 2004 17:35:23 +0000 + +dnsmasq (2.19-1) unstable; urgency=high + + * New upstream. + * Fix another IPv6 interface enumeration problem. (closes: #285182) + * Uploading at high priority since 285182 is really RC. + + -- Simon Kelley Sat, 11 Dec 2004 20:39:33 +0000 + +dnsmasq (2.18-2) unstable; urgency=low + + * Revert startup to not start from rcS. Starting in rcS + * causes problems if interfaces are not available at that + * point. Users who need this facility should manually + * make rcS.d symlinks. (closes: #283239) + + -- Simon Kelley Sat, 27 Nov 2004 16:33:12 +0000 + +dnsmasq (2.18-1) unstable; urgency=low + + * New upstream. + * Reset cache statistics when clearing the cache. (closes: #281817) + * Fix problems with bind-interfaces and IPv6. (closes: #282192) + * Fix problems upgrading when restarting dnsmasq fails. + + -- Simon Kelley Tue, 16 Nov 2004 17:33:32 +0000 + +dnsmasq (2.17-1) unstable; urgency=high + + * New upstream - fixes crash, hence high urgency. + * Clarified log message when a record in /etc/hosts + and a DHCP name clash. (closes: #275420) + * Start dnsmasq just before portmap and nfs mounts from rcS.d + DNS is required at this stage to use the net. (closes: #280434) + * Make "bind-interfaces" apply to IPv6 interfaces. (closes: #278492) + * Allow a list if interfaces as arg to the --interface and + --except-interface options. (closes: #279063) + + -- Simon Kelley Tue, 26 Oct 2004 20:39:33 +0000 + +dnsmasq (2.16-2) unstable; urgency=high + + * Rename variable in cache.c which clashes with C headers + under gcc-3.4 (closes: #277893) + + -- Simon Kelley Mon, 25 Oct 2004 16:03:24 +0000 + +dnsmasq (2.16-1) unstable; urgency=high + + * New upstream. + * Fixes interaction with Linux 2.4.x and 2.6.x not-quite-POSIX + select behavior, which can cause hangs when receiving UDP + packets with bad checksum. + * Fix bad interaction with polipo. (closes: #275754) + * Cache CNAMEs better. (closes: #276289) + + -- Simon Kelley Mon, 04 Oct 2004 15:25:44 +0000 + +dnsmasq (2.15-1) unstable; urgency=low + + * New upstream. + * Fix NXDOMAIN/NODATA confusion for locally known names. (closes: #271564) + + -- Simon Kelley Wed, 15 Sep 2004 15:01:44 +0000 + +dnsmasq (2.14-1) unstable; urgency=low + + * New upstream. + + -- Simon Kelley Sat, 28 Aug 2004 20:39:33 +0000 + +dnsmasq (2.13-1) unstable; urgency=high + + * New upstream - fixes crash. (closes #265313) + + -- Simon Kelley Thur, 12 Aug 2004 12:45:23 +0000 + +dnsmasq (2.12-1) unstable; urgency=low + + * New upstream. + * Log types of incoming queries (closes: #230123). + * Don't set "filterwin2k" by default in the included + config file - it breaks SRV lookups and Kerberos. + + -- Simon Kelley Sun, 8 Aug 2004 19:58:13 +0000 + +dnsmasq (2.11-1) unstable; urgency=low + + * New upstream. + + -- Simon Kelley Wed, 28 July 2004 21:59:33 +0000 + +dnsmasq (2.10-1) unstable; urgency=low + + * New upstream. + * Allow query-port less than 1024 (closes: #236586) + * Change behaviour of --bogus-priv (closes: #254711) + * Match existing leases by MAC address when a client stops + using client-id or they get suppressed by dnsmasq. (closes: #258519) + + -- Simon Kelley Thur, 24 June 2004 20:55:42 +0000 + +dnsmasq (2.9-2) unstable; urgency=low + + * Fix typo in debian/control (closes: #255762) + + -- Simon Kelley Wed, 23 Jun 2004 20:40:13 +0000 + +dnsmasq (2.9-1) unstable; urgency=low + + * New upstream. + * New version has improved server selection logic (closes: #251097) + * Improved initscript (closes: #252229) + * Conflict with old resolvconf versions to maintain compatibility. + * Updated README.debian (closes: #253429) + * Changed startup message to mention DHCP as well as DNS. + * New resolvconf update script (closes: #254765) + + -- Simon Kelley Wed, 26 May 2004 12:35:23 +0000 + +dnsmasq (2.8-1) unstable; urgency=low + + * New upstream. + * Fixes problem with zero-length hostnames which can lose + DHCP leases over a restart. (closes: #248829) + + -- Simon Kelley Thur, 13 May 2004 18:40:12 +0000 + +dnsmasq (2.7-2) unstable; urgency=low + + * New version of resolvconf script from Thomas Hood with the + following changes: (closes: #247695) + * Doesn't include nameservers listed in the lo.inet or lo.inet6 interface + records created by "ifup lo" + * Lists addresses in a specified order (by interface name) + * Eliminates duplicate nameserver addresses + * Updates /var/run/dnsmasq/resolv.conf atomically + * Doesn't generate empty lines + + -- Simon Kelley Tue, 11 May 2004 22:35:12 +0000 + +dnsmasq (2.7-1) unstable; urgency=low + + * New upstream. + + -- Simon Kelley Sun, 18 Apr 2004 20:00:23 +0000 + +dnsmasq (2.6-3) unstable; urgency=low + + * Removed reload command from start script and moved force-reload + to be equivalent to restart. This is needed to be policy compliant + since SIGHUP doesn't cause dnsmasq to reload its configuration file, + only the /etc/hosts, /etc/resolv.conf etc. (closes: #244208) + + -- Simon Kelley Sun, 18 Apr 2004 14:40:51 +0000 + +dnsmasq (2.6-2) unstable; urgency=low + + * Added Conflict with pdnsd (closes: #242731). + Rationale: dnsmasq used to conflict with all the DNS servers + in Debian, but that was removed because some people wished + to run with dnsmasq listening on one interface and another DNS + server listening on another interface. However AFAIK it is not + possible to make pdnsd listen on a subset of a hosts interfaces, + so there is no scenario where running pdnsd and dnsmasq on the same + host would be useful, hence the conflict goes back. + * Added note about the --bind-interfaces option to + readme.Debian (closes: #241700) + + -- Simon Kelley Tue, 13 Apr 2004 18:37:55 +0000 + +dnsmasq (2.6-1) unstable; urgency=low + + * New upstream. + * New version adds back ability to read ISC dhcpd lease files + for backwards compatibility. (closes: #229684) (closes: #236421) + * Fix parsing of # characters in options file. (closes: #241199) + + -- Simon Kelley Sun, 21 Mar 2004 19:59:25 +0000 + +dnsmasq (2.5-1) unstable; urgency=low + + * New upstream, includes fix for IP-alias related + problem. (closes: #238268) + + -- Simon Kelley Sun, 14 Mar 2004 08:32:43 +0000 + +dnsmasq (2.4-3) unstable; urgency=low + + * Fixed "bind-interfaces" option, even when + an "interface" option is given also. + + -- Simon Kelley Fri, 12 Mar 2004 08:14:23 +0000 + +dnsmasq (2.4-2) unstable; urgency=low + + * Fixed "bind-interfaces" option (closes: #237543). + + -- Simon Kelley Fri, 12 Mar 2004 07:30:25 +0000 + +dnsmasq (2.4-1) unstable; urgency=low + + * New upstream. + + -- Simon Kelley Thurs, 11 Mar 2004 07:59:55 +0000 + +dnsmasq (2.3-1) unstable; urgency=low + + * New upstream. + + -- Simon Kelley Tues, 03 Feb 2004 20:33:10 +0000 + +dnsmasq (2.2-1) unstable; urgency=low + + * New upstream. (fixes no DHCP with IPv6 problem) + * Restart (old) daemon on abort-upgrade. (closes: #230286) + + -- Simon Kelley Fri, 30 Jan 2004 10:23:00 +0000 + +dnsmasq (2.1-1) unstable; urgency=low + + * New upstream. + * Allow addresses in /etc/hosts to be used for + DHCP leases (closes: #229681) + * Fix lease time processing. (closes: #229682) (closes: #229687) + * Fix example conf file. (closes: #229683) (closes: #229701) + * Allow address 0.0.0.0 to mean "self" in dhcp-option. (closes: #229685) + * Cope with ENODEV return from bind of + IPv6 server socket (closes: #229607) + * Document the strict-order option in dnsmasq.conf (closes: #229272) + * Fix local-only domain setting. (closes: #229846) + * Updates Debian readme to mention resolvconf and point at the + local copy of RFC2132. + + -- Simon Kelley Fri, 23 Jan 2004 14:38:29 +0000 + +dnsmasq (2.0-1) unstable; urgency=low + + * New upstream: This removes the ability to read the + the leases file of ISC DHCP and replaces it with a built-in + DHCP server. Apologies in advance for breaking backwards + compatibility, but this replaces a bit of a hack (the ISC stuff) + with a nicely engineered and much more appropriate solution. + Wearing my upstream-maintainer hat, I want to lose the hack now, + rather than have to support it into Sarge. + * New upstream closes some bugs since they become + irrelevant. (closes: #197295) + * Ensure that /var/run and /var/lib/misc exist. + * Remove sed dependency, which was a mistake. + * Remove extraneous "build" file. (closes: #226994) + + -- Simon Kelley Sun, 16 Jan 2004 19:35:49 +0000 + +dnsmasq (1.18-2) unstable; urgency=low + + * Fixed manpage typo (closes: #220961) + * Added dependency for sed. (closes: #222401) + * Check for complete resolvconf installation before + calling it. (closes: #223442) + * Added Links section to doc.html + + -- Simon Kelley Sat, 27 Dec 2003 20:21:15 +0000 + +dnsmasq (1.18-1) unstable; urgency=low + + * New upstream which does round-robin. (closes: #215460) + * Removed conflicts with other dns servers since it is now + possible to control exactly where dnsmasq listens on multi-homed + hosts, making co-existence with another nameserver + a viable proposition. (closes #176163) + * New upstream allows _ in hostnames and check for illegal + names in /etc/hosts. (closes: #218842) + + -- Simon Kelley Fri, 17 Oct 2003 16:23:14 +0000 + +dnsmasq (1.17-1) unstable; urgency=high + + * New upstream (closes: #212680) + + -- Simon Kelley Wed, 8 Oct 2003 14:38:29 +0000 + +dnsmasq (1.16-1) unstable; urgency=low + + * New upstream. + * Renamed Debian README to the standard README.Debian. (closes: #211577) + * Updated the installed /etc/dnsmasq.conf to reflect new options. + + -- Simon Kelley Tues, 16 Sep 2003 23:18:59 +0000 + +dnsmasq (1.15-1) unstable; urgency=low + + * New upstream. + + -- Simon Kelley Tues, 16 Sep 2003 21:48:49 +0000 + +dnsmasq (1.14-1) unstable; urgency=low + + * New upstream. + * Use invoke-rc.d in postinst and prerm scripts when available. + * Stop dnsmasq later (at priority 85). (closes: #200625) + * Updated /etc/resolvconf/update.d/dnsmasq. (closes: #202609) + * Suggest resolvconf. (closes: #208093) + + -- Simon Kelley Tues, 2 Sep 2003 16:43:29 +0000 + +dnsmasq (1.13-4) unstable; urgency=high + + * Ignore failures in stopping existing dnsmasq + processes. (closes: #204127) (closes: #204129) + * Added download source to copyright. (closes: #206647) + + -- Simon Kelley Tues, 2 Sep 2003 15:28:28 +0000 + +dnsmasq (1.13-3) unstable; urgency=low + + * Moved /etc/resolvconf/update.d/dnsmasq script into this package. + * Don't call resolvconf from /etc/init.d/dnsmasq if dnsmasq fails + to start. (Patch from Thomas Hood.) + + -- Simon Kelley Mon, 7 Jul 2003 20:55:29 +0000 + +dnsmasq (1.13-2) unstable; urgency=low + + * Added support for the resolvconf nameserver configuration package. + + -- Simon Kelley Sun, 22 Jun 2003 20:30:19 +0000 + +dnsmasq (1.13-1) unstable; urgency=low + + * New upstream. + * Added new options to the default dnsmasq.conf. + * Default config now reads /var/lib/dhcp/dhcp.leases (closes: #195185) + * Added option to disable negative caching. (closes: #194274) + * Added David Coe's query port patch. (closes: #196578) + + -- Simon Kelley Sat, 31 May 2003 18:10:29 +0000 + +dnsmasq (1.12-1) unstable; urgency=low + + * New upstream. + * Added examples of "local" and "address" options to dnsmasq.conf. + * Remove /usr/doc symlink code. + * Remove period from end of description field. + + -- Simon Kelley Sat, 8 Mar 2003 12:16:09 +0000 + +dnsmasq (1.11-2) unstable; urgency=low + + * Fixed thinko in example dnsmasq.conf. (closes: #180410) + + -- Simon Kelley Mon, 24 Feb 2003 20:06:19 +0000 + +dnsmasq (1.11-1) unstable; urgency=low + + * New upstream. + + -- Simon Kelley Tues, 12 Jan 2003 22:25:17 -0100 + +dnsmasq (1.10-1) unstable; urgency=low + + * New upstream. + * Force service to stop in postinst before restarting. I don't + understand the circumstances under which it would still be running at + this point, but this is the correct fix anyway. (closes: #169718) + * Add /etc/dnsmasq.conf as a conffile and add a comment to + /etc/default/dnsmasq deprecating its use and recommending + /etc/dnsmasq.conf instead, since upstream now supports this. + + -- Simon Kelley Mon, 9 Oct 2002 19:05:34 -0100 + +dnsmasq (1.9-1) unstable; urgency=low + + * New upstream. + + -- Simon Kelley Mon, 23 Sept 2002 21:35:07 -0100 + +dnsmasq (1.8-1) unstable; urgency=low + + * New upstream. + + -- Simon Kelley Mon, 12 Aug 2002 21:56:17 -0100 + +dnsmasq (1.7-1) unstable; urgency=low + + * New upstream including better group-id manipulation. (closes: #152212) + * Conflict with bind9 (closes: #151812) + * Added more options to startup script. (closes: #148535) + + -- Simon Kelley Sun, 14 July 2002 20:23:14 -0100 + +dnsmasq (1.6-1) unstable; urgency=low + + * New upstream. + * Fixed documentation typos. (closes: #144637) + * Fixed failure to remove package if daemon not running. (closes: #147083) + * Changed upload to tarball-and-diff. (closes: #144638) + + -- Simon Kelley Sun, 19 May 2002 22:30:17 -0100 + +dnsmasq (1.5-1) unstable; urgency=medium + + * New upstream (includes hotmail.com fix). + * Fixed DHCP lease file bug. (closes: #143778) + * Fixed failure of "reload" command in startup script (closes: #141021) + * Allow more than one interface name in the DNSMASQ_INTERFACE variable. + + -- Simon Kelley Sun, 14 Apr 2002 16:39:13 -0100 + +dnsmasq (1.4-2) unstable; urgency=low + + * Fixed snafu in startup script (closes: #139760) + + -- Simon Kelley Sun, 24 Mar 2002 23:06:18 +0000 + +dnsmasq (1.4-1) unstable; urgency=low + + * New upstream + + -- Simon Kelley Thurs, 7 Mar 2002 21:02:05 +0000 + +dnsmasq (1.3-1) unstable; urgency=low + + * New upstream + + -- Simon Kelley Fri, 15 Feb 2002 20:45:01 +0000 + +dnsmasq (1.2-4) unstable; urgency=low + + * Updated standards-version. + * More aggressive strip of binaries. + * Added depends: netbase. + * distribution->unstable for upload. + * Updated readme.Debian since config in /etc/default/dnsmasq now. + * Updated readme.Debian to reflect fact that this package is official now! + + -- Simon Kelley Fri, 15 Feb 2002 20:45:01 +0000 + +dnsmasq (1.2-3) stable; urgency=low + + * Added Suggests: and Conflicts: fields to control file. + + -- Simon Kelley Thurs, 14 Feb 2002 20:33:47 +0000 + +dnsmasq (1.2-2) stable; urgency=low + + * Many packaging fixes, to please lintian + * Added extended description. + * Fixed copyright file. + * Compressed everything in /usr/share/doc/dnsmasq. + * Added code to remove /usr/doc/dnsmasq to prerm script. + * Moved configuration from /etc/init.d/dnsmasq to /etc/default/dnsmasq + + -- Simon Kelley Sat, 02 Feb 2002 18:54:37 +0000 + +dnsmasq (1.2-1) stable; urgency=low + + * New upstream + * Added more options to startup script + + -- Simon Kelley Sat, 20 Dec 2001 21:15:07 +0000 + +dnsmasq (1.1-2) stable; urgency=low + + * New upstream + * Strip binary + * Moved manpage from section 1 to section 8 + + -- Simon Kelley Sat, 21 Oct 2001 17:32:04 -0100 + +dnsmasq (1.0-1) unstable; urgency=low + + * New upstream + + -- Simon Kelley Sat, 10 Oct 2001 15:52:06 -0100 + +dnsmasq (0.996-1) unstable; urgency=low + + * New upstream + + -- Simon Kelley Fri, 26 Oct 2001 10:32:06 -0100 + +dnsmasq (0.995-1) unstable; urgency=low + + * New upstream + + -- Simon Kelley Tue, 09 Oct 2001 16:39:07 -0100 + +dnsmasq (0.994-1) unstable; urgency=low + + * New upstream + + -- Simon Kelley Sat, 07 Oct 2001 15:45:04 -0100 + +dnsmasq (0.992-1) unstable; urgency=low + + * New upstream + + -- Simon Kelley Fri, 31 Aug 2001 16:17:00 -0100 + +dnsmasq (0.98-1) unstable; urgency=low + + * New upstream + + -- Simon Kelley Wed, 11 Jul 2001 11:31:00 -0100 + +dnsmasq (0.96-1) unstable; urgency=low + + * Fixed thinko in cache code.. + + -- Simon Kelley Sat, 07 Jul 2001 18:52:00 -0100 + +dnsmasq (0.95-1) unstable; urgency=low + + * Initial Release. + + -- Simon Kelley Sat, 29 Aug 1998 20:27:27 -0400 + + + + + + + + + + --- dnsmasq-2.89.orig/debian/conffiles +++ dnsmasq-2.89/debian/conffiles @@ -0,0 +1,5 @@ +/etc/init.d/dnsmasq +/etc/default/dnsmasq +/etc/dnsmasq.conf +/etc/resolvconf/update.d/dnsmasq +/etc/insserv.conf.d/dnsmasq --- dnsmasq-2.89.orig/debian/control +++ dnsmasq-2.89/debian/control @@ -0,0 +1,66 @@ +Source: dnsmasq +Section: net +Priority: optional +Build-depends: gettext, libnetfilter-conntrack-dev [linux-any], + libidn2-dev, libdbus-1-dev (>=0.61), libgmp-dev, + nettle-dev (>=2.4-3), libbsd-dev [kfreebsd-any], + liblua5.2-dev, dh-runit, debhelper-compat (= 10), + pkg-config, libnftables-dev +Maintainer: Simon Kelley +Homepage: http://www.thekelleys.org.uk/dnsmasq/doc.html +Vcs-Git: http://thekelleys.org.uk/git/dnsmasq.git +Vcs-Browser: http://thekelleys.org.uk/gitweb/?p=dnsmasq.git +Standards-Version: 3.9.8 + +Package: dnsmasq +Architecture: all +Depends: netbase, dnsmasq-base, + init-system-helpers (>= 1.18~), lsb-base (>= 3.0-6), ${misc:Depends} +Suggests: resolvconf +Breaks: ${runit:Breaks} +Conflicts: resolvconf (<<1.15), ${runit:Conflicts} +Description: Small caching DNS proxy and DHCP/TFTP server + 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 which are + not in the global DNS. The DHCP server integrates with the DNS + server and allows machines with DHCP-allocated addresses + to appear in the DNS with names configured either in each host or + in a central configuration file. Dnsmasq supports static and dynamic + DHCP leases and BOOTP/TFTP for network booting of diskless machines. + +Package: dnsmasq-base +Architecture: any +Depends: adduser, ${shlibs:Depends} +Breaks: dnsmasq (<< 2.63-1~) +Replaces: dnsmasq (<< 2.63-1~), dnsmasq-base +Recommends: dns-root-data +Provides: dnsmasq-base +Conflicts: dnsmasq-base-lua +Description: Small caching DNS proxy and DHCP/TFTP server + This package contains the dnsmasq executable and documentation, but + not the infrastructure required to run it as a system daemon. For + that, install the dnsmasq package. + +Package: dnsmasq-base-lua +Architecture: any +Depends: adduser, ${shlibs:Depends} +Breaks: dnsmasq (<< 2.63-1~) +Replaces: dnsmasq (<< 2.63-1~), dnsmasq-base +Recommends: dns-root-data +Provides: dnsmasq-base +Conflicts: dnsmasq-base +Description: Small caching DNS proxy and DHCP/TFTP server + This package contains the dnsmasq executable and documentation, but + not the infrastructure required to run it as a system daemon. For + that, install the dnsmasq package. This package is an alternative + to dnsmasq-base which includes the LUA interpreter. + +Package: dnsmasq-utils +Architecture: linux-any +Depends: ${shlibs:Depends} +Conflicts: dnsmasq (<<2.40) +Description: Utilities for manipulating DHCP leases + Small utilities to query a DHCP server's lease database and + remove leases from it. These programs are distributed with dnsmasq + and may not work correctly with other DHCP servers. --- dnsmasq-2.89.orig/debian/copyright +++ dnsmasq-2.89/debian/copyright @@ -0,0 +1,21 @@ +dnsmasq is Copyright (c) 2000-2021 Simon Kelley + +It was downloaded from: http://www.thekelleys.org.uk/dnsmasq/ + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 dated June, 1991, or + (at your option) version 3 dated 29 June, 2007. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + +On Debian GNU/Linux systems, the text of the GNU general public license is +available in the file /usr/share/common-licenses/GPL-2 or +/usr/share/common-licenses/GPL-3 + +The Debian package of dnsmasq was created by Simon Kelley with assistance +from Lars Bahner. + --- dnsmasq-2.89.orig/debian/dbus.conf +++ dnsmasq-2.89/debian/dbus.conf @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + --- dnsmasq-2.89.orig/debian/default +++ dnsmasq-2.89/debian/default @@ -0,0 +1,42 @@ +# This file has six functions: +# 1) to completely disable starting this dnsmasq instance +# 2) to set DOMAIN_SUFFIX by running `dnsdomainname` +# 3) to select an alternative config file +# by setting DNSMASQ_OPTS to --conf-file= +# 4) to tell dnsmasq to read the files in /etc/dnsmasq.d for +# more configuration variables. +# 5) to stop the resolvconf package from controlling dnsmasq's +# idea of which upstream nameservers to use. +# 6) to avoid using this dnsmasq instance as the system's default resolver +# by setting DNSMASQ_EXCEPT="lo" +# For upgraders from very old versions, all the shell variables set +# here in previous versions are still honored by the init script +# so if you just keep your old version of this file nothing will break. + +#DOMAIN_SUFFIX=`dnsdomainname` +#DNSMASQ_OPTS="--conf-file=/etc/dnsmasq.alt" + +# Whether or not to run the dnsmasq daemon; set to 0 to disable. +# Note that this is only valid when using SYSV init. For systemd, +# use "systemctl disable dnsmasq" +ENABLED=1 + +# By default search this drop directory for configuration options. +# Libvirt leaves a file here to make the system dnsmasq play nice. +# Comment out this line if you don't want this. The dpkg-* are file +# endings which cause dnsmasq to skip that file. This avoids pulling +# in backups made by dpkg. +CONFIG_DIR=/etc/dnsmasq.d,.dpkg-dist,.dpkg-old,.dpkg-new + +# If the resolvconf package is installed, dnsmasq will use its output +# rather than the contents of /etc/resolv.conf to find upstream +# nameservers. Uncommenting this line inhibits this behaviour. +# Note that including a "resolv-file=" line in +# /etc/dnsmasq.conf is not enough to override resolvconf if it is +# installed: the line below must be uncommented. +#IGNORE_RESOLVCONF=yes + +# If the resolvconf package is installed, dnsmasq will tell resolvconf +# to use dnsmasq under 127.0.0.1 as the system's default resolver. +# Uncommenting this line inhibits this behaviour. +#DNSMASQ_EXCEPT="lo" --- dnsmasq-2.89.orig/debian/dnsmasq-base.conffiles +++ dnsmasq-2.89/debian/dnsmasq-base.conffiles @@ -0,0 +1 @@ +/etc/dbus-1/system.d/dnsmasq.conf --- dnsmasq-2.89.orig/debian/dnsmasq-base.postinst +++ dnsmasq-2.89/debian/dnsmasq-base.postinst @@ -0,0 +1,24 @@ +#!/bin/sh +set -e + +# Create the dnsmasq user in dnsmasq-base, so that Dbus doesn't complain. + +# create a user to run as (code stolen from dovecot-common) +if [ "$1" = "configure" ]; then + if [ -z "`id -u dnsmasq 2> /dev/null`" ]; then + adduser --system --home /var/lib/misc --gecos "dnsmasq" \ + --no-create-home --disabled-password \ + --quiet dnsmasq || true + fi + + # Make the directory where we keep the pid file - this + # has to be owned by "dnsmasq" so that the file can be unlinked. + # This is only actually used by the dnsmasq binary package, not + # dnsmasq-base, but it's much easier to create it here so that + # we don't have synchronisation issues with the creation of the + # dnsmasq user. + if [ ! -d /run/dnsmasq ]; then + mkdir /run/dnsmasq + chown dnsmasq:nogroup /run/dnsmasq + fi +fi --- dnsmasq-2.89.orig/debian/dnsmasq-base.postrm +++ dnsmasq-2.89/debian/dnsmasq-base.postrm @@ -0,0 +1,11 @@ +#!/bin/sh +set -e + +if [ purge = "$1" ]; then + if [ -x "$(command -v deluser)" ]; then + deluser --quiet --system dnsmasq > /dev/null || true + else + echo >&2 "not removing dnsmasq system account because deluser command was not found" + fi + rm -rf /run/dnsmasq +fi --- dnsmasq-2.89.orig/debian/dnsmasq.runit +++ dnsmasq-2.89/debian/dnsmasq.runit @@ -0,0 +1 @@ +debian/dnsmasq.runscript name=dnsmasq,logscript,presubj --- dnsmasq-2.89.orig/debian/dnsmasq.runscript/finish +++ dnsmasq-2.89/debian/dnsmasq.runscript/finish @@ -0,0 +1,5 @@ +#!/bin/sh -eu +if [ -x /sbin/resolvconf ] ; then + /sbin/resolvconf -d lo.dnsmasq +fi + --- dnsmasq-2.89.orig/debian/dnsmasq.runscript/run +++ dnsmasq-2.89/debian/dnsmasq.runscript/run @@ -0,0 +1,43 @@ +#!/lib/runit/invoke-run + +readonly name=dnsmasq +readonly daemon=/usr/sbin/dnsmasq +readonly marker=/usr/share/dnsmasq/installed-marker + +test -e "${marker}" || exec sv down "${name}" +test -x "${daemon}" || exec sv down "${name}" + +if [ ! "${RESOLV_CONF:-}" ] && + [ "${IGNORE_RESOLVCONF:-}" != "yes" ] && + [ -x /sbin/resolvconf ] +then + RESOLV_CONF=/run/dnsmasq/resolv.conf +fi + +# This tells dnsmasq to ignore DNS requests that don't come from a local network. +# It's automatically ignored if --interface --except-interface, --listen-address +# or --auth-server exist in the configuration, so for most installations, it will +# have no effect, but for otherwise-unconfigured installations, it stops dnsmasq +# from being vulnerable to DNS-reflection attacks. + +DNSMASQ_OPTS="${DNSMASQ_OPTS:-} --local-service" + +# If the dns-root-data package is installed, then the trust anchors will be +# available in $ROOT_DS, in BIND zone-file format. Reformat as dnsmasq +# --trust-anchor options. + +ROOT_DS="/usr/share/dns/root.ds" + +if [ -f $ROOT_DS ]; then + DNSMASQ_OPTS="$DNSMASQ_OPTS `env LC_ALL=C sed -rne "s/^([.a-zA-Z0-9]+)([[:space:]]+[0-9]+)*([[:space:]]+IN)*[[:space:]]+DS[[:space:]]+/--trust-anchor=\1,/;s/[[:space:]]+/,/gp" $ROOT_DS | tr '\n' ' '`" +fi + +mkdir -p /run/dnsmasq +chown dnsmasq:nogroup /run/dnsmasq +[ -x /sbin/restorecon ] && /sbin/restorecon /run/dnsmasq +exec "${daemon}" \ + --keep-in-foreground \ + --log-facility=/dev/stdout \ + ${RESOLV_CONF:+ -r $RESOLV_CONF} \ + ${DNSMASQ_OPTS} \ + -u dnsmasq --- dnsmasq-2.89.orig/debian/init +++ dnsmasq-2.89/debian/init @@ -0,0 +1,325 @@ +#!/bin/sh +### BEGIN INIT INFO +# Provides: dnsmasq +# Required-Start: $network $remote_fs $syslog +# Required-Stop: $network $remote_fs $syslog +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Description: DHCP and DNS server +### END INIT INFO + +# Don't exit on error status +set +e + +PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin +DAEMON=/usr/sbin/dnsmasq +NAME=dnsmasq +DESC="DNS forwarder and DHCP server" +INSTANCE="${2}" + +# Most configuration options in /etc/default/dnsmasq are deprecated +# but still honoured. +ENABLED=1 +if [ -r /etc/default/${NAME}${INSTANCE:+.${INSTANCE}} ]; then + . /etc/default/${NAME}${INSTANCE:+.${INSTANCE}} +fi + +# Get the system locale, so that messages are in the correct language, and the +# charset for IDN is correct +if [ -r /etc/default/locale ]; then + . /etc/default/locale + export LANG +fi + +# The following test ensures the dnsmasq service is not started, when the +# package 'dnsmasq' is removed but not purged, even if the dnsmasq-base +# package is still in place. +test -e /usr/share/dnsmasq/installed-marker || exit 0 + +test -x ${DAEMON} || exit 0 + +# Provide skeleton LSB log functions for backports which don't have LSB functions. +if [ -f /lib/lsb/init-functions ]; then + . /lib/lsb/init-functions +else + log_warning_msg () { + echo "${@}." + } + + log_success_msg () { + echo "${@}." + } + + log_daemon_msg () { + echo -n "${1}: ${2}" + } + + log_end_msg () { + if [ "${1}" -eq 0 ]; then + echo "." + elif [ "${1}" -eq 255 ]; then + /bin/echo -e " (warning)." + else + /bin/echo -e " failed!" + fi + } +fi + +# RESOLV_CONF: +# If the resolvconf package is installed then use the resolv conf file +# that it provides as the default. Otherwise use /etc/resolv.conf as +# the default. +# +# If IGNORE_RESOLVCONF is set in /etc/default/dnsmasq or an explicit +# filename is set there then this inhibits the use of the resolvconf-provided +# information. +# +# Note that if the resolvconf package is installed it is not possible to +# override it just by configuration in /etc/dnsmasq.conf, it is necessary +# to set IGNORE_RESOLVCONF=yes in /etc/default/dnsmasq. + +if [ ! "${RESOLV_CONF}" ] && + [ "${IGNORE_RESOLVCONF}" != "yes" ] && + [ -x /sbin/resolvconf ] +then + RESOLV_CONF=/run/dnsmasq/resolv.conf +fi + +for INTERFACE in ${DNSMASQ_INTERFACE}; do + DNSMASQ_INTERFACES="${DNSMASQ_INTERFACES} -i ${INTERFACE}" +done + +for INTERFACE in ${DNSMASQ_EXCEPT}; do + DNSMASQ_INTERFACES="${DNSMASQ_INTERFACES} -I ${INTERFACE}" +done + +if [ ! "${DNSMASQ_USER}" ]; then + DNSMASQ_USER="dnsmasq" +fi + +# This tells dnsmasq to ignore DNS requests that don't come from a local network. +# It's automatically ignored if --interface --except-interface, --listen-address +# or --auth-server exist in the configuration, so for most installations, it will +# have no effect, but for otherwise-unconfigured installations, it stops dnsmasq +# from being vulnerable to DNS-reflection attacks. + +DNSMASQ_OPTS="${DNSMASQ_OPTS} --local-service" + +# If the dns-root-data package is installed, then the trust anchors will be +# available in ROOT_DS, in BIND zone-file format. Reformat as dnsmasq +# --trust-anchor options. + +ROOT_DS="/usr/share/dns/root.ds" + +if [ -f ${ROOT_DS} ]; then + DNSMASQ_OPTS="$DNSMASQ_OPTS `env LC_ALL=C sed -rne "s/^([.a-zA-Z0-9]+)([[:space:]]+[0-9]+)*([[:space:]]+IN)*[[:space:]]+DS[[:space:]]+/--trust-anchor=\1,/;s/[[:space:]]+/,/gp" $ROOT_DS | tr '\n' ' '`" +fi + +start() +{ + # Return + # 0 if daemon has been started + # 1 if daemon was already running + # 2 if daemon could not be started + + # /run may be volatile, so we need to ensure that + # /run/dnsmasq exists here as well as in postinst + if [ ! -d /run/dnsmasq ]; then + mkdir /run/dnsmasq || { [ -d /run/dnsmasq ] || return 2 ; } + chown dnsmasq:nogroup /run/dnsmasq || return 2 + fi + [ -x /sbin/restorecon ] && /sbin/restorecon /run/dnsmasq + + start-stop-daemon --start --quiet --pidfile /run/dnsmasq/${NAME}${INSTANCE:+.${INSTANCE}}.pid --exec ${DAEMON} --test > /dev/null || return 1 + start-stop-daemon --start --quiet --pidfile /run/dnsmasq/${NAME}${INSTANCE:+.${INSTANCE}}.pid --exec ${DAEMON} -- \ + -x /run/dnsmasq/${NAME}${INSTANCE:+.${INSTANCE}}.pid \ + ${MAILHOSTNAME:+ -m ${MAILHOSTNAME}} \ + ${MAILTARGET:+ -t ${MAILTARGET}} \ + ${DNSMASQ_USER:+ -u ${DNSMASQ_USER}} \ + ${DNSMASQ_INTERFACES:+ ${DNSMASQ_INTERFACES}} \ + ${DHCP_LEASE:+ -l ${DHCP_LEASE}} \ + ${DOMAIN_SUFFIX:+ -s ${DOMAIN_SUFFIX}} \ + ${RESOLV_CONF:+ -r ${RESOLV_CONF}} \ + ${CACHESIZE:+ -c ${CACHESIZE}} \ + ${CONFIG_DIR:+ -7 ${CONFIG_DIR}} \ + ${DNSMASQ_OPTS:+ ${DNSMASQ_OPTS}} \ + || return 2 +} + +start_resolvconf() +{ +# If interface "lo" is explicitly disabled in /etc/default/dnsmasq +# Then dnsmasq won't be providing local DNS, so don't add it to +# the resolvconf server set. + for interface in ${DNSMASQ_EXCEPT}; do + [ ${interface} = lo ] && return + done + + # Also skip this if DNS functionality is disabled in /etc/dnsmasq.conf + if grep -qs '^port=0' /etc/dnsmasq.conf; then + return + fi + + if [ -x /sbin/resolvconf ] ; then + echo "nameserver 127.0.0.1" | /sbin/resolvconf -a lo.${NAME}${INSTANCE:+.${INSTANCE}} + fi + return 0 +} + +stop() +{ + # Return + # 0 if daemon has been stopped + # 1 if daemon was already stopped + # 2 if daemon could not be stopped + # other if a failure occurred + start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile /run/dnsmasq/${NAME}${INSTANCE:+.${INSTANCE}}.pid --name ${NAME} +} + +stop_resolvconf() +{ + if [ -x /sbin/resolvconf ] ; then + /sbin/resolvconf -d lo.${NAME}${INSTANCE:+.${INSTANCE}} + fi + return 0 +} + +status() +{ + # Return + # 0 if daemon is running + # 1 if daemon is dead and pid file exists + # 3 if daemon is not running + # 4 if daemon status is unknown + start-stop-daemon --start --quiet --pidfile /run/dnsmasq/${NAME}${INSTANCE:+.${INSTANCE}}.pid --exec ${DAEMON} --test > /dev/null + case "${?}" in + 0) [ -e "/run/dnsmasq/${NAME}${INSTANCE:+.${INSTANCE}}.pid" ] && return 1 ; return 3 ;; + 1) return 0 ;; + *) return 4 ;; + esac +} + +case "${1}" in + start) + test "${ENABLED}" != "0" || exit 0 + log_daemon_msg "Starting ${DESC}" "${NAME}${INSTANCE:+.${INSTANCE}}" + start + case "${?}" in + 0) + log_end_msg 0 + start_resolvconf + exit 0 + ;; + 1) + log_success_msg "(already running)" + exit 0 + ;; + *) + log_end_msg 1 + exit 1 + ;; + esac + ;; + stop) + stop_resolvconf + if [ "${ENABLED}" != "0" ]; then + log_daemon_msg "Stopping ${DESC}" "${NAME}${INSTANCE:+.${INSTANCE}}" + fi + stop + RETVAL="${?}" + if [ "${ENABLED}" = "0" ]; then + case "${RETVAL}" in + 0) log_daemon_msg "Stopping ${DESC}" "${NAME}${INSTANCE:+.${INSTANCE}}"; log_end_msg 0 ;; + esac + exit 0 + fi + case "${RETVAL}" in + 0) log_end_msg 0 ; exit 0 ;; + 1) log_warning_msg "(not running)" ; exit 0 ;; + *) log_end_msg 1; exit 1 ;; + esac + ;; + checkconfig) + ${DAEMON} --test ${CONFIG_DIR:+ -7 ${CONFIG_DIR}} ${DNSMASQ_OPTS:+ ${DNSMASQ_OPTS}} >/dev/null 2>&1 + RETVAL="${?}" + exit ${RETVAL} + ;; + restart|force-reload) + test "${ENABLED}" != "0" || exit 1 + ${DAEMON} --test ${CONFIG_DIR:+ -7 ${CONFIG_DIR}} ${DNSMASQ_OPTS:+ ${DNSMASQ_OPTS}} >/dev/null 2>&1 + if [ ${?} -ne 0 ]; then + NAME="configuration syntax check" + RETVAL="2" + else + stop_resolvconf + stop + RETVAL="${?}" + fi + log_daemon_msg "Restarting ${DESC}" "${NAME}${INSTANCE:+.${INSTANCE}}" + case "${RETVAL}" in + 0|1) + sleep 2 + start + case "${?}" in + 0) + log_end_msg 0 + start_resolvconf + exit 0 + ;; + *) + log_end_msg 1 + exit 1 + ;; + esac + ;; + *) + log_end_msg 1 + exit 1 + ;; + esac + ;; + status) + log_daemon_msg "Checking ${DESC}" "${NAME}${INSTANCE:+.${INSTANCE}}" + status + case "${?}" in + 0) log_success_msg "(running)" ; exit 0 ;; + 1) log_success_msg "(dead, pid file exists)" ; exit 1 ;; + 3) log_success_msg "(not running)" ; exit 3 ;; + *) log_success_msg "(unknown)" ; exit 4 ;; + esac + ;; + dump-stats) + kill -s USR1 `cat /run/dnsmasq/${NAME}${INSTANCE:+.${INSTANCE}}.pid` + ;; + systemd-start-resolvconf) + start_resolvconf + ;; + systemd-stop-resolvconf) + stop_resolvconf + ;; + systemd-exec) + # /run may be volatile, so we need to ensure that + # /run/dnsmasq exists here as well as in postinst + if [ ! -d /run/dnsmasq ]; then + mkdir /run/dnsmasq || { [ -d /run/dnsmasq ] || return 2 ; } + chown dnsmasq:nogroup /run/dnsmasq || return 2 + fi + exec ${DAEMON} -x /run/dnsmasq/${NAME}${INSTANCE:+.${INSTANCE}}.pid \ + ${MAILHOSTNAME:+ -m ${MAILHOSTNAME}} \ + ${MAILTARGET:+ -t ${MAILTARGET}} \ + ${DNSMASQ_USER:+ -u ${DNSMASQ_USER}} \ + ${DNSMASQ_INTERFACES:+ ${DNSMASQ_INTERFACES}} \ + ${DHCP_LEASE:+ -l ${DHCP_LEASE}} \ + ${DOMAIN_SUFFIX:+ -s ${DOMAIN_SUFFIX}} \ + ${RESOLV_CONF:+ -r ${RESOLV_CONF}} \ + ${CACHESIZE:+ -c ${CACHESIZE}} \ + ${CONFIG_DIR:+ -7 ${CONFIG_DIR}} \ + ${DNSMASQ_OPTS:+ ${DNSMASQ_OPTS}} + ;; + *) + echo "Usage: /etc/init.d/${NAME} {start|stop|restart|force-reload|dump-stats|status}" >&2 + exit 3 + ;; +esac + +exit 0 --- dnsmasq-2.89.orig/debian/insserv +++ dnsmasq-2.89/debian/insserv @@ -0,0 +1 @@ +$named dnsmasq --- dnsmasq-2.89.orig/debian/installed-marker +++ dnsmasq-2.89/debian/installed-marker @@ -0,0 +1,2 @@ +# This file indicates dnsmasq (and not just dnsmasq-base) is installed. +# It is an implementation detail of the dnsmasq init script. --- dnsmasq-2.89.orig/debian/lintian-override +++ dnsmasq-2.89/debian/lintian-override @@ -0,0 +1,3 @@ +# dnsmasq-base and dnsmasq-base-lua are mutually exclusive and both +# provide /usr/share/doc/dnsmasq-base +dnsmasq-base-lua binary: usr-share-doc-symlink-without-dependency dnsmasq-base --- dnsmasq-2.89.orig/debian/postinst +++ dnsmasq-2.89/debian/postinst @@ -0,0 +1,41 @@ +#!/bin/sh +set -e + +# /usr/share/doc/dnsmasq was a symlink in versions < 2.81-1 (see #985282) +dpkg-maintscript-helper symlink_to_dir /usr/share/doc/dnsmasq dnsmasq-base 2.84-1.2~ dnsmasq -- "$@" + +# Code copied from dh_systemd_enable ---------------------- +# This will only remove masks created by d-s-h on package removal. +deb-systemd-helper unmask dnsmasq.service >/dev/null || true + +# was-enabled defaults to true, so new installations run enable. +if deb-systemd-helper --quiet was-enabled dnsmasq.service; then + # Enables the unit on first installation, creates new + # symlinks on upgrades if the unit file has changed. + deb-systemd-helper enable dnsmasq.service >/dev/null || true +else + # Update the statefile to add new symlinks (if any), which need to be + # cleaned up on purge. Also remove old symlinks. + deb-systemd-helper update-state dnsmasq.service >/dev/null || true +fi +# End code copied from dh_systemd_enable ------------------ + +if [ -x /etc/init.d/dnsmasq ]; then + update-rc.d dnsmasq defaults 15 85 >/dev/null + + if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ]; then + if [ -e /run/dnsmasq/dnsmasq.pid ]; then + ACTION=restart + else + ACTION=start + fi + + if [ -x /usr/sbin/invoke-rc.d ] ; then + invoke-rc.d dnsmasq $ACTION || true + else + /etc/init.d/dnsmasq $ACTION || true + fi + fi +fi + + --- dnsmasq-2.89.orig/debian/postrm +++ dnsmasq-2.89/debian/postrm @@ -0,0 +1,25 @@ +#!/bin/sh +set -e + +# /usr/share/doc/dnsmasq was a symlink in versions < 2.81-1 (see #985282) +dpkg-maintscript-helper symlink_to_dir /usr/share/doc/dnsmasq dnsmasq-base 2.84-1.2~ dnsmasq -- "$@" + +if [ purge = "$1" ]; then + update-rc.d dnsmasq remove >/dev/null +fi + +# Code copied from dh_systemd_enable ---------------------- +if [ "$1" = "remove" ]; then + if [ -x "/usr/bin/deb-systemd-helper" ]; then + deb-systemd-helper mask dnsmasq.service >/dev/null + fi +fi + +if [ "$1" = "purge" ]; then + if [ -x "/usr/bin/deb-systemd-helper" ]; then + deb-systemd-helper purge dnsmasq.service >/dev/null + deb-systemd-helper unmask dnsmasq.service >/dev/null + fi +fi +# End code copied from dh_systemd_enable ------------------ + --- dnsmasq-2.89.orig/debian/preinst +++ dnsmasq-2.89/debian/preinst @@ -0,0 +1,5 @@ +#!/bin/sh +set -e + +# /usr/share/doc/dnsmasq was a symlink in versions < 2.81-1 (see #985282) +dpkg-maintscript-helper symlink_to_dir /usr/share/doc/dnsmasq dnsmasq-base 2.84-1.2~ dnsmasq -- "$@" --- dnsmasq-2.89.orig/debian/prerm +++ dnsmasq-2.89/debian/prerm @@ -0,0 +1,14 @@ +#!/bin/sh +set -e + +if [ "$1" = "remove" ]; then + if [ -x /usr/sbin/invoke-rc.d ] ; then + invoke-rc.d dnsmasq stop || true + else + /etc/init.d/dnsmasq stop || true + fi +fi + +exit 0 + + --- dnsmasq-2.89.orig/debian/readme +++ dnsmasq-2.89/debian/readme @@ -0,0 +1,80 @@ +Notes on configuring dnsmasq as packaged for Debian. + +(1) To configure dnsmasq edit /etc/dnsmasq.conf. The file is well + commented; see also the dnsmasq.8 man page for explanation of + the options. The file /etc/default/dnsmasq also exists but it + shouldn't need to be touched in most cases. To set up DHCP + options you might need to refer to a copy of RFC 2132. This is + available on Debian systems in the package doc-rfc-std as the file + /usr/share/doc/RFC/draft-standard/rfc2132.txt.gz . + +(2) Installing the dnsmasq package also creates the directory + /etc/dnsmasq.d which is searched by dnsmasq for configuration file + fragments. This behaviour can be disabled by editing + /etc/default/dnsmasq. + +(3) If the Debian resolvconf package is installed then, regardless + of what interface configuration daemons are employed, the list of + nameservers to which dnsmasq should forward queries can be found + in /var/run/dnsmasq/resolv.conf; also, 127.0.0.1 is listed as the + first nameserver address in /etc/resolv.conf. This works using the + default configurations of resolvconf and dnsmasq. + +(4) In the absence of resolvconf, if you are using dhcpcd then + dnsmasq should read the list of nameservers from the automatically + generated file /etc/dhcpc/resolv.conf. You should list 127.0.0.1 + as the first nameserver address in /etc/resolv.conf. + +(5) In the absence of resolvconf, if you are using pppd then + dnsmasq should read the list of nameservers from the automatically + generated file /etc/ppp/resolv.conf. You should list 127.0.0.1 + as the first nameserver address in /etc/resolv.conf. + +(6) In the absence of resolvconf, dns-nameservers lines in + /etc/network/interfaces are ignored. If you do not use + resolvconf, list 127.0.0.1 as the first nameserver address + in /etc/resolv.conf and configure your nameservers using + "server=" lines in /etc/dnsmasq.conf. + +(7) If you run multiple DNS servers on a single machine, each + listening on a different interface, then it is necessary to use + the bind-interfaces option by uncommenting "bind-interfaces" in + /etc/dnsmasq.conf. This option stops dnsmasq from binding the + wildcard address and allows servers listening on port 53 on + interfaces not in use by dnsmasq to work. The Debian + libvirt package will add a configuration file in /etc/dnsmasq.d + which does this so that the "system" dnsmasq and "private" dnsmasq + instances started by libvirt do not clash. + +(8) The following options are supported in DEB_BUILD_OPTIONS + noopt : compile without optimisation. + nostrip : don't remove symbols from binary. + nodocs : omit documentation. + notftp : omit TFTP support. + nodhcp : omit DHCP support. + nodhcp6 : omit DHCPv6 support. + noscript : omit lease-change script support. + uselua : provide support for lease-change scripts written + in Lua. + noipv6 : omit IPv6 support. + nodbus : omit DBus support. + noconntrack : omit connection tracking support. + noipset : omit IPset support. + nonftset : omit nftset support. + nortc : compile alternate mode suitable for systems without an RTC. + noi18n : omit translations and internationalisation support. + noidn : omit international domain name support, must be + combined with noi18n to be effective. + gitversion : set the version of the produced packages from the + git-derived versioning information on the source, + rather than the debian changelog. + +(9) Dnsmasq comes as three packages - dnsmasq-utils, dnsmasq-base and + dnsmasq. Dnsmasq-base provides the dnsmasq executable and + documentation (including this file). Dnsmasq, which depends on + dnsmasq-base, provides the init script and configuration + infrastructure. This file assumes that both are installed. It is + possible to install only dnsmasq-base and use dnsmasq as a + non-"system" daemon. Libvirt, for instance, does this. + Dnsmasq-utils provides the utilities dhcp_release and + dhcp_lease_time. --- dnsmasq-2.89.orig/debian/readme.dnsmasq.d +++ dnsmasq-2.89/debian/readme.dnsmasq.d @@ -0,0 +1,7 @@ +# All files in this directory will be read by dnsmasq as +# configuration files, except if their names end in +# ".dpkg-dist",".dpkg-old" or ".dpkg-new" +# +# This can be changed by editing /etc/default/dnsmasq + + --- dnsmasq-2.89.orig/debian/resolvconf +++ dnsmasq-2.89/debian/resolvconf @@ -0,0 +1,84 @@ +#!/bin/sh +# +# Script to update the resolver list for dnsmasq +# +# N.B. Resolvconf may run us even if dnsmasq is not (yet) running. +# If dnsmasq is installed then we go ahead and update the resolver list +# in case dnsmasq is started later. +# +# Assumption: On entry, PWD contains the resolv.conf-type files. +# +# This file is part of the dnsmasq package. +# + +set -e + +RUN_DIR="/run/dnsmasq" +RSLVRLIST_FILE="${RUN_DIR}/resolv.conf" +TMP_FILE="${RSLVRLIST_FILE}_new.$$" +MY_NAME_FOR_RESOLVCONF="dnsmasq" + +[ -x /usr/sbin/dnsmasq ] || exit 0 +[ -x /lib/resolvconf/list-records ] || exit 1 + +PATH=/bin:/sbin + +report_err() { echo "$0: Error: $*" >&2 ; } + +# Stores arguments (minus duplicates) in RSLT, separated by spaces +# Doesn't work properly if an argument itself contains whitespace +uniquify() +{ + RSLT="" + while [ "$1" ] ; do + for E in $RSLT ; do + [ "$1" = "$E" ] && { shift ; continue 2 ; } + done + RSLT="${RSLT:+$RSLT }$1" + shift + done +} + +if [ ! -d "$RUN_DIR" ] && ! mkdir --parents --mode=0755 "$RUN_DIR" ; then + report_err "Failed trying to create directory $RUN_DIR" + exit 1 +fi + +RSLVCNFFILES="" +for F in $(/lib/resolvconf/list-records --after "lo.$MY_NAME_FOR_RESOLVCONF") ; do + case "$F" in + "lo.$MY_NAME_FOR_RESOLVCONF") + # Omit own record + ;; + lo.*) + # Include no more records after one for a local nameserver + RSLVCNFFILES="${RSLVCNFFILES:+$RSLVCNFFILES }$F" + break + ;; + *) + RSLVCNFFILES="${RSLVCNFFILES:+$RSLVCNFFILES }$F" + ;; + esac +done + +NMSRVRS="" +if [ "$RSLVCNFFILES" ] ; then + uniquify $(sed -n -e 's/^[[:space:]]*nameserver[[:space:]]\+//p' $RSLVCNFFILES) + NMSRVRS="$RSLT" +fi + +# Dnsmasq uses the mtime of $RSLVRLIST_FILE, with a resolution of one second, +# to detect changes in the file. This means that if a resolvconf update occurs +# within one second of the previous one then dnsmasq may fail to notice the +# more recent change. To work around this problem we sleep one second here +# if necessary in order to ensure that the new mtime is different. +if [ -f "$RSLVRLIST_FILE" ] && [ "$(ls -go --time-style='+%s' "$RSLVRLIST_FILE" | { read p h s t n ; echo "$t" ; })" = "$(date +%s)" ] ; then + sleep 1 +fi + +clean_up() { rm -f "$TMP_FILE" ; } +trap clean_up EXIT +: >| "$TMP_FILE" +for N in $NMSRVRS ; do echo "nameserver $N" >> "$TMP_FILE" ; done +mv -f "$TMP_FILE" "$RSLVRLIST_FILE" + --- dnsmasq-2.89.orig/debian/resolvconf-package +++ dnsmasq-2.89/debian/resolvconf-package @@ -0,0 +1,13 @@ +#!/bin/sh +# Resolvconf packaging event hook script for the dnsmasq package +restart_dnsmasq() { + if which invoke-rc.d >/dev/null 2>&1 ; then + invoke-rc.d dnsmasq restart + elif [ -x /etc/init.d/dnsmasq ] ; then + /etc/init.d/dnsmasq restart + fi +} + +case "$1" in + install) restart_dnsmasq ;; +esac --- dnsmasq-2.89.orig/debian/rules +++ dnsmasq-2.89/debian/rules @@ -0,0 +1,309 @@ +#!/usr/bin/make -f +# debian/rules file - for dnsmasq. +# Copyright 2001-2020 by Simon Kelley +# Based on the sample in the debian hello package which carries the following: +# Copyright 1994,1995 by Ian Jackson. +# I hereby give you perpetual unlimited permission to copy, +# modify and relicense this file, provided that you do not remove +# my name from the file itself. (I assert my moral right of +# paternity under the Copyright, Designs and Patents Act 1988.) +# This file may have to be extensively modified + +package=dnsmasq-base + +dpkg_buildflags := DEB_BUILD_MAINT_OPTIONS="hardening=+all,+pie,+bindnow" dpkg-buildflags + +CFLAGS = $(shell $(dpkg_buildflags) --get CFLAGS) +CFLAGS += $(shell $(dpkg_buildflags) --get CPPFLAGS) +CFLAGS += -Wall -W + +LDFLAGS = $(shell $(dpkg_buildflags) --get LDFLAGS) + +DEB_COPTS = $(COPTS) + +TARGET = install-i18n + +DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) +DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +BUILD_DATE := $(shell dpkg-parsechangelog --show-field Date) + +ifeq ($(origin CC),default) + CC = $(DEB_HOST_GNU_TYPE)-gcc +endif + +# Support non-cross-builds on systems without gnu-triplet-binaries for pkg-config. +ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE)) + PKG_CONFIG=pkg-config +else + PKG_CONFIG=$(DEB_HOST_GNU_TYPE)-pkg-config +endif + +# Force package version based on git tags. +ifneq (,$(filter gitversion,$(DEB_BUILD_OPTIONS))) + PACKAGE_VERSION = $(shell bld/get-version `pwd` | sed 's/test/~&/; s/[a-z]/~&/; s/-/./g; s/$$/-1/; s/^/-v/';) +endif + +ifeq (,$(filter nodbus,$(DEB_BUILD_OPTIONS))) + DEB_COPTS += -DHAVE_DBUS +endif + +ifeq (,$(filter noidn, $(DEB_BUILD_OPTIONS))) + DEB_COPTS += -DHAVE_LIBIDN2 +endif + +ifeq (,$(filter nonftset, $(DEB_BUILD_OPTIONS))) + DEB_COPTS += -DHAVE_NFTSET +endif + +ifeq (,$(filter noconntrack,$(DEB_BUILD_OPTIONS))) +ifeq ($(DEB_HOST_ARCH_OS),linux) + DEB_COPTS += -DHAVE_CONNTRACK +endif +endif + +ifneq (,$(filter noipset,$(DEB_BUILD_OPTIONS))) + DEB_COPTS += -DNO_IPSET +endif + +ifneq (,$(filter nodhcp6,$(DEB_BUILD_OPTIONS))) + DEB_COPTS += -DNO_DHCP6 +endif + +ifneq (,$(filter noipv6,$(DEB_BUILD_OPTIONS))) + DEB_COPTS += -DNO_IPV6 +endif + +ifneq (,$(filter notftp,$(DEB_BUILD_OPTIONS))) + DEB_COPTS += -DNO_TFTP +endif + +ifneq (,$(filter nodhcp,$(DEB_BUILD_OPTIONS))) + DEB_COPTS += -DNO_DHCP +endif + +ifneq (,$(filter noscript,$(DEB_BUILD_OPTIONS))) + DEB_COPTS += -DNO_SCRIPT +endif + +ifneq (,$(filter nortc,$(DEB_BUILD_OPTIONS))) + DEB_COPTS += -DHAVE_BROKEN_RTC +endif + +ifneq (,$(filter noi18n,$(DEB_BUILD_OPTIONS))) + TARGET = install +endif + +ifneq (,$(filter uselua,$(DEB_BUILD_OPTIONS))) + DEB_COPTS += -DHAVE_LUASCRIPT +endif + +ifeq (,$(filter nodnssec,$(DEB_BUILD_OPTIONS))) + DEB_COPTS += -DHAVE_DNSSEC +endif + +ifeq ($(DEB_HOST_ARCH_OS),kfreebsd) + # For strlcpy in FreeBSD + LIBS += $(shell ${PKG_CONFIG} --libs libbsd-overlay) + CFLAGS += $(shell ${PKG_CONFIG} --cflags libbsd-overlay) +endif + +define build_tree + rm -rf $1 + install -m 755 \ + -d $1/DEBIAN \ + -d $1/etc/dbus-1/system.d \ + -d $1/usr/share/doc/$(package) \ + -d $1/usr/share/doc/$(package)/examples \ + -d $1/usr/share/$(package) \ + -d $1/var/lib/misc + +endef + +define add_docs +# Need to remove paypal links in Debian Package for policy reasons. + sed -e /\Donations/Q -e /icon.png/d doc.html -e /favicon.ico/d >$1/usr/share/doc/$(package)/doc.html + echo "" >>$1/usr/share/doc/$(package)/doc.html + install -m 644 setup.html $1/usr/share/doc/$(package)/. + install -m 644 dnsmasq.conf.example $1/usr/share/doc/$(package)/examples/. + install -m 644 FAQ $1/usr/share/doc/$(package)/. + gzip -9n $1/usr/share/doc/$(package)/FAQ + install -m 644 CHANGELOG $1/usr/share/doc/$(package)/changelog + gzip -9n $1/usr/share/doc/$(package)/changelog + install -m 644 CHANGELOG.archive $1/usr/share/doc/$(package)/changelog.archive + gzip -9n $1/usr/share/doc/$(package)/changelog.archive + install -m 644 dbus/DBus-interface $1/usr/share/doc/$(package)/. + gzip -9n $1/usr/share/doc/$(package)/DBus-interface + install -m 644 debian/systemd_howto $1/usr/share/doc/$(package)/. + gzip -9n $1/usr/share/doc/$(package)/systemd_howto + gzip -9n $1/usr/share/man/man8/dnsmasq.8 + for f in $1/usr/share/man/*; do \ + if [ -f $$f/man8/dnsmasq.8 ]; then \ + gzip -9n $$f/man8/dnsmasq.8 ; \ + fi \ + done +endef + +define add_files + install -m 644 trust-anchors.conf $1/usr/share/$(package)/. + install -m 644 debian/dnsmasq-base.conffiles $1/DEBIAN/conffiles + install -m 755 debian/dnsmasq-base.postinst $1/DEBIAN/postinst + install -m 755 debian/dnsmasq-base.postrm $1/DEBIAN/postrm + install -m 644 debian/changelog $1/usr/share/doc/$(package)/changelog.Debian + gzip -9n $1/usr/share/doc/$(package)/changelog.Debian + install -m 644 debian/readme $1/usr/share/doc/$(package)/README.Debian + install -m 644 debian/copyright $1/usr/share/doc/$(package)/copyright + install -m 644 debian/dbus.conf $1/etc/dbus-1/system.d/dnsmasq.conf +endef + +clean: + $(checkdir) + make BUILDDIR=debian/build/no-lua clean + make BUILDDIR=debian/build/lua clean + make -C contrib/lease-tools clean + rm -rf debian/build debian/trees debian/*~ debian/files debian/substvars debian/utils-substvars + +binary-indep: checkroot + $(checkdir) + rm -rf debian/trees/daemon + install -m 755 \ + -d debian/trees/daemon/DEBIAN \ + -d debian/trees/daemon/usr/share/doc/dnsmasq \ + -d debian/trees/daemon/etc/init.d \ + -d debian/trees/daemon/etc/dnsmasq.d \ + -d debian/trees/daemon/etc/resolvconf/update.d \ + -d debian/trees/daemon/usr/lib/resolvconf/dpkg-event.d \ + -d debian/trees/daemon/usr/share/dnsmasq \ + -d debian/trees/daemon/usr/share/doc/dnsmasq \ + -d debian/trees/daemon/etc/default \ + -d debian/trees/daemon/lib/systemd/system \ + -d debian/trees/daemon/usr/lib/tmpfiles.d \ + -d debian/trees/daemon/etc/insserv.conf.d + install -m 644 debian/conffiles debian/trees/daemon/DEBIAN + install -m 755 debian/postinst debian/postrm debian/preinst debian/prerm debian/trees/daemon/DEBIAN + if ! dpkg-vendor --derives-from Ubuntu; then \ + rm -f debian/dnsmasq.postinst.debhelper debian/dnsmasq.postrm.debhelper; \ + dh_runit -pdnsmasq -Pdebian/trees/daemon; \ + cat debian/dnsmasq.postinst.debhelper >> debian/trees/daemon/DEBIAN/postinst; \ + cat debian/dnsmasq.postrm.debhelper >> debian/trees/daemon/DEBIAN/postrm; \ + cd debian/trees/daemon && find etc/sv -type f -printf '/%p\n' >>DEBIAN/conffiles; \ + fi + install -m 755 debian/init debian/trees/daemon/etc/init.d/dnsmasq + install -m 755 debian/resolvconf debian/trees/daemon/etc/resolvconf/update.d/dnsmasq + install -m 755 debian/resolvconf-package debian/trees/daemon/usr/lib/resolvconf/dpkg-event.d/dnsmasq + install -m 644 debian/installed-marker debian/trees/daemon/usr/share/dnsmasq + install -m 644 debian/default debian/trees/daemon/etc/default/dnsmasq + install -m 644 dnsmasq.conf.example debian/trees/daemon/etc/dnsmasq.conf + install -m 644 debian/readme.dnsmasq.d debian/trees/daemon/etc/dnsmasq.d/README + install -m 644 debian/systemd.service debian/trees/daemon/lib/systemd/system/dnsmasq.service + install -m 644 debian/systemd@.service debian/trees/daemon/lib/systemd/system/dnsmasq@.service + install -m 644 debian/tmpfiles.conf debian/trees/daemon/usr/lib/tmpfiles.d/dnsmasq.conf + install -m 644 debian/insserv debian/trees/daemon/etc/insserv.conf.d/dnsmasq + install -m 644 debian/copyright debian/trees/daemon/usr/share/doc/dnsmasq/copyright + install -m 644 debian/changelog debian/trees/daemon/usr/share/doc/dnsmasq/changelog.Debian + gzip -9n debian/trees/daemon/usr/share/doc/dnsmasq/changelog.Debian + cd debian/trees/daemon && find . -type f ! -regex '.*DEBIAN/.*' -printf '%P\0' | LC_ALL=C sort -z | xargs -r0 md5sum > DEBIAN/md5sums + dpkg-gencontrol $(PACKAGE_VERSION) -Tdebian/dnsmasq.substvars -pdnsmasq -Pdebian/trees/daemon + find debian/trees/daemon -depth -newermt '$(BUILD_DATE)' -print0 | xargs -0r touch --no-dereference --date='$(BUILD_DATE)' + chown -R root.root debian/trees/daemon + chmod -R g-ws debian/trees/daemon + dpkg --build debian/trees/daemon .. + +binary-arch: checkroot + $(call build_tree,debian/trees/base) + make $(TARGET) BUILDDIR=debian/build/no-lua PREFIX=/usr DESTDIR=`pwd`/debian/trees/base CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" COPTS="$(DEB_COPTS)" CC=$(CC) PKG_CONFIG=$(PKG_CONFIG) LIBS="$(LIBS)" +ifeq (,$(findstring nodoc,$(DEB_BUILD_OPTIONS))) + $(call add_docs,debian/trees/base) +else + rm -rf debian/trees/base/usr/share/man +endif + $(call add_files,debian/trees/base) +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + $(DEB_HOST_GNU_TYPE)-strip -R .note -R .comment debian/trees/base/usr/sbin/dnsmasq +endif + cd debian/trees/base && find . -type f ! -regex '.*DEBIAN/.*' -printf '%P\0' | LC_ALL=C sort -z | xargs -r0 md5sum > DEBIAN/md5sums + dpkg-shlibdeps --warnings=1 debian/trees/base/usr/sbin/dnsmasq + dpkg-gencontrol $(PACKAGE_VERSION) -pdnsmasq-base -Pdebian/trees/base + find debian/trees/base -depth -newermt '$(BUILD_DATE)' -print0 | xargs -0r touch --no-dereference --date='$(BUILD_DATE)' + chown -R root.root debian/trees/base + chmod -R g-ws debian/trees/base + dpkg --build debian/trees/base .. + + $(call build_tree,debian/trees/lua-base) + make $(TARGET) BUILDDIR=debian/build/lua PREFIX=/usr DESTDIR=`pwd`/debian/trees/lua-base CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" COPTS="-DHAVE_LUASCRIPT $(DEB_COPTS)" CC=$(CC) PKG_CONFIG=$(PKG_CONFIG) LIBS="$(LIBS)" +ifeq (,$(findstring nodoc,$(DEB_BUILD_OPTIONS))) + $(call add_docs,debian/trees/lua-base) +else + rm -rf debian/trees/lua-base/usr/share/man +endif + $(call add_files,debian/trees/lua-base) + install -m 755 -d debian/trees/lua-base/usr/share/lintian/overrides + install -m 644 debian/lintian-override debian/trees/lua-base/usr/share/lintian/overrides/dnsmasq-base-lua +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + $(DEB_HOST_GNU_TYPE)-strip -R .note -R .comment debian/trees/lua-base/usr/sbin/dnsmasq +endif + ln -s $(package) debian/trees/lua-base/usr/share/doc/dnsmasq-base-lua + cd debian/trees/lua-base && find . -type f ! -regex '.*DEBIAN/.*' -printf '%P\0' | LC_ALL=C sort -z | xargs -r0 md5sum > DEBIAN/md5sums + dpkg-shlibdeps --warnings=1 debian/trees/lua-base/usr/sbin/dnsmasq + dpkg-gencontrol $(PACKAGE_VERSION) -pdnsmasq-base-lua -Pdebian/trees/lua-base + find debian/trees/lua-base -depth -newermt '$(BUILD_DATE)' -print0 | xargs -0r touch --no-dereference --date='$(BUILD_DATE)' + chown -R root.root debian/trees/lua-base + chmod -R g-ws debian/trees/lua-base + dpkg --build debian/trees/lua-base .. + + +ifeq ($(DEB_HOST_ARCH_OS),linux) + rm -rf debian/trees/utils + install -m 755 -d debian/trees/utils/DEBIAN \ + -d debian/trees/utils/usr/bin \ + -d debian/trees/utils/usr/share/doc/dnsmasq-utils +ifeq (,$(findstring nodoc,$(DEB_BUILD_OPTIONS))) + install -m 755 -d debian/trees/utils/usr/share/man/man1 +endif + make -C contrib/lease-tools PREFIX=/usr DESTDIR=`pwd`/debian/trees/utils CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" COPTS="$(DEB_COPTS)" CC=$(CC) PKG_CONFIG=$(PKG_CONFIG) LIBS="$(LIBS)" + install -m 755 contrib/lease-tools/dhcp_release debian/trees/utils/usr/bin/dhcp_release + install -m 755 contrib/lease-tools/dhcp_release6 debian/trees/utils/usr/bin/dhcp_release6 + install -m 755 contrib/lease-tools/dhcp_lease_time debian/trees/utils/usr/bin/dhcp_lease_time +ifeq (,$(findstring nodoc,$(DEB_BUILD_OPTIONS))) + install -m 644 contrib/lease-tools/dhcp_release.1 debian/trees/utils/usr/share/man/man1/dhcp_release.1 + gzip -9n debian/trees/utils/usr/share/man/man1/dhcp_release.1 + install -m 644 contrib/lease-tools/dhcp_release6.1 debian/trees/utils/usr/share/man/man1/dhcp_release6.1 + gzip -9n debian/trees/utils/usr/share/man/man1/dhcp_release6.1 + install -m 644 contrib/lease-tools/dhcp_lease_time.1 debian/trees/utils/usr/share/man/man1/dhcp_lease_time.1 + gzip -9n debian/trees/utils/usr/share/man/man1/dhcp_lease_time.1 +endif + install -m 644 debian/copyright debian/trees/utils/usr/share/doc/dnsmasq-utils/copyright + install -m 644 debian/changelog debian/trees/utils/usr/share/doc/dnsmasq-utils/changelog.Debian + gzip -9n debian/trees/utils/usr/share/doc/dnsmasq-utils/changelog.Debian +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + $(DEB_HOST_GNU_TYPE)-strip -R .note -R .comment debian/trees/utils/usr/bin/dhcp_release + $(DEB_HOST_GNU_TYPE)-strip -R .note -R .comment debian/trees/utils/usr/bin/dhcp_release6 + $(DEB_HOST_GNU_TYPE)-strip -R .note -R .comment debian/trees/utils/usr/bin/dhcp_lease_time +endif + cd debian/trees/utils && find . -type f ! -regex '.*DEBIAN/.*' -printf '%P\0' | LC_ALL=C sort -z | xargs -r0 md5sum > DEBIAN/md5sums + dpkg-shlibdeps -Tdebian/utils-substvars debian/trees/utils/usr/bin/dhcp_release debian/trees/utils/usr/bin/dhcp_release6 debian/trees/utils/usr/bin/dhcp_lease_time + dpkg-gencontrol $(PACKAGE_VERSION) -Tdebian/utils-substvars -pdnsmasq-utils -Pdebian/trees/utils + find debian/trees/utils -depth -newermt '$(BUILD_DATE)' -print0 | xargs -0r touch --no-dereference --date='$(BUILD_DATE)' + chown -R root.root debian/trees/utils + chmod -R g-ws debian/trees/utils + dpkg --build debian/trees/utils .. +endif + +define checkdir + test -f Makefile -a -f debian/rules +endef + +# Below here is fairly generic really + +binary: binary-arch binary-indep + +build: +build-arch: +build-indep: + +checkroot: + test root = "`whoami`" + +.PHONY: binary binary-arch binary-indep clean checkroot + + --- dnsmasq-2.89.orig/debian/source/format +++ dnsmasq-2.89/debian/source/format @@ -0,0 +1 @@ +1.0 --- dnsmasq-2.89.orig/debian/systemd.service +++ dnsmasq-2.89/debian/systemd.service @@ -0,0 +1,31 @@ +[Unit] +Description=dnsmasq - A lightweight DHCP and caching DNS server +Requires=network.target +Wants=nss-lookup.target +Before=nss-lookup.target +After=network.target + +[Service] +Type=forking +PIDFile=/run/dnsmasq/dnsmasq.pid + +# Test the config file and refuse starting if it is not valid. +ExecStartPre=/etc/init.d/dnsmasq checkconfig + +# We run dnsmasq via the /etc/init.d/dnsmasq script which acts as a +# wrapper picking up extra configuration files and then execs dnsmasq +# itself, when called with the "systemd-exec" function. +ExecStart=/etc/init.d/dnsmasq systemd-exec + +# The systemd-*-resolvconf functions configure (and deconfigure) +# resolvconf to work with the dnsmasq DNS server. They're called like +# this to get correct error handling (ie don't start-resolvconf if the +# dnsmasq daemon fails to start). +ExecStartPost=/etc/init.d/dnsmasq systemd-start-resolvconf +ExecStop=/etc/init.d/dnsmasq systemd-stop-resolvconf + + +ExecReload=/bin/kill -HUP $MAINPID + +[Install] +WantedBy=multi-user.target --- dnsmasq-2.89.orig/debian/systemd@.service +++ dnsmasq-2.89/debian/systemd@.service @@ -0,0 +1,31 @@ +[Unit] +Description=dnsmasq (%i) - A lightweight DHCP and caching DNS server +Requires=network.target +Wants=nss-lookup.target +Before=nss-lookup.target +After=network.target + +[Service] +Type=forking +PIDFile=/run/dnsmasq/dnsmasq.%i.pid + +# Test the config file and refuse starting if it is not valid. +ExecStartPre=/etc/init.d/dnsmasq checkconfig "%i" + +# We run dnsmasq via the /etc/init.d/dnsmasq script which acts as a +# wrapper picking up extra configuration files and then execs dnsmasq +# itself, when called with the "systemd-exec" function. +ExecStart=/etc/init.d/dnsmasq systemd-exec "%i" + +# The systemd-*-resolvconf functions configure (and deconfigure) +# resolvconf to work with the dnsmasq DNS server. They're called like +# this to get correct error handling (ie don't start-resolvconf if the +# dnsmasq daemon fails to start). +ExecStartPost=/etc/init.d/dnsmasq systemd-start-resolvconf "%i" +ExecStop=/etc/init.d/dnsmasq systemd-stop-resolvconf "%i" + + +ExecReload=/bin/kill -HUP $MAINPID + +[Install] +WantedBy=multi-user.target --- dnsmasq-2.89.orig/debian/systemd_howto +++ dnsmasq-2.89/debian/systemd_howto @@ -0,0 +1,41 @@ +HOWTO +===== +dnsmasq comes with the possibility to run multiple systemd service instances on the same machine. +There is the main service which is enabled by default via `systemctl enable dnsmasq.service` and uses the configuration from `/etc/default/dnsmasq`. + +Additional service instances can be enabled via `systemctl enable dnsmasq@.service` that use the configuration from `/etc/default/dnsmasq.`. +It is recommended to use a separate configuration file and directory for each instance. +Additionally make sure that all instances use either different ports and/or ip addresses to avoid binding collisions. + +Example setup for an instance called "alt" +#1 File `/etc/dnsmasq.alt.conf` copied from `/etc/dnsmasq.conf` +#2 Directory `/etc/dnsmasq.alt.d` +#3 File `/etc/default/dnsmasq.alt` copied from `/etc/default/dnsmasq` with following adaptions: + * The options DNSMASQ_OPTS and CONFIG_DIR point to the correct configuration file and directory. + DNSMASQ_OPTS="... --conf-file=/etc/dnsmasq.alt.conf ..." + CONFIG_DIR=/etc/dnsmasq.alt.d,.dpkg-dist,.dpkg-old,.dpkg-new + * The option DNSMASQ_EXCEPT must contain "lo" to avoid that an instance becomes the machine's DNS resolver. + DNSMASQ_EXCEPT="lo" + * If the additional instance should bind to all IP addresses of a specific interface, e.g. "dnsalt01", then the following addition could be used: + DNSMASQ_OPTS="... --bind-dynamic --interface=dnsalt01 ..." + Additionally the main instance must be stopped from binding to interfaces that are used by other instances: + DNSMASQ_OPTS="... --bind-dynamic --except-interface=dnsalt* ..." + * If the additional instance should not use the machine's DNS resolver, normally that's the dnsmasq main instance, as upstream server, then the following addition could be used: + IGNORE_RESOLVCONF=yes +#4 Enable additional instance via `systemctl enable dnsmasq@alt.service` +#5 Start additional instance without reboot via `systemctl start dnsmasq@alt.service` + + + +TODO +==== +#1 - Found shortcoming on 2019-03-10 +Only the option DNSMASQ_EXCEPT="lo" avoids that an DNS instance will be set as the machine's DNS resolver. +This may interfere with the wish to run an additional instance on a different port on the localhost addresses. +My suggestion in the initial Debian report [1] was to specify an explicit variable for this. + +[1] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=914305#5 + + +#2 - Preferred configuration way +Should the variables DNSMASQ_INTERFACE and DNSMASQ_EXCEPT be used instead of --interface and --except-interface? (while "lo" still has to be in DNSMASQ_EXCEPT as of now) --- dnsmasq-2.89.orig/debian/tmpfiles.conf +++ dnsmasq-2.89/debian/tmpfiles.conf @@ -0,0 +1 @@ +d /run/dnsmasq 755 dnsmasq nogroup