[pkg-dhcp-commits] [isc-dhcp] 03/04: refresh patches for 4.3.5~b1

[Michael Gilbert]

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

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

commit 8c7fd7886ee68226fb9726421a9ec95e97281851
Author: Michael Gilbert <mgilbert at debian.org>
Date:   Sun Sep 11 23:06:51 2016 +0000

    refresh patches for 4.3.5~b1
---
 debian/patches/dhcpd-conf.patch        |  8 ++++----
 debian/patches/dhcpd-leaselist.patch   | 14 --------------
 debian/patches/dhcrelay-listen.patch   |  6 +++---
 debian/patches/fix-manpage-error.patch |  5 ++++-
 debian/patches/series                  |  1 -
 5 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/debian/patches/dhcpd-conf.patch b/debian/patches/dhcpd-conf.patch
index 46e1026..ee1d223 100644
--- a/debian/patches/dhcpd-conf.patch
+++ b/debian/patches/dhcpd-conf.patch
@@ -85,12 +85,12 @@ author: Michael Gilbert <mgilbert at debian.org>
 -host passacaglia {
 -  hardware ethernet 0:0:c0:5d:bd:95;
 -  filename "vmunix.passacaglia";
--  server-name "toccata.fugue.com";
+-  server-name "toccata.example.com";
 -}
 +#host passacaglia {
 +#  hardware ethernet 0:0:c0:5d:bd:95;
 +#  filename "vmunix.passacaglia";
-+#  server-name "toccata.fugue.com";
++#  server-name "toccata.example.com";
 +#}
  
  # Fixed IP addresses can also be specified for hosts.   These addresses
@@ -101,11 +101,11 @@ author: Michael Gilbert <mgilbert at debian.org>
  # set.
 -host fantasia {
 -  hardware ethernet 08:00:07:26:c0:a5;
--  fixed-address fantasia.fugue.com;
+-  fixed-address fantasia.example.com;
 -}
 +#host fantasia {
 +#  hardware ethernet 08:00:07:26:c0:a5;
-+#  fixed-address fantasia.fugue.com;
++#  fixed-address fantasia.example.com;
 +#}
  
  # You can declare a class of clients and then do address allocation
diff --git a/debian/patches/dhcpd-leaselist.patch b/debian/patches/dhcpd-leaselist.patch
deleted file mode 100644
index a2d461c..0000000
--- a/debian/patches/dhcpd-leaselist.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-description: use the correct path to the dhcpd leases file
-author: Michael Gilbert <mgilbert at debian.org>
-
---- a/contrib/dhcp-lease-list.pl
-+++ b/contrib/dhcp-lease-list.pl
-@@ -22,7 +22,7 @@ use strict;
- use warnings;
- use POSIX qw(strftime);
- 
--my $LEASES = '/var/db/dhcpd.leases';
-+my $LEASES = '/var/lib/dhcp/dhcpd.leases';
- my @all_leases;
- my @leases;
- 
diff --git a/debian/patches/dhcrelay-listen.patch b/debian/patches/dhcrelay-listen.patch
index c74be20..6e36f40 100644
--- a/debian/patches/dhcrelay-listen.patch
+++ b/debian/patches/dhcrelay-listen.patch
@@ -3,7 +3,7 @@ author: Steinar H. Gunderson <sgunderson at bigfoot.com>
 
 --- a/common/discover.c
 +++ b/common/discover.c
-@@ -1104,9 +1104,9 @@ discover_interfaces(int state) {
+@@ -1112,9 +1112,9 @@ discover_interfaces(int state) {
  					  INTERFACE_REQUESTED);
  
  #ifdef DHCPv6
@@ -17,9 +17,9 @@ author: Steinar H. Gunderson <sgunderson at bigfoot.com>
  				log_fatal ("%s: not found", tmp -> name);
 --- a/relay/dhcrelay.c
 +++ b/relay/dhcrelay.c
-@@ -787,6 +787,11 @@ do_relay4(struct interface_info *ip, str
- 	if (out)
+@@ -817,6 +817,11 @@ do_relay4(struct interface_info *ip, str
  		return;
+ 	}
  
 +       /* If this is not a BOOTREPLY, and it is not on a requested interface,
 +	 * drop it. */
diff --git a/debian/patches/fix-manpage-error.patch b/debian/patches/fix-manpage-error.patch
index 6769d5d..12fddeb 100644
--- a/debian/patches/fix-manpage-error.patch
+++ b/debian/patches/fix-manpage-error.patch
@@ -1,6 +1,9 @@
+description: fix error in dhcpd.conf manpage
+author: Michael Gilbert <mgilbert at debian.org>
+
 --- a/server/dhcpd.conf.5
 +++ b/server/dhcpd.conf.5
-@@ -3056,7 +3056,7 @@ server will use dhcp-renewal-time and dh
+@@ -3092,7 +3092,7 @@ server will use dhcp-renewal-time and dh
  A value of zero tells the client it may choose its own value.
  
  When those options are not defined then values will be set to zero unless the
diff --git a/debian/patches/series b/debian/patches/series
index 4ab7075..44519a4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,7 +5,6 @@ dhclient-64bit-time.patch
 dhclient-more-detail.patch
 dhcrelay-listen.patch
 
-dhcpd-leaselist.patch
 dhcpd-conf.patch
 
 fix-exit-hook-manpage.patch

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