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

Michael Gilbert mgilbert at moszumanska.debian.org
Sun Sep 6 04:39:51 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 fb299e2268caf607084e207d1b464ff8bf4b2c72
Author: Michael Gilbert <mgilbert at debian.org>
Date:   Sun Sep 6 04:22:59 2015 +0000

    release 4.3.3-2
---
 debian/changelog                         |  22 +++-
 debian/control                           |  15 ++-
 debian/isc-dhcp-client.dirs              |   4 +
 debian/isc-dhcp-client.install           |   3 +-
 debian/isc-dhcp-client.links             |   2 +
 debian/isc-dhcp-common.install           |   1 -
 debian/isc-dhcp-common.manpages          |   1 -
 debian/isc-dhcp-server.init.d            |   4 +
 debian/isc-dhcp-server.install           |   2 +
 debian/isc-dhcp-server.manpages          |   2 +
 debian/patches/dhclient-64bit-time.patch |  30 +++++
 debian/patches/disable-nsupdate.patch    |  16 +++
 debian/patches/series                    |   3 +
 debian/patches/system-bind.patch         |  18 +--
 debian/po/sk.po                          | 188 ++++++++-----------------------
 debian/rules                             |  12 +-
 16 files changed, 157 insertions(+), 166 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b1359c5..ac5c351 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,19 @@
-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 at 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 at debian.org>  Sun, 06 Sep 2015 04:21:05 +0000
 
 isc-dhcp (4.3.3-1) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index a16d182..25abefe 100644
--- a/debian/control
+++ b/debian/control
@@ -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
diff --git a/debian/isc-dhcp-client.dirs b/debian/isc-dhcp-client.dirs
new file mode 100644
index 0000000..f8aae85
--- /dev/null
+++ b/debian/isc-dhcp-client.dirs
@@ -0,0 +1,4 @@
+var/lib/dhcp
+
+etc/dhcp/dhclient-exit-hooks.d
+etc/dhcp/dhclient-enter-hooks.d
diff --git a/debian/isc-dhcp-client.install b/debian/isc-dhcp-client.install
index 73e14af..4e96831 100644
--- a/debian/isc-dhcp-client.install
+++ b/debian/isc-dhcp-client.install
@@ -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
diff --git a/debian/isc-dhcp-client.links b/debian/isc-dhcp-client.links
new file mode 100644
index 0000000..964fadc
--- /dev/null
+++ b/debian/isc-dhcp-client.links
@@ -0,0 +1,2 @@
+etc/dhcp/debug etc/dhcp/dhclient-exit-hooks.d/debug
+etc/dhcp/debug etc/dhcp/dhclient-enter-hooks.d/debug
diff --git a/debian/isc-dhcp-common.install b/debian/isc-dhcp-common.install
deleted file mode 100644
index 273da5b..0000000
--- a/debian/isc-dhcp-common.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/bin/omshell
diff --git a/debian/isc-dhcp-common.manpages b/debian/isc-dhcp-common.manpages
index 29a941b..d7fde6e 100644
--- a/debian/isc-dhcp-common.manpages
+++ b/debian/isc-dhcp-common.manpages
@@ -1,2 +1 @@
 debian/tmp/usr/share/man/man5/dhcp-*
-debian/tmp/usr/share/man/man1/omshell.*
diff --git a/debian/isc-dhcp-server.init.d b/debian/isc-dhcp-server.init.d
index 10e4679..ac32883 100644
--- a/debian/isc-dhcp-server.init.d
+++ b/debian/isc-dhcp-server.init.d
@@ -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 -- \
diff --git a/debian/isc-dhcp-server.install b/debian/isc-dhcp-server.install
index b5b95f0..1310738 100644
--- a/debian/isc-dhcp-server.install
+++ b/debian/isc-dhcp-server.install
@@ -1,3 +1,5 @@
 usr/sbin/dhcpd
 
