[pkg-dhcp-commits] [isc-dhcp] 03/11: refresh patches for 4.3.2

Mon May 11 00:55:00 UTC 2015

This is an automated email from the git hooks/post-receive script.

mgilbert pushed a commit to branch master
in repository isc-dhcp.

commit 611c9d90192769cb653aac51c1213c7af1a6449f
Author: Michael Gilbert <mgilbert at debian.org>
Date:   Mon May 11 00:37:35 2015 +0000

    refresh patches for 4.3.2
---
 debian/patches/manpage-hyphens.patch      | 12 ++++++------
 debian/patches/no-loopback-checksum.patch | 16 ----------------
 debian/patches/series                     |  2 --
 debian/patches/spelling-error.patch       |  2 +-
 debian/patches/system-bind.patch          |  4 ++--
 5 files changed, 9 insertions(+), 27 deletions(-)

diff --git a/debian/patches/manpage-hyphens.patch b/debian/patches/manpage-hyphens.patch
index ed741a6..6fd09e4 100644
--- a/debian/patches/manpage-hyphens.patch
+++ b/debian/patches/manpage-hyphens.patch
@@ -36,7 +36,7 @@ author: Michael Gilbert <mgilbert at debian.org>
  .SH NBI
 --- a/server/dhcpd.conf.5
 +++ b/server/dhcpd.conf.5
-@@ -1302,7 +1302,7 @@ dnssec-keygen.  If you are using BIND 9\
+@@ -1310,7 +1310,7 @@ dnssec-keygen.  If you are using BIND 9\
  dnssec-keygen, the above key would be created as follows:
  .PP
  .nf
@@ -44,8 +44,8 @@ author: Michael Gilbert <mgilbert at debian.org>
 +	dnssec-keygen \-a HMAC-MD5 \-b 128 \-n USER DHCP_UPDATER
  .fi
  .PP
- You may wish to enable logging of DNS updates on your DNS server.
-@@ -1817,7 +1817,7 @@ A short min-lease-time enforces a step c
+ The key name, algorithm, and secret must match that being used by the DNS
+@@ -1868,7 +1868,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
-@@ -2073,7 +2073,7 @@ a second).
+@@ -2124,7 +2124,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 
-@@ -2454,8 +2454,8 @@ The syntax of the \fIsyslog.conf\fR file
+@@ -2534,8 +2534,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
-@@ -108,7 +108,7 @@ Lease times are specified in Universal C
+@@ -109,7 +109,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
deleted file mode 100644
index cebf960..0000000
--- a/debian/patches/no-loopback-checksum.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-description: loopback interface isn't checksumed
-
---- 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))));
- 
-+  /* 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
index 95856c0..8062dd7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,8 +2,6 @@ dhclient-script-exit-status.patch
 dhclient-exit-hook.patch
 dhclient-dividebyzero.patch
 
-no-loopback-checksum.patch
-
 fix-exit-hook-manpage.patch
 spelling-error.patch
 manpage-hyphens.patch
diff --git a/debian/patches/spelling-error.patch b/debian/patches/spelling-error.patch
index 1a2ac5b..2abb7ed 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
-@@ -1264,7 +1264,7 @@ parse_option_name (cfile, allocate, know
+@@ -1270,7 +1270,7 @@ parse_option_name (cfile, allocate, know
  			option_reference(opt, option, MDL);
  		} else
  			log_info("option %s has been redefined as option %s.  "
diff --git a/debian/patches/system-bind.patch b/debian/patches/system-bind.patch
index 664a8ab..4d4166b 100644
--- a/debian/patches/system-bind.patch
+++ b/debian/patches/system-bind.patch
@@ -81,7 +81,7 @@ author: Michael Gilbert <mgilbert at debian.org>
  
 --- a/configure.ac
 +++ b/configure.ac
-@@ -609,9 +609,6 @@ fi
+@@ -629,9 +629,6 @@ fi
  # AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],[],[]) & etc).
  CFLAGS="$CFLAGS $STD_CWARNINGS"
  
@@ -91,7 +91,7 @@ author: Michael Gilbert <mgilbert at debian.org>
  case "$host" in
  *-darwin*)
      CFLAGS="$CFLAGS -D__APPLE_USE_RFC_3542" ;;
-@@ -637,8 +634,6 @@ AC_CONFIG_FILES([
+@@ -658,8 +655,6 @@ AC_CONFIG_FILES([
  ])
  AC_OUTPUT
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-dhcp/isc-dhcp.git

