Package: ifupdown Version: 0.6.7-0.2 Tags: patch Here is the patch for the 0.6.7-0.3 NMU.
diff -urN ifupdown-0.6.7-0.2/debian/changelog ifupdown-0.6.7/debian/changelog --- ifupdown-0.6.7-0.2/debian/changelog 2006-09-14 11:52:52.000000000 +0200 +++ ifupdown-0.6.7/debian/changelog 2006-09-14 15:02:39.000000000 +0200 @@ -1,3 +1,19 @@ +ifupdown (0.6.7-0.3) unstable; urgency=low + + * Non-maintainer upload. + * Correct typo in interfaces(5). (Closes: #311443) + * Correct typo in ifupdown.nw. (Closes: #353154) + * Avoid segfault on freebsd. Patch from Brian M. Carlson. (Closes: #339834) + + [ Translations ] + * Added Vietnamese (vi) by Clytie Siddall. (Closes: #311928) + * Added Portuguese (pt) by Sim�£o Pedro Cardoso. (Closes: #336931) + * Updated Swedish (sv) by Daniel Nylander. (Closes: #338849) + * Added Galician (gl) by Jacobo Tarrio. (Closes: #362093) + * Added Norwegian Bokmaal (nb) by Petter Reinholdtsen. + + -- Petter Reinholdtsen <[EMAIL PROTECTED]> Thu, 14 Sep 2006 15:02:06 +0200 + ifupdown (0.6.7-0.2) unstable; urgency=low * Non-maintainer upload approved by maintainer. diff -urN ifupdown-0.6.7-0.2/debian/po/gl.po ifupdown-0.6.7/debian/po/gl.po --- ifupdown-0.6.7-0.2/debian/po/gl.po 1970-01-01 01:00:00.000000000 +0100 +++ ifupdown-0.6.7/debian/po/gl.po 2006-09-14 14:47:17.000000000 +0200 @@ -0,0 +1,43 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +msgid "" +msgstr "" +"Project-Id-Version: ifupdown\n" +"Report-Msgid-Bugs-To: [EMAIL PROTECTED]" +"POT-Creation-Date: 2006-09-14 14:40+0200\n" +"PO-Revision-Date: 2006-04-12 09:13+0200\n" +"Last-Translator: Jacobo Tarrio <[EMAIL PROTECTED]>\n" +"Language-Team: Galician <[EMAIL PROTECTED]>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: boolean +#. Description +#: ../templates.master:1001 +msgid "Update /etc/network/interfaces?" +msgstr "�¿Actualizar /etc/network/interfaces?" + +#. Type: boolean +#. Description +#: ../templates.master:1001 +msgid "" +"The format of /etc/network/interfaces has had a minor but incompatible " +"change made between version 0.5.x and 0.6.x of ifupdown. It is however " +"possible to automatically convert from the old format to the new in almost " +"all cases." +msgstr "" +"O formato de /etc/network/interfaces tivo un cambio menor pero incompatible " +"entre as versi�³ns 0.5.x e 0.6.x de ifupdown. Nembargantes, �© posible " +"converter autom�¡ticamente do formato antigo ao novo en case t�³dolos casos." diff -urN ifupdown-0.6.7-0.2/debian/po/nb.po ifupdown-0.6.7/debian/po/nb.po --- ifupdown-0.6.7-0.2/debian/po/nb.po 1970-01-01 01:00:00.000000000 +0100 +++ ifupdown-0.6.7/debian/po/nb.po 2006-09-14 14:57:18.000000000 +0200 @@ -0,0 +1,46 @@ +# translation of nb.po to Norwegian Bokm�¥l +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans# +# Developers do not need to manually edit POT or PO files. +# Petter Reinholdtsen <[EMAIL PROTECTED]>, 2006. +# +msgid "" +msgstr "" +"Project-Id-Version: nb\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-08-04 17:16+0200\n" +"PO-Revision-Date: 2006-09-14 14:57MET\n" +"Last-Translator: Petter Reinholdtsen <[EMAIL PROTECTED]>\n" +"Language-Team: Norwegian Bokm�¥l <[EMAIL PROTECTED]>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.9.1\n" + +#. Type: boolean +#. Description +#: ../templates.master:4 +msgid "Update /etc/network/interfaces?" +msgstr "Oppdatere /etc/network/interfaces?" + +#. Type: boolean +#. Description +#: ../templates.master:4 +msgid "" +"The format of /etc/network/interfaces has had a minor but incompatible " +"change made between version 0.5.x and 0.6.x of ifupdown. It is however " +"possible to automatically convert from the old format to the new in almost " +"all cases." +msgstr "" +"Formatet til /etc/network/interfaces gjennomgikk en mindre" +"ikke-kompatibel endring mellom versjon 0.5.x og 0.6.x av ifupdown." +"Det er mulig a automatisk konvertere fra det gamle til det nye" +"formatet i nesten alle tilfeller." + diff -urN ifupdown-0.6.7-0.2/debian/po/pt.po ifupdown-0.6.7/debian/po/pt.po --- ifupdown-0.6.7-0.2/debian/po/pt.po 1970-01-01 01:00:00.000000000 +0100 +++ ifupdown-0.6.7/debian/po/pt.po 2006-09-14 14:48:12.000000000 +0200 @@ -0,0 +1,32 @@ +# Sim�£o Pedro Cardoso, [EMAIL PROTECTED], first translation on 01/11/2005 +msgid "" +msgstr "" +"Project-Id-Version: ifupdown 0.6.7\n" +"Report-Msgid-Bugs-To: [EMAIL PROTECTED]" +"POT-Creation-Date: 2006-09-14 14:40+0200\n" +"PO-Revision-Date: 2005-11-01 19:02+0000\n" +"Last-Translator: Sim�£o Pedro Cardoso <[EMAIL PROTECTED]>\n" +"Language-Team: Portuguese <[EMAIL PROTECTED]>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: boolean +#. Description +#: ../templates.master:1001 +msgid "Update /etc/network/interfaces?" +msgstr "Actualizar /etc/network/interfaces?" + +#. Type: boolean +#. Description +#: ../templates.master:1001 +msgid "" +"The format of /etc/network/interfaces has had a minor but incompatible " +"change made between version 0.5.x and 0.6.x of ifupdown. It is however " +"possible to automatically convert from the old format to the new in almost " +"all cases." +msgstr "" +"O formato de /etc/network/interfaces teve uma modificação menor mas " +"incompat�vel entre as vers�µes 0.5.x e 0.6.x do ifupdown. É no entanto, " +"poss�vel converter automaticamente a partir do velho para o novo formato na " +"maioria dos casos." diff -urN ifupdown-0.6.7-0.2/debian/po/sv.po ifupdown-0.6.7/debian/po/sv.po --- ifupdown-0.6.7-0.2/debian/po/sv.po 2006-09-14 11:52:52.000000000 +0200 +++ ifupdown-0.6.7/debian/po/sv.po 2006-09-14 14:48:03.000000000 +0200 @@ -11,34 +11,36 @@ # # Developers do not need to manually edit POT or PO files. # -#, fuzzy msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-08-04 17:16+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <[EMAIL PROTECTED]>\n" -"Language-Team: LANGUAGE <[EMAIL PROTECTED]>\n" +"Project-Id-Version: ifupdown 0.6.7\n" +"Report-Msgid-Bugs-To: [EMAIL PROTECTED]" +"POT-Creation-Date: 2006-09-14 14:40+0200\n" +"PO-Revision-Date: 2005-11-13 12:23+0100\n" +"Last-Translator: Daniel Nylander <[EMAIL PROTECTED]>\n" +"Language-Team: Swedish <[EMAIL PROTECTED]>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: swe\n" +"X-Poedit-Country: swe\n" #. Type: boolean #. Description -#: ../templates.master:4 +#: ../templates.master:1001 msgid "Update /etc/network/interfaces?" msgstr "Uppdatera /etc/network/interfaces?" #. Type: boolean #. Description -#: ../templates.master:4 +#: ../templates.master:1001 msgid "" "The format of /etc/network/interfaces has had a minor but incompatible " "change made between version 0.5.x and 0.6.x of ifupdown. It is however " "possible to automatically convert from the old format to the new in almost " "all cases." msgstr "" -"Formatet p� /etc/network/interfaces genomgick en liten men inkompatibel " -"�ndring mellan version 0.5.x och 0.6.x av ifupdown. Det �r dock m�jligt att " -"n�stan alltid automatiskt konvertera fr�n det gamla formatet till det nya." +"Formatet p� /etc/network/interfaces har genomg�tt en liten �ndring som g�r " +"att versionerna 0.5.x och 0.6.x av ifupdown blivit inkompatibla. Dock �r det " +"m�jligt att n�stan alltid automatiskt konvertera fr�n det gamla formatet " +"till det nya." diff -urN ifupdown-0.6.7-0.2/debian/po/vi.po ifupdown-0.6.7/debian/po/vi.po --- ifupdown-0.6.7-0.2/debian/po/vi.po 1970-01-01 01:00:00.000000000 +0100 +++ ifupdown-0.6.7/debian/po/vi.po 2006-09-14 14:47:57.000000000 +0200 @@ -0,0 +1,36 @@ +# Vietnamese Translation for ifupdown. +# Copyright �© 2005 Free Software Foundation, Inc. +# Clytie Siddall <[EMAIL PROTECTED]>, 2005. +# +msgid "" +msgstr "" +"Project-Id-Version: ifupdown 0.6.7\n" +"Report-Msgid-Bugs-To: [EMAIL PROTECTED]" +"POT-Creation-Date: 2006-09-14 14:40+0200\n" +"PO-Revision-Date: 2005-06-04 20:49+0930\n" +"Last-Translator: Clytie Siddall <[EMAIL PROTECTED]>\n" +"Language-Team: Vietnamese <[EMAIL PROTECTED]>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0\n" + +#. Type: boolean +#. Description +#: ../templates.master:1001 +msgid "Update /etc/network/interfaces?" +msgstr "Cập nhật �«/etc/network/interfaces�» kh�´ng?" + +#. Type: boolean +#. Description +#: ../templates.master:1001 +msgid "" +"The format of /etc/network/interfaces has had a minor but incompatible " +"change made between version 0.5.x and 0.6.x of ifupdown. It is however " +"possible to automatically convert from the old format to the new in almost " +"all cases." +msgstr "" +"Khu�´n dạng của �«/etc/network/interfaces�» đã thay đổi một c�¡ch nhỏ nh�°ng " +"kh�´ng tương th�ch giữa phi�ªn bản 0.5.x v� 0.6.x của tr�¬nh ifupdown. Tuy " +"nhi�ªn, c�³ thể tự động chuyển đổi từ khu�´n dạng c�© sang điều mới trong gần " +"tất cả trường hợp." diff -urN ifupdown-0.6.7-0.2/ifupdown.nw ifupdown-0.6.7/ifupdown.nw --- ifupdown-0.6.7-0.2/ifupdown.nw 2006-09-14 11:52:53.000000000 +0200 +++ ifupdown-0.6.7/ifupdown.nw 2006-09-14 14:46:49.000000000 +0200 @@ -2112,7 +2112,7 @@ At a conceptual level, [[iface_up()]] and [[iface_down()]] have a reasonably straightforward job: they have to run one set of scripts, -the configure or deconfigure the interface, then run another set of +then configure or deconfigure the interface, then run another set of scripts. This is complicated slightly in that they also have to handle the @@ -3789,7 +3789,7 @@ #include "archlinux.h" unsigned int mylinuxver() { - static int maj = -1, rev, min; + static int maj = -1, rev = 0, min = 0; if (maj == -1) { struct utsname u; @@ -3797,9 +3797,13 @@ uname(&u); maj = atoi(u.release); pch = strchr(u.release, '.'); - rev = atoi(pch+1); - pch = strchr(pch+1, '.'); - min = atoi(pch+1); + if (pch) { + rev = atoi(pch+1); + pch = strchr(pch+1, '.'); + if (pch) { + min = atoi(pch+1); + } + } } return mylinux(maj,rev,min); @@ -3910,7 +3914,7 @@ options hostname hostname -- Hostname to be requested (pump, dhcpcd, udhcpc) - leasehours leastime -- Preferred lease time in hours (pump) + leasehours leasetime -- Preferred lease time in hours (pump) leasetime leasetime -- Preferred lease time in seconds (dhcpcd) vendor vendor -- Vendor class identifier (dhcpcd) client client_id -- Client identifier (dhcpcd, udhcpc) diff -urN ifupdown-0.6.7-0.2/inet.defn ifupdown-0.6.7/inet.defn --- ifupdown-0.6.7-0.2/inet.defn 2006-09-14 11:52:53.000000000 +0200 +++ ifupdown-0.6.7/inet.defn 2006-09-14 15:02:59.000000000 +0200 @@ -65,7 +65,7 @@ options hostname hostname -- Hostname to be requested (pump, dhcpcd, udhcpc) - leasehours leastime -- Preferred lease time in hours (pump) + leasehours leasetime -- Preferred lease time in hours (pump) leasetime leasetime -- Preferred lease time in seconds (dhcpcd) vendor vendor -- Vendor class identifier (dhcpcd) client client_id -- Client identifier (dhcpcd, udhcpc)