+usr/bin/omshell
+
 debian/dhcpd.conf etc/dhcp
diff --git a/debian/isc-dhcp-server.manpages b/debian/isc-dhcp-server.manpages
index fd117de..7bf05e7 100644
--- a/debian/isc-dhcp-server.manpages
+++ b/debian/isc-dhcp-server.manpages
@@ -1,3 +1,5 @@
+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
 
diff --git a/debian/patches/dhclient-64bit-time.patch b/debian/patches/dhclient-64bit-time.patch
new file mode 100644
index 0000000..f6ff3d1
--- /dev/null
+++ b/debian/patches/dhclient-64bit-time.patch
@@ -0,0 +1,30 @@
+description: fix for unsafe 64-bit time calculation on large leases
+author: Ben Howard <ben.howard at 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) {
+ 		/*
diff --git a/debian/patches/disable-nsupdate.patch b/debian/patches/disable-nsupdate.patch
new file mode 100644
index 0000000..5248a77
--- /dev/null
+++ b/debian/patches/disable-nsupdate.patch
@@ -0,0 +1,16 @@
+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. */
diff --git a/debian/patches/series b/debian/patches/series
index 8062dd7..fb8aebc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,9 +1,12 @@
 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
diff --git a/debian/patches/system-bind.patch b/debian/patches/system-bind.patch
index d7d17cd..a4c13a8 100644
--- a/debian/patches/system-bind.patch
+++ b/debian/patches/system-bind.patch
@@ -9,20 +9,21 @@ author: Michael Gilbert <mgilbert at 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 at 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 at 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
diff --git a/debian/po/sk.po b/debian/po/sk.po
index 36b52bc..f0e24ad 100644
--- a/debian/po/sk.po
+++ b/debian/po/sk.po
@@ -1,11 +1,16 @@
+# Slovak translation of dhcp3 debconf templates.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the dhcp3 package.
+# Ivan Masár <helix84 at centrum.sk>, 2012.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: dhcp3 3.0.6-1\n"
+"Project-Id-Version: dhcp3\n"
 "Report-Msgid-Bugs-To: isc-dhcp at packages.debian.org\n"
-"POT-Creation-Date: 2014-01-10 04:22+0000\n"
-"PO-Revision-Date: 2007-08-17 23:36+0100\n"
+"POT-Creation-Date: 2010-07-07 18:58-0700\n"
+"PO-Revision-Date: 2012-06-17 20:34+0100\n"
 "Last-Translator: Ivan Masár <helix84 at centrum.sk>\n"
-"Language-Team: Slovak <sk-i18n at lists.linux.sk>\n"
+"Language-Team: Slovak <debian-l10n-slovak at lists.debian.org>\n"
 "Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
@@ -20,22 +25,14 @@ msgstr "Servery, ktorým má DHCP relay preposielať požiadavky:"
 #. Type: string
 #. Description
 #: ../isc-dhcp-relay.templates:2001
-msgid ""
-"Please enter the hostname or IP address of at least one DHCP server to which "
-"DHCP and BOOTP requests should be relayed."
-msgstr ""
-"Prosím, zadajte názvov stroja alebo IP adresu aspoň jedného DHCP servera, "
-"ktorému majú byť preposielané DHCP a BOOTP požiadavky."
+msgid "Please enter the hostname or IP address of at least one DHCP server to which DHCP and BOOTP requests should be relayed."
+msgstr "Prosím, zadajte názov počítača alebo IP adresu aspoň jedného DHCP servera, ktorému sa majú preposielať požiadavky DHCP a BOOTP."
 
 #. Type: string
 #. Description
 #: ../isc-dhcp-relay.templates:2001
-msgid ""
-"You can specify multiple server names or IP addresses (in a space-separated "
-"list)."
-msgstr ""
-"Môžete uviesť viacero názvov serverov alebo IP adries (v zozname oddelenom "
-"medzerami)."
+msgid "You can specify multiple server names or IP addresses (in a space-separated list)."
+msgstr "Môžete uviesť viacero názvov serverov alebo IP adries (v zozname oddelenom medzerami)."
 
 #. Type: string
 #. Description
@@ -46,26 +43,14 @@ msgstr "Rozhrania, na kotrých má DHCP relay počúvať:"
 #. Type: string
 #. Description
 #: ../isc-dhcp-relay.templates:3001
-msgid ""
-"Please specify which network interface(s) the DHCP relay should attempt to "
-"configure. Multiple interface names should be entered as a space-separated "
-"list."
-msgstr ""
-"Prosím, uveďte, ktoré sieťové rozhrania by sa mal DHCP relay pokúsiť "
-"nakonfigurovať. Viaceré názvy rozhraní sa zadávajú ako zoznam oddelený "
-"medzerami."
+msgid "Please specify which network interface(s) the DHCP relay should attempt to configure. Multiple interface names should be entered as a space-separated list."
+msgstr "Prosím, uveďte, ktoré sieťové rozhrania by sa mal DHCP relay pokúsiť nakonfigurovať. Viaceré názvy rozhraní sa zadávajú ako zoznam oddelený medzerami."
 
 #. Type: string
 #. Description
 #: ../isc-dhcp-relay.templates:3001
-msgid ""
-"Leave this field blank to allow for automatic detection and configuration of "
-"network interfaces by the DHCP relay, in which case only broadcast "
-"interfaces will be used (if possible)."
-msgstr ""
-"Pre automatickú detekciu sieťových rozhraní pomocou DHCP relay nechajte toto "
-"pole nevyplnené. V takom prípade sa použijú iba broadcast rozhrania (ak to "
-"bude možné)."
+msgid "Leave this field blank to allow for automatic detection and configuration of network interfaces by the DHCP relay, in which case only broadcast interfaces will be used (if possible)."
+msgstr "Na automatickú detekciu sieťových rozhraní pomocou DHCP relay nechajte toto pole nevyplnené. V takom prípade sa použijú iba broadcast rozhrania (ak to bude možné)."
 
 #. Type: string
 #. Description
@@ -83,56 +68,48 @@ msgstr "Prosím, zadajte akékoľvek ďalšie voľby pre DHCP relay démona."
 #. Description
 #: ../isc-dhcp-relay.templates:4001
 msgid "For example: '-m replace' or '-a -D'."
-msgstr "Napríklad: '-m replace' alebo '-a -D'."
+msgstr "Napríklad: „-m replace“ alebo „-a -D“."
 
-#. Type: string
+#. Type: note
 #. Description
 #: ../isc-dhcp-server.templates:2001
+msgid "Manual configuration required after installation"
+msgstr "Po inštalácii sa vyžaduje manuálna konfigurácia"
+
+#. Type: note
+#. Description
+#: ../isc-dhcp-server.templates:2001
+#| msgid ""
+#| "After the DHCP server is installed, you will need to manually configure "
+#| "it by editing the file /etc/isc-dhcp/dhcpd.conf. Please note that the "
+#| "dhcpd.conf supplied is just a sample, and must be adapted to the network "
+#| "environment."
+msgid "After the DHCP server is installed, you will need to manually configure it by editing the file /etc/dhcp/dhcpd.conf. Please note that the dhcpd.conf supplied is just a sample, and must be adapted to the network environment."
+msgstr "Po inštalácii DHCP servera ho budete musieť ručne nakonfigurovať editáciou súboru /etc/dhcp/dhcpd.conf. Prosím, všimnite si, že dhcpd.conf sa dodáva iba ako vzor a je potrebné ho prispôsobiť vášmu sieťovému prostrediu."
+
+#. Type: note
+#. Description
+#: ../isc-dhcp-server.templates:2001
+msgid "Please configure the DHCP server as soon as the installation finishes."
+msgstr "Prosím, nakonfigurujte DHCP server hneď po skončení inštalácie."
+
+#. Type: string
+#. Description
+#: ../isc-dhcp-server.templates:3001
 msgid "Network interfaces on which the DHCP server should listen:"
 msgstr "Sieťové rozhrania, na ktorých má DHCP server počúvať:"
 
 #. Type: string
 #. Description
-#: ../isc-dhcp-server.templates:2001
-msgid ""
-"Please specify on which network interface(s) the DHCP server should listen "
-"for DHCP requests. Multiple interface names should be entered as a space-"
-"separated list."
-msgstr ""
-"Prosím, uveďte na ktorých sieťových rozhraniach by mal DHCP server počúvať "
-"DHCP požiadavky. Viaceré názvy rozhraní sa zadávajú ako zoznam oddelený "
-"medzerami."
+#: ../isc-dhcp-server.templates:3001
+msgid "Please specify on which network interface(s) the DHCP server should listen for DHCP requests. Multiple interface names should be entered as a space-separated list."
+msgstr "Prosím, uveďte na ktorých sieťových rozhraniach by mal DHCP server počúvať požiadavky DHCP. Viaceré názvy rozhraní sa zadávajú ako zoznam oddelený medzerami."
 
 #. Type: string
 #. Description
-#: ../isc-dhcp-server.templates:2001
-msgid ""
-"The interfaces will be automatically detected if this field is left blank."
-msgstr "Ak pole necháte nevyplnené, rozhrania budú detekované automaticky."
-
-#~ msgid "Manual configuration required after installation"
-#~ msgstr "Po inštalácii sa vyžaduje manuálna konfigurácia"
-
-#, fuzzy
-#~| msgid ""
-#~| "After the DHCP server is installed, you will need to manually configure "
-#~| "it by editing the file /etc/isc-dhcp/dhcpd.conf. Please note that the "
-#~| "dhcpd.conf supplied is just a sample, and must be adapted to the network "
-#~| "environment."
-#~ msgid ""
-#~ "After the DHCP server is installed, you will need to manually configure "
-#~ "it by editing the file /etc/dhcp/dhcpd.conf. Please note that the dhcpd."
-#~ "conf supplied is just a sample, and must be adapted to the network "
-#~ "environment."
-#~ msgstr ""
-#~ "Po inštalácii DHCP servera ho budete musieť ručne nakonfigurovať "
-#~ "editáciou súboru /etc/isc-dhcp/dhcpd.conf. Prosím, všimnite si, že dhcpd."
-#~ "conf sa dodáva iba ako vzor a je potrebné ho prispôsobiť vášmu sieťovému "
-#~ "prostrediu."
-
-#~ msgid ""
-#~ "Please configure the DHCP server as soon as the installation finishes."
-#~ msgstr "Prosím, nakofigurujte DHCP server hneď po skončení inštalácie."
+#: ../isc-dhcp-server.templates:3001
+msgid "The interfaces will be automatically detected if this field is left blank."
+msgstr "Ak pole necháte nevyplnené, rozhrania budú detegované automaticky."
 
 #~ msgid "Non-authoritative version of DHCP server"
 #~ msgstr "Neautoritatívna verzia DHCP servera"
@@ -156,72 +133,3 @@ msgstr "Ak pole necháte nevyplnené, rozhrania budú detekované automaticky."
 
 #~ msgid "Change in default behaviour of the next-server directive"
 #~ msgstr "Zmeniť štandardné správanie direktívy next-server"
-
-#, fuzzy
-#~| msgid ""
-#~| "From version 3.0.3, the DHCP server's default value of the next-server "
-#~| "directive has changed. If you are network booting clients, and your TFTP "
-#~| "server is your DHCP server, you need to explicitly set a next-server "
-#~| "directive to state this. Please see /usr/share/doc/isc-dhcp-server/NEWS."
-#~| "Debian.gz and /usr/share/doc/dhcp3-common/RELNOTES.gz for more "
-#~| "information."
-#~ msgid ""
-#~ "From version 3.0.3, the DHCP server's default value of the next-server "
-#~ "directive has changed. If you are network booting clients, and your TFTP "
-#~ "server is your DHCP server, you need to explicitly set a next-server "
-#~ "directive to state this. Please see /usr/share/doc/dhcp3-server/NEWS."
-#~ "Debian.gz and /usr/share/doc/dhcp3-common/RELNOTES.gz for more "
-#~ "information."
-#~ msgstr ""
-#~ "Od verzie 3.0.3 sa štandardná hodnota direktívy next-server DHCP servera "
-#~ "zmenila. Ak ste klient, ktorý bootuje zo siete a váš TFTP server je váš "
-#~ "DHCP server, musíte explicitne nastaviť direktívu next-server, aby to "
-#~ "hovorila. Viac informácií nájdete v /usr/share/doc/isc-dhcp-server/NEWS."
-#~ "Debian.gz a v /usr/share/doc/dhcp3-common/RELNOTES.gz."
-
-#~ msgid "dhclient-script moved"
-#~ msgstr "dhclient-script sa presunul"
-
-#, fuzzy
-#~| msgid ""
-#~| "As of 3.0.4-2, dhclient-script is installed in /sbin and is no longer "
-#~| "registered as a configuration file. /etc/isc-dhcp/dhclient-script "
-#~| "appears to have been modified at some point, so it has not been removed. "
-#~| "However it is no longer being used."
-#~ msgid ""
-#~ "As of 3.0.4-2, dhclient-script is installed in /sbin and is no longer "
-#~ "registered as a configuration file. /etc/dhcp3/dhclient-script appears to "
-#~ "have been modified at some point, so it has not been removed. However it "
-#~ "is no longer being used."
-#~ msgstr ""
-#~ "Od verzie 3.0.4-2, je dhclient-script nainštalovaný v /sbin a už nie je "
-#~ "registrovaný ako konfiguračný súbor. Zdá sa, že /etc/isc-dhcp/dhclient-"
-#~ "script bol niekedy zmenený, takže nebol odstránený. Už sa však nepoužíva."
-
-#~ msgid ""
-#~ "Please consider using the hook infrastructure (see dhclient-script(8) for "
-#~ "more information) instead of modifying dhclient-script."
-#~ msgstr ""
-#~ "Prosím, zvážte použitie infraštruktúry postupných volaní (hook) (viac "
-#~ "informácií v dhclient-script(8)) namiesto zmeny dhclient-script."
-
-#~ msgid "dhclient needs restarting"
-#~ msgstr "dhclient potrebuje reštart"
-
-#~ msgid ""
-#~ "As always, dhclient is not restarted on upgrade, so you are still running "
-#~ "the previous version of dhclient. You can restart it by doing an ifdown "
-#~ "and ifup on the interface(s) that are configured to use DHCP, or by "
-#~ "explicitly killing and restarting dhclient."
-#~ msgstr ""
-#~ "Ako vždy, dhclient sa po upgrade nereštartuje, takže momentálne stále "
-#~ "beží predchádzajúca verzia dhclient. Môžete ho reštartovať pomocou ifdown "
-#~ "a ifup na rozhraniach, ktoré boli nakonfigurované, aby používali DHCP, "
-#~ "alebo explicitne zabitím a znovuspustením procesu dhclient."
-
-#~ msgid ""
-#~ "Naturally, you should exercise caution if you are managing a remote "
-#~ "server via an interface using DHCP."
-#~ msgstr ""
-#~ "Prirodzene by ste mali byť opatrní ak spravujete vzdialený server cez "
-#~ "rozhranie používajúce DHCP."
diff --git a/debian/rules b/debian/rules
index b7d6fa0..25b2065 100755
--- a/debian/rules
+++ b/debian/rules
@@ -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

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

More information about the pkg-dhcp-commits mailing list