[pkg-dhcp-commits] [isc-dhcp] 03/03: release 4.3.5-1

Sun Dec 18 23:22:37 UTC 2016

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

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

commit 43a29d4c4b558f8c6ec6e2c7960486e19943b7f3
Author: Michael Gilbert <mgilbert at debian.org>
Date:   Sun Dec 18 23:04:13 2016 +0000

    release 4.3.5-1
---
 debian/changelog                | 11 ++++++++++
 debian/control                  | 11 ++++++----
 debian/copyright                |  8 ++++++++
 debian/dhcp-lease-list.1        | 11 ----------
 debian/dhcp-lease-list.8        | 45 +++++++++++++++++++++++++++++++++++++++++
 debian/isc-dhcp-relay.install   |  1 -
 debian/isc-dhcp-relay.manpages  |  1 +
 debian/isc-dhcp-server.init.d   |  9 +++++++++
 debian/isc-dhcp-server.manpages |  2 +-
 9 files changed, 82 insertions(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5c77e8d..1bd1d7b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+isc-dhcp (4.3.5-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Add lsb-base dependency to isc-dhcp-relay.
+  * Use the original author's dhcp-lease-list manpage.
+  * Correct the description of the common package (closes: #832782).
+  * If no interfaces have been specified, start servers for both IPv4 and IPv6
+    (closes: #815319).
+
+ -- Michael Gilbert <mgilbert at debian.org>  Sat, 26 Nov 2016 06:44:09 +0000
+
 isc-dhcp (4.3.5~b1-1) unstable; urgency=medium
 
   * New upstream beta release.
diff --git a/debian/control b/debian/control
index 895f57d..fdaba23 100644
--- a/debian/control
+++ b/debian/control
@@ -73,10 +73,12 @@ Architecture: any
 Depends:
  ${misc:Depends},
  debianutils (>= 2.8.2),
-Description: common files used by all of the isc-dhcp packages
- This package includes all of the files that are used in common by the various
- ISC DHCP packages, such as the dhcp-eval and dhcp-options manpages and the
- OMAPI command shell.
+Description: common manpages relevant to all of the isc-dhcp packages
+ This package includes manpages that are relevant to the various ISC DHCP
+ packages.
+ .
+ The dhcp-options manpage describes available options for dhcpd and dhclient.
+ The dhcp-eval manpage describes evaluation of conditional expressions.
 
 Package: isc-dhcp-dev
 Priority: optional
@@ -154,6 +156,7 @@ Architecture: any
 Depends:
  ${misc:Depends},
  ${shlibs:Depends},
+ lsb-base (>= 3.0-6),
  debianutils (>= 2.8.2),
 Recommends:
  isc-dhcp-common,
diff --git a/debian/copyright b/debian/copyright
index 99c7ba1..896d3a7 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -25,6 +25,11 @@ Copyright:
  2011-2015 Michael Gilbert <mgilbert at debian.org>
 License: ISC
 
+Files: debian/dhcp-lease-list.8
+Copyright:
+ 2008 Christian Hammers <ch at westend.com>
+License: GPL-2
+
 License: ISC
  Permission to use, copy, modify, and distribute this software for any
  purpose with or without fee is hereby granted, provided that the above
@@ -37,3 +42,6 @@ License: ISC
  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
  OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+License: GPL-2
+ See /usr/share/common-licenses/GPL-2.
diff --git a/debian/dhcp-lease-list.1 b/debian/dhcp-lease-list.1
deleted file mode 100644
index 0a4608f..0000000
--- a/debian/dhcp-lease-list.1
+++ /dev/null
@@ -1,11 +0,0 @@
-.TH dhcp-lease-list 1 2016-03-25
-.SH NAME
-dhcp-lease-list \- list active leases
-.SH SYNOPSIS
-.B dhcp-lease-list
-<options>
-.SH DESCRIPTION
-.B dhcp-lease-list
-can be used to list currently active leases.
-.SH AUTHOR
-Michael Gilbert <mgilbert at debian.org>
diff --git a/debian/dhcp-lease-list.8 b/debian/dhcp-lease-list.8
new file mode 100644
index 0000000..18b31f5
--- /dev/null
+++ b/debian/dhcp-lease-list.8
@@ -0,0 +1,45 @@
+.\" '\" t
+.\" ** The above line should force tbl to be a preprocessor **
+.\" Man page for man
+.\" 
+.\" Copyright (C) 2008 Christian Hammers.
+.\" 
+.\" You may distribute under the terms of the GNU General Public
+.\" License as specified in the file COPYING that comes with the
+.\" man-db distribution.
+.\" 
+.\" .pc
+.TH "dhcp-lease-list" "8" "2008-07-13" "Christian Hammers" ""
+.SH "NAME"
+dhcp\-lease\-list \- Prints active DHCP leases.
+.SH "SYNOPSIS"
+.\" The general command line
+.B dhcp\-lease\-list
+.RB [\|options \|]
+.SH "OPTIONS"
+.TP 
+.B \-\-help
+Shows command line help
+.TP 
+.B \-\-parsable
+machine readable output with full dates
+.TP 
+.B \-\-last
+prints the last (even if end<now) for every MAC
+.TP 
+.B \-\-all
+prints all entries i.e. more than one per MAC
+.SH "DESCRIPTION"
+.B dhcp\-lease\-list
+shows the dhcpd.leases file but filters, depending on the
+specified command line options, obsolete entries.
+.SH "FILES"
+.TP 
+.I /var/lib/dhcp3/dhcpd.leases
+dhcpd leases
+.TP 
+.I /usr/share/misc/oui.txt or /usr/local/etc/oui.txt
+optional file to map MAC addresses to manufactorer names
+.SH "SEE ALSO"
+.BR dhcpd3 (8)
+.BR dhcpd.leases (5)
diff --git a/debian/isc-dhcp-relay.install b/debian/isc-dhcp-relay.install
index 3dea33c..cdd90ff 100644
--- a/debian/isc-dhcp-relay.install
+++ b/debian/isc-dhcp-relay.install
@@ -1,2 +1 @@
 usr/sbin/dhcrelay
-usr/share/man/man8/dhcrelay.8
diff --git a/debian/isc-dhcp-relay.manpages b/debian/isc-dhcp-relay.manpages
new file mode 100644
index 0000000..4abe8d7
--- /dev/null
+++ b/debian/isc-dhcp-relay.manpages
@@ -0,0 +1 @@
+relay/dhcrelay.8
diff --git a/debian/isc-dhcp-server.init.d b/debian/isc-dhcp-server.init.d
index 62b8278..083bb24 100644
--- a/debian/isc-dhcp-server.init.d
+++ b/debian/isc-dhcp-server.init.d
@@ -144,13 +144,22 @@ case "$1" in
                         INTERFACESv4="$INTERFACES"
 		fi
 		if test -n "$INTERFACESv4"; then
+			echo "Launching IPv4 server only."
 			start_daemon "-4" "$DHCPDv4_CONF" "$NAME4" \
 				"$DHCPDv4_PID" "$DESC4" "$INTERFACESv4"
 		fi
 		if test -n "$INTERFACESv6"; then
+			echo "Launching IPv6 server only."
 			start_daemon "-6" "$DHCPDv6_CONF" "$NAME6" \
 				"$DHCPDv6_PID" "$DESC6" "$INTERFACESv6"
 		fi
+		if test -z "$INTERFACESv4" -a -z "$INTERFACESv6"; then
+			echo "Launching both IPv4 and IPv6 servers (please configure INTERFACES in /etc/default/isc-dhcp-server if you only want one or the other)."
+			start_daemon "-4" "$DHCPDv4_CONF" "$NAME4" \
+				"$DHCPDv4_PID" "$DESC4" ""
+			start_daemon "-6" "$DHCPDv6_CONF" "$NAME6" \
+				"$DHCPDv6_PID" "$DESC6" ""
+		fi
 		;;
 	stop)
 		stop_daemon
diff --git a/debian/isc-dhcp-server.manpages b/debian/isc-dhcp-server.manpages
index 5d06b66..330eb79 100644
--- a/debian/isc-dhcp-server.manpages
+++ b/debian/isc-dhcp-server.manpages
@@ -1,4 +1,4 @@
-debian/dhcp-lease-list.1
+debian/dhcp-lease-list.8
 
 debian/tmp/usr/share/man/man1/omshell.*
 

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

