From 5f096ed82ae03d137704f4bb40907dab152421a9 Mon Sep 17 00:00:00 2001 From: Tomas Hozza Date: Fri, 12 Jul 2013 08:45:12 +0200 Subject: [PATCH] Add missing documentation and fix --preserve-permissins - Add documentation for --regex-type and --preserve-permissions - Fix --preserve-permissions to work as documented (and expected) Signed-off-by: Tomas Hozza --- ...ng-opts-and-fix-preserve-permissions.patch | 61 +++++++++++++++++++ wget.spec | 6 +- 2 files changed, 66 insertions(+), 1 deletion(-) create mode 100644 wget-1.14-doc-missing-opts-and-fix-preserve-permissions.patch diff --git a/wget-1.14-doc-missing-opts-and-fix-preserve-permissions.patch b/wget-1.14-doc-missing-opts-and-fix-preserve-permissions.patch new file mode 100644 index 0000000..7bc67c0 --- /dev/null +++ b/wget-1.14-doc-missing-opts-and-fix-preserve-permissions.patch @@ -0,0 +1,61 @@ +From c78caecbb4209ce2e36a587497cf1d6b350e513a Mon Sep 17 00:00:00 2001 +From: Tomas Hozza +Date: Thu, 11 Jul 2013 15:52:28 +0000 +Subject: Document missing options and fix --preserve-permissions + +Added documentation for --regex-type and --preserve-permissions +options. + +Fixed --preserve-permissions to work properly also if downloading a +single file from FTP. + +Signed-off-by: Tomas Hozza +--- +diff --git a/doc/wget.texi b/doc/wget.texi +index 710f0ac..5054382 100644 +--- a/doc/wget.texi ++++ b/doc/wget.texi +@@ -1816,6 +1816,10 @@ in some rare firewall configurations, active FTP actually works when + passive FTP doesn't. If you suspect this to be the case, use this + option, or set @code{passive_ftp=off} in your init file. + ++@cindex file permissions ++@item --preserve-permissions ++Preserve remote file permissions instead of permissions set by umask. ++ + @cindex symbolic links, retrieving + @item --retr-symlinks + Usually, when retrieving @sc{ftp} directories recursively and a symbolic +@@ -2057,6 +2061,11 @@ it will be treated as a pattern, rather than a suffix. + @itemx --reject-regex @var{urlregex} + Specify a regular expression to accept or reject the complete URL. + ++@item --regex-type @var{regextype} ++Specify the regular expression type. Possible types are @samp{posix} or ++@samp{pcre}. Note that to be able to use @samp{pcre} type, wget has to be ++compiled with libpcre support. ++ + @item -D @var{domain-list} + @itemx --domains=@var{domain-list} + Set domains to be followed. @var{domain-list} is a comma-separated list +diff --git a/src/ftp.c b/src/ftp.c +index 9b3d81c..1fe2bac 100644 +--- a/src/ftp.c ++++ b/src/ftp.c +@@ -2285,11 +2285,11 @@ ftp_loop (struct url *u, char **local_file, int *dt, struct url *proxy, + file_part = u->path; + ispattern = has_wildcards_p (file_part); + } +- if (ispattern || recursive || opt.timestamping) ++ if (ispattern || recursive || opt.timestamping || opt.preserve_perm) + { + /* ftp_retrieve_glob is a catch-all function that gets called +- if we need globbing, time-stamping or recursion. Its +- third argument is just what we really need. */ ++ if we need globbing, time-stamping, recursion or preserve ++ permissions. Its third argument is just what we really need. */ + res = ftp_retrieve_glob (u, &con, + ispattern ? GLOB_GLOBALL : GLOB_GETONE); + } +-- +cgit v0.9.0.2 diff --git a/wget.spec b/wget.spec index 4b66236..7367b2b 100644 --- a/wget.spec +++ b/wget.spec @@ -15,6 +15,7 @@ Patch5: wget-1.14-add_missing_options_doc.patch Patch6: wget-1.14-texi2pod_error_perl518.patch Patch7: wget-1.14-fix-double-free-of-iri-orig_url.patch Patch8: wget-1.14-Fix-deadcode-and-possible-NULL-use.patch +Patch9: wget-1.14-doc-missing-opts-and-fix-preserve-permissions.patch Provides: webclient Provides: bundled(gnulib) @@ -42,6 +43,7 @@ support for Proxy servers, and configurability. %patch6 -p1 %patch7 -p1 %patch8 -p1 +%patch9 -p1 %build if pkg-config openssl ; then @@ -78,8 +80,10 @@ rm -rf $RPM_BUILD_ROOT %{_infodir}/* %changelog -* Thu Jul 11 2013 Tomas Hozza - 1.14-8 +* Fri Jul 12 2013 Tomas Hozza - 1.14-8 - Fix deadcode and possible use of NULL in vprintf (#913153) +- Add documentation for --regex-type and --preserve-permissions +- Fix --preserve-permissions to work as documented (and expected) * Wed Jul 10 2013 Tomas Hozza - 1.14-7 - Fix double free of iri->orig_url (#981778)