tags 614373 + patch tags 614373 + pending thanks Dear maintainer,
I've prepared an NMU for wget (versioned as 1.12-2.2) and uploaded it to DELAYED/7. Please feel free to tell me if I should delay it longer. Best regards. Filippo Rusconi -- Filippo Rusconi, PhD - CNRS - public key C78F687C Author of ``massXpert'' at http://www.massxpert.org
diff -Nru wget-1.12/debian/changelog wget-1.12/debian/changelog --- wget-1.12/debian/changelog 2010-09-05 15:35:56.000000000 +0200 +++ wget-1.12/debian/changelog 2011-03-14 21:24:24.000000000 +0100 @@ -1,3 +1,11 @@ +wget (1.12-2.2) unstable; urgency=low + + * Non-maintainer upload by Joachim Reichel <[email protected]>. + * Convert all dpatch-based patches to quilt-based ones, thus fixing the + bug reported by Lucas Nussbaum (closes: #614373). + + -- Filippo Rusconi <[email protected]> Mon, 14 Mar 2011 20:41:47 +0100 + wget (1.12-2.1) unstable; urgency=high * Non-maintainer upload by the Security Team. diff -Nru wget-1.12/debian/control wget-1.12/debian/control --- wget-1.12/debian/control 2010-09-05 15:35:56.000000000 +0200 +++ wget-1.12/debian/control 2011-03-14 21:24:24.000000000 +0100 @@ -2,7 +2,7 @@ Section: web Priority: important Maintainer: Noèl Köthe <[email protected]> -Build-Depends: debhelper (>> 5.0.0), gettext, texinfo, libssl-dev (>= 0.9.8), dpatch, info2man +Build-Depends: debhelper (>> 5.0.0), gettext, texinfo, libssl-dev (>= 0.9.8), info2man Standards-Version: 3.8.4 Homepage: http://www.gnu.org/software/wget/ diff -Nru wget-1.12/debian/patches/00list wget-1.12/debian/patches/00list --- wget-1.12/debian/patches/00list 2010-09-05 15:35:56.000000000 +0200 +++ wget-1.12/debian/patches/00list 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ -wget-doc-remove-usr-local-in-sample.wgetrc -wget-doc-remove-usr-local-in-wget.texi -wget-fr.po-spelling-correction -wget-passive_ftp-default -wget-infopod_generated_manpage.dpatch -wget-de.po-remove-double-quote-signs -wget-zh_CN.po-translation-correction -CVE-2010-2252 diff -Nru wget-1.12/debian/patches/CVE-2010-2252 wget-1.12/debian/patches/CVE-2010-2252 --- wget-1.12/debian/patches/CVE-2010-2252 1970-01-01 01:00:00.000000000 +0100 +++ wget-1.12/debian/patches/CVE-2010-2252 2011-03-14 21:24:24.000000000 +0100 @@ -0,0 +1,150 @@ +fix arbitrary file overwrite via 3xx redirect -- Origin: upstream, http://lists.gnu.org/archive/html/bug-wget/2010-07/msg00076.html -- Bug: https://savannah.gnu.org/bugs/?29958 -- Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=590296 + +--- a/doc/wget.texi ++++ b/doc/wget.texi +@@ -1487,6 +1487,13 @@ + @code{Content-Disposition} headers to describe what the name of a + downloaded file should be. + ++@cindex Trust server names ++@item --trust-server-names ++ ++If this is set to on, on a redirect the last component of the ++redirection URL will be used as the local file name. By default it is ++used the last component in the original URL. ++ + @cindex authentication + @item --auth-no-challenge + +@@ -2797,6 +2804,10 @@ + Turn on recognition of the (non-standard) @samp{Content-Disposition} + HTTP header---if set to @samp{on}, the same as @samp{--content-disposition}. + ++@item trust_server_names = on/off ++If set to on, use the last component of a redirection URL for the local ++file name. ++ + @item continue = on/off + If set to on, force continuation of preexistent partially retrieved + files. See @samp{-c} before setting it. +--- a/src/http.c ++++ b/src/http.c +@@ -2410,8 +2410,9 @@ + /* The genuine HTTP loop! This is the part where the retrieval is + retried, and retried, and retried, and... */ + uerr_t +-http_loop (struct url *u, char **newloc, char **local_file, const char *referer, +- int *dt, struct url *proxy, struct iri *iri) ++http_loop (struct url *u, struct url *original_url, char **newloc, ++ char **local_file, const char *referer, int *dt, struct url *proxy, ++ struct iri *iri) + { + int count; + bool got_head = false; /* used for time-stamping and filename detection */ +@@ -2457,7 +2458,8 @@ + } + else if (!opt.content_disposition) + { +- hstat.local_file = url_file_name (u); ++ hstat.local_file = ++ url_file_name (opt.trustservernames ? u : original_url); + got_name = true; + } + +@@ -2497,7 +2499,7 @@ + + /* Send preliminary HEAD request if -N is given and we have an existing + * destination file. */ +- file_name = url_file_name (u); ++ file_name = url_file_name (opt.trustservernames ? u : original_url); + if (opt.timestamping + && !opt.content_disposition + && file_exists_p (file_name)) +@@ -2852,9 +2854,9 @@ + + /* Remember that we downloaded the file for later ".orig" code. */ + if (*dt & ADDED_HTML_EXTENSION) +- downloaded_file(FILE_DOWNLOADED_AND_HTML_EXTENSION_ADDED, hstat.local_file); ++ downloaded_file (FILE_DOWNLOADED_AND_HTML_EXTENSION_ADDED, hstat.local_file); + else +- downloaded_file(FILE_DOWNLOADED_NORMALLY, hstat.local_file); ++ downloaded_file (FILE_DOWNLOADED_NORMALLY, hstat.local_file); + + ret = RETROK; + goto exit; +@@ -2885,9 +2887,9 @@ + + /* Remember that we downloaded the file for later ".orig" code. */ + if (*dt & ADDED_HTML_EXTENSION) +- downloaded_file(FILE_DOWNLOADED_AND_HTML_EXTENSION_ADDED, hstat.local_file); ++ downloaded_file (FILE_DOWNLOADED_AND_HTML_EXTENSION_ADDED, hstat.local_file); + else +- downloaded_file(FILE_DOWNLOADED_NORMALLY, hstat.local_file); ++ downloaded_file (FILE_DOWNLOADED_NORMALLY, hstat.local_file); + + ret = RETROK; + goto exit; +--- a/src/http.h ++++ b/src/http.h +@@ -33,8 +33,8 @@ + + struct url; + +-uerr_t http_loop (struct url *, char **, char **, const char *, int *, +- struct url *, struct iri *); ++uerr_t http_loop (struct url *, struct url *, char **, char **, const char *, ++ int *, struct url *, struct iri *); + void save_cookies (void); + void http_cleanup (void); + time_t http_atotm (const char *); +--- a/src/init.c ++++ b/src/init.c +@@ -243,6 +243,7 @@ + { "timeout", NULL, cmd_spec_timeout }, + { "timestamping", &opt.timestamping, cmd_boolean }, + { "tries", &opt.ntry, cmd_number_inf }, ++ { "trustservernames", &opt.trustservernames, cmd_boolean }, + { "useproxy", &opt.use_proxy, cmd_boolean }, + { "user", &opt.user, cmd_string }, + { "useragent", NULL, cmd_spec_useragent }, +--- a/src/main.c ++++ b/src/main.c +@@ -266,6 +266,7 @@ + { "timeout", 'T', OPT_VALUE, "timeout", -1 }, + { "timestamping", 'N', OPT_BOOLEAN, "timestamping", -1 }, + { "tries", 't', OPT_VALUE, "tries", -1 }, ++ { "trust-server-names", 0, OPT_BOOLEAN, "trustservernames", -1 }, + { "user", 0, OPT_VALUE, "user", -1 }, + { "user-agent", 'U', OPT_VALUE, "useragent", -1 }, + { "verbose", 'v', OPT_BOOLEAN, "verbose", -1 }, +@@ -675,6 +676,8 @@ + N_("\ + -I, --include-directories=LIST list of allowed directories.\n"), + N_("\ ++ --trust-server-names use the name specified by the redirection url last component.\n"), ++ N_("\ + -X, --exclude-directories=LIST list of excluded directories.\n"), + N_("\ + -np, --no-parent don't ascend to the parent directory.\n"), +--- a/src/options.h ++++ b/src/options.h +@@ -242,6 +242,7 @@ + char *encoding_remote; + char *locale; + ++ bool trustservernames; + #ifdef __VMS + int ftp_stmlf; /* Force Stream_LF format for binary FTP. */ + #endif /* def __VMS */ +--- a/src/retr.c ++++ b/src/retr.c +@@ -689,7 +689,8 @@ + #endif + || (proxy_url && proxy_url->scheme == SCHEME_HTTP)) + { +- result = http_loop (u, &mynewloc, &local_file, refurl, dt, proxy_url, iri); ++ result = http_loop (u, orig_parsed, &mynewloc, &local_file, refurl, dt, ++ proxy_url, iri); + } + else if (u->scheme == SCHEME_FTP) + { diff -Nru wget-1.12/debian/patches/CVE-2010-2252.dpatch wget-1.12/debian/patches/CVE-2010-2252.dpatch --- wget-1.12/debian/patches/CVE-2010-2252.dpatch 2010-09-05 15:35:56.000000000 +0200 +++ wget-1.12/debian/patches/CVE-2010-2252.dpatch 1970-01-01 01:00:00.000000000 +0100 @@ -1,162 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -# Description: fix arbitrary file overwrite via 3xx redirect -# Origin: upstream, http://lists.gnu.org/archive/html/bug-wget/2010-07/msg00076.html -# Bug: https://savannah.gnu.org/bugs/?29958 -# Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=590296 - -@DPATCH@ -diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' wget~/doc/wget.texi wget/doc/wget.texi ---- wget~/doc/wget.texi 2010-09-05 15:32:44.000000000 +0200 -+++ wget/doc/wget.texi 2010-09-05 15:32:44.000000000 +0200 -@@ -1487,6 +1487,13 @@ - @code{Content-Disposition} headers to describe what the name of a - downloaded file should be. - -+@cindex Trust server names -+@item --trust-server-names -+ -+If this is set to on, on a redirect the last component of the -+redirection URL will be used as the local file name. By default it is -+used the last component in the original URL. -+ - @cindex authentication - @item --auth-no-challenge - -@@ -2797,6 +2804,10 @@ - Turn on recognition of the (non-standard) @samp{Content-Disposition} - HTTP header---if set to @samp{on}, the same as @samp{--content-disposition}. - -+@item trust_server_names = on/off -+If set to on, use the last component of a redirection URL for the local -+file name. -+ - @item continue = on/off - If set to on, force continuation of preexistent partially retrieved - files. See @samp{-c} before setting it. -diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' wget~/src/http.c wget/src/http.c ---- wget~/src/http.c 2010-09-05 15:30:22.000000000 +0200 -+++ wget/src/http.c 2010-09-05 15:32:44.000000000 +0200 -@@ -2410,8 +2410,9 @@ - /* The genuine HTTP loop! This is the part where the retrieval is - retried, and retried, and retried, and... */ - uerr_t --http_loop (struct url *u, char **newloc, char **local_file, const char *referer, -- int *dt, struct url *proxy, struct iri *iri) -+http_loop (struct url *u, struct url *original_url, char **newloc, -+ char **local_file, const char *referer, int *dt, struct url *proxy, -+ struct iri *iri) - { - int count; - bool got_head = false; /* used for time-stamping and filename detection */ -@@ -2457,7 +2458,8 @@ - } - else if (!opt.content_disposition) - { -- hstat.local_file = url_file_name (u); -+ hstat.local_file = -+ url_file_name (opt.trustservernames ? u : original_url); - got_name = true; - } - -@@ -2497,7 +2499,7 @@ - - /* Send preliminary HEAD request if -N is given and we have an existing - * destination file. */ -- file_name = url_file_name (u); -+ file_name = url_file_name (opt.trustservernames ? u : original_url); - if (opt.timestamping - && !opt.content_disposition - && file_exists_p (file_name)) -@@ -2852,9 +2854,9 @@ - - /* Remember that we downloaded the file for later ".orig" code. */ - if (*dt & ADDED_HTML_EXTENSION) -- downloaded_file(FILE_DOWNLOADED_AND_HTML_EXTENSION_ADDED, hstat.local_file); -+ downloaded_file (FILE_DOWNLOADED_AND_HTML_EXTENSION_ADDED, hstat.local_file); - else -- downloaded_file(FILE_DOWNLOADED_NORMALLY, hstat.local_file); -+ downloaded_file (FILE_DOWNLOADED_NORMALLY, hstat.local_file); - - ret = RETROK; - goto exit; -@@ -2885,9 +2887,9 @@ - - /* Remember that we downloaded the file for later ".orig" code. */ - if (*dt & ADDED_HTML_EXTENSION) -- downloaded_file(FILE_DOWNLOADED_AND_HTML_EXTENSION_ADDED, hstat.local_file); -+ downloaded_file (FILE_DOWNLOADED_AND_HTML_EXTENSION_ADDED, hstat.local_file); - else -- downloaded_file(FILE_DOWNLOADED_NORMALLY, hstat.local_file); -+ downloaded_file (FILE_DOWNLOADED_NORMALLY, hstat.local_file); - - ret = RETROK; - goto exit; -diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' wget~/src/http.h wget/src/http.h ---- wget~/src/http.h 2010-09-05 15:30:22.000000000 +0200 -+++ wget/src/http.h 2010-09-05 15:32:44.000000000 +0200 -@@ -33,8 +33,8 @@ - - struct url; - --uerr_t http_loop (struct url *, char **, char **, const char *, int *, -- struct url *, struct iri *); -+uerr_t http_loop (struct url *, struct url *, char **, char **, const char *, -+ int *, struct url *, struct iri *); - void save_cookies (void); - void http_cleanup (void); - time_t http_atotm (const char *); -diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' wget~/src/init.c wget/src/init.c ---- wget~/src/init.c 2010-09-05 15:30:22.000000000 +0200 -+++ wget/src/init.c 2010-09-05 15:32:44.000000000 +0200 -@@ -243,6 +243,7 @@ - { "timeout", NULL, cmd_spec_timeout }, - { "timestamping", &opt.timestamping, cmd_boolean }, - { "tries", &opt.ntry, cmd_number_inf }, -+ { "trustservernames", &opt.trustservernames, cmd_boolean }, - { "useproxy", &opt.use_proxy, cmd_boolean }, - { "user", &opt.user, cmd_string }, - { "useragent", NULL, cmd_spec_useragent }, -diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' wget~/src/main.c wget/src/main.c ---- wget~/src/main.c 2010-09-05 15:30:22.000000000 +0200 -+++ wget/src/main.c 2010-09-05 15:32:44.000000000 +0200 -@@ -266,6 +266,7 @@ - { "timeout", 'T', OPT_VALUE, "timeout", -1 }, - { "timestamping", 'N', OPT_BOOLEAN, "timestamping", -1 }, - { "tries", 't', OPT_VALUE, "tries", -1 }, -+ { "trust-server-names", 0, OPT_BOOLEAN, "trustservernames", -1 }, - { "user", 0, OPT_VALUE, "user", -1 }, - { "user-agent", 'U', OPT_VALUE, "useragent", -1 }, - { "verbose", 'v', OPT_BOOLEAN, "verbose", -1 }, -@@ -675,6 +676,8 @@ - N_("\ - -I, --include-directories=LIST list of allowed directories.\n"), - N_("\ -+ --trust-server-names use the name specified by the redirection url last component.\n"), -+ N_("\ - -X, --exclude-directories=LIST list of excluded directories.\n"), - N_("\ - -np, --no-parent don't ascend to the parent directory.\n"), -diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' wget~/src/options.h wget/src/options.h ---- wget~/src/options.h 2010-09-05 15:30:22.000000000 +0200 -+++ wget/src/options.h 2010-09-05 15:32:44.000000000 +0200 -@@ -242,6 +242,7 @@ - char *encoding_remote; - char *locale; - -+ bool trustservernames; - #ifdef __VMS - int ftp_stmlf; /* Force Stream_LF format for binary FTP. */ - #endif /* def __VMS */ -diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' wget~/src/retr.c wget/src/retr.c ---- wget~/src/retr.c 2010-09-05 15:30:22.000000000 +0200 -+++ wget/src/retr.c 2010-09-05 15:32:44.000000000 +0200 -@@ -689,7 +689,8 @@ - #endif - || (proxy_url && proxy_url->scheme == SCHEME_HTTP)) - { -- result = http_loop (u, &mynewloc, &local_file, refurl, dt, proxy_url, iri); -+ result = http_loop (u, orig_parsed, &mynewloc, &local_file, refurl, dt, -+ proxy_url, iri); - } - else if (u->scheme == SCHEME_FTP) - { diff -Nru wget-1.12/debian/patches/fix-paramter-spelling-error-in-wget.texi wget-1.12/debian/patches/fix-paramter-spelling-error-in-wget.texi --- wget-1.12/debian/patches/fix-paramter-spelling-error-in-wget.texi 1970-01-01 01:00:00.000000000 +0100 +++ wget-1.12/debian/patches/fix-paramter-spelling-error-in-wget.texi 2011-03-14 21:24:24.000000000 +0100 @@ -0,0 +1,13 @@ +fix paramter spelling error in doc/wget.texi + +--- a/doc/wget.texi ++++ b/doc/wget.texi +@@ -1426,7 +1426,7 @@ + Other than that, they work in exactly the same way. In particular, + they @emph{both} expect content of the form @code{key1=value1&key2=value2}, + with percent-encoding for special characters; the only difference is +-that one expects its content as a command-line paramter and the other ++that one expects its content as a command-line parameter and the other + accepts its content from a file. In particular, @samp{--post-file} is + @emph{not} for transmitting files as form attachments: those must + appear as @code{key=value} data (with appropriate percent-coding) just diff -Nru wget-1.12/debian/patches/series wget-1.12/debian/patches/series --- wget-1.12/debian/patches/series 2010-09-05 15:35:56.000000000 +0200 +++ wget-1.12/debian/patches/series 2011-03-14 21:24:24.000000000 +0100 @@ -1 +1,10 @@ +fix-paramter-spelling-error-in-wget.texi debian-changes-1.12-2 +wget-doc-remove-usr-local-in-sample.wgetrc +wget-doc-remove-usr-local-in-wget.texi +wget-fr.po-spelling-correction +wget-passive_ftp-default +wget-infopod_generated_manpage +wget-de.po-remove-double-quote-signs +wget-zh_CN.po-translation-correction +CVE-2010-2252 diff -Nru wget-1.12/debian/patches/wget-de.po-remove-double-quote-signs wget-1.12/debian/patches/wget-de.po-remove-double-quote-signs --- wget-1.12/debian/patches/wget-de.po-remove-double-quote-signs 2010-09-05 15:35:56.000000000 +0200 +++ wget-1.12/debian/patches/wget-de.po-remove-double-quote-signs 2011-03-14 21:24:24.000000000 +0100 @@ -1,31 +1,7 @@ -#!/bin/sh -e -## wget-de.po-remove-double-quote-signs.dpatch by Anthony Fok <[email protected]> -## -## DP: Removed extraneous doubled quote signs, and merged 2009-12-18 revisions -## DP: from http://translationproject.org/PO-files/de/wget-1.12-pre6.de.po +Removed extraneous doubled quote signs, and merged 2009-12-18 revisions from http://translationproject.org/PO-files/de/wget-1.12-pre6.de.po -if [ $# -lt 1 ]; then - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -fi - -[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts -patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}" - -case "$1" in - -patch) patch $patch_opts -p1 < $0;; - -unpatch) patch $patch_opts -p1 -R < $0;; - *) - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1;; -esac - -exit 0 - -@DPATCH@ -diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' wget-1.12~/po/de.po wget-1.12/po/de.po ---- wget-1.12~/po/de.po 2009-09-23 00:40:36.000000000 +0800 -+++ wget-1.12/po/de.po 2010-03-17 06:00:29.136757384 +0800 +--- a/po/de.po ++++ b/po/de.po @@ -10,7 +10,7 @@ "Project-Id-Version: wget 1.12-pre6\n" "Report-Msgid-Bugs-To: [email protected]\n" diff -Nru wget-1.12/debian/patches/wget-doc-remove-usr-local-in-sample.wgetrc wget-1.12/debian/patches/wget-doc-remove-usr-local-in-sample.wgetrc --- wget-1.12/debian/patches/wget-doc-remove-usr-local-in-sample.wgetrc 2010-09-05 15:35:56.000000000 +0200 +++ wget-1.12/debian/patches/wget-doc-remove-usr-local-in-sample.wgetrc 2011-03-14 21:24:24.000000000 +0100 @@ -1,30 +1,7 @@ -#!/bin/sh -e -## wget-doc-wgetrc-path-in-sample.wgetrc by Noèl Köthe <noel debian.org> -## -## DP: corrects the wgetrc path from /usr/local/etc/ to /etc/wgetrc in the -## DP: sample wgetrc +corrects the wgetrc path from /usr/local/etc/ to /etc/wgetrc in the sample wgetrc -if [ $# -lt 1 ]; then - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -fi - -[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts -patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}" - -case "$1" in - -patch) patch $patch_opts -p1 < $0;; - -unpatch) patch $patch_opts -p1 -R < $0;; - *) - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1;; -esac - -exit 0 - -@DPATCH@ ---- wget-1.9.1.orig/doc/sample.wgetrc -+++ wget-1.9.1/doc/sample.wgetrc +--- a/doc/sample.wgetrc ++++ b/doc/sample.wgetrc @@ -7,7 +7,7 @@ ## not contain a comprehensive list of commands -- look at the manual ## to find out what you can put into this file. diff -Nru wget-1.12/debian/patches/wget-doc-remove-usr-local-in-wget.texi wget-1.12/debian/patches/wget-doc-remove-usr-local-in-wget.texi --- wget-1.12/debian/patches/wget-doc-remove-usr-local-in-wget.texi 2010-09-05 15:35:56.000000000 +0200 +++ wget-1.12/debian/patches/wget-doc-remove-usr-local-in-wget.texi 2011-03-14 21:24:24.000000000 +0100 @@ -1,31 +1,8 @@ -#!/bin/sh -e -## wget-doc-wgetrc-path-in-sample.wgetrc by Noèl Köthe <noel debian.org> -## -## DP: corrects the wgetrc path from /usr/local/etc/ to /etc/wgetrc in the -## DP: sample wgetrc +corrects the wgetrc path from /usr/local/etc/ to /etc/wgetrc in the sample wget.texi -if [ $# -lt 1 ]; then - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -fi - -[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts -patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}" - -case "$1" in - -patch) patch $patch_opts -p1 < $0;; - -unpatch) patch $patch_opts -p1 -R < $0;; - *) - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1;; -esac - -exit 0 - -@DPATCH@ ---- wget-1.9.1.orig/doc/wget.texi -+++ wget-1.9.1/doc/wget.texi -@@ -197,12 +197,12 @@ +--- a/doc/wget.texi ++++ b/doc/wget.texi +@@ -190,12 +190,12 @@ Most of the features are fully configurable, either through command line options, or via the initialization file @file{.wgetrc} (@pxref{Startup File}). Wget allows you to define @dfn{global} startup files @@ -40,7 +17,7 @@ Default location of the @dfn{global} startup file. @item .wgetrc -@@ -2090,9 +2090,7 @@ +@@ -2670,9 +2670,7 @@ @cindex location of wgetrc When initializing, Wget will look for a @dfn{global} startup file, @@ -51,7 +28,7 @@ Then it will look for the user's file. If the environmental variable @code{WGETRC} is set, Wget will try to load that file. Failing that, no -@@ -2102,7 +2100,7 @@ +@@ -2682,7 +2680,7 @@ The fact that user's settings are loaded after the system-wide ones means that in case of collision user's wgetrc @emph{overrides} the diff -Nru wget-1.12/debian/patches/wget-fr.po-spelling-correction wget-1.12/debian/patches/wget-fr.po-spelling-correction --- wget-1.12/debian/patches/wget-fr.po-spelling-correction 2010-09-05 15:35:56.000000000 +0200 +++ wget-1.12/debian/patches/wget-fr.po-spelling-correction 2011-03-14 21:24:24.000000000 +0100 @@ -1,36 +1,13 @@ -#!/bin/sh -e -## wget-fr.po-spelling-correction by Noèl Köthe <noel debian.org> -## -## DP: corrects the translation of Length +corrects the translation of Length -if [ $# -lt 1 ]; then - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -fi - -[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts -patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}" - -case "$1" in - -patch) patch $patch_opts -p1 < $0;; - -unpatch) patch $patch_opts -p1 -R < $0;; - *) - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1;; -esac - -exit 0 - -@DPATCH@ ---- wget-1.9.1.orig/po/fr.po -+++ wget-1.9.1/po/fr.po -@@ -252,7 +252,7 @@ - #: src/ftp.c:898 src/ftp.c:906 +--- a/po/fr.po ++++ b/po/fr.po +@@ -236,7 +236,7 @@ + #: src/ftp.c:221 #, c-format msgid "Length: %s" -msgstr "Longueur: %s" +msgstr "Taille: %s" - - #: src/ftp.c:900 src/ftp.c:908 + + #: src/ftp.c:227 src/http.c:2253 #, c-format - diff -Nru wget-1.12/debian/patches/wget-infopod_generated_manpage wget-1.12/debian/patches/wget-infopod_generated_manpage --- wget-1.12/debian/patches/wget-infopod_generated_manpage 1970-01-01 01:00:00.000000000 +0100 +++ wget-1.12/debian/patches/wget-infopod_generated_manpage 2011-03-14 21:24:24.000000000 +0100 @@ -0,0 +1,17 @@ +using info2pod to generate the pod file to have a complete manpage + +--- a/doc/Makefile.in ++++ b/doc/Makefile.in +@@ -1032,8 +1032,10 @@ + $(SAMPLERCTEXI): $(srcdir)/sample.wgetrc + sed s/@/@@/g $? > $@ + +-wget.pod: $(srcdir)/wget.texi version.texi +- $(TEXI2POD) $(srcdir)/wget.texi $@ ++#wget.pod: $(srcdir)/wget.texi version.texi ++# $(TEXI2POD) $(srcdir)/wget.texi $@ ++wget.pod: wget.info ++ info2pod wget.info > $@ + + $(MAN): wget.pod + $(POD2MAN) --center="GNU Wget" --release="GNU Wget @VERSION@" $? > $@ diff -Nru wget-1.12/debian/patches/wget-infopod_generated_manpage.dpatch wget-1.12/debian/patches/wget-infopod_generated_manpage.dpatch --- wget-1.12/debian/patches/wget-infopod_generated_manpage.dpatch 2010-09-05 15:35:56.000000000 +0200 +++ wget-1.12/debian/patches/wget-infopod_generated_manpage.dpatch 1970-01-01 01:00:00.000000000 +0100 @@ -1,42 +0,0 @@ -#!/bin/sh -e -## wget-infopod_generated_manpage.dpatch by Noèl Köthe <noel debian.org> -## -## DP: using info2pod to generate the pod file to have a complete manpage - -if [ $# -lt 1 ]; then - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -fi - -[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts -patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}" - -case "$1" in - -patch) patch $patch_opts -p1 < $0;; - -unpatch) patch $patch_opts -p1 -R < $0;; - *) - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1;; -esac - -exit 0 - -@DPATCH@ -diff --git a/doc/Makefile.in b/doc/Makefile.in -index e89a525..c13a4f9 100644 ---- a/doc/Makefile.in -+++ b/doc/Makefile.in -@@ -1032,8 +1032,10 @@ - $(SAMPLERCTEXI): $(srcdir)/sample.wgetrc - sed s/@/@@/g $? > $@ - --wget.pod: $(srcdir)/wget.texi version.texi -- $(TEXI2POD) $(srcdir)/wget.texi $@ -+#wget.pod: $(srcdir)/wget.texi version.texi -+# $(TEXI2POD) $(srcdir)/wget.texi $@ -+wget.pod: wget.info -+ info2pod wget.info > $@ - - $(MAN): wget.pod - $(POD2MAN) --center="GNU Wget" --release="GNU Wget @VERSION@" $? > $@ - diff -Nru wget-1.12/debian/patches/wget-passive_ftp-default wget-1.12/debian/patches/wget-passive_ftp-default --- wget-1.12/debian/patches/wget-passive_ftp-default 2010-09-05 15:35:56.000000000 +0200 +++ wget-1.12/debian/patches/wget-passive_ftp-default 2011-03-14 21:24:24.000000000 +0100 @@ -1,35 +1,12 @@ -#!/bin/sh -e -## wget-passive_ftp-default by Noèl Köthe <noel debian.org> -## -## DP: make passive-ftp the default +make passive-ftp the default -if [ $# -lt 1 ]; then - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -fi - -[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts -patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}" - -case "$1" in - -patch) patch $patch_opts -p1 < $0;; - -unpatch) patch $patch_opts -p1 -R < $0;; - *) - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1;; -esac - -exit 0 - -@DPATCH@ ---- wget-1.9.1.orig/doc/sample.wgetrc -+++ wget-1.9.1/doc/sample.wgetrc -@@ -40,6 +40,7 @@ - # `passive' feature of FTP. If you are behind such a firewall, you - # can turn this on to make Wget use passive FTP by default. +--- a/doc/sample.wgetrc ++++ b/doc/sample.wgetrc +@@ -43,6 +43,7 @@ + # problems supporting passive transfer. If you are in such + # environment, use "passive_ftp = off" to revert to active FTP. #passive_ftp = off +passive_ftp = on - + # The "wait" command below makes Wget wait between every connection. # If, instead, you want Wget to wait only between retries of failed - diff -Nru wget-1.12/debian/patches/wget-zh_CN.po-translation-correction wget-1.12/debian/patches/wget-zh_CN.po-translation-correction --- wget-1.12/debian/patches/wget-zh_CN.po-translation-correction 2010-09-05 15:35:56.000000000 +0200 +++ wget-1.12/debian/patches/wget-zh_CN.po-translation-correction 2011-03-14 21:24:24.000000000 +0100 @@ -1,30 +1,7 @@ -#!/bin/sh -e -## wget-zh_CN.po-translation-correction.dpatch by Anthony Fok <[email protected]> -## -## DP: Correct mistranslation of " eta " etc. +Correct mistranslation of " eta " etc. -if [ $# -lt 1 ]; then - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -fi - -[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts -patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}" - -case "$1" in - -patch) patch $patch_opts -p1 < $0;; - -unpatch) patch $patch_opts -p1 -R < $0;; - *) - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1;; -esac - -exit 0 - -@DPATCH@ -diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' wget-1.12~/po/zh_CN.po wget-1.12/po/zh_CN.po ---- wget-1.12~/po/zh_CN.po 2009-09-23 00:40:40.000000000 +0800 -+++ wget-1.12/po/zh_CN.po 2010-03-04 08:02:40.148827703 +0800 +--- a/po/zh_CN.po ++++ b/po/zh_CN.po @@ -4,17 +4,17 @@ # Rongjun Mu <[email protected]>, 2003. # Liu Songhe <[email protected]>, 2003. diff -Nru wget-1.12/debian/rules wget-1.12/debian/rules --- wget-1.12/debian/rules 2010-09-05 15:35:56.000000000 +0200 +++ wget-1.12/debian/rules 2011-03-14 21:24:24.000000000 +0100 @@ -1,9 +1,10 @@ #!/usr/bin/make -f # Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 +export DH_VERBOSE=1 -include /usr/share/dpatch/dpatch.make +# No more needed as all dpatches converted to quilt. +# include /usr/share/dpatch/dpatch.make DEB_HOST_GNU_TYPE ?=$(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?=$(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) @@ -14,7 +15,7 @@ confflags= --build $(DEB_BUILD_GNU_TYPE) endif -config.status: patch-stamp +config.status: dh_testdir # Add here commands to configure the package. CFLAGS="$$CFLAGS -D_FILE_OFFSET_BITS=64 -O2 -g -Wall" ./configure \ @@ -39,8 +40,7 @@ touch build-stamp -clean: clean-patched unpatch -clean-patched: +clean: dh_testdir dh_testroot rm -f build-stamp configure-stamp
signature.asc
Description: Digital signature
