[pkg-dhcp-commits] [isc-dhcp] 03/08: refresh patches
Michael Gilbert
mgilbert at moszumanska.debian.org
Thu Aug 14 04:56:04 UTC 2014
This is an automated email from the git hooks/post-receive script.
mgilbert pushed a commit to branch master
in repository isc-dhcp.
commit d50e75d5f76e56556c6f66a1e15caa5176cb227f
Author: Michael Gilbert <mgilbert at debian.org>
Date: Sat Jul 19 18:22:38 2014 -0400
refresh patches
---
debian/patches/dhclient-exit-hook.patch | 7 ++++---
debian/patches/dhclient-script-exit-status.patch | 16 ++++++++--------
debian/patches/fix-exit-hook-manpage.patch | 8 ++++----
debian/patches/manpage-hyphens.patch | 12 ++++++------
debian/patches/no-loopback-checksum.patch | 6 +++---
debian/patches/spelling-error.patch | 2 +-
6 files changed, 26 insertions(+), 25 deletions(-)
diff --git a/debian/patches/dhclient-exit-hook.patch b/debian/patches/dhclient-exit-hook.patch
index c43d342..7efad98 100644
--- a/debian/patches/dhclient-exit-hook.patch
+++ b/debian/patches/dhclient-exit-hook.patch
@@ -1,9 +1,10 @@
Description: Run exit hooks when "dhclient -1" fails (closes: #486520).
Author: Martin Pitt <martin.pitt at ubuntu.com>
Bug-Debian: http://bugs.debian.org/486520
---- isc-dhcp-4.2.4.orig/client/dhclient.c
-+++ isc-dhcp-4.2.4/client/dhclient.c
-@@ -2018,6 +2018,8 @@ void state_panic (cpp)
+
+--- a/client/dhclient.c
++++ b/client/dhclient.c
+@@ -2073,6 +2073,8 @@ void state_panic (cpp)
if (!quiet)
log_info ("Unable to obtain a lease on first try.%s",
" Exiting.");
diff --git a/debian/patches/dhclient-script-exit-status.patch b/debian/patches/dhclient-script-exit-status.patch
index d368eb9..01121fc 100644
--- a/debian/patches/dhclient-script-exit-status.patch
+++ b/debian/patches/dhclient-script-exit-status.patch
@@ -1,13 +1,13 @@
description: check that exit status is 2
---- a/client/dhclient.c 2012-01-07 20:51:59.911859051 -0800
-+++ b/client/dhclient.c 2012-01-08 13:52:16.262475966 -0800
-@@ -1211,7 +1211,7 @@
+--- a/client/dhclient.c
++++ b/client/dhclient.c
+@@ -1255,7 +1255,7 @@ void bind_lease (client)
/* 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);
+- 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-manpage.patch b/debian/patches/fix-exit-hook-manpage.patch
index d2fb107..c202fe9 100644
--- a/debian/patches/fix-exit-hook-manpage.patch
+++ b/debian/patches/fix-exit-hook-manpage.patch
@@ -1,8 +1,8 @@
description: fix exit hook documentation
---- a/client/dhclient-script.8 2012-01-07 20:51:59.907859051 -0800
-+++ b/client/dhclient-script.8 2012-01-08 13:53:10.538478286 -0800
-@@ -66,13 +66,15 @@
+--- a/client/dhclient-script.8
++++ b/client/dhclient-script.8
+@@ -64,13 +64,15 @@ which is later used to create the
file. To override the default behaviour, redefine this function in
the enter hook script.
.PP
@@ -22,7 +22,7 @@ description: fix exit hook documentation
execution of the script, it can set the exit_status variable to a nonzero
value, and
.B CLIENTBINDIR/dhclient-script
-@@ -82,14 +84,18 @@
+@@ -80,14 +82,18 @@ After all processing has completed,
.B CLIENTBINDIR/dhclient-script
checks for the presence of an executable
.B ETCDIR/dhclient-exit-hooks
diff --git a/debian/patches/manpage-hyphens.patch b/debian/patches/manpage-hyphens.patch
index 9ec22d2..ed741a6 100644
--- a/debian/patches/manpage-hyphens.patch
+++ b/debian/patches/manpage-hyphens.patch
@@ -3,7 +3,7 @@ author: Michael Gilbert <mgilbert at debian.org>
--- a/client/dhclient.8
+++ b/client/dhclient.8
-@@ -228,7 +228,7 @@ parameters. This is the default and can
+@@ -232,7 +232,7 @@ parameters. This is the default and can
.BI \-6
Use the DHCPv6 protocol to obtain whatever IPv6 addresses are available
along with configuration parameters. It cannot be combined with
@@ -36,7 +36,7 @@ author: Michael Gilbert <mgilbert at debian.org>
.SH NBI
--- a/server/dhcpd.conf.5
+++ b/server/dhcpd.conf.5
-@@ -1306,7 +1306,7 @@ dnssec-keygen. If you are using BIND 9\
+@@ -1302,7 +1302,7 @@ dnssec-keygen. If you are using BIND 9\
dnssec-keygen, the above key would be created as follows:
.PP
.nf
@@ -45,7 +45,7 @@ author: Michael Gilbert <mgilbert at debian.org>
.fi
.PP
You may wish to enable logging of DNS updates on your DNS server.
-@@ -1821,7 +1821,7 @@ A short min-lease-time enforces a step c
+@@ -1817,7 +1817,7 @@ A short min-lease-time enforces a step c
min-lease-time allows for a gradual change.
\fItime\fR is either second since epoch, or a UTC time string e.g.
4 2007/08/24 09:14:32 or a string with time zone offset in seconds
@@ -54,7 +54,7 @@ author: Michael Gilbert <mgilbert at debian.org>
.SH REFERENCE: PARAMETERS
The
.I adaptive-lease-time-threshold
-@@ -2077,7 +2077,7 @@ a second).
+@@ -2073,7 +2073,7 @@ a second).
.PP
Please note that as delayed-ack is currently experimental, the delayed-ack
feature is not compiled in by default, but must be enabled at compile time
@@ -63,7 +63,7 @@ author: Michael Gilbert <mgilbert at debian.org>
.RE
.PP
The
-@@ -2458,8 +2458,8 @@ The syntax of the \fIsyslog.conf\fR file
+@@ -2454,8 +2454,8 @@ The syntax of the \fIsyslog.conf\fR file
operating systems - consult the \fIsyslog.conf\fR manual page to be
sure. To get syslog to start logging to the new file, you must first
create the file with correct ownership and permissions (usually, the
@@ -194,7 +194,7 @@ author: Michael Gilbert <mgilbert at debian.org>
forwarded. At least one \fB-u\fR option must be included in the command
--- a/server/dhcpd.leases.5
+++ b/server/dhcpd.leases.5
-@@ -121,7 +121,7 @@ Lease times are specified in Universal C
+@@ -108,7 +108,7 @@ Lease times are specified in Universal C
the local time zone. There is probably nowhere in the world where the
times recorded on a lease are always the same as wall clock times. On
most unix machines, you can display the current time in UTC by typing
diff --git a/debian/patches/no-loopback-checksum.patch b/debian/patches/no-loopback-checksum.patch
index bc11e8f..cebf960 100644
--- a/debian/patches/no-loopback-checksum.patch
+++ b/debian/patches/no-loopback-checksum.patch
@@ -1,8 +1,8 @@
description: loopback interface isn't checksumed
---- a/common/packet.c 2012-01-07 20:51:59.915859049 -0800
-+++ b/common/packet.c 2012-01-08 13:54:29.514481663 -0800
-@@ -321,6 +321,11 @@
+--- a/common/packet.c
++++ b/common/packet.c
+@@ -336,6 +336,11 @@ decode_udp_ip_header(struct interface_in
checksum((unsigned char *)&ip.ip_src,
8, IPPROTO_UDP + ulen))));
diff --git a/debian/patches/spelling-error.patch b/debian/patches/spelling-error.patch
index 2abb7ed..1a2ac5b 100644
--- a/debian/patches/spelling-error.patch
+++ b/debian/patches/spelling-error.patch
@@ -3,7 +3,7 @@ Author: Michael Gilbert <mgilbert at debian.org>
--- a/common/parse.c
+++ b/common/parse.c
-@@ -1270,7 +1270,7 @@ parse_option_name (cfile, allocate, know
+@@ -1264,7 +1264,7 @@ parse_option_name (cfile, allocate, know
option_reference(opt, option, MDL);
} else
log_info("option %s has been redefined as option %s. "
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-dhcp/isc-dhcp.git
More information about the pkg-dhcp-commits
mailing list