[pkg-dhcp-commits] [isc-dhcp] 07/09: refresh patches for 4.3.3

Sat Sep 5 23:44:17 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 1b400ba2c270ce2c0554b9a7a6d5539b1ed4d228
Author: Michael Gilbert <mgilbert at debian.org>
Date:   Sat Sep 5 19:32:32 2015 +0000

    refresh patches for 4.3.3
---
 debian/patches/dhclient-dividebyzero.patch       |  4 ++--
 debian/patches/dhclient-exit-hook.patch          |  2 +-
 debian/patches/dhclient-script-exit-status.patch |  2 +-
 debian/patches/manpage-hyphens.patch             |  8 ++++----
 debian/patches/spelling-error.patch              |  2 +-
 debian/patches/system-bind.patch                 | 24 ++++++++++++++++--------
 6 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/debian/patches/dhclient-dividebyzero.patch b/debian/patches/dhclient-dividebyzero.patch
index ce75f33..e2fb49a 100644
--- a/debian/patches/dhclient-dividebyzero.patch
+++ b/debian/patches/dhclient-dividebyzero.patch
@@ -5,7 +5,7 @@ Author: Kees Cook <kees at ubuntu.com>
 
 --- a/client/dhclient.c
 +++ b/client/dhclient.c
-@@ -1928,9 +1928,12 @@ void send_discover (cpp)
+@@ -1929,9 +1929,12 @@ void send_discover (cpp)
  			client->interval += random() % (2 * client->interval);
  
  		/* Don't backoff past cutoff. */
@@ -21,7 +21,7 @@ Author: Kees Cook <kees at ubuntu.com>
  	} else if (!client->interval)
  		client->interval = client->config->initial_interval;
  
-@@ -2177,11 +2180,13 @@ void send_request (cpp)
+@@ -2178,11 +2181,13 @@ void send_request (cpp)
  
  	/* Don't backoff past cutoff. */
  	if (client -> interval >
diff --git a/debian/patches/dhclient-exit-hook.patch b/debian/patches/dhclient-exit-hook.patch
index 7efad98..b916dc4 100644
--- a/debian/patches/dhclient-exit-hook.patch
+++ b/debian/patches/dhclient-exit-hook.patch
@@ -4,7 +4,7 @@ Bug-Debian: http://bugs.debian.org/486520
 
 --- a/client/dhclient.c
 +++ b/client/dhclient.c
-@@ -2073,6 +2073,8 @@ void state_panic (cpp)
+@@ -2074,6 +2074,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 01121fc..ed85b45 100644
--- a/debian/patches/dhclient-script-exit-status.patch
+++ b/debian/patches/dhclient-script-exit-status.patch
@@ -2,7 +2,7 @@ description: check that exit status is 2
 
 --- a/client/dhclient.c
 +++ b/client/dhclient.c
-@@ -1255,7 +1255,7 @@ void bind_lease (client)
+@@ -1256,7 +1256,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. */
diff --git a/debian/patches/manpage-hyphens.patch b/debian/patches/manpage-hyphens.patch
index 6fd09e4..29fb50b 100644
--- a/debian/patches/manpage-hyphens.patch
+++ b/debian/patches/manpage-hyphens.patch
@@ -14,7 +14,7 @@ author: Michael Gilbert <mgilbert at debian.org>
  types together or even to share the lease file between them.
 --- a/server/dhcpd.8
 +++ b/server/dhcpd.8
-@@ -93,7 +93,7 @@ dhcpd - Dynamic Host Configuration Proto
+@@ -105,7 +105,7 @@ dhcpd - Dynamic Host Configuration Proto
  ]
  
  .B dhcpd
@@ -45,7 +45,7 @@ author: Michael Gilbert <mgilbert at debian.org>
  .fi
  .PP
  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
+@@ -1881,7 +1881,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
-@@ -2124,7 +2124,7 @@ a second).
+@@ -2137,7 +2137,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 
-@@ -2534,8 +2534,8 @@ The syntax of the \fIsyslog.conf\fR file
+@@ -2577,8 +2577,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
diff --git a/debian/patches/spelling-error.patch b/debian/patches/spelling-error.patch
index 2abb7ed..fe51920 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
+@@ -1278,7 +1278,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 4d4166b..d7d17cd 100644
--- a/debian/patches/system-bind.patch
+++ b/debian/patches/system-bind.patch
@@ -60,28 +60,28 @@ author: Michael Gilbert <mgilbert at debian.org>
  dhcpd_CFLAGS = $(LDAP_CFLAGS)
  dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
 -	      ../dhcpctl/libdhcpctl.a ../bind/lib/libirs.a \
--	      ../bind/lib/libdns.a ../bind/lib/libisccfg.a ../bind/lib/libisc.a
-+	      ../dhcpctl/libdhcpctl.a -lirs-export -ldns-export -lisc-export
+-	      ../bind/lib/libdns.a ../bind/lib/libisccfg.a ../bind/lib/libisc.a \
++	      ../dhcpctl/libdhcpctl.a -lirs-export -ldns-export -lisc-export \
+ 	      $(LDAP_LIBS)		
  
  man_MANS = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5
- EXTRA_DIST = $(man_MANS)
 --- a/Makefile.am
 +++ b/Makefile.am
 @@ -22,10 +22,9 @@ EXTRA_DIST = RELNOTES LICENSE \
  	     doc/devel/arch.dox doc/devel/atf.dox doc/devel/contrib.dox \
  	     doc/devel/debug.dox doc/devel/isc-logo.jpg doc/devel/mainpage.dox \
  	     doc/devel/omapi.dox doc/devel/qa.dox util/bindvar.sh \
--	     bind/Makefile bind/bind.tar.gz bind/version.tmp \
+-	     bind/Makefile.in bind/bind.tar.gz bind/version.tmp \
  	     common/tests/Atffile server/tests/Atffile
  
--SUBDIRS = bind includes tests common dst omapip client dhcpctl relay server
-+SUBDIRS = includes tests common dst omapip client dhcpctl relay server
+-SUBDIRS = bind includes tests common omapip client dhcpctl relay server
++SUBDIRS = includes tests common omapip client dhcpctl relay server
  
  nobase_include_HEADERS = dhcpctl/dhcpctl.h
  
 --- a/configure.ac
 +++ b/configure.ac
-@@ -629,9 +629,6 @@ fi
+@@ -699,9 +699,6 @@ fi
  # AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],[],[]) & etc).
  CFLAGS="$CFLAGS $STD_CWARNINGS"
  
@@ -91,7 +91,15 @@ author: Michael Gilbert <mgilbert at debian.org>
  case "$host" in
  *-darwin*)
      CFLAGS="$CFLAGS -D__APPLE_USE_RFC_3542" ;;
-@@ -658,8 +655,6 @@ AC_CONFIG_FILES([
+@@ -711,7 +708,6 @@ AC_C_FLEXIBLE_ARRAY_MEMBER
+ 
+ AC_CONFIG_FILES([
+   Makefile
+-  bind/Makefile
+   client/Makefile
+   client/tests/Makefile
+   common/Makefile
+@@ -728,8 +724,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

