[Bug 853255] Re: FFe: Sync dnsmasq 2.58-3 (main) from Debian unstable (main)

[Dave Walker]

Adds new libnetfilter-conntrack-dev build dep and install dep of
libnetfilter-conntrack3, which is in universe.

Due to this in upstream changelog:
            Add support for Linux conntrack connection marking. If 
	    enabled with --conntrack, the connection mark for incoming
	    DNS queries will be copied  to the outgoing connections
	    used to answer those queries. This allows clever firewall
	    and accounting stuff. Only available if dnsmasq is
	    compiled with HAVE_CONNTRACK and adds a dependency on 
	    libnetfilter-conntrack. Thanks to Ed Wildgoose for the
	    initial idea, testing and sponsorship of this function.

Do not believe it is worth the MIR this cycle to add that feature.
Therefore suggesting that this package is merged, with the introduction
of a delta dropping the conntrack support, and removing the build-dep.

Thanks.

** Summary changed:

- FFe: Sync dnsmasq 2.58-3 (main) from Debian unstable (main)
+ FFe: Merge dnsmasq 2.58-3 (main) from Debian unstable (main)

** Description changed:

- Please sync dnsmasq 2.58-3 (main) from Debian unstable (main)
+ Please merge dnsmasq 2.58-3 (main) from Debian unstable (main)
  
  Explanation of FeatureFreeze exception:
  New upstream version is mostly bug fixes:
-  - http://thekelleys.org.uk/dnsmasq/CHANGELOG
+  - http://thekelleys.org.uk/dnsmasq/CHANGELOG
  
  Introduces new binary package (dnsmasq-utils) which ships
  dhcp_lease_time which allows fixing of bug 852771 (allow IP addresses to
  be put back into the pool faster, for re-use - avoiding exhaustion.
  This is the /main/ reason for the FFe request, and could be achieved by
  cherrypicking that single change as it is in the current ubuntu package
  upstream contrib/, but i'd like to avoid introducing a Ubuntu delta on
  this package, and the other bug fixes seem generally useful.)
  
  Changelog entries since current oneiric version 2.57-1:
  
  dnsmasq (2.58-3) unstable; urgency=low
  
-    * Fix resolvconf script location. (closes: #641717)
-    * Update systemd service file. (closes: #640095)
+    * Fix resolvconf script location. (closes: #641717)
+    * Update systemd service file. (closes: #640095)
  
-  -- Simon Kelley <simon at thekelleys.org.uk>  Thu, 15 Sep 2011 16:33:23
+  -- Simon Kelley <simon at thekelleys.org.uk>  Thu, 15 Sep 2011 16:33:23
  +0000
  
  dnsmasq (2.58-2) unstable; urgency=low
  
-    * Fix resolvconf script. (closes: #635383)
+    * Fix resolvconf script. (closes: #635383)
  
-  -- Simon Kelley <simon at thekelleys.org.uk>  Thu, 1 Sep 2011 10:05:23
+  -- Simon Kelley <simon at thekelleys.org.uk>  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)
+    * 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 <simon at thekelleys.org.uk>  Mon, 22 Aug 2011 14:57:03
+  -- Simon Kelley <simon at thekelleys.org.uk>  Mon, 22 Aug 2011 14:57:03
  +0000

** Also affects: dnsmasq (Ubuntu Oneiric)
   Importance: Wishlist
       Status: New

-- 
You received this bug notification because you are a member of Ubuntu
Server Team, which is subscribed to dnsmasq in Ubuntu.
https://bugs.launchpad.net/bugs/853255

Title:
  FFe: Merge dnsmasq 2.58-3 (main) from Debian unstable (main)

To manage notifications about this bug go to:
https://bugs.launchpad.net/ubuntu/+source/dnsmasq/+bug/853255/+subscriptions