[pkg-dhcp-commits] [isc-dhcp] 01/02: release 4.3.3-4

Sat Oct 3 22:25: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 b1d5bab630a29f2ca94c458f9402aa43cc5975c4
Author: Michael Gilbert <mgilbert at debian.org>
Date:   Sun Sep 27 02:57:24 2015 +0000

    release 4.3.3-4
---
 debian/changelog                    | 10 ++++++++++
 debian/clean                        |  2 ++
 debian/control                      | 29 +++++++++++++++++++++++++----
 debian/isc-dhcp-client-ddns.install |  1 +
 debian/isc-dhcp-client.install      |  2 +-
 debian/isc-dhcp-common.docs         |  2 ++
 debian/isc-dhcp-server.postinst     |  2 +-
 debian/rules                        | 25 +++++++++++++++----------
 8 files changed, 57 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 03bed7a..fe8c417 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+isc-dhcp (4.3.3-4) unstable; urgency=medium
+
+  * Reenable NSUPDATE (closes: #798237).
+  * Add a DDNS enabled dhclient package.
+  * Include README file (closes: #791788).
+  * Recommend rather than depend on policycoreutils.
+  * Finish replacing macros in manpages (closes: #773801).
+
+ -- Michael Gilbert <mgilbert at debian.org>  Sun, 20 Sep 2015 20:39:58 +0000
+
 isc-dhcp (4.3.3-3) unstable; urgency=medium
 
   * Revert change to lease file paths (closes: #798177).
diff --git a/debian/clean b/debian/clean
index 7812ee6..c3620d2 100644
--- a/debian/clean
+++ b/debian/clean
@@ -1,2 +1,4 @@
 dhcpd
+dhclient
+
 config.*
diff --git a/debian/control b/debian/control
index 25abefe..1567d86 100644
--- a/debian/control
+++ b/debian/control
@@ -26,9 +26,9 @@ Depends:
  ${shlibs:Depends},
  debianutils (>= 2.8.2),
  lsb-base,
- policycoreutils,
 Recommends:
  isc-dhcp-common,
+ policycoreutils,
 Conflicts:
  dhcp,
  logcheck-database (<= 1.3.17~)
@@ -91,7 +91,6 @@ Package: isc-dhcp-common
 Architecture: any
 Depends:
  ${misc:Depends},
- ${shlibs: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
@@ -121,11 +120,33 @@ Recommends:
  isc-dhcp-common,
 Suggests:
  resolvconf,
- avahi-autoipd
+ avahi-autoipd,
+ isc-dhcp-client-ddns,
 Provides:
  dhcp-client,
 Description: DHCP client for automatically obtaining an IP address
- This is the Internet Software Consortium's DHCP client. 
+ This is the Internet Software Consortium's DHCP client.
+ .
+ Dynamic Host Configuration Protocol (DHCP) is a protocol like BOOTP
+ (actually dhcpd includes much of the functionality of bootpd). It
+ gives client machines "leases" for IP addresses and can
+ automatically set their network configuration. If your machine
+ depends on DHCP (especially likely if it's a workstation on a large
+ network, or a laptop, or attached to a cable modem), keep this or
+ another DHCP client installed.
+ .
+ Extra documentation can be found in the package isc-dhcp-common.
+
+Package: isc-dhcp-client-ddns
+Priority: optional
+Architecture: any
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
+ isc-dhcp-client (= ${binary:Version}),
+Enhances: isc-dhcp-client
+Description: Dynamic DNS (DDNS) enabled DHCP client
+ This a Dynamic DNS enabled version of the DHCP client.
  .
  Dynamic Host Configuration Protocol (DHCP) is a protocol like BOOTP
  (actually dhcpd includes much of the functionality of bootpd). It
diff --git a/debian/isc-dhcp-client-ddns.install b/debian/isc-dhcp-client-ddns.install
new file mode 100644
index 0000000..55433fa
--- /dev/null
+++ b/debian/isc-dhcp-client-ddns.install
@@ -0,0 +1 @@
+client/dhclient sbin
diff --git a/debian/isc-dhcp-client.install b/debian/isc-dhcp-client.install
index 4e96831..a1d998d 100644
--- a/debian/isc-dhcp-client.install
+++ b/debian/isc-dhcp-client.install
@@ -1,4 +1,4 @@
-usr/sbin/dhclient sbin
+dhclient sbin
 
 debian/dhclient.conf etc/dhcp
 
diff --git a/debian/isc-dhcp-common.docs b/debian/isc-dhcp-common.docs
new file mode 100644
index 0000000..c99fce3
--- /dev/null
+++ b/debian/isc-dhcp-common.docs
@@ -0,0 +1,2 @@
+README
+RELNOTES
diff --git a/debian/isc-dhcp-server.postinst b/debian/isc-dhcp-server.postinst
index 4a77a52..b28014f 100644
--- a/debian/isc-dhcp-server.postinst
+++ b/debian/isc-dhcp-server.postinst
@@ -74,7 +74,7 @@ fi
 # ------------------------- Debconf questions end ---------------------
 db_stop
 
-restorecon /var/lib/dhcp/dhcpd.leases || true
+test ! -x /sbin/restorecon || /sbin/restorecon /var/lib/dhcp/dhcpd.leases
 
 #DEBHELPER#
 
diff --git a/debian/rules b/debian/rules
index acc598c..1a24449 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,14 +13,14 @@ DHCLIENT_SCRIPT=/sbin/dhclient-script
 CFLAGS+=-Wall
 CFLAGS+=-I/usr/include/bind-export
 
-CFLAGS+=-D_PATH_DHCPD_CONF='"/etc/dhcp/dhcpd.conf"'
-CFLAGS+=-D_PATH_DHCPD_DB='"$(LEASE_PATH)/dhcpd.leases"'
-CFLAGS+=-D_PATH_DHCPD6_DB='"$(LEASE_PATH)/dhcpd6.leases"'
+CFLAGS+=-D_PATH_DHCPD_CONF='\"/etc/dhcp/dhcpd.conf\"'
+CFLAGS+=-D_PATH_DHCPD_DB='\"$(LEASE_PATH)/dhcpd.leases\"'
+CFLAGS+=-D_PATH_DHCPD6_DB='\"$(LEASE_PATH)/dhcpd6.leases\"'
 
-CFLAGS+=-D_PATH_DHCLIENT_SCRIPT='"$(DHCLIENT_SCRIPT)"'
-CFLAGS+=-D_PATH_DHCLIENT_CONF='"/etc/dhcp/dhclient.conf"'
-CFLAGS+=-D_PATH_DHCLIENT_DB='"$(LEASE_PATH)/dhclient.leases"'
-CFLAGS+=-D_PATH_DHCLIENT6_DB='"$(LEASE_PATH)/dhclient6.leases"'
+CFLAGS+=-D_PATH_DHCLIENT_SCRIPT='\"$(DHCLIENT_SCRIPT)\"'
+CFLAGS+=-D_PATH_DHCLIENT_CONF='\"/etc/dhcp/dhclient.conf\"'
+CFLAGS+=-D_PATH_DHCLIENT_DB='\"$(LEASE_PATH)/dhclient.leases\"'
+CFLAGS+=-D_PATH_DHCLIENT6_DB='\"$(LEASE_PATH)/dhclient6.leases\"'
 
 CONFFLAGS=--prefix=/usr --enable-log-pid --enable-paranoia
 
@@ -45,12 +45,17 @@ override_dh_auto_configure:
 override_dh_auto_build:
 	# ldap-enabled build
 	test -f Makefile && $(MAKE) distclean || true
-	./configure --with-ldap --with-ldapcrypto $(CONFFLAGS)
+	./configure --with-ldap --with-ldapcrypto CFLAGS="$(CFLAGS) -DNSUPDATE" LDFLAGS="-lirs-export" $(CONFFLAGS)
 	$(MAKE) $(CROSS)
 	mv server/dhcpd dhcpd
+	# ddns-disabled build
+	test -f Makefile && $(MAKE) distclean || true
+	./configure CFLAGS="$(CFLAGS)" $(CONFFLAGS)
+	$(MAKE) $(CROSS)
+	mv client/dhclient dhclient
 	# ldap-disabled build
 	test -f Makefile && $(MAKE) distclean || true
-	./configure $(CONFFLAGS)
+	./configure CFLAGS="$(CFLAGS) -DNSUPDATE" LDFLAGS="-lirs-export" $(CONFFLAGS)
 	$(MAKE) $(CROSS)
 
 override_dh_install:
@@ -69,7 +74,7 @@ override_dh_install:
 	    -e 's/RUNDIR/\/var\/run/g' \
 	    -e 's/CLIENTBINDIR/\/sbin/g' \
 	    -e 's/DBDIR/\/var\/lib\/dhcp/g' \
-	    -i debian/tmp/usr/share/man/man8/*
+	    -i debian/tmp/usr/share/man/man*/*
 
 override_dh_installinit:
 	dh_installinit -Nisc-dhcp-server

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

