Merge lp:~davewalker/ubuntu/oneiric/dnsmasq/add_dnsmasq-utils_package into lp:ubuntu/oneiric/dnsmasq

[Dave Walker]

[Robie Basak (racb)]

This builds and installs OK. I can't see how it might break anything else. I don't understand the purpose of the Conflicts: addition but I don't think it will matter here, and if that's what Debian does then it'll be easier to merge later. I assume that nova will be set to depend on dnsmasq-utils in bug 852771 to pull this package in. No other objections.

review: Approve

[Dave Walker (davewalker)]

Thanks Robie!

=== added file 'contrib/wrt/dhcp_lease_time.1'
--- contrib/wrt/dhcp_lease_time.1	1970-01-01 00:00:00 +0000
+++ contrib/wrt/dhcp_lease_time.1	2011-09-19 10:13:26 +0000
@@ -0,0 +1,23 @@
+.TH DHCP_LEASE_TIME 1
+.SH NAME
+dhcp_lease_time \- Query remaining time of a lease on a the local dnsmasq DHCP server.
+.SH SYNOPSIS
+.B  dhcp_lease_time <address>
+.SH "DESCRIPTION"
+Send a DHCPINFORM message to a dnsmasq server running on the local host
+and print (to stdout) the time remaining in any lease for the given
+address. The time is given as string printed to stdout.
+
+If an error occurs or no lease exists for the given address, 
+nothing is sent to stdout a message is sent to stderr and a
+non-zero error code is returned.
+
+Requires dnsmasq 2.40 or later and may not work with other DHCP servers.
+
+The address argument is a dotted-quad IP addresses and mandatory. 
+.SH SEE ALSO
+.BR dnsmasq (8)
+.SH AUTHOR
+This manual page was written by Simon Kelley <[e-mail]>.
+
+
 
=== added file 'contrib/wrt/dhcp_release.1'
--- contrib/wrt/dhcp_release.1	1970-01-01 00:00:00 +0000
+++ contrib/wrt/dhcp_release.1	2011-09-19 10:13:26 +0000
@@ -0,0 +1,35 @@
+.TH DHCP_RELEASE 1
+.SH NAME
+dhcp_release \- Release a DHCP lease on a the local dnsmasq DHCP server.
+.SH SYNOPSIS
+.B dhcp_release <interface> <address> <MAC address> <client_id>
+.SH "DESCRIPTION"
+A utility which forces the DHCP server running on this machine to release a 
+DHCP lease.
+.PP
+Send a DHCPRELEASE message via the specified interface to tell the
+local DHCP server to delete a particular lease. 
+
+The interface argument is the interface in which a DHCP
+request _would_ be received if it was coming from the client, 
+rather than being faked up here.
+   
+The address argument is a dotted-quad IP addresses and mandatory. 
+   
+The MAC address is colon separated hex, and is mandatory. It may be 
+prefixed by an address-type byte followed by -, eg
+
+10-11:22:33:44:55:66
+
+but if the address-type byte is missing it is assumed to be 1, the type 
+for ethernet. This encoding is the one used in dnsmasq lease files.
+
+The client-id is optional. If it is "*" then it treated as being missing.
+.SH NOTES
+MUST be run as root - will fail otherwise.
+.SH SEE ALSO
+.BR dnsmasq (8)
+.SH AUTHOR
+This manual page was written by Simon Kelley <[e-mail]>.
+
+
 
