diff -u tftp-hpa-5.2+20150808/debian/changelog tftp-hpa-5.2+20150808/debian/changelog --- tftp-hpa-5.2+20150808/debian/changelog +++ tftp-hpa-5.2+20150808/debian/changelog @@ -1,3 +1,11 @@ +tftp-hpa (5.2+20150808-1ubuntu1.16.04.1) xenial; urgency=medium + + * Replace the default value of TFTP_ADDRESS to :69 instead of [::]:69. + The previous default caused a failure to start when the NIC is not + available at startup time (LP: #1342580) + + -- Louis Bouchard Tue, 07 Mar 2017 12:00:08 +0100 + tftp-hpa (5.2+20150808-1ubuntu1) xenial; urgency=medium * Merge from Debian unstable. Remaining changes: diff -u tftp-hpa-5.2+20150808/debian/po/cs.po tftp-hpa-5.2+20150808/debian/po/cs.po --- tftp-hpa-5.2+20150808/debian/po/cs.po +++ tftp-hpa-5.2+20150808/debian/po/cs.po @@ -72,10 +72,10 @@ #: ../tftpd-hpa.templates:3001 msgid "" "By default, the TFTP server listens to port 69 on all addresses and all " -"interfaces ([::]:69). If no port is specified, it defaults to 69." +"interfaces (:69). If no port is specified, it defaults to 69." msgstr "" "Ve výchozím nastavení TFTP server naslouchá na portu 69 na všech adresách a " -"všech síťových rozhraních ([::]:69). Pokud nebude zadán port, použije se " +"všech síťových rozhraních (:69). Pokud nebude zadán port, použije se " "výchozí hodnota 69." #. Type: string diff -u tftp-hpa-5.2+20150808/debian/po/da.po tftp-hpa-5.2+20150808/debian/po/da.po --- tftp-hpa-5.2+20150808/debian/po/da.po +++ tftp-hpa-5.2+20150808/debian/po/da.po @@ -71,10 +71,10 @@ #: ../tftpd-hpa.templates:3001 msgid "" "By default, the TFTP server listens to port 69 on all addresses and all " -"interfaces ([::]:69). If no port is specified, it defaults to 69." +"interfaces (:69). If no port is specified, it defaults to 69." msgstr "" "Som standard, lytter TFTP-serveren på port 69 for alle adresser og alle " -"grænseflader ([::]:69). Hvis ingen port er angivet, er standarden 69." +"grænseflader (:69). Hvis ingen port er angivet, er standarden 69." #. Type: string #. Description diff -u tftp-hpa-5.2+20150808/debian/po/de.po tftp-hpa-5.2+20150808/debian/po/de.po --- tftp-hpa-5.2+20150808/debian/po/de.po +++ tftp-hpa-5.2+20150808/debian/po/de.po @@ -76,10 +76,10 @@ #: ../tftpd-hpa.templates:3001 msgid "" "By default, the TFTP server listens to port 69 on all addresses and all " -"interfaces ([::]:69). If no port is specified, it defaults to 69." +"interfaces (:69). If no port is specified, it defaults to 69." msgstr "" "Standardmässig wartet der TFTP-Server auf Port 69 auf allen Adressen und " -"allen Schnittstellen ([::]:69). Ohne Port-Angabe wird die Vorgabe 69 " +"allen Schnittstellen (:69). Ohne Port-Angabe wird die Vorgabe 69 " "verwendet." #. Type: string diff -u tftp-hpa-5.2+20150808/debian/po/es.po tftp-hpa-5.2+20150808/debian/po/es.po --- tftp-hpa-5.2+20150808/debian/po/es.po +++ tftp-hpa-5.2+20150808/debian/po/es.po @@ -76,10 +76,10 @@ #: ../tftpd-hpa.templates:3001 msgid "" "By default, the TFTP server listens to port 69 on all addresses and all " -"interfaces ([::]:69). If no port is specified, it defaults to 69." +"interfaces (:69). If no port is specified, it defaults to 69." msgstr "" "Por omisión, el servidor de TFTP escucha en el puerto 69 de todas las " -"direcciones e interfaces ([::]:69). Si no se especifica un puerto, el valor " +"direcciones e interfaces (:69). Si no se especifica un puerto, el valor " "por omisión es 69." #. Type: string diff -u tftp-hpa-5.2+20150808/debian/po/fi.po tftp-hpa-5.2+20150808/debian/po/fi.po --- tftp-hpa-5.2+20150808/debian/po/fi.po +++ tftp-hpa-5.2+20150808/debian/po/fi.po @@ -71,7 +71,7 @@ #: ../tftpd-hpa.templates:3001 msgid "" "By default, the TFTP server listens to port 69 on all addresses and all " -"interfaces ([::]:69). If no port is specified, it defaults to 69." +"interfaces (:69). If no port is specified, it defaults to 69." msgstr "" #. Type: string diff -u tftp-hpa-5.2+20150808/debian/po/fr.po tftp-hpa-5.2+20150808/debian/po/fr.po --- tftp-hpa-5.2+20150808/debian/po/fr.po +++ tftp-hpa-5.2+20150808/debian/po/fr.po @@ -72,10 +72,10 @@ #: ../tftpd-hpa.templates:3001 msgid "" "By default, the TFTP server listens to port 69 on all addresses and all " -"interfaces ([::]:69). If no port is specified, it defaults to 69." +"interfaces (:69). If no port is specified, it defaults to 69." msgstr "" "Le serveur TFTP écoute par défaut sur le port 69 pour toutes les adresses et " -"toutes les interfaces ([::]:69). Si aucun port n'est indiqué, le port par " +"toutes les interfaces (:69). Si aucun port n'est indiqué, le port par " "défaut sera le port 69." #. Type: string diff -u tftp-hpa-5.2+20150808/debian/po/gl.po tftp-hpa-5.2+20150808/debian/po/gl.po --- tftp-hpa-5.2+20150808/debian/po/gl.po +++ tftp-hpa-5.2+20150808/debian/po/gl.po @@ -72,7 +72,7 @@ #: ../tftpd-hpa.templates:3001 msgid "" "By default, the TFTP server listens to port 69 on all addresses and all " -"interfaces ([::]:69). If no port is specified, it defaults to 69." +"interfaces (:69). If no port is specified, it defaults to 69." msgstr "" #. Type: string diff -u tftp-hpa-5.2+20150808/debian/po/it.po tftp-hpa-5.2+20150808/debian/po/it.po --- tftp-hpa-5.2+20150808/debian/po/it.po +++ tftp-hpa-5.2+20150808/debian/po/it.po @@ -72,10 +72,10 @@ #: ../tftpd-hpa.templates:3001 msgid "" "By default, the TFTP server listens to port 69 on all addresses and all " -"interfaces ([::]:69). If no port is specified, it defaults to 69." +"interfaces (:69). If no port is specified, it defaults to 69." msgstr "" "In modo predefinito il server TFTP si pone in ascolto sulla posta 69 su " -"tutti gli indirizzi e tutte le interfacce ([::]:69). Se non viene " +"tutti gli indirizzi e tutte le interfacce (:69). Se non viene " "specificata alcuna porta viene utilizzata quella predefinita (la 69)." #. Type: string diff -u tftp-hpa-5.2+20150808/debian/po/ja.po tftp-hpa-5.2+20150808/debian/po/ja.po --- tftp-hpa-5.2+20150808/debian/po/ja.po +++ tftp-hpa-5.2+20150808/debian/po/ja.po @@ -72,10 +72,10 @@ #: ../tftpd-hpa.templates:3001 msgid "" "By default, the TFTP server listens to port 69 on all addresses and all " -"interfaces ([::]:69). If no port is specified, it defaults to 69." +"interfaces (:69). If no port is specified, it defaults to 69." msgstr "" "デフォルトでは、TFTP サーバは全てのアドレス上の69番ポートと、全てのインター" -"フェイス上で listen します ([::]:69)。ポートが指定されない場合は、デフォルト" +"フェイス上で listen します (:69)。ポートが指定されない場合は、デフォルト" "値は 69 です。" #. Type: string diff -u tftp-hpa-5.2+20150808/debian/po/nl.po tftp-hpa-5.2+20150808/debian/po/nl.po --- tftp-hpa-5.2+20150808/debian/po/nl.po +++ tftp-hpa-5.2+20150808/debian/po/nl.po @@ -72,10 +72,10 @@ #: ../tftpd-hpa.templates:3001 msgid "" "By default, the TFTP server listens to port 69 on all addresses and all " -"interfaces ([::]:69). If no port is specified, it defaults to 69." +"interfaces (:69). If no port is specified, it defaults to 69." msgstr "" "Standaard luistert de TFTP-server op poort 69 van alle adressen en " -"interfaces ([::]:69). Als u geen poort opgeeft, zal de standaardwaarde 69 " +"interfaces (:69). Als u geen poort opgeeft, zal de standaardwaarde 69 " "worden gebruikt." #. Type: string diff -u tftp-hpa-5.2+20150808/debian/po/pt.po tftp-hpa-5.2+20150808/debian/po/pt.po --- tftp-hpa-5.2+20150808/debian/po/pt.po +++ tftp-hpa-5.2+20150808/debian/po/pt.po @@ -75,10 +75,10 @@ #: ../tftpd-hpa.templates:3001 msgid "" "By default, the TFTP server listens to port 69 on all addresses and all " -"interfaces ([::]:69). If no port is specified, it defaults to 69." +"interfaces (:69). If no port is specified, it defaults to 69." msgstr "" "Por predefinição, o servidor TFTP escuta no porto 69 em todos os endereços e " -"todas as interfaces ([::]:69). Se nenhum porto for especificado, será usado " +"todas as interfaces (:69). Se nenhum porto for especificado, será usado " "o 69." #. Type: string diff -u tftp-hpa-5.2+20150808/debian/po/pt_BR.po tftp-hpa-5.2+20150808/debian/po/pt_BR.po --- tftp-hpa-5.2+20150808/debian/po/pt_BR.po +++ tftp-hpa-5.2+20150808/debian/po/pt_BR.po @@ -76,10 +76,10 @@ #: ../tftpd-hpa.templates:3001 msgid "" "By default, the TFTP server listens to port 69 on all addresses and all " -"interfaces ([::]:69). If no port is specified, it defaults to 69." +"interfaces (:69). If no port is specified, it defaults to 69." msgstr "" "Por padrão, o servidor TFTP escuta na porta 69 em todos os endereços de " -"todas as interfaces ([::]:69). Se a porta não for especificada, o padrão " +"todas as interfaces (:69). Se a porta não for especificada, o padrão " "será a 69." #. Type: string diff -u tftp-hpa-5.2+20150808/debian/po/ru.po tftp-hpa-5.2+20150808/debian/po/ru.po --- tftp-hpa-5.2+20150808/debian/po/ru.po +++ tftp-hpa-5.2+20150808/debian/po/ru.po @@ -76,10 +76,10 @@ #: ../tftpd-hpa.templates:3001 msgid "" "By default, the TFTP server listens to port 69 on all addresses and all " -"interfaces ([::]:69). If no port is specified, it defaults to 69." +"interfaces (:69). If no port is specified, it defaults to 69." msgstr "" "По умолчанию, сервер TFTP прослушивает порт 69 на всех адресах и интерфейсах " -"([::]:69). Если порт не указан, то по умолчанию используется 69." +"(:69). Если порт не указан, то по умолчанию используется 69." #. Type: string #. Description diff -u tftp-hpa-5.2+20150808/debian/po/sk.po tftp-hpa-5.2+20150808/debian/po/sk.po --- tftp-hpa-5.2+20150808/debian/po/sk.po +++ tftp-hpa-5.2+20150808/debian/po/sk.po @@ -76,7 +76,7 @@ #| "interfaces (0.0.0.0:69). If no port is specified, it defaults to 69." msgid "" "By default, the TFTP server listens to port 69 on all addresses and all " -"interfaces ([::]:69). If no port is specified, it defaults to 69." +"interfaces (:69). If no port is specified, it defaults to 69." msgstr "" "Predvolene server TFTP načúva na porte 69 na všetkých adresách a všetkých " "rozhraniach (0.0.0.0:69). Ak nie je zadaný port, je predvolene použitý port " diff -u tftp-hpa-5.2+20150808/debian/po/sv.po tftp-hpa-5.2+20150808/debian/po/sv.po --- tftp-hpa-5.2+20150808/debian/po/sv.po +++ tftp-hpa-5.2+20150808/debian/po/sv.po @@ -70,10 +70,10 @@ #: ../tftpd-hpa.templates:3001 msgid "" "By default, the TFTP server listens to port 69 on all addresses and all " -"interfaces ([::]:69). If no port is specified, it defaults to 69." +"interfaces (:69). If no port is specified, it defaults to 69." msgstr "" "Standardvärdet är att TFTP-servern lyssnar på port 69 på alla adress och " -"alla gränssnitt ([::]:69). Om ingen port anges kommer standardporten 69 att " +"alla gränssnitt (:69). Om ingen port anges kommer standardporten 69 att " "användas." #. Type: string diff -u tftp-hpa-5.2+20150808/debian/po/templates.pot tftp-hpa-5.2+20150808/debian/po/templates.pot --- tftp-hpa-5.2+20150808/debian/po/templates.pot +++ tftp-hpa-5.2+20150808/debian/po/templates.pot @@ -69,7 +69,7 @@ #: ../tftpd-hpa.templates:3001 msgid "" "By default, the TFTP server listens to port 69 on all addresses and all " -"interfaces ([::]:69). If no port is specified, it defaults to 69." +"interfaces (:69). If no port is specified, it defaults to 69." msgstr "" #. Type: string diff -u tftp-hpa-5.2+20150808/debian/po/zh_CN.po tftp-hpa-5.2+20150808/debian/po/zh_CN.po --- tftp-hpa-5.2+20150808/debian/po/zh_CN.po +++ tftp-hpa-5.2+20150808/debian/po/zh_CN.po @@ -69,7 +69,7 @@ #: ../tftpd-hpa.templates:3001 msgid "" "By default, the TFTP server listens to port 69 on all addresses and all " -"interfaces ([::]:69). If no port is specified, it defaults to 69." +"interfaces (:69). If no port is specified, it defaults to 69." msgstr "" #. Type: string diff -u tftp-hpa-5.2+20150808/debian/tftpd-hpa.config tftp-hpa-5.2+20150808/debian/tftpd-hpa.config --- tftp-hpa-5.2+20150808/debian/tftpd-hpa.config +++ tftp-hpa-5.2+20150808/debian/tftpd-hpa.config @@ -13,7 +13,14 @@ # Move from IPv4-only to dual-stack if [ "${TFTP_ADDRESS}" = "0.0.0.0:69" ] && \ dpkg --compare-versions $2 lt 5.2-7ubuntu3; then - TFTP_ADDRESS="[::]:69" + TFTP_ADDRESS=":69" + fi + # Replace previous dual-stack syntax + # that fails to work if NIC is not available + # (LP: #1342580) + if [ "${TFTP_ADDRESS}" = "[::]:69" ] && \ + dpkg --compare-versions $2 lt 5.2+20150808-1ubuntu1.16.04.1; then + TFTP_ADDRESS=":69" fi db_set tftpd-hpa/username "${TFTP_USERNAME}" diff -u tftp-hpa-5.2+20150808/debian/tftpd-hpa.postinst tftp-hpa-5.2+20150808/debian/tftpd-hpa.postinst --- tftp-hpa-5.2+20150808/debian/tftpd-hpa.postinst +++ tftp-hpa-5.2+20150808/debian/tftpd-hpa.postinst @@ -15,7 +15,7 @@ TFTP_DIRECTORY="${RET:-/srv/tftp}" db_get tftpd-hpa/address - TFTP_ADDRESS="${RET:-[::]:69}" + TFTP_ADDRESS="${RET:-:69}" db_get tftpd-hpa/options TFTP_OPTIONS="${RET}" # is ok when empty diff -u tftp-hpa-5.2+20150808/debian/tftpd-hpa.templates tftp-hpa-5.2+20150808/debian/tftpd-hpa.templates --- tftp-hpa-5.2+20150808/debian/tftpd-hpa.templates +++ tftp-hpa-5.2+20150808/debian/tftpd-hpa.templates @@ -17,13 +17,13 @@ Template: tftpd-hpa/address Type: string -Default: [::]:69 +Default: :69 _Description: TFTP server address and port: Please specify an address and port to listen to in the form of [address][:port]. . By default, the TFTP server listens to port 69 on all addresses and all - interfaces ([::]:69). If no port is specified, it defaults to 69. + interfaces (:69). If no port is specified, it defaults to 69. . Please note that numeric IPv6 addresses must be enclosed in square brackets to avoid ambiguity with the optional port information.