[pkg-dhcp-commits] [SCM] ISC DHCP packaging for Debian branch, master, updated. debian/4.1.1-P1-16.1-58-gdff6e8e
Andrew Pollock
apollock at debian.org
Sun Jan 8 22:07:19 UTC 2012
The following commit has been merged in the master branch:
commit dff6e8ef54546bfc177fe5f6776244d56bfdd67b
Author: Andrew Pollock <apollock at debian.org>
Date: Sun Jan 8 14:06:15 2012 -0800
Convert to 3.0 (quilt)
Remove dpatch references and adjust debian/rules
Reformat patches
diff --git a/debian/changelog b/debian/changelog
index e5c7141..d443131 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,13 @@ isc-dhcp (4.2.2-3) UNRELEASED; urgency=low
hardening options (closes: #644413)
* debian/control: also add inetutils-ping to the dependencies for
isc-dhcp-client on hurd (closes: #648140)
+ * Convert to 3.0 (quilt) source format:
+ - debian/control: remove build-dep on dpatch
+ - debian/rules: stop including dpatch.make
+ - debian/rules: remove dpatch-related target dependencies
+ - convert patches from dpatch to pure quilt
- -- Andrew Pollock <apollock at debian.org> Sat, 07 Jan 2012 22:19:36 -0800
+ -- Andrew Pollock <apollock at debian.org> Sun, 08 Jan 2012 14:04:44 -0800
isc-dhcp (4.2.2-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index b7e4025..c5821f0 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian ISC DHCP maintainers <pkg-dhcp-devel at lists.alioth.debian.org>
Uploaders: Andrew Pollock <apollock at debian.org>
Vcs-Git: git://git.debian.org/pkg-dhcp/isc-dhcp.git
Vcs-Browser: http://git.debian.org/?p=pkg-dhcp/isc-dhcp.git;a=summary
-Build-Depends: debhelper (>> 7), dpkg-dev (>= 1.13.2), groff, dpatch, po-debconf, libldap2-dev, libssl-dev, autoconf, automake, pkg-config, hardening-wrapper
+Build-Depends: debhelper (>> 7), dpkg-dev (>= 1.13.2), groff, po-debconf, libldap2-dev, libssl-dev, autoconf, automake, pkg-config, hardening-wrapper
Standards-Version: 3.9.2
Package: isc-dhcp-server
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 1b84e59..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,8 +0,0 @@
-# emailed upstream
-dhclient-script-exit-status
-
-# Debian specific, not appropriate to send upstream
-fix_exit_hook_doc_manpage
-
-# I think this has been independently emailed upstream
-no_loopback_checksum
diff --git a/debian/patches/dhclient-script-exit-status b/debian/patches/dhclient-script-exit-status
new file mode 100644
index 0000000..3019110
--- /dev/null
+++ b/debian/patches/dhclient-script-exit-status
@@ -0,0 +1,13 @@
+Index: isc-dhcp/client/dhclient.c
+===================================================================
+--- isc-dhcp.orig/client/dhclient.c 2012-01-07 20:51:59.911859051 -0800
++++ isc-dhcp/client/dhclient.c 2012-01-08 13:52:16.262475966 -0800
+@@ -1211,7 +1211,7 @@
+ /* If the BOUND/RENEW code detects another machine using the
+ offered address, it exits nonzero. We need to send a
+ DHCPDECLINE and toss the lease. */
+- if (script_go (client)) {
++ if (script_go (client) == 2) {
+ make_decline (client, client -> new);
+ send_decline (client);
+ destroy_client_lease (client -> new);
diff --git a/debian/patches/dhclient-script-exit-status.dpatch b/debian/patches/dhclient-script-exit-status.dpatch
deleted file mode 100755
index d075892..0000000
--- a/debian/patches/dhclient-script-exit-status.dpatch
+++ /dev/null
@@ -1,20 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## dhclient-script-exit-status.dpatch by <apollock at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Use exit status 2, rather than 1, to indicate that binding failed,
-## DP: so that unrelated errors do not result in DHCPDECLINE
-
- at DPATCH@
-diff -urNad dhcp3-3.0.2/client/dhclient.c /tmp/dpep.DiNW3N/dhcp3-3.0.2/client/dhclient.c
---- dhcp3-3.0.2/client/dhclient.c 2004-11-25 04:39:14.000000000 +1100
-+++ /tmp/dpep.DiNW3N/dhcp3-3.0.2/client/dhclient.c 2005-06-15 12:51:38.952349445 +1000
-@@ -869,7 +869,7 @@
- /* If the BOUND/RENEW code detects another machine using the
- offered address, it exits nonzero. We need to send a
- DHCPDECLINE and toss the lease. */
-- if (script_go (client)) {
-+ if (script_go (client) == 2) {
- make_decline (client, client -> new);
- send_decline (client);
- destroy_client_lease (client -> new);
diff --git a/debian/patches/fix_exit_hook_doc_manpage.dpatch b/debian/patches/fix_exit_hook_doc_manpage
old mode 100755
new mode 100644
similarity index 73%
rename from debian/patches/fix_exit_hook_doc_manpage.dpatch
rename to debian/patches/fix_exit_hook_doc_manpage
index 12ee20e..ce9c1e8
--- a/debian/patches/fix_exit_hook_doc_manpage.dpatch
+++ b/debian/patches/fix_exit_hook_doc_manpage
@@ -1,17 +1,7 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## fix_exit_hook_doc_manpage.diff by <nfm at nfm.id.au>
-## packaging by Dustin Kirkland <kirkland at canonical.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Patch from nfm <nfm at nfm.id.au> for LP: #53024
-## DP: Modified client/dhclient-script.8 manpage to include information about
-## DP: the script directories /etc/dhcp/dhclient-enter-hooks.d and
-## DP: /etc/dhcp/dhclient-enter-hooks.d.
-
- at DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' isc-dhcp~/client/dhclient-script.8 isc-dhcp/client/dhclient-script.8
---- isc-dhcp~/client/dhclient-script.8 2011-08-20 22:08:40.000000000 -0700
-+++ isc-dhcp/client/dhclient-script.8 2011-08-20 22:31:33.000000000 -0700
+Index: isc-dhcp/client/dhclient-script.8
+===================================================================
+--- isc-dhcp.orig/client/dhclient-script.8 2012-01-07 20:51:59.907859051 -0800
++++ isc-dhcp/client/dhclient-script.8 2012-01-08 13:53:10.538478286 -0800
@@ -66,13 +66,15 @@
file. To override the default behaviour, redefine this function in
the enter hook script.
diff --git a/debian/patches/no_loopback_checksum b/debian/patches/no_loopback_checksum
new file mode 100644
index 0000000..c993f2b
--- /dev/null
+++ b/debian/patches/no_loopback_checksum
@@ -0,0 +1,16 @@
+Index: isc-dhcp/common/packet.c
+===================================================================
+--- isc-dhcp.orig/common/packet.c 2012-01-07 20:51:59.915859049 -0800
++++ isc-dhcp/common/packet.c 2012-01-08 13:54:29.514481663 -0800
+@@ -321,6 +321,11 @@
+ checksum((unsigned char *)&ip.ip_src,
+ 8, IPPROTO_UDP + ulen))));
+
++ /* loopback interface isn't checksumed in linux */
++ if (interface -> hw_address.hbuf [0] == 0) {
++ usum = 0;
++ }
++
+ udp_packets_seen++;
+ if (usum && usum != sum) {
+ udp_packets_bad_checksum++;
diff --git a/debian/patches/no_loopback_checksum.dpatch b/debian/patches/no_loopback_checksum.dpatch
deleted file mode 100755
index 6e41c99..0000000
--- a/debian/patches/no_loopback_checksum.dpatch
+++ /dev/null
@@ -1,22 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## no_loopback_checksum.dpatch by <apollock at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Deal with the fact that the loopback interface isn't checsummed by Linux
-
- at DPATCH@
-diff -urNad isc-dhcp~/common/packet.c isc-dhcp/common/packet.c
---- isc-dhcp~/common/packet.c 2009-06-23 22:15:20.000000000 -0700
-+++ isc-dhcp/common/packet.c 2009-08-31 21:40:19.000000000 -0700
-@@ -319,6 +319,11 @@
- checksum((unsigned char *)&ip.ip_src,
- 8, IPPROTO_UDP + ulen))));
-
-+ /* loopback interface isn't checksumed in linux */
-+ if (interface -> hw_address.hbuf [0] == 0) {
-+ usum = 0;
-+ }
-+
- udp_packets_seen++;
- if (usum && usum != sum) {
- udp_packets_bad_checksum++;
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..930e1f1
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+dhclient-script-exit-status
+fix_exit_hook_doc_manpage
+no_loopback_checksum
diff --git a/debian/rules b/debian/rules
index 1b5c5c3..4f120d0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,7 +23,6 @@ DESTDIR = `pwd`/debian/tmp
PACKAGE = isc-dhcp
-include /usr/share/dpatch/dpatch.make
-include /usr/share/dpkg/buildflags.mk
INSTALL = install
@@ -60,7 +59,7 @@ build: build-arch build-indep
build-arch: build-stamp
build-indep: build-stamp
-build-stamp: patch-stamp patched-ldap/build-stamp
+build-stamp: patched-ldap/build-stamp
./configure \
--prefix=$(DESTDIR)/usr \
@@ -74,7 +73,7 @@ build-stamp: patch-stamp patched-ldap/build-stamp
touch build-stamp
-clean: unpatch
+clean:
dh_testdir
rm -f build-stamp install-stamp
rm -Rf patched-ldap
diff --git a/debian/source/format b/debian/source/format
index d3827e7..163aaf8 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-1.0
+3.0 (quilt)
--
ISC DHCP packaging for Debian
More information about the pkg-dhcp-commits
mailing list