Commit fb299e22 authored by Michael Gilbert's avatar Michael Gilbert

release 4.3.3-2

parent f060d7ce
isc-dhcp (4.3.3-2) UNRELEASED; urgency=medium
* Disable tracing and failover (closes: #712503).
* Use default paths for lease files (closes: #758882).
-- Michael Gilbert <mgilbert@debian.org> Sat, 05 Sep 2015 23:12:43 +0000
isc-dhcp (4.3.3-2) unstable; urgency=medium
* Use default paths for lease files.
* Move omshell into the server package.
* Avoid unnecessary libirs dependencies.
* Recommend rather than depend isc-dhcp-common.
* Disable NSUPDATE (closes: #712503).
* Update translation (closes: #677918).
* Enable pid file logging (closes: #792928).
* Fix variables in manpages (closes: #570895).
* Use a symlink for the debug script (closes: #794771).
* Enable -user, -group, and -chroot server options (closes: #793490).
* Avoid launching the server when its already running (closes: #704175).
* Fix error when max lease time is used on 64-bit systems (closes: #795227).
-- Michael Gilbert <mgilbert@debian.org> Sun, 06 Sep 2015 04:21:05 +0000
isc-dhcp (4.3.3-1) unstable; urgency=medium
......
......@@ -25,12 +25,17 @@ Depends:
${misc:Depends},
${shlibs:Depends},
debianutils (>= 2.8.2),
isc-dhcp-common (= ${binary:Version}),
lsb-base,
policycoreutils,
Recommends:
isc-dhcp-common,
Conflicts:
dhcp,
logcheck-database (<= 1.3.17~)
Breaks:
isc-dhcp-common (<= 4.3.3-1),
Replaces:
isc-dhcp-common (<= 4.3.3-1),
Suggests:
isc-dhcp-server-ldap,
Description: ISC DHCP server for automatic IP address assignment
......@@ -50,7 +55,6 @@ Architecture: any
Depends:
${misc:Depends},
debianutils (>= 2.8.2),
isc-dhcp-common (= ${binary:Version}),
lsb-base,
Replaces:
isc-dhcp-client-dbg (<< 4.3.0a1),
......@@ -68,7 +72,6 @@ Depends:
${misc:Depends},
${shlibs:Depends},
debianutils (>= 2.8.2),
isc-dhcp-common (= ${binary:Version}),
isc-dhcp-server (= ${binary:Version}),
Conflicts:
dhcp,
......@@ -113,8 +116,9 @@ Depends:
${misc:Depends},
${shlibs:Depends},
debianutils (>= 2.8.2),
isc-dhcp-common (= ${binary:Version}),
iproute2 [linux-any] | freebsd-net-tools [kfreebsd-any],
Recommends:
isc-dhcp-common,
Suggests:
resolvconf,
avahi-autoipd
......@@ -149,7 +153,8 @@ Depends:
${misc:Depends},
${shlibs:Depends},
debianutils (>= 2.8.2),
isc-dhcp-common (= ${binary:Version}),
Recommends:
isc-dhcp-common,
Conflicts:
dhcp-relay,
Description: ISC DHCP relay daemon
......
var/lib/dhcp
etc/dhcp/dhclient-exit-hooks.d
etc/dhcp/dhclient-enter-hooks.d
......@@ -2,5 +2,4 @@ usr/sbin/dhclient sbin
debian/dhclient.conf etc/dhcp
debian/debug etc/dhcp/dhclient-exit-hooks.d
debian/debug etc/dhcp/dhclient-enter-hooks.d
debian/debug etc/dhcp
etc/dhcp/debug etc/dhcp/dhclient-exit-hooks.d/debug
etc/dhcp/debug etc/dhcp/dhclient-enter-hooks.d/debug
debian/tmp/usr/share/man/man5/dhcp-*
debian/tmp/usr/share/man/man1/omshell.*
......@@ -74,6 +74,10 @@ check_status()
case "$1" in
start)
test_config
if [ -e "$DHCPD_PID" ]; then
log_failure_msg "dhcpd service already running (pid file $DHCPD_PID currenty exists)"
exit 1
fi
log_daemon_msg "Starting $DESC" "$NAME"
start-stop-daemon --start --quiet --pidfile "$DHCPD_PID" \
--exec /usr/sbin/dhcpd -- \
......
usr/sbin/dhcpd
usr/bin/omshell
debian/dhcpd.conf etc/dhcp
debian/tmp/usr/share/man/man1/omshell.*
debian/tmp/usr/share/man/man5/dhcpd.conf.5
debian/tmp/usr/share/man/man5/dhcpd.leases.5
......
description: fix for unsafe 64-bit time calculation on large leases
author: Ben Howard <ben.howard@canonical.com>
origin: https://bugzilla.redhat.com/attachment.cgi?id=600673
bug: https://launchpad.net/bugs/1189571
bug-debian: https://bugs.debian.org/795227
--- a/common/dispatch.c
+++ b/common/dispatch.c
@@ -339,7 +339,20 @@ void add_timeout (when, where, what, ref
q->next = timeouts;
timeouts = q;
- isc_interval_set(&interval, sec & DHCP_SEC_MAX, usec * 1000);
+ /* isc_time_nowplusinterval() is not safe with 64-bit time_t and will
+ * return an error for sufficiently large intervals. We have to limit
+ * the interval to INT_MAX or less to ensure the interval doesn't
+ * overflow 32 bits, since the returned isc_time_t fields are
+ * 32-bit unsigned ints.
+ *
+ * HACK: The 9 is a magic number of seconds, since some time may have
+ * gone by since the last call to gettimeofday() and the one in
+ * isc_time_nowplusinterval().
+ */
+ if (sec > TIME_MAX)
+ sec = TIME_MAX - 9;
+
+ isc_interval_set(&interval, sec, usec * 1000);
status = isc_time_nowplusinterval(&expires, &interval);
if (status != ISC_R_SUCCESS) {
/*
description: undefine NSUPDATE
author: cchip
origin: http://forums.debian.net/viewtopic.php?f=10&t=95273
bug-debian: https://bugs.debian.org/712503
--- a/includes/site.h
+++ b/includes/site.h
@@ -121,7 +121,7 @@
/* Define this if you want DNS update functionality to be available. */
-#define NSUPDATE
+/* #define NSUPDATE */
/* Define this if you want to enable the DHCP server attempting to
find a nameserver to use for DDNS updates. */
dhclient-script-exit-status.patch
dhclient-exit-hook.patch
dhclient-dividebyzero.patch
dhclient-64bit-time.patch
fix-exit-hook-manpage.patch
spelling-error.patch
manpage-hyphens.patch
disable-nsupdate.patch
system-bind.patch
......@@ -9,20 +9,21 @@ author: Michael Gilbert <mgilbert@debian.org>
scripts/solaris scripts/openwrt
-dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.a ../bind/lib/libirs.a \
- ../bind/lib/libdns.a ../bind/lib/libisccfg.a ../bind/lib/libisc.a
+dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.a -lirs-export -ldns-export -lisc-export
+dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.a -ldns-export -lisc-export
+
man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5
EXTRA_DIST = $(man_MANS)
--- a/dhcpctl/Makefile.am
+++ b/dhcpctl/Makefile.am
@@ -6,12 +6,10 @@ EXTRA_DIST = $(man_MANS)
@@ -5,13 +5,10 @@ man_MANS = omshell.1 dhcpctl.3
EXTRA_DIST = $(man_MANS)
omshell_SOURCES = omshell.c
omshell_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \
-omshell_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \
- ../bind/lib/libirs.a ../bind/lib/libdns.a \
- ../bind/lib/libisccfg.a ../bind/lib/libisc.a
+ -lirs-export -ldns-export -lisc-export
+omshell_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a -ldns-export -lisc-export
libdhcpctl_a_SOURCES = dhcpctl.c callback.c remote.c
......@@ -43,13 +44,14 @@ author: Michael Gilbert <mgilbert@debian.org>
+svtest_LDADD = libomapi.a -lirs-export -ldns-export -lisc-export
--- a/relay/Makefile.am
+++ b/relay/Makefile.am
@@ -3,8 +3,7 @@ AM_CPPFLAGS = -DLOCALSTATEDIR='"@localst
@@ -2,9 +2,7 @@ AM_CPPFLAGS = -DLOCALSTATEDIR='"@localst
sbin_PROGRAMS = dhcrelay
dhcrelay_SOURCES = dhcrelay.c
dhcrelay_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
-dhcrelay_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
- ../bind/lib/libirs.a ../bind/lib/libdns.a \
- ../bind/lib/libisccfg.a ../bind/lib/libisc.a
+ -lirs-export -ldns-export -lisc-export
+dhcrelay_LDADD = ../common/libdhcp.a ../omapip/libomapi.a -ldns-export -lisc-export
man_MANS = dhcrelay.8
EXTRA_DIST = $(man_MANS)
......@@ -61,7 +63,7 @@ author: Michael Gilbert <mgilbert@debian.org>
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 \
+ ../dhcpctl/libdhcpctl.a -ldns-export -lisc-export \
$(LDAP_LIBS)
man_MANS = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5
......
This diff is collapsed.
......@@ -16,9 +16,8 @@ CFLAGS+=-D_PATH_DHCLIENT_CONF='"/etc/dhcp/dhclient.conf"'
CFLAGS+=-D_PATH_DHCLIENT_SCRIPT='"$(DHCLIENT_SCRIPT)"'
CONFFLAGS=--prefix=/usr \
--disable-tracing \
--disable-failover \
--sysconfdir=/etc/dhcp \
--enable-log-pid \
--enable-paranoia \
# cross-architecture building
ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
......@@ -51,6 +50,7 @@ override_dh_auto_build:
override_dh_install:
dh_install
# rename scripts
cp debian/dhclient-script.$(DEB_HOST_ARCH_OS) \
debian/isc-dhcp-client$(DHCLIENT_SCRIPT)
cp debian/dhclient-script.$(DEB_HOST_ARCH_OS).udeb \
......@@ -59,6 +59,12 @@ override_dh_install:
debian/isc-dhcp-client/etc/dhcp/dhclient-exit-hooks.d/rfc3442-classless-routes
cp contrib/dhcp-lease-list.pl \
debian/isc-dhcp-server/usr/sbin/dhcp-lease-list
# use actual paths rather than undefined variables in man pages
sed -e 's|ETCDIR|/etc/dhcp|g' \
-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/*
override_dh_installinit:
dh_installinit -Nisc-dhcp-server
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment