Your message dated Thu, 06 Nov 2014 14:29:29 +0100 with message-id <1415280569.14623.18.camel@debian.org> and subject line 768304 wget unblock not needed has caused the Debian Bug report #768304, regarding unblock: wget/1.16-2 to be marked as done. This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact owner@bugs.debian.org immediately.) -- 768304: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=768304 Debian Bug Tracking System Contact owner@bugs.debian.org with problems
--- Begin Message ---
- To: Debian Bug Tracking System <submit@bugs.debian.org>
- Subject: unblock: wget/1.16-2
- From: Noël Köthe <noel@debian.org>
- Date: Thu, 06 Nov 2014 12:21:22 +0100
- Message-id: <[🔎] 1415272882.14623.9.camel@debian.org>
Package: release.debian.org User: release.debian.org@packages.debian.org Usertags: unblock Severity: normal Please unblock package wget wget 1.16-2 fixes two important problems: 1. with some locales the progressbar is broken and you it scrolls down. The patch from the upstream git. #768110 screenshot from reporter: http://imgbin.org/index.php?page=image&id=20771 2. it is not documented that certificate revocation lists (CRLs) are not checked (reporter reported it as grave). This is added to the manpage. Upstream is working on CRL support but until then it is documented somewhere. #767283 Additional I added the CVE number of the security problem which is fixes by 1.16 for documentation. Shame on me I accidentally deleted an unused patch which blow up the debdiff. Attached you find the full debdiff and inline for reading. I'm not sure if it is worth to reupload -3 with the needed changelog line because there are no changes for the resulting binaries but I understand if you require it. Thanks you. Regards Noël diff -Nru wget-1.16/debian/changelog wget-1.16/debian/changelog --- wget-1.16/debian/changelog 2014-10-27 11:41:18.000000000 +0100 +++ wget-1.16/debian/changelog 2014-11-05 11:31:52.000000000 +0100 @@ -1,7 +1,18 @@ +wget (1.16-2) unstable; urgency=medium + + * debian/changelog mention CVE-2014-4877 in 1.16-1 + * debian/patches/wget-progressbar.patch upstream commited patch + 76f6fe22 to fix progressbar. Closes: #768110 + * debian/patches/wget-doc-CRLs.patch document that CRLs are not checked. + Closes: #767283 + + -- No�l K�the <noel@debian.org> Wed, 05 Nov 2014 12:15:02 +0100 + wget (1.16-1) unstable; urgency=medium * new upstream release from 2014-10-27 - - "Poodle" do not use SSLv3 except explicitely requested (CVE-2014-3566) + - No longer create local symbolic links by default CVE-2014-4877 + - "Poodle" do not use SSLv3 except explicitly requested CVE-2014-3566 * debian/control: Public Suffix List cookie domain checking via libpsl Closes: #766780 * debian/control: updated Standards-Version to 3.9.6 (no changes needed) diff -Nru wget-1.16/debian/patches/disable-SSLv2 wget-1.16/debian/patches/disable-SSLv2 --- wget-1.16/debian/patches/disable-SSLv2 2011-04-25 19:28:29.000000000 +0200 +++ wget-1.16/debian/patches/disable-SSLv2 1970-01-01 01:00:00.000000000 +0100 [...patch removed.. No�l] diff -Nru wget-1.16/debian/patches/series wget-1.16/debian/patches/series --- wget-1.16/debian/patches/series 2014-10-16 11:32:22.000000000 +0200 +++ wget-1.16/debian/patches/series 2014-11-05 11:18:51.000000000 +0100 @@ -1,4 +1,6 @@ wget-doc-remove-usr-local-in-sample.wgetrc wget-doc-remove-usr-local-in-wget.texi wget-passive_ftp-default +wget-progressbar.patch +wget-doc-CRLs.patch diff -Nru wget-1.16/debian/patches/wget-doc-CRLs.patch wget-1.16/debian/patches/wget-doc-CRLs.patch --- wget-1.16/debian/patches/wget-doc-CRLs.patch 1970-01-01 01:00:00.000000000 +0100 +++ wget-1.16/debian/patches/wget-doc-CRLs.patch 2014-11-05 12:05:49.000000000 +0100 @@ -0,0 +1,26 @@ +Author: Noël Köthe <noel@debian.org> +Date: Wed, 05 Nov 2014 12:10:41 +0100 + + document no CRLs are checked. + See bug https://savannah.gnu.org/bugs/?43501 + +--- a/doc/wget.texi 2014-11-05 12:03:10.848353361 +0100 ++++ b/doc/wget.texi 2014-11-05 12:08:46.831481483 +0100 +@@ -165,6 +165,17 @@ + @c man end + + @item ++@ignore ++@c man begin DESCRIPTION ++ ++@c man end ++@end ignore ++@c man begin DESCRIPTION ++Wget does not support Client Revocation Lists (CRLs) so the HTTPS ++certificate you are connecting to might be revoked by the siteowner. ++@c man end ++ ++@item + Wget supports proxy servers, which can lighten the network load, speed + up retrieval and provide access behind firewalls. Wget uses the passive + @sc{ftp} downloading by default, active @sc{ftp} being an option. diff -Nru wget-1.16/debian/patches/wget-progressbar.patch wget-1.16/debian/patches/wget-progressbar.patch --- wget-1.16/debian/patches/wget-progressbar.patch 1970-01-01 01:00:00.000000000 +0100 +++ wget-1.16/debian/patches/wget-progressbar.patch 2014-11-05 08:51:44.000000000 +0100 @@ -0,0 +1,33 @@ +commit 35bfcb34b0eb5ccc28c1e9f308678fd476f6fe22 +Author: Darshit Shah <darnir@gmail.com> +Date: Sat Nov 1 05:34:04 2014 +0530 + + Remove extra padding from the progress bar + +diff --git a/src/progress.c b/src/progress.c +index 5ba542d..a0b48e4 100644 +--- a/src/progress.c ++++ b/src/progress.c +@@ -907,10 +907,6 @@ create_image (struct bar_progress *bp, double dl_total_time, bool done) + char *p = bp->buffer; + wgint size = bp->initial_length + bp->count; + +- const char *size_grouped = with_thousand_seps (size); +- int size_grouped_len = count_cols (size_grouped); +- /* Difference between num cols and num bytes: */ +- int size_grouped_diff = strlen (size_grouped) - size_grouped_len; + int size_grouped_pad; /* Used to pad the field width for size_grouped. */ + + struct bar_progress_hist *hist = &bp->hist; +@@ -1159,9 +1155,10 @@ create_image (struct bar_progress *bp, double dl_total_time, bool done) + move_to_end (p); + } + +- while (p - bp->buffer - bytes_cols_diff - size_grouped_diff < bp->width) ++ while (p - bp->buffer - bytes_cols_diff < bp->width) + *p++ = ' '; + *p = '\0'; ++ assert (count_cols (bp->buffer) <= bp->width); + } + + /* Print the contents of the buffer as a one-line ASCII "image" so diff -Nru wget-1.16/debian/wget.debhelper.log wget-1.16/debian/wget.debhelper.log --- wget-1.16/debian/wget.debhelper.log 2014-10-27 11:41:24.000000000 +0100 +++ wget-1.16/debian/wget.debhelper.log 2014-11-05 12:06:28.000000000 +0100 @@ -3,3 +3,10 @@ dh_prep dh_prep dh_prep +dh_prep +dh_prep +dh_prep +dh_prep +dh_prep +dh_prep +dh_prep unblock wget/1.16-2diff -Nru wget-1.16/debian/changelog wget-1.16/debian/changelog --- wget-1.16/debian/changelog 2014-10-27 11:41:18.000000000 +0100 +++ wget-1.16/debian/changelog 2014-11-05 11:31:52.000000000 +0100 @@ -1,7 +1,18 @@ +wget (1.16-2) unstable; urgency=medium + + * debian/changelog mention CVE-2014-4877 in 1.16-1 + * debian/patches/wget-progressbar.patch upstream commited patch + 76f6fe22 to fix progressbar. Closes: #768110 + * debian/patches/wget-doc-CRLs.patch document that CRLs are not checked. + Closes: #767283 + + -- Noël Köthe <noel@debian.org> Wed, 05 Nov 2014 12:15:02 +0100 + wget (1.16-1) unstable; urgency=medium * new upstream release from 2014-10-27 - - "Poodle" do not use SSLv3 except explicitely requested (CVE-2014-3566) + - No longer create local symbolic links by default CVE-2014-4877 + - "Poodle" do not use SSLv3 except explicitly requested CVE-2014-3566 * debian/control: Public Suffix List cookie domain checking via libpsl Closes: #766780 * debian/control: updated Standards-Version to 3.9.6 (no changes needed) diff -Nru wget-1.16/debian/patches/disable-SSLv2 wget-1.16/debian/patches/disable-SSLv2 --- wget-1.16/debian/patches/disable-SSLv2 2011-04-25 19:28:29.000000000 +0200 +++ wget-1.16/debian/patches/disable-SSLv2 1970-01-01 01:00:00.000000000 +0100 @@ -1,631 +0,0 @@ -If -DNO_SSLv2 is set, disable any use of SSLv2 related -functionality, which is needed for building against -Debian’s OpenSSL 1.0.0 that disabled SSLv2 (which was -deprecated in 1996 and isn’t all that secure, so no -big deal). This patch also updates most translations. - -Index: wget-1.12/doc/wget.texi -=================================================================== ---- wget-1.12.orig/doc/wget.texi 2011-04-25 17:26:47.000000000 +0000 -+++ wget-1.12/doc/wget.texi 2011-04-25 17:26:47.000000000 +0000 -@@ -1531,6 +1531,9 @@ - choose the correct protocol version. Fortunately, such servers are - quite rare. - -+Note that SSLv2 may not be available in your version of Wget, -+because it has been deprecated since 1996. -+ - @cindex SSL certificate, check - @item --no-check-certificate - Don't check the server certificate against the available certificate -Index: wget-1.12/po/ca.po -=================================================================== ---- wget-1.12.orig/po/ca.po 2009-09-22 16:40:36.000000000 +0000 -+++ wget-1.12/po/ca.po 2011-04-25 17:27:05.000000000 +0000 -@@ -1530,6 +1530,14 @@ - " --secure-protocol=PR selecciona el protocol segur, d'entre auto,\n" - " SSLv2, SSLv3, TLSv1.\n" - -+#: src/main.c:586 -+msgid "" -+" --secure-protocol=PR choose secure protocol, one of auto,\n" -+" SSLv3, and TLSv1.\n" -+msgstr "" -+" --secure-protocol=PR selecciona el protocol segur, d'entre auto,\n" -+" SSLv3, TLSv1.\n" -+ - #: src/main.c:588 - msgid "" - " --no-check-certificate don't validate the server's certificate.\n" -Index: wget-1.12/po/cs.po -=================================================================== ---- wget-1.12.orig/po/cs.po 2009-09-22 16:40:36.000000000 +0000 -+++ wget-1.12/po/cs.po 2011-04-25 17:27:05.000000000 +0000 -@@ -1490,6 +1490,15 @@ - "„auto“,\n" - " „SSLv2“, „SSLv3“ a „TLSv1“.\n" - -+#: src/main.c:586 -+msgid "" -+" --secure-protocol=PR choose secure protocol, one of auto,\n" -+" SSLv3, and TLSv1.\n" -+msgstr "" -+" --secure-protocol=PROT vybere bezpečnostní protokol, jeden z " -+"„auto“,\n" -+" „SSLv3“ a „TLSv1“.\n" -+ - #: src/main.c:588 - msgid "" - " --no-check-certificate don't validate the server's certificate.\n" -Index: wget-1.12/po/de.po -=================================================================== ---- wget-1.12.orig/po/de.po 2011-04-25 17:26:47.000000000 +0000 -+++ wget-1.12/po/de.po 2011-04-25 17:27:04.000000000 +0000 -@@ -979,6 +979,11 @@ - "%s: %s: Ungültige Einschränkung %s,\n" - " verwenden Sie [unix|windows],[lowercase|uppercase],[nocontrol],[ascii].\n" - -+#: src/init.c:1343 -+#, c-format -+msgid "SSLv2 has been deprecated since 1996 and is no longer available.\n" -+msgstr "SSLv2 ist seit 1996 veraltet und nun nicht mehr verfügbar.\n" -+ - #: src/iri.c:103 - #, c-format - msgid "Encoding %s isn't valid\n" -@@ -1520,6 +1525,14 @@ - " --secure-protocol=PR Verwende als sicheres Protokoll eins aus\n" - " »auto«, »SSLv2«, »SSLv3« oder »TLSv1«.\n" - -+#: src/main.c:586 -+msgid "" -+" --secure-protocol=PR choose secure protocol, one of auto,\n" -+" SSLv3, and TLSv1.\n" -+msgstr "" -+" --secure-protocol=PR Verwende als sicheres Protokoll eins aus\n" -+" »auto«, »SSLv3« oder »TLSv1«.\n" -+ - #: src/main.c:588 - msgid "" - " --no-check-certificate don't validate the server's certificate.\n" -Index: wget-1.12/po/es.po -=================================================================== ---- wget-1.12.orig/po/es.po 2009-09-22 16:40:37.000000000 +0000 -+++ wget-1.12/po/es.po 2011-04-25 17:27:05.000000000 +0000 -@@ -1099,6 +1099,11 @@ - " use [unix|windows],[lowercase|uppercase],[nocontrol],[ascii].\n" - msgstr "" - -+#: src/init.c:1343 -+#, c-format -+msgid "SSLv2 has been deprecated since 1996 and is no longer available.\n" -+msgstr "SSLv2 no est�isponible porque est�bsolescente desde 1996.\n" -+ - #: src/iri.c:103 - #, c-format - msgid "Encoding %s isn't valid\n" -Index: wget-1.12/po/et.po -=================================================================== ---- wget-1.12.orig/po/et.po 2009-09-22 16:40:37.000000000 +0000 -+++ wget-1.12/po/et.po 2011-04-25 17:27:05.000000000 +0000 -@@ -1429,6 +1429,14 @@ - "SSLv2,\n" - " SSLv3 ja TLSv1.\n" - -+#: src/main.c:586 -+msgid "" -+" --secure-protocol=PR choose secure protocol, one of auto,\n" -+" SSLv3, and TLSv1.\n" -+msgstr "" -+" --secure-protocol=PR vali turvaprotokoll, v�likud auto,\n" -+" SSLv3 ja TLSv1.\n" -+ - #: src/main.c:588 - msgid "" - " --no-check-certificate don't validate the server's certificate.\n" -Index: wget-1.12/po/fi.po -=================================================================== ---- wget-1.12.orig/po/fi.po 2009-09-22 16:40:37.000000000 +0000 -+++ wget-1.12/po/fi.po 2011-04-25 17:27:05.000000000 +0000 -@@ -964,6 +964,11 @@ - "%s: %s: Virheellinen rajoite %s,\n" - " valitse [unix|windows],[lowercase|uppercase],[nocontrol],[ascii].\n" - -+#: src/init.c:1343 -+#, c-format -+msgid "SSLv2 has been deprecated since 1996 and is no longer available.\n" -+msgstr "SSLv2 on ollut vanhentunut vuodesta 1996 saakka eikä ole enää käytettävissä.\n" -+ - #: src/iri.c:103 - #, c-format - msgid "Encoding %s isn't valid\n" -@@ -1488,6 +1493,14 @@ - " --secure-protocol=PR valitse turvaprotokolla, vaihtoehdot:\n" - " auto, SSLv2, SSLv3 tai TLSv1.\n" - -+#: src/main.c:586 -+msgid "" -+" --secure-protocol=PR choose secure protocol, one of auto,\n" -+" SSLv3, and TLSv1.\n" -+msgstr "" -+" --secure-protocol=PR valitse turvaprotokolla, vaihtoehdot:\n" -+" auto, SSLv3 tai TLSv1.\n" -+ - #: src/main.c:588 - msgid "" - " --no-check-certificate don't validate the server's certificate.\n" -Index: wget-1.12/po/fr.po -=================================================================== ---- wget-1.12.orig/po/fr.po 2011-04-25 17:26:47.000000000 +0000 -+++ wget-1.12/po/fr.po 2011-04-25 17:27:05.000000000 +0000 -@@ -962,6 +962,11 @@ - "%s : %s : restriction non valide %s,\n" - " utiliser [unix|windows],[lowercase|uppercase],[nocontrol],[ascii].\n" - -+#: src/init.c:1343 -+#, c-format -+msgid "SSLv2 has been deprecated since 1996 and is no longer available.\n" -+msgstr "SSLv2 est d���epuis 1996 et n'est plus disponible.\n" -+ - #: src/iri.c:103 - #, c-format - msgid "Encoding %s isn't valid\n" -@@ -1515,6 +1520,15 @@ - "auto, SSLv2,\n" - " SSLv3 et TLSv1.\n" - -+#: src/main.c:586 -+msgid "" -+" --secure-protocol=PR choose secure protocol, one of auto,\n" -+" SSLv3, and TLSv1.\n" -+msgstr "" -+" --secure-protocol=PR choisir un protocole s�ris�R parmi : " -+"auto,\n" -+" SSLv3 et TLSv1.\n" -+ - #: src/main.c:588 - msgid "" - " --no-check-certificate don't validate the server's certificate.\n" -Index: wget-1.12/po/ga.po -=================================================================== ---- wget-1.12.orig/po/ga.po 2009-09-22 16:40:37.000000000 +0000 -+++ wget-1.12/po/ga.po 2011-04-25 17:27:05.000000000 +0000 -@@ -1479,7 +1479,14 @@ - msgstr "" - " --secure-protocol=PR roghnaigh pr�al daingean: auto, SSLv2,\n" - " SSLv3, n�Sv1.\n" -+ -+#: src/main.c:586 -+msgid "" -+" --secure-protocol=PR choose secure protocol, one of auto,\n" - " SSLv3, and TLSv1.\n" -+msgstr "" -+" --secure-protocol=PR roghnaigh pr�al daingean: auto,\n" -+" SSLv3, n�Sv1.\n" - - #: src/main.c:588 - msgid "" -Index: wget-1.12/po/hr.po -=================================================================== ---- wget-1.12.orig/po/hr.po 2009-09-22 16:40:37.000000000 +0000 -+++ wget-1.12/po/hr.po 2011-04-25 17:27:05.000000000 +0000 -@@ -1450,6 +1450,14 @@ - "SSLv2,\n" - " SSLv3 ili TLSv1.\n" - -+#: src/main.c:586 -+msgid "" -+" --secure-protocol=PR choose secure protocol, one of auto,\n" -+" SSLv3, and TLSv1.\n" -+msgstr "" -+" --secure-protocol=PR izaberi sigurni protokol, jedan od auto,\n" -+" SSLv3 ili TLSv1.\n" -+ - #: src/main.c:588 - msgid "" - " --no-check-certificate don't validate the server's certificate.\n" -Index: wget-1.12/po/hu.po -=================================================================== ---- wget-1.12.orig/po/hu.po 2009-09-22 16:40:37.000000000 +0000 -+++ wget-1.12/po/hu.po 2011-04-25 17:27:05.000000000 +0000 -@@ -1520,6 +1520,15 @@ - "„auto”,\n" - " „SSLv2”, „SSLv3”, és „TLSv1” egyike.\n" - -+#: src/main.c:586 -+msgid "" -+" --secure-protocol=PR choose secure protocol, one of auto,\n" -+" SSLv3, and TLSv1.\n" -+msgstr "" -+" --secure-protocol=PR a biztonságos protokoll kiválasztása, az " -+"„auto”,\n" -+" „SSLv3”, és „TLSv1” egyike.\n" -+ - #: src/main.c:588 - msgid "" - " --no-check-certificate don't validate the server's certificate.\n" -Index: wget-1.12/po/id.po -=================================================================== ---- wget-1.12.orig/po/id.po 2009-09-22 16:40:37.000000000 +0000 -+++ wget-1.12/po/id.po 2011-04-25 17:27:05.000000000 +0000 -@@ -1474,6 +1474,15 @@ - "auto,\n" - " SSLv2, SSLv3, dan TLSv1.\n" - -+#: src/main.c:586 -+msgid "" -+" --secure-protocol=PR choose secure protocol, one of auto,\n" -+" SSLv3, and TLSv1.\n" -+msgstr "" -+" --secure-protocol=PR pilih secure protocolm salah satu dari " -+"auto,\n" -+" SSLv3, dan TLSv1.\n" -+ - #: src/main.c:588 - msgid "" - " --no-check-certificate don't validate the server's certificate.\n" -Index: wget-1.12/po/it.po -=================================================================== ---- wget-1.12.orig/po/it.po 2009-09-22 16:40:38.000000000 +0000 -+++ wget-1.12/po/it.po 2011-04-25 17:27:05.000000000 +0000 -@@ -959,6 +959,11 @@ - "%s: %s: restrizione %s non valida,\n" - " usare [unix|windows],[lowercase|uppercase],[nocontrol],[ascii].\n" - -+#: src/init.c:1343 -+#, c-format -+msgid "SSLv2 has been deprecated since 1996 and is no longer available.\n" -+msgstr "SSLv2 è deprecato dal 1996 e non è più disponibile.\n" -+ - #: src/iri.c:103 - #, c-format - msgid "Encoding %s isn't valid\n" -@@ -1491,6 +1496,14 @@ - " --secure-protocol=PROT. sceglie il protocollo sicuro, uno tra auto,\n" - " SSLv2, SSLv3,e TLSv1.\n" - -+#: src/main.c:586 -+msgid "" -+" --secure-protocol=PR choose secure protocol, one of auto,\n" -+" SSLv3, and TLSv1.\n" -+msgstr "" -+" --secure-protocol=PROT. sceglie il protocollo sicuro, uno tra auto,\n" -+" SSLv3,e TLSv1.\n" -+ - #: src/main.c:588 - msgid "" - " --no-check-certificate don't validate the server's certificate.\n" -Index: wget-1.12/po/ja.po -=================================================================== ---- wget-1.12.orig/po/ja.po 2009-09-22 16:40:38.000000000 +0000 -+++ wget-1.12/po/ja.po 2011-04-25 17:27:05.000000000 +0000 -@@ -1449,6 +1449,14 @@ - " --secure-protocol=PR セキュアプロトコルを選択する (auto, SSLv2, " - "SSLv3, TLSv1)\n" - -+#: src/main.c:586 -+msgid "" -+" --secure-protocol=PR choose secure protocol, one of auto,\n" -+" SSLv3, and TLSv1.\n" -+msgstr "" -+" --secure-protocol=PR セキュアプロトコルを選択する (auto, " -+"SSLv3, TLSv1)\n" -+ - #: src/main.c:588 - msgid "" - " --no-check-certificate don't validate the server's certificate.\n" -Index: wget-1.12/po/lt.po -=================================================================== ---- wget-1.12.orig/po/lt.po 2009-09-22 16:40:38.000000000 +0000 -+++ wget-1.12/po/lt.po 2011-04-25 17:27:05.000000000 +0000 -@@ -1471,6 +1471,14 @@ - " --secure-protocol=PR rinktis saugų protokolą: „auto“, „SSLv2“,\n" - " „SSLv3“ arba „TLSv1“.\n" - -+#: src/main.c:586 -+msgid "" -+" --secure-protocol=PR choose secure protocol, one of auto,\n" -+" SSLv3, and TLSv1.\n" -+msgstr "" -+" --secure-protocol=PR rinktis saugų protokolą: „auto“,\n" -+" „SSLv3“ arba „TLSv1“.\n" -+ - #: src/main.c:588 - msgid "" - " --no-check-certificate don't validate the server's certificate.\n" -Index: wget-1.12/po/nl.po -=================================================================== ---- wget-1.12.orig/po/nl.po 2009-09-22 16:40:38.000000000 +0000 -+++ wget-1.12/po/nl.po 2011-04-25 17:27:05.000000000 +0000 -@@ -962,6 +962,11 @@ - "%s: %s: Ongeldige beperking '%s',\n" - " gebruik [unix|windows],[lowercase|uppercase],[nocontrol],[ascii].\n" - -+#: src/init.c:1343 -+#, c-format -+msgid "SSLv2 has been deprecated since 1996 and is no longer available.\n" -+msgstr "SSLv2 is in 1996 uitgefaseerd en daarom niet meer beschikbaar.\n" -+ - #: src/iri.c:103 - #, c-format - msgid "Encoding %s isn't valid\n" -@@ -1479,6 +1484,14 @@ - " --secure-protocol=PRTCL beveiligingsprotocol PRTCL gebruiken\n" - " ('auto', 'SSLv2', 'SSLv3', of 'TLSv1')\n" - -+#: src/main.c:586 -+msgid "" -+" --secure-protocol=PR choose secure protocol, one of auto,\n" -+" SSLv3, and TLSv1.\n" -+msgstr "" -+" --secure-protocol=PRTCL beveiligingsprotocol PRTCL gebruiken\n" -+" ('auto', 'SSLv3', of 'TLSv1')\n" -+ - #: src/main.c:588 - msgid "" - " --no-check-certificate don't validate the server's certificate.\n" -Index: wget-1.12/po/pl.po -=================================================================== ---- wget-1.12.orig/po/pl.po 2009-09-22 16:40:39.000000000 +0000 -+++ wget-1.12/po/pl.po 2011-04-25 17:27:05.000000000 +0000 -@@ -1494,6 +1494,14 @@ - " --secure-protocol=PR wybiera bezpieczny protok�auto, SSLv2,\n" - " SSLv3, TLSv1.\n" - -+#: src/main.c:586 -+msgid "" -+" --secure-protocol=PR choose secure protocol, one of auto,\n" -+" SSLv3, and TLSv1.\n" -+msgstr "" -+" --secure-protocol=PR wybiera bezpieczny protok�auto,\n" -+" SSLv3, TLSv1.\n" -+ - #: src/main.c:588 - msgid "" - " --no-check-certificate don't validate the server's certificate.\n" -Index: wget-1.12/po/pt.po -=================================================================== ---- wget-1.12.orig/po/pt.po 2009-09-22 16:40:39.000000000 +0000 -+++ wget-1.12/po/pt.po 2011-04-25 17:27:05.000000000 +0000 -@@ -1495,6 +1495,14 @@ - "SSLv2,\n" - " SSLv3 ou TLSv1.\n" - -+#: src/main.c:586 -+msgid "" -+" --secure-protocol=PR choose secure protocol, one of auto,\n" -+" SSLv3, and TLSv1.\n" -+msgstr "" -+" --secure-protocol=PR escolher protocolo de segurança, auto,\n" -+" SSLv3 ou TLSv1.\n" -+ - #: src/main.c:588 - msgid "" - " --no-check-certificate don't validate the server's certificate.\n" -Index: wget-1.12/po/pt_BR.po -=================================================================== ---- wget-1.12.orig/po/pt_BR.po 2009-09-22 16:40:39.000000000 +0000 -+++ wget-1.12/po/pt_BR.po 2011-04-25 17:27:05.000000000 +0000 -@@ -1559,6 +1559,15 @@ - "auto\n" - " (automático), SSLv2, SSLv3 e TLSv1.\n" - -+#: src/main.c:586 -+msgid "" -+" --secure-protocol=PR choose secure protocol, one of auto,\n" -+" SSLv3, and TLSv1.\n" -+msgstr "" -+" --secure-protocol=PR escolhe entre um protocolo de segurança: " -+"auto\n" -+" (automático), SSLv3 e TLSv1.\n" -+ - #: src/main.c:588 - msgid "" - " --no-check-certificate don't validate the server's certificate.\n" -Index: wget-1.12/po/ru.po -=================================================================== ---- wget-1.12.orig/po/ru.po 2009-09-22 16:40:39.000000000 +0000 -+++ wget-1.12/po/ru.po 2011-04-25 17:27:04.000000000 +0000 -@@ -1485,6 +1485,14 @@ - " --secure-protocol=ПР выбор безопасного протокола: auto, SSLv2,\n" - " SSLv3 или TLSv1.\n" - -+#: src/main.c:586 -+msgid "" -+" --secure-protocol=PR choose secure protocol, one of auto,\n" -+" SSLv3, and TLSv1.\n" -+msgstr "" -+" --secure-protocol=ПР выбор безопасного протокола: auto,\n" -+" SSLv3 или TLSv1.\n" -+ - #: src/main.c:588 - msgid "" - " --no-check-certificate don't validate the server's certificate.\n" -Index: wget-1.12/po/sk.po -=================================================================== ---- wget-1.12.orig/po/sk.po 2009-09-22 16:40:39.000000000 +0000 -+++ wget-1.12/po/sk.po 2011-04-25 17:27:05.000000000 +0000 -@@ -1472,6 +1472,14 @@ - "SSLv2,\n" - " SSLv3 alebo TLSv1.\n" - -+#: src/main.c:586 -+msgid "" -+" --secure-protocol=PR choose secure protocol, one of auto,\n" -+" SSLv3, and TLSv1.\n" -+msgstr "" -+" --secure-protocol=PR vybrať bezpečný protokol, jeden z auto,\n" -+" SSLv3 alebo TLSv1.\n" -+ - #: src/main.c:588 - msgid "" - " --no-check-certificate don't validate the server's certificate.\n" -Index: wget-1.12/po/sl.po -=================================================================== ---- wget-1.12.orig/po/sl.po 2009-09-22 16:40:39.000000000 +0000 -+++ wget-1.12/po/sl.po 2011-04-25 17:27:05.000000000 +0000 -@@ -1489,6 +1489,14 @@ - " --secure-protocol izberi varni protokol SSL; lahko je auto,\n" - " SSLv2, SSLv3 ali TLSv1\n" - -+#: src/main.c:586 -+msgid "" -+" --secure-protocol=PR choose secure protocol, one of auto,\n" -+" SSLv3, and TLSv1.\n" -+msgstr "" -+" --secure-protocol izberi varni protokol SSL; lahko je auto,\n" -+" SSLv3 ali TLSv1\n" -+ - #: src/main.c:588 - msgid "" - " --no-check-certificate don't validate the server's certificate.\n" -Index: wget-1.12/po/sv.po -=================================================================== ---- wget-1.12.orig/po/sv.po 2009-09-22 16:40:39.000000000 +0000 -+++ wget-1.12/po/sv.po 2011-04-25 17:27:05.000000000 +0000 -@@ -1469,6 +1469,14 @@ - " --secure-protocol=PR välj säkert protokoll, ett av auto, SSLv2,\n" - " SSLv3 och TLSv1.\n" - -+#: src/main.c:586 -+msgid "" -+" --secure-protocol=PR choose secure protocol, one of auto,\n" -+" SSLv3, and TLSv1.\n" -+msgstr "" -+" --secure-protocol=PR välj säkert protokoll, ett av auto,\n" -+" SSLv3 och TLSv1.\n" -+ - #: src/main.c:588 - msgid "" - " --no-check-certificate don't validate the server's certificate.\n" -Index: wget-1.12/po/tr.po -=================================================================== ---- wget-1.12.orig/po/tr.po 2009-09-22 16:40:40.000000000 +0000 -+++ wget-1.12/po/tr.po 2011-04-25 17:27:05.000000000 +0000 -@@ -1469,6 +1469,15 @@ - " auto, SSLv2, SSLv3 veya TLSv1 " - "belirtilebilir.\n" - -+#: src/main.c:586 -+msgid "" -+" --secure-protocol=PR choose secure protocol, one of auto,\n" -+" SSLv3, and TLSv1.\n" -+msgstr "" -+" --secure-protocol=PR güvenlik protokolü belirtilir;\n" -+" auto, SSLv3 veya TLSv1 " -+"belirtilebilir.\n" -+ - #: src/main.c:588 - msgid "" - " --no-check-certificate don't validate the server's certificate.\n" -Index: wget-1.12/po/vi.po -=================================================================== ---- wget-1.12.orig/po/vi.po 2009-09-22 16:40:40.000000000 +0000 -+++ wget-1.12/po/vi.po 2011-04-25 17:27:05.000000000 +0000 -@@ -1466,6 +1466,14 @@ - "SSLv2,\n" - " SSLv3, và TLSv1.\n" - -+#: src/main.c:586 -+msgid "" -+" --secure-protocol=PR choose secure protocol, one of auto,\n" -+" SSLv3, and TLSv1.\n" -+msgstr "" -+" --secure-protocol=PR chọn giao thức bảo mật, một trong số auto,\n" -+" SSLv3, và TLSv1.\n" -+ - #: src/main.c:588 - msgid "" - " --no-check-certificate don't validate the server's certificate.\n" -Index: wget-1.12/po/zh_CN.po -=================================================================== ---- wget-1.12.orig/po/zh_CN.po 2011-04-25 17:26:47.000000000 +0000 -+++ wget-1.12/po/zh_CN.po 2011-04-25 17:27:04.000000000 +0000 -@@ -1419,6 +1419,14 @@ - " --secure-protocol=PR 选择安全协议，可以是 auto、SSLv2、\n" - " SSLv3 或是 TLSv1 中的一个。\n" - -+#: src/main.c:586 -+msgid "" -+" --secure-protocol=PR choose secure protocol, one of auto,\n" -+" SSLv3, and TLSv1.\n" -+msgstr "" -+" --secure-protocol=PR 选择安全协议，可以是 auto、\n" -+" SSLv3 或是 TLSv1 中的一个。\n" -+ - #: src/main.c:588 - msgid "" - " --no-check-certificate don't validate the server's certificate.\n" -Index: wget-1.12/po/zh_TW.po -=================================================================== ---- wget-1.12.orig/po/zh_TW.po 2009-09-22 16:40:40.000000000 +0000 -+++ wget-1.12/po/zh_TW.po 2011-04-25 17:27:05.000000000 +0000 -@@ -1407,6 +1407,14 @@ - " --secure-protocol=PR 選擇安全通訊協定，可以使用 auto, SSLv2, \n" - " SSLv3 或 TLSv1\n" - -+#: src/main.c:586 -+msgid "" -+" --secure-protocol=PR choose secure protocol, one of auto,\n" -+" SSLv3, and TLSv1.\n" -+msgstr "" -+" --secure-protocol=PR 選擇安全通訊協定，可以使用 auto,\n" -+" SSLv3 或 TLSv1\n" -+ - #: src/main.c:588 - msgid "" - " --no-check-certificate don't validate the server's certificate.\n" -Index: wget-1.12/src/init.c -=================================================================== ---- wget-1.12.orig/src/init.c 2011-04-25 17:26:47.000000000 +0000 -+++ wget-1.12/src/init.c 2011-04-25 17:26:47.000000000 +0000 -@@ -1337,6 +1337,13 @@ - { "tlsv1", secure_protocol_tlsv1 }, - }; - int ok = decode_string (val, choices, countof (choices), place); -+#ifdef NO_SSLv2 -+ /* do not touch choices[] so that numeric values of options stay the same */ -+ if (ok && *((int *)place) == secure_protocol_sslv2) { -+ fprintf (stderr, _("SSLv2 has been deprecated since 1996 and is no longer available.\n")); -+ ok = 0; -+ } -+#endif - if (!ok) - fprintf (stderr, _("%s: %s: Invalid value %s.\n"), exec_name, com, quote (val)); - return ok; -Index: wget-1.12/src/main.c -=================================================================== ---- wget-1.12.orig/src/main.c 2011-04-25 17:26:47.000000000 +0000 -+++ wget-1.12/src/main.c 2011-04-25 17:26:47.000000000 +0000 -@@ -583,9 +583,15 @@ - #ifdef HAVE_SSL - N_("\ - HTTPS (SSL/TLS) options:\n"), -+#ifndef NO_SSLv2 - N_("\ - --secure-protocol=PR choose secure protocol, one of auto, SSLv2,\n\ - SSLv3, and TLSv1.\n"), -+#else -+ N_("\ -+ --secure-protocol=PR choose secure protocol, one of auto,\n\ -+ SSLv3, and TLSv1.\n"), -+#endif - N_("\ - --no-check-certificate don't validate the server's certificate.\n"), - N_("\ -Index: wget-1.12/src/openssl.c -=================================================================== ---- wget-1.12.orig/src/openssl.c 2009-09-22 15:24:45.000000000 +0000 -+++ wget-1.12/src/openssl.c 2011-04-25 17:26:47.000000000 +0000 -@@ -184,9 +184,11 @@ - case secure_protocol_auto: - meth = SSLv23_client_method (); - break; -+#ifndef NO_SSLv2 - case secure_protocol_sslv2: - meth = SSLv2_client_method (); - break; -+#endif - case secure_protocol_sslv3: - meth = SSLv3_client_method (); - break; diff -Nru wget-1.16/debian/patches/series wget-1.16/debian/patches/series --- wget-1.16/debian/patches/series 2014-10-16 11:32:22.000000000 +0200 +++ wget-1.16/debian/patches/series 2014-11-05 11:18:51.000000000 +0100 @@ -1,4 +1,6 @@ wget-doc-remove-usr-local-in-sample.wgetrc wget-doc-remove-usr-local-in-wget.texi wget-passive_ftp-default +wget-progressbar.patch +wget-doc-CRLs.patch diff -Nru wget-1.16/debian/patches/wget-doc-CRLs.patch wget-1.16/debian/patches/wget-doc-CRLs.patch --- wget-1.16/debian/patches/wget-doc-CRLs.patch 1970-01-01 01:00:00.000000000 +0100 +++ wget-1.16/debian/patches/wget-doc-CRLs.patch 2014-11-05 12:05:49.000000000 +0100 @@ -0,0 +1,26 @@ +Author: Noël Köthe <noel@debian.org> +Date: Wed, 05 Nov 2014 12:10:41 +0100 + + document no CRLs are checked. + See bug https://savannah.gnu.org/bugs/?43501 + +--- a/doc/wget.texi 2014-11-05 12:03:10.848353361 +0100 ++++ b/doc/wget.texi 2014-11-05 12:08:46.831481483 +0100 +@@ -165,6 +165,17 @@ + @c man end + + @item ++@ignore ++@c man begin DESCRIPTION ++ ++@c man end ++@end ignore ++@c man begin DESCRIPTION ++Wget does not support Client Revocation Lists (CRLs) so the HTTPS ++certificate you are connecting to might be revoked by the siteowner. ++@c man end ++ ++@item + Wget supports proxy servers, which can lighten the network load, speed + up retrieval and provide access behind firewalls. Wget uses the passive + @sc{ftp} downloading by default, active @sc{ftp} being an option. diff -Nru wget-1.16/debian/patches/wget-progressbar.patch wget-1.16/debian/patches/wget-progressbar.patch --- wget-1.16/debian/patches/wget-progressbar.patch 1970-01-01 01:00:00.000000000 +0100 +++ wget-1.16/debian/patches/wget-progressbar.patch 2014-11-05 08:51:44.000000000 +0100 @@ -0,0 +1,33 @@ +commit 35bfcb34b0eb5ccc28c1e9f308678fd476f6fe22 +Author: Darshit Shah <darnir@gmail.com> +Date: Sat Nov 1 05:34:04 2014 +0530 + + Remove extra padding from the progress bar + +diff --git a/src/progress.c b/src/progress.c +index 5ba542d..a0b48e4 100644 +--- a/src/progress.c ++++ b/src/progress.c +@@ -907,10 +907,6 @@ create_image (struct bar_progress *bp, double dl_total_time, bool done) + char *p = bp->buffer; + wgint size = bp->initial_length + bp->count; + +- const char *size_grouped = with_thousand_seps (size); +- int size_grouped_len = count_cols (size_grouped); +- /* Difference between num cols and num bytes: */ +- int size_grouped_diff = strlen (size_grouped) - size_grouped_len; + int size_grouped_pad; /* Used to pad the field width for size_grouped. */ + + struct bar_progress_hist *hist = &bp->hist; +@@ -1159,9 +1155,10 @@ create_image (struct bar_progress *bp, double dl_total_time, bool done) + move_to_end (p); + } + +- while (p - bp->buffer - bytes_cols_diff - size_grouped_diff < bp->width) ++ while (p - bp->buffer - bytes_cols_diff < bp->width) + *p++ = ' '; + *p = '\0'; ++ assert (count_cols (bp->buffer) <= bp->width); + } + + /* Print the contents of the buffer as a one-line ASCII "image" so diff -Nru wget-1.16/debian/wget.debhelper.log wget-1.16/debian/wget.debhelper.log --- wget-1.16/debian/wget.debhelper.log 2014-10-27 11:41:24.000000000 +0100 +++ wget-1.16/debian/wget.debhelper.log 2014-11-05 12:06:28.000000000 +0100 @@ -3,3 +3,10 @@ dh_prep dh_prep dh_prep +dh_prep +dh_prep +dh_prep +dh_prep +dh_prep +dh_prep +dh_prepAttachment: signature.asc
Description: This is a digitally signed message part
--- End Message ---
--- Begin Message ---
- To: 768304-done@bugs.debian.org
- Subject: 768304 wget unblock not needed
- From: Noël Köthe <noel@debian.org>
- Date: Thu, 06 Nov 2014 14:29:29 +0100
- Message-id: <1415280569.14623.18.camel@debian.org>
Hello, do not need to unblock wget.:) Regards NoëlAttachment: signature.asc
Description: This is a digitally signed message part
--- End Message ---