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

Proposed by Dave Walker
Status: Merged
Merged at revision: 20
Proposed branch: lp:~davewalker/ubuntu/oneiric/dnsmasq/add_dnsmasq-utils_package
Merge into: lp:ubuntu/oneiric/dnsmasq
Diff against target: 160 lines (+109/-1)
5 files modified
contrib/wrt/dhcp_lease_time.1 (+23/-0)
contrib/wrt/dhcp_release.1 (+35/-0)
debian/changelog (+10/-0)
debian/control (+11/-1)
debian/rules (+30/-0)
To merge this branch: bzr merge lp:~davewalker/ubuntu/oneiric/dnsmasq/add_dnsmasq-utils_package
Reviewer Review Type Date Requested Status
Robie Basak Approve
Ubuntu branches Pending
Review via email: mp+75988@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Robie Basak (racb) wrote :

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
Revision history for this message
Dave Walker (davewalker) wrote :

Thanks Robie!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'contrib/wrt/dhcp_lease_time.1'
2--- contrib/wrt/dhcp_lease_time.1 1970-01-01 00:00:00 +0000
3+++ contrib/wrt/dhcp_lease_time.1 2011-09-19 10:13:26 +0000
4@@ -0,0 +1,23 @@
5+.TH DHCP_LEASE_TIME 1
6+.SH NAME
7+dhcp_lease_time \- Query remaining time of a lease on a the local dnsmasq DHCP server.
8+.SH SYNOPSIS
9+.B dhcp_lease_time <address>
10+.SH "DESCRIPTION"
11+Send a DHCPINFORM message to a dnsmasq server running on the local host
12+and print (to stdout) the time remaining in any lease for the given
13+address. The time is given as string printed to stdout.
14+
15+If an error occurs or no lease exists for the given address,
16+nothing is sent to stdout a message is sent to stderr and a
17+non-zero error code is returned.
18+
19+Requires dnsmasq 2.40 or later and may not work with other DHCP servers.
20+
21+The address argument is a dotted-quad IP addresses and mandatory.
22+.SH SEE ALSO
23+.BR dnsmasq (8)
24+.SH AUTHOR
25+This manual page was written by Simon Kelley <simon@thekelleys.org.uk>.
26+
27+
28
29=== added file 'contrib/wrt/dhcp_release.1'
30--- contrib/wrt/dhcp_release.1 1970-01-01 00:00:00 +0000
31+++ contrib/wrt/dhcp_release.1 2011-09-19 10:13:26 +0000
32@@ -0,0 +1,35 @@
33+.TH DHCP_RELEASE 1
34+.SH NAME
35+dhcp_release \- Release a DHCP lease on a the local dnsmasq DHCP server.
36+.SH SYNOPSIS
37+.B dhcp_release <interface> <address> <MAC address> <client_id>
38+.SH "DESCRIPTION"
39+A utility which forces the DHCP server running on this machine to release a
40+DHCP lease.
41+.PP
42+Send a DHCPRELEASE message via the specified interface to tell the
43+local DHCP server to delete a particular lease.
44+
45+The interface argument is the interface in which a DHCP
46+request _would_ be received if it was coming from the client,
47+rather than being faked up here.
48+
49+The address argument is a dotted-quad IP addresses and mandatory.
50+
51+The MAC address is colon separated hex, and is mandatory. It may be
52+prefixed by an address-type byte followed by -, eg
53+
54+10-11:22:33:44:55:66
55+
56+but if the address-type byte is missing it is assumed to be 1, the type
57+for ethernet. This encoding is the one used in dnsmasq lease files.
58+
59+The client-id is optional. If it is "*" then it treated as being missing.
60+.SH NOTES
61+MUST be run as root - will fail otherwise.
62+.SH SEE ALSO
63+.BR dnsmasq (8)
64+.SH AUTHOR
65+This manual page was written by Simon Kelley <simon@thekelleys.org.uk>.
66+
67+
68
69=== modified file 'debian/changelog'
70--- debian/changelog 2011-02-18 09:54:13 +0000
71+++ debian/changelog 2011-09-19 10:13:26 +0000
72@@ -1,3 +1,13 @@
73+dnsmasq (2.57-1ubuntu1) oneiric; urgency=low
74+
75+ * New binary package, dnsmasq-utils - cherry picked from Debian's
76+ 2.58-1 package. Contains dhcp_release and dhcp_lease_time from
77+ contrib/wrt. (LP: #853255)
78+ - contrib/wrt/(dhcp_release.1,dhcp_lease_time.1): Included manpages
79+ from 2.58-1 package.
80+
81+ -- Dave Walker (Daviey) <DaveWalker@ubuntu.com> Mon, 19 Sep 2011 09:41:12 +0000
82+
83 dnsmasq (2.57-1) unstable; urgency=low
84
85 * New upstream.
86
87=== modified file 'debian/control'
88--- debian/control 2011-02-18 09:54:13 +0000
89+++ debian/control 2011-09-19 10:13:26 +0000
90@@ -2,7 +2,8 @@
91 Section: net
92 Priority: optional
93 Build-depends: gettext, libidn11-dev, libdbus-1-dev (>=0.61)
94-Maintainer: Simon Kelley <simon@thekelleys.org.uk>
95+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
96+XSBC-Original-Maintainer: Simon Kelley <simon@thekelleys.org.uk>
97 Standards-Version: 3.9.1
98
99 Package: dnsmasq
100@@ -28,3 +29,12 @@
101 This package contains the dnsmasq executable and documentation, but
102 not the infrastructure required to run it as a system daemon. For
103 that, install the dnsmasq package.
104+
105+Package: dnsmasq-utils
106+Architecture: linux-any
107+Depends: ${shlibs:Depends}
108+Conflicts: dnsmasq (<<2.40)
109+Description: Utilities for manipulating DHCP leases
110+ Small utilities to query a DHCP server's lease database and
111+ remove leases from it. These programs are distributed with dnsmasq
112+ and may not work correctly with other DHCP servers..
113
114=== modified file 'debian/rules'
115--- debian/rules 2011-02-18 09:54:13 +0000
116+++ debian/rules 2011-09-19 10:13:26 +0000
117@@ -21,6 +21,8 @@
118 COPTS =
119 TARGET = install-i18n
120
121+DEB_BUILD_ARCH_OS := $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
122+
123 ifeq (,$(findstring nodbus,$(DEB_BUILD_OPTIONS)))
124 COPTS += -DHAVE_DBUS
125 endif
126@@ -126,6 +128,34 @@
127 chmod -R g-ws debian/base
128 dpkg --build debian/base ..
129
130+ifeq ($(DEB_BUILD_ARCH_OS),linux)
131+ rm -rf debian/utils
132+ install -m 755 -d debian/utils/DEBIAN \
133+ -d debian/utils/usr/share/man/man1 \
134+ -d debian/utils/usr/bin \
135+ -d debian/utils/usr/share/doc/dnsmasq-utils
136+ make -C contrib/wrt PREFIX=/usr DESTDIR=`pwd`/debian/utils CFLAGS="$(CFLAGS)" COPTS="$(COPTS)" CC=gcc
137+ install -m 755 contrib/wrt/dhcp_release debian/utils/usr/bin/dhcp_release
138+ install -m 644 contrib/wrt/dhcp_release.1 debian/utils/usr/share/man/man1/dhcp_release.1
139+ gzip -9 debian/utils/usr/share/man/man1/dhcp_release.1
140+ install -m 755 contrib/wrt/dhcp_lease_time debian/utils/usr/bin/dhcp_lease_time
141+ install -m 644 contrib/wrt/dhcp_lease_time.1 debian/utils/usr/share/man/man1/dhcp_lease_time.1
142+ install -m 644 debian/copyright debian/utils/usr/share/doc/dnsmasq-utils/copyright
143+ install -m 644 debian/changelog debian/utils/usr/share/doc/dnsmasq-utils/changelog.Debian
144+ gzip -9 debian/utils/usr/share/doc/dnsmasq-utils/changelog.Debian
145+ gzip -9 debian/utils/usr/share/man/man1/dhcp_lease_time.1
146+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
147+ strip -R .note -R .comment debian/utils/usr/bin/dhcp_release
148+ strip -R .note -R .comment debian/utils/usr/bin/dhcp_lease_time
149+endif
150+ cd debian/utils && find . -type f ! -regex '.*DEBIAN/.*' -printf '%P\0' | xargs -r0 md5sum > DEBIAN/md5sums
151+ dpkg-shlibdeps -Tdebian/utils-substvars debian/utils/usr/bin/dhcp_release debian/utils/usr/bin/dhcp_lease_time
152+ dpkg-gencontrol -Tdebian/utils-substvars -pdnsmasq-utils -Pdebian/utils
153+ chown -R root.root debian/utils
154+ chmod -R g-ws debian/utils
155+ dpkg --build debian/utils ..
156+endif
157+
158 define checkdir
159 test -f Makefile -a -f debian/rules
160 endef

Subscribers

People subscribed via source and target branches

to all changes: