[pkg-dhcp-commits] [SCM] ISC DHCP packaging for Debian branch, master, updated. upstream/4.1.1-90-g6e43f0c
Andrew Pollock
apollock at debian.org
Fri Oct 22 04:10:18 UTC 2010
The following commit has been merged in the master branch:
commit 6e43f0cb8133dec62ed60796ef9afa9716cf3012
Author: Andrew Pollock <apollock at debian.org>
Date: Thu Oct 21 21:10:08 2010 -0700
Patch from Simon McVittie to fix #592361
diff --git a/debian/changelog b/debian/changelog
index f69fd96..ac54b88 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,8 +16,11 @@ isc-dhcp (4.1.1-P1-10) UNRELEASED; urgency=low
* Updated Portugeuse debconf template translation (closes: #597143)
* Added Danish debconf template translation (closes: #600748)
* debian/control: bumped Standards-Version (no changes)
+ * debian/control: added pkg-config to Build-Depends
+ * Added patch from Simon McVittie to stop unnecessary linking with libcrypto
+ (closes: #592361)
- -- Andrew Pollock <apollock at debian.org> Wed, 20 Oct 2010 15:57:44 -0700
+ -- Andrew Pollock <apollock at debian.org> Thu, 21 Oct 2010 21:04:11 -0700
isc-dhcp (4.1.1-P1-9) unstable; urgency=high
diff --git a/debian/control b/debian/control
index 28ff55c..af9a92c 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: net
Priority: important
Maintainer: Debian ISC DHCP maintainers <pkg-dhcp-devel at lists.alioth.debian.org>
Uploaders: Andrew Pollock <apollock at debian.org>
-Build-Depends: debhelper (>> 7), dpkg-dev (>= 1.13.2), groff, dpatch, po-debconf, libldap2-dev, libssl-dev, autoconf, automake
+Build-Depends: debhelper (>> 7), dpkg-dev (>= 1.13.2), groff, dpatch, po-debconf, libldap2-dev, libssl-dev, autoconf, automake, pkg-config
Standards-Version: 3.9.1
Package: isc-dhcp-server
diff --git a/debian/patches/00list b/debian/patches/00list
index 1c26643..6efcd93 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -4,6 +4,10 @@ dhclient-script-exit-status
fix_groff_warnings
# I think this has been independently emailed upstream
no_loopback_checksum
+
+# must be applied before the LDAP stuff
+no-libcrypto
+
#ldap backend for dhcp server (docs and code)
dhcp-4.1.0-ldap-docs
dhcp-4.1.0-ldap-code
diff --git a/debian/patches/dhcp-4.1.0-ldap-code.dpatch b/debian/patches/dhcp-4.1.0-ldap-code.dpatch
index d3993a5..b230caf 100755
--- a/debian/patches/dhcp-4.1.0-ldap-code.dpatch
+++ b/debian/patches/dhcp-4.1.0-ldap-code.dpatch
@@ -2751,20 +2751,13 @@ diff -urNad isc-dhcp.orig/server/Makefile.am isc-dhcp/server/Makefile.am
man_MANS = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5
EXTRA_DIST = $(man_MANS)
-diff -urNad isc-dhcp.orig/configure.ac isc-dhcp/configure.ac
---- isc-dhcp.orig/configure.ac 2009-12-30 10:56:15.000000000 +0100
-+++ isc-dhcp/configure.ac 2009-12-30 12:34:28.000000000 +0100
-@@ -389,8 +389,78 @@ AC_TRY_LINK(
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' isc-dhcp-4.1.1-P1~/configure.ac isc-dhcp-4.1.1-P1/configure.ac
+--- isc-dhcp-4.1.1-P1~/configure.ac 2010-10-20 22:14:33.694570303 +0100
++++ isc-dhcp-4.1.1-P1/configure.ac 2010-10-20 22:17:15.682086336 +0100
+@@ -419,6 +419,74 @@
+ # Look for optional headers.
AC_CHECK_HEADERS(sys/socket.h net/if_dl.h net/if6.h regex.h)
- # find an MD5 library
-+saved_LIBS="$LIBS"
-+LIBS=""
- AC_SEARCH_LIBS(MD5_Init, [crypto])
- AC_SEARCH_LIBS(MD5Init, [crypto])
-+CRYPTO_LIBS="$LIBS"
-+LIBS="$saved_LIBS"
-+
+AC_ARG_ENABLE(ldap-conf,
+ AS_HELP_STRING([--enable-ldap-conf],
+ [enable ldap configuration support (default is no)]))
@@ -2806,7 +2799,10 @@ diff -urNad isc-dhcp.orig/configure.ac isc-dhcp/configure.ac
+ # should be possible to just link against libldap...
+ # All this at least in case of openldap-2.4.x.
+ #
-+ #PKG_CHECK_MODULES(OPENSSL, [openssl])
++ # However, if we're using something that uses libssl anyway,
++ # we should use libcrypto's MD5, not our own. So link libssl
++ # after all.
++ PKG_CHECK_MODULES(OPENSSL, [openssl])
+ #if test "x$OPENSSL_LIBS" != x ; then
+ # # reset it, libcrypto is in OPENSSL_LIBS
+ # CRYPTO_LIBS=""
@@ -2825,14 +2821,14 @@ diff -urNad isc-dhcp.orig/configure.ac isc-dhcp/configure.ac
+ ])
+ fi
+fi
-+AC_SUBST(CRYPTO_LIBS)
+AC_SUBST(LDAP_LIBS)
+AC_SUBST(LDAP_CPPFLAGS)
+AC_SUBST(OPENSSL_LIBS)
+AC_SUBST(OPENSSL_CFLAGS)
-
++
# Solaris needs some libraries for functions
AC_SEARCH_LIBS(socket, [socket])
+ AC_SEARCH_LIBS(inet_ntoa, [nsl])
diff -urNad isc-dhcp.orig/server/ldap_casa.c isc-dhcp/server/ldap_casa.c
--- isc-dhcp.orig/server/ldap_casa.c 2009-12-30 10:56:15.000000000 +0100
+++ isc-dhcp/server/ldap_casa.c 2009-12-30 12:34:28.000000000 +0100
diff --git a/debian/patches/no-libcrypto.dpatch b/debian/patches/no-libcrypto.dpatch
new file mode 100755
index 0000000..1bc1fb8
--- /dev/null
+++ b/debian/patches/no-libcrypto.dpatch
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## no-libcrypto.dpatch by Simon McVittie <smcv at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' isc-dhcp-4.1.1-P1~/configure.ac isc-dhcp-4.1.1-P1/configure.ac
+--- isc-dhcp-4.1.1-P1~/configure.ac 2010-10-20 22:01:22.000000000 +0100
++++ isc-dhcp-4.1.1-P1/configure.ac 2010-10-20 22:06:38.046156633 +0100
+@@ -419,10 +419,6 @@
+ # Look for optional headers.
+ AC_CHECK_HEADERS(sys/socket.h net/if_dl.h net/if6.h regex.h)
+
+-# find an MD5 library
+-AC_SEARCH_LIBS(MD5_Init, [crypto])
+-AC_SEARCH_LIBS(MD5Init, [crypto])
+-
+ # Solaris needs some libraries for functions
+ AC_SEARCH_LIBS(socket, [socket])
+ AC_SEARCH_LIBS(inet_ntoa, [nsl])
diff --git a/debian/po/cs.po b/debian/po/cs.po
index 53e24e8..72e3e06 100644
--- a/debian/po/cs.po
+++ b/debian/po/cs.po
@@ -19,10 +19,10 @@ msgstr ""
"PO-Revision-Date: 2010-08-16 15:31+0200\n"
"Last-Translator: Michal Simunek <michal.simunek at gmail.com>\n"
"Language-Team: Czech <debian-l10n-czech at lists.debian.org>\n"
-"Language: cs\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
#. Type: string
#. Description
diff --git a/debian/po/da.po b/debian/po/da.po
index 4ff4af8..7f5be4a 100644
--- a/debian/po/da.po
+++ b/debian/po/da.po
@@ -11,10 +11,10 @@ msgstr ""
"PO-Revision-Date: 2010-10-19 19:21+0100\n"
"Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
"Language-Team: Danish <debian-l10n-danish at lists.debian.org>\n"
-"Language: da\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: da\n"
#. Type: string
#. Description
diff --git a/debian/po/de.po b/debian/po/de.po
index 8453260..9b191a8 100644
--- a/debian/po/de.po
+++ b/debian/po/de.po
@@ -19,10 +19,10 @@ msgstr ""
"PO-Revision-Date: 2010-07-18 21:01+0200\n"
"Last-Translator: Erik Schanze <eriks at debian.org>\n"
"Language-Team: German <debian-l10n-german at lists.debian.org>\n"
-"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
"X-Generator: KBabel 1.11.4\n"
#. Type: string
diff --git a/debian/po/es.po b/debian/po/es.po
index 45b6e97..307b6b0 100644
--- a/debian/po/es.po
+++ b/debian/po/es.po
@@ -35,10 +35,10 @@ msgstr ""
"PO-Revision-Date: 2010-08-08 01:44+0200\n"
"Last-Translator: Javier Fernández-Sanguino <jfs at debian.org>\n"
"Language-Team: Debian l10n spanish <debian-l10n-spanish at lists.debian.org>\n"
-"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
"X-POFile-SpellExtra: dhcpd personalizarse replace conf interface dhcp\n"
#. Type: string
@@ -265,9 +265,9 @@ msgstr ""
#~ msgstr ""
#~ "Como siempre, no se ha reinstalado dhclient al hacer la actualización, "
#~ "por lo que aún está ejecutando la versión anterior de este programa. "
-#~ "Puede reiniciarlo si ejecuta «ifdown» seguido de «ifup» para la/s "
-#~ "interface/s que tiene configuradas para que utilicen DHCP o bien "
-#~ "explícitamente matando y rearrancando dhclient."
+#~ "Puede reiniciarlo si ejecuta «ifdown» seguido de «ifup» para la/s interface/"
+#~ "s que tiene configuradas para que utilicen DHCP o bien explícitamente "
+#~ "matando y rearrancando dhclient."
#~ msgid ""
#~ "Naturally, you should exercise caution if you are managing a remote "
diff --git a/debian/po/eu.po b/debian/po/eu.po
index 48f11fc..a70291d 100644
--- a/debian/po/eu.po
+++ b/debian/po/eu.po
@@ -12,10 +12,10 @@ msgstr ""
"PO-Revision-Date: 2007-12-21 11:01+0100\n"
"Last-Translator: Piarres Beobide <pi at beobide.net>\n"
"Language-Team: Euskara <Librezale at librezale.org>\n"
-"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
"X-Generator: KBabel 1.11.4\n"
#. Type: string
diff --git a/debian/po/fi.po b/debian/po/fi.po
index aaaf1a3..aef818e 100644
--- a/debian/po/fi.po
+++ b/debian/po/fi.po
@@ -6,10 +6,10 @@ msgstr ""
"PO-Revision-Date: 2007-10-20 22:30+0200\n"
"Last-Translator: Esko Arajärvi <edu at iki.fi>\n"
"Language-Team: Finnish <debian-l10n-finnish at lists.debian.org>\n"
-"Language: fi\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: fi\n"
"X-Poedit-Language: Finnish\n"
"X-Poedit-Country: FINLAND\n"
diff --git a/debian/po/fr.po b/debian/po/fr.po
index 310cc0a..7348b0e 100644
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -11,10 +11,10 @@ msgstr ""
"PO-Revision-Date: 2007-06-06 20:37+0200\n"
"Last-Translator: Christian Perrier <bubulle at debian.org>\n"
"Language-Team: French <debian-l10n-french at lists.debian.org>\n"
-"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
"X-Generator: KBabel 1.11.4\n"
"X-Poedit-Country: SWITZERLAND\n"
"X-Poedit-SourceCharset: utf-8\n"
diff --git a/debian/po/gl.po b/debian/po/gl.po
index 85af6cf..7e27278 100644
--- a/debian/po/gl.po
+++ b/debian/po/gl.po
@@ -12,10 +12,10 @@ msgstr ""
"PO-Revision-Date: 2010-08-13 02:14+0200\n"
"Last-Translator: Jorge Barreiro <yortx.barry at gmail.com>\n"
"Language-Team: Galician <proxecto at trasno.net>\n"
-"Language: gl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: gl\n"
"X-Generator: KBabel 1.11.4\n"
#. Type: string
diff --git a/debian/po/it.po b/debian/po/it.po
index 2228a74..4e8bfbe 100644
--- a/debian/po/it.po
+++ b/debian/po/it.po
@@ -10,10 +10,10 @@ msgstr ""
"PO-Revision-Date: 2007-06-03 10:46+0200\n"
"Last-Translator: Luca Monducci <luca.mo at tiscali.it>\n"
"Language-Team: Italian <debian-l10n-italian at lists.debian.org>\n"
-"Language: it\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: it\n"
#. Type: string
#. Description
diff --git a/debian/po/ja.po b/debian/po/ja.po
index 2421c40..0145797 100644
--- a/debian/po/ja.po
+++ b/debian/po/ja.po
@@ -20,10 +20,10 @@ msgstr ""
"PO-Revision-Date: 2010-07-25 14:19+0900\n"
"Last-Translator: Hideki Yamane <henrich at debian.org>\n"
"Language-Team: Japanese <debian-japanese at lists.debian.org>\n"
-"Language: ja\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: ja\n"
#. Type: string
#. Description
diff --git a/debian/po/ko.po b/debian/po/ko.po
index b76b576..61e2867 100644
--- a/debian/po/ko.po
+++ b/debian/po/ko.po
@@ -12,10 +12,10 @@ msgstr ""
"PO-Revision-Date: 2007-06-19 23:09-0500\n"
"Last-Translator: Sunjae Park <darehanl at gmail.com>\n"
"Language-Team: Korean <debian-l10n-korean at lists.debian.org>\n"
-"Language: ko\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: ko\n"
"Plural-Forms: nplurals=1; plural=0;\n"
#. Type: string
diff --git a/debian/po/nl.po b/debian/po/nl.po
index ff9884a..d605db7 100644
--- a/debian/po/nl.po
+++ b/debian/po/nl.po
@@ -20,10 +20,10 @@ msgstr ""
"PO-Revision-Date: 2007-06-01 13:56+0200\n"
"Last-Translator: Frans Pop <elendil at planet.nl>\n"
"Language-Team: Dutch <debian-l10n-dutch at lists.debian.org>\n"
-"Language: nl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: nl\n"
"X-Generator: KBabel 1.11.4\n"
#. Type: string
diff --git a/debian/po/pt.po b/debian/po/pt.po
index 55744e3..8f9175f 100644
--- a/debian/po/pt.po
+++ b/debian/po/pt.po
@@ -11,10 +11,10 @@ msgstr ""
"PO-Revision-Date: 2010-09-12 22:43+0100\n"
"Last-Translator: Pedro Ribeiro <p.m42.ribeiro at gmail.com>\n"
"Language-Team: Portuguese <traduz at debianpt.org>\n"
-"Language: pt\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: pt\n"
#. Type: string
#. Description
diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po
index 59bcff9..8719253 100644
--- a/debian/po/pt_BR.po
+++ b/debian/po/pt_BR.po
@@ -23,10 +23,10 @@ msgstr ""
"Last-Translator: Felipe Augusto van de Wiel (faw) <faw at debian.org>\n"
"Language-Team: Brazilian Portuguese <debian-l10n-portuguese at lists.debian."
"org>\n"
-"Language: pt_BR\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_BR\n"
"pt_BR utf-8\n"
#. Type: string
diff --git a/debian/po/ru.po b/debian/po/ru.po
index ada3a7d..5437ae0 100644
--- a/debian/po/ru.po
+++ b/debian/po/ru.po
@@ -22,13 +22,13 @@ msgstr ""
"PO-Revision-Date: 2010-08-01 17:03+0400\n"
"Last-Translator: Yuri Kozlov <yuray at komyakino.ru>\n"
"Language-Team: Russian <debian-l10n-russian at lists.debian.org>\n"
-"Language: ru\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: ru\n"
"X-Generator: Lokalize 1.0\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
#. Type: string
#. Description
diff --git a/debian/po/sk.po b/debian/po/sk.po
index 97c87f5..79eb604 100644
--- a/debian/po/sk.po
+++ b/debian/po/sk.po
@@ -6,10 +6,10 @@ msgstr ""
"PO-Revision-Date: 2007-08-17 23:36+0100\n"
"Last-Translator: Ivan Masár <helix84 at centrum.sk>\n"
"Language-Team: Slovak <sk-i18n at lists.linux.sk>\n"
-"Language: sk\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: sk\n"
#. Type: string
#. Description
diff --git a/debian/po/sv.po b/debian/po/sv.po
index 6fbd0dc..a74080b 100644
--- a/debian/po/sv.po
+++ b/debian/po/sv.po
@@ -12,10 +12,10 @@ msgstr ""
"PO-Revision-Date: 2010-08-07 04:56+0100\n"
"Last-Translator: Martin Bagge / brother <brother at bsnet.se>\n"
"Language-Team: Swedish <debian-l10n-swedish at lists.debian.org>\n"
-"Language: sv\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: sv\n"
"X-Poedit-Language: Swedish\n"
"X-Poedit-Country: SWEDEN\n"
diff --git a/debian/po/ta.po b/debian/po/ta.po
index 1eed6fa..03f1762 100644
--- a/debian/po/ta.po
+++ b/debian/po/ta.po
@@ -11,10 +11,10 @@ msgstr ""
"PO-Revision-Date: 2007-06-09 14:38+0530\n"
"Last-Translator: Dr.T.Vasudevan <agnihot3 at gmail.com>\n"
"Language-Team: TAMIL <ubuntu-l10n-tam at lists.ubuntu.com>\n"
-"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
"X-Generator: KBabel 1.11.4\n"
#. Type: string
diff --git a/debian/po/tr.po b/debian/po/tr.po
index ed1a624..c22c1ab 100644
--- a/debian/po/tr.po
+++ b/debian/po/tr.po
@@ -10,10 +10,10 @@ msgstr ""
"PO-Revision-Date: 2007-05-31 15:22+0300\n"
"Last-Translator: Mehmet Türker <mturker at innova.com.tr>\n"
"Language-Team: Turkish <debian-l10n-turkish at lists.debian.org>\n"
-"Language: tr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: tr\n"
"Plural-Forms: nplurals=1; plural=0;\n"
#. Type: string
diff --git a/debian/po/vi.po b/debian/po/vi.po
index 6e65f1a..84f4ead 100644
--- a/debian/po/vi.po
+++ b/debian/po/vi.po
@@ -10,10 +10,10 @@ msgstr ""
"PO-Revision-Date: 2007-06-02 15:46+0930\n"
"Last-Translator: Clytie Siddall <clytie at riverland.net.au>\n"
"Language-Team: Vietnamese <vi-VN at googlegroups.com>\n"
-"Language: vi\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: vi\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: LocFactoryEditor 1.6.3b1\n"
@@ -247,8 +247,8 @@ msgstr "Bỏ rỗng nên tự động phát hiện giao diện."
#~ "Please consider using the hook infrastructure (see dhclient-script(8) for "
#~ "more information) instead of modifying dhclient-script."
#~ msgstr ""
-#~ "Khuyên bạn dùng hạ tầng cơ sở « hook » (xem « dhclient-script » để tìm "
-#~ "thêm thông tin) thay vào sửa đổi « dhclient-script »."
+#~ "Khuyên bạn dùng hạ tầng cơ sở « hook » (xem « dhclient-script » để tìm thêm "
+#~ "thông tin) thay vào sửa đổi « dhclient-script »."
#~ msgid "dhclient needs restarting"
#~ msgstr "dhclient cần phải được khởi chạy lại"
@@ -260,9 +260,9 @@ msgstr "Bỏ rỗng nên tự động phát hiện giao diện."
#~ "explicitly killing and restarting dhclient."
#~ msgstr ""
#~ "dhclient không được khởi chạy lại khi nâng cấp, vì thế bạn vẫn còn chạy "
-#~ "phiên bản dhclient trước. Cũng có thể khởi chạy lại bằng cách làm « "
-#~ "ifdown » và « ifup » trên mỗi giao diện được cấu hình để sử dụng DHCP, "
-#~ "hoặc bằng cách buộc kết thúc và khởi chạy lại dhclient một cách dứt khoát."
+#~ "phiên bản dhclient trước. Cũng có thể khởi chạy lại bằng cách làm « ifdown "
+#~ "» và « ifup » trên mỗi giao diện được cấu hình để sử dụng DHCP, hoặc bằng "
+#~ "cách buộc kết thúc và khởi chạy lại dhclient một cách dứt khoát."
#~ msgid ""
#~ "Naturally, you should exercise caution if you are managing a remote "
--
ISC DHCP packaging for Debian
More information about the pkg-dhcp-commits
mailing list