=== modified file 'debian/changelog'
--- debian/changelog	2011-02-18 09:54:13 +0000
+++ debian/changelog	2011-09-19 10:13:26 +0000
@@ -1,3 +1,13 @@
+dnsmasq (2.57-1ubuntu1) oneiric; urgency=low
+
+   * New binary package, dnsmasq-utils - cherry picked from Debian's
+     2.58-1 package.  Contains dhcp_release and dhcp_lease_time from 
+     contrib/wrt. (LP: #853255)
+     - contrib/wrt/(dhcp_release.1,dhcp_lease_time.1): Included manpages 
+       from 2.58-1 package.
+
+ -- Dave Walker (Daviey) <[e-mail]>  Mon, 19 Sep 2011 09:41:12 +0000
+
 dnsmasq (2.57-1) unstable; urgency=low
 
    * New upstream.
 
=== modified file 'debian/control'
--- debian/control	2011-02-18 09:54:13 +0000
+++ debian/control	2011-09-19 10:13:26 +0000
@@ -2,7 +2,8 @@
 Section: net
 Priority: optional
 Build-depends: gettext, libidn11-dev, libdbus-1-dev (>=0.61)
-Maintainer: Simon Kelley <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Simon Kelley <[e-mail]>
 Standards-Version: 3.9.1
 
 Package: dnsmasq
@@ -28,3 +29,12 @@
  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-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..
 
=== modified file 'debian/rules'
--- debian/rules	2011-02-18 09:54:13 +0000
+++ debian/rules	2011-09-19 10:13:26 +0000
@@ -21,6 +21,8 @@
 COPTS = 
 TARGET = install-i18n
 
+DEB_BUILD_ARCH_OS := $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
+
 ifeq (,$(findstring nodbus,$(DEB_BUILD_OPTIONS)))
      COPTS += -DHAVE_DBUS
 endif
@@ -126,6 +128,34 @@
 	chmod -R g-ws debian/base 
 	dpkg --build debian/base ..
 
+ifeq ($(DEB_BUILD_ARCH_OS),linux)
+	rm -rf debian/utils
+	install -m 755 -d debian/utils/DEBIAN \
+                       -d debian/utils/usr/share/man/man1 \
+	               -d debian/utils/usr/bin \
+                       -d debian/utils/usr/share/doc/dnsmasq-utils
+	make -C contrib/wrt PREFIX=/usr DESTDIR=`pwd`/debian/utils CFLAGS="$(CFLAGS)" COPTS="$(COPTS)" CC=gcc
+	install -m 755 contrib/wrt/dhcp_release debian/utils/usr/bin/dhcp_release
+	install -m 644 contrib/wrt/dhcp_release.1 debian/utils/usr/share/man/man1/dhcp_release.1
+	gzip -9 debian/utils/usr/share/man/man1/dhcp_release.1
+	install -m 755 contrib/wrt/dhcp_lease_time debian/utils/usr/bin/dhcp_lease_time
+	install -m 644 contrib/wrt/dhcp_lease_time.1 debian/utils/usr/share/man/man1/dhcp_lease_time.1
+	install -m 644 debian/copyright debian/utils/usr/share/doc/dnsmasq-utils/copyright
+	install -m 644 debian/changelog debian/utils/usr/share/doc/dnsmasq-utils/changelog.Debian
+	gzip -9 debian/utils/usr/share/doc/dnsmasq-utils/changelog.Debian
+	gzip -9 debian/utils/usr/share/man/man1/dhcp_lease_time.1
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+	strip -R .note -R .comment debian/utils/usr/bin/dhcp_release
+	strip -R .note -R .comment debian/utils/usr/bin/dhcp_lease_time
+endif	
+	cd debian/utils && find . -type f ! -regex '.*DEBIAN/.*' -printf '%P\0' | xargs -r0 md5sum > DEBIAN/md5sums
+	dpkg-shlibdeps -Tdebian/utils-substvars debian/utils/usr/bin/dhcp_release debian/utils/usr/bin/dhcp_lease_time
+	dpkg-gencontrol -Tdebian/utils-substvars -pdnsmasq-utils -Pdebian/utils
+	chown -R root.root debian/utils
+	chmod -R g-ws debian/utils 
+	dpkg --build debian/utils ..
+endif
+
 define checkdir
 	test -f Makefile -a -f debian/rules
 endef