From a8b0b1e955b59bc9c4e4633407793f6725ad2bc6 Mon Sep 17 00:00:00 2001 From: CentOS Buildsys Date: Jul 15 2013 08:13:37 +0000 Subject: import wget-1.14-8.el7.src.rpm --- diff --git a/.wget.metadata b/.wget.metadata new file mode 100644 index 0000000..99ca2af --- /dev/null +++ b/.wget.metadata @@ -0,0 +1,2 @@ +cfa0906e6f72c1c902c29b52d140c22ecdcd617e SOURCES/wget-1.14.tar.xz +b4eee8aca0c13cd7934b8270f72c0491ad1ae075 SOURCES/wget-1.12-path.patch diff --git a/README.md b/README.md deleted file mode 100644 index 0e7897f..0000000 --- a/README.md +++ /dev/null @@ -1,5 +0,0 @@ -The master branch has no content - -Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6 - -If you find this file in a distro specific branch, it means that no content has been checked in yet diff --git a/SOURCES/wget-1.14-Fix-deadcode-and-possible-NULL-use.patch b/SOURCES/wget-1.14-Fix-deadcode-and-possible-NULL-use.patch new file mode 100644 index 0000000..20c4f33 --- /dev/null +++ b/SOURCES/wget-1.14-Fix-deadcode-and-possible-NULL-use.patch @@ -0,0 +1,47 @@ +From 613d8639c48b950f76d132b70d27e518ba6d6891 Mon Sep 17 00:00:00 2001 +From: Tomas Hozza +Date: Fri, 26 Apr 2013 14:42:30 +0200 +Subject: [PATCH] Fix using deadcode and possible use of NULL pointer + +Fix for deadcode in unique_create() so that "opened_name" parameter is +always initialized to a valid string or NULL when returning from +function. + +Fix for redirect_output() so that "logfile" is not blindly used in +fprintf() call and checked if it is not NULL. + +Signed-off-by: Tomas Hozza +--- + src/log.c | 2 +- + src/utils.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/log.c b/src/log.c +index 0185df1..4f93a21 100644 +--- a/src/log.c ++++ b/src/log.c +@@ -871,7 +871,7 @@ redirect_output (void) + can do but disable printing completely. */ + fprintf (stderr, _("\n%s received.\n"), redirect_request_signal_name); + fprintf (stderr, _("%s: %s; disabling logging.\n"), +- logfile, strerror (errno)); ++ (logfile) ? logfile : DEFAULT_LOGFILE, strerror (errno)); + inhibit_logging = true; + } + save_context_p = false; +diff --git a/src/utils.c b/src/utils.c +index 567dc35..7cc942f 100644 +--- a/src/utils.c ++++ b/src/utils.c +@@ -703,7 +703,7 @@ unique_create (const char *name, bool binary, char **opened_name) + xfree (uname); + uname = unique_name (name, false); + } +- if (opened_name && fp != NULL) ++ if (opened_name) + { + if (fp) + *opened_name = uname; +-- +1.8.1.4 + diff --git a/SOURCES/wget-1.14-add_missing_options_doc.patch b/SOURCES/wget-1.14-add_missing_options_doc.patch new file mode 100644 index 0000000..f406609 --- /dev/null +++ b/SOURCES/wget-1.14-add_missing_options_doc.patch @@ -0,0 +1,27 @@ +From 8dc52c6eaa1993d140a52bc0627e436efd9870d0 Mon Sep 17 00:00:00 2001 +From: Giuseppe Scrivano +Date: Sun, 28 Apr 2013 22:41:24 +0200 +Subject: [PATCH] doc: add documentation for --accept-regex and --reject-regex + +--- + doc/wget.texi | 4 ++++ + 1 files changed, 4 insertions(+) + +diff --git a/doc/wget.texi b/doc/wget.texi +index fed188a..039f700 100644 +--- a/doc/wget.texi ++++ b/doc/wget.texi +@@ -2049,6 +2049,10 @@ any of the wildcard characters, @samp{*}, @samp{?}, @samp{[} or + @samp{]}, appear in an element of @var{acclist} or @var{rejlist}, + it will be treated as a pattern, rather than a suffix. + ++@item --accept-regex @var{urlregex} ++@itemx --reject-regex @var{urlregex} ++Specify a regular expression to accept or reject the complete URL. ++ + @item -D @var{domain-list} + @itemx --domains=@var{domain-list} + Set domains to be followed. @var{domain-list} is a comma-separated list +-- +1.8.1.4 + diff --git a/SOURCES/wget-1.14-doc-missing-opts-and-fix-preserve-permissions.patch b/SOURCES/wget-1.14-doc-missing-opts-and-fix-preserve-permissions.patch new file mode 100644 index 0000000..7bc67c0 --- /dev/null +++ b/SOURCES/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/SOURCES/wget-1.14-document-backups.patch b/SOURCES/wget-1.14-document-backups.patch new file mode 100644 index 0000000..eac0ad4 --- /dev/null +++ b/SOURCES/wget-1.14-document-backups.patch @@ -0,0 +1,60 @@ +From 44ba49b31f4ea515f8a6ef2642a34c0fd2024b90 Mon Sep 17 00:00:00 2001 +From: Giuseppe Scrivano +Date: Tue, 9 Jul 2013 00:50:30 +0200 +Subject: [PATCH] doc: document --backups + +--- + doc/wget.texi | 15 ++++++++++++--- + src/main.c | 3 +++ + 2 files changed, 15 insertions(+), 3 deletions(-) + +diff --git a/doc/wget.texi b/doc/wget.texi +index 5054382..7a1670e 100644 +--- a/doc/wget.texi ++++ b/doc/wget.texi +@@ -630,6 +630,13 @@ Note that when @samp{-nc} is specified, files with the suffixes + @samp{.html} or @samp{.htm} will be loaded from the local disk and + parsed as if they had been retrieved from the Web. + ++@cindex backing up files ++@item --backups=@var{backups} ++Before (over)writing a file, back up an existing file by adding a ++@samp{.1} suffix (@samp{_1} on VMS) to the file name. Such backup ++files are rotated to @samp{.2}, @samp{.3}, and so on, up to ++@var{backups} (and lost beyond that). ++ + @cindex continue retrieval + @cindex incomplete downloads + @cindex resume download +@@ -2882,9 +2889,11 @@ enables it). + Enable/disable saving pre-converted files with the suffix + @samp{.orig}---the same as @samp{-K} (which enables it). + +-@c @item backups = @var{number} +-@c #### Document me! +-@c ++@item backups = @var{number} ++Use up to @var{number} backups for a file. Backups are rotated by ++adding an incremental counter that starts at @samp{1}. The default is ++@samp{0}. ++ + @item base = @var{string} + Consider relative @sc{url}s in input files (specified via the + @samp{input} command or the @samp{--input-file}/@samp{-i} option, +diff --git a/src/main.c b/src/main.c +index c895c4e..8ce0eb3 100644 +--- a/src/main.c ++++ b/src/main.c +@@ -714,6 +714,9 @@ Recursive download:\n"), + N_("\ + -k, --convert-links make links in downloaded HTML or CSS point to\n\ + local files.\n"), ++ N_("\ ++ --backups=N before writing file X, rotate up to N backup files.\n"), ++ + #ifdef __VMS + N_("\ + -K, --backup-converted before converting file X, back up as X_orig.\n"), +-- +1.8.3.1 + diff --git a/SOURCES/wget-1.14-fix-backups-to-work-as-documented.patch b/SOURCES/wget-1.14-fix-backups-to-work-as-documented.patch new file mode 100644 index 0000000..799a7a1 --- /dev/null +++ b/SOURCES/wget-1.14-fix-backups-to-work-as-documented.patch @@ -0,0 +1,80 @@ +From c52bbad9e4bad1393a9d6ba37e600d388f5ab419 Mon Sep 17 00:00:00 2001 +From: Giuseppe Scrivano +Date: Wed, 10 Jul 2013 20:59:34 +0200 +Subject: [PATCH] Make --backups work as documented + +--- + src/http.c | 6 ------ + src/options.h | 2 +- + src/url.c | 3 ++- + src/url.h | 6 ++++++ + 4 files changed, 9 insertions(+), 8 deletions(-) + +diff --git a/src/http.c b/src/http.c +index 9f274dc..b0c782b 100644 +--- a/src/http.c ++++ b/src/http.c +@@ -1641,12 +1641,6 @@ read_response_body (struct http_stat *hs, int sock, FILE *fp, wgint contlen, + } while (0) + #endif /* def __VMS [else] */ + +-/* The flags that allow clobbering the file (opening with "wb"). +- Defined here to avoid repetition later. #### This will require +- rework. */ +-#define ALLOW_CLOBBER (opt.noclobber || opt.always_rest || opt.timestamping \ +- || opt.dirstruct || opt.output_document) +- + /* Retrieve a document through HTTP protocol. It recognizes status + code, and correctly handles redirections. It closes the network + socket. If it receives an error from the functions below it, it +diff --git a/src/options.h b/src/options.h +index ed38617..0a10c9b 100644 +--- a/src/options.h ++++ b/src/options.h +@@ -166,7 +166,7 @@ struct options + bool timestamping; /* Whether to use time-stamping. */ + + bool backup_converted; /* Do we save pre-converted files as *.orig? */ +- bool backups; /* Are numeric backups made? */ ++ int backups; /* Are numeric backups made? */ + + char *useragent; /* User-Agent string, which can be set + to something other than Wget. */ +diff --git a/src/url.c b/src/url.c +index 5e2b9a3..bf9d697 100644 +--- a/src/url.c ++++ b/src/url.c +@@ -1669,11 +1669,12 @@ url_file_name (const struct url *u, char *replaced_filename) + 2) Retrieval with regetting. + 3) Timestamping is used. + 4) Hierarchy is built. ++ 5) Backups are specified. + + The exception is the case when file does exist and is a + directory (see `mkalldirs' for explanation). */ + +- if ((opt.noclobber || opt.always_rest || opt.timestamping || opt.dirstruct) ++ if (ALLOW_CLOBBER + && !(file_exists_p (fname) && !file_non_directory_p (fname))) + { + unique = fname; +diff --git a/src/url.h b/src/url.h +index b7f4366..cd3782b 100644 +--- a/src/url.h ++++ b/src/url.h +@@ -47,6 +47,12 @@ as that of the covered work. */ + #define DEFAULT_FTP_PORT 21 + #define DEFAULT_HTTPS_PORT 443 + ++/* The flags that allow clobbering the file (opening with "wb"). ++ Defined here to avoid repetition later. #### This will require ++ rework. */ ++#define ALLOW_CLOBBER (opt.noclobber || opt.always_rest || opt.timestamping \ ++ || opt.dirstruct || opt.output_document || opt.backups > 0) ++ + /* Specifies how, or whether, user auth information should be included + * in URLs regenerated from URL parse structures. */ + enum url_auth_mode { +-- +1.8.3.1 + diff --git a/SOURCES/wget-1.14-fix-double-free-of-iri-orig_url.patch b/SOURCES/wget-1.14-fix-double-free-of-iri-orig_url.patch new file mode 100644 index 0000000..9ad8195 --- /dev/null +++ b/SOURCES/wget-1.14-fix-double-free-of-iri-orig_url.patch @@ -0,0 +1,29 @@ +From bdf2764457bef7c33be289b889ddf6df91773296 Mon Sep 17 00:00:00 2001 +From: Tomas Hozza +Date: Wed, 10 Jul 2013 13:23:37 +0200 +Subject: [PATCH] Set iri->orig_url to NULL after free. + +Set iri->orig_url to NULL after free to prevent double +free in retrieve_url() and iri_free() when using IRI +and downloading site that redirects itself. + +Signed-off-by: Tomas Hozza +--- + src/retr.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/retr.c b/src/retr.c +index 6204839..66624dc 100644 +--- a/src/retr.c ++++ b/src/retr.c +@@ -838,6 +838,7 @@ retrieve_url (struct url * orig_parsed, const char *origurl, char **file, + iri->utf8_encode = opt.enable_iri; + set_content_encoding (iri, NULL); + xfree_null (iri->orig_url); ++ iri->orig_url = NULL; + + /* Now, see if this new location makes sense. */ + newloc_parsed = url_parse (mynewloc, &up_error_code, iri, true); +-- +1.8.3.1 + diff --git a/SOURCES/wget-1.14-manpage-tex5.patch b/SOURCES/wget-1.14-manpage-tex5.patch new file mode 100644 index 0000000..49728fc --- /dev/null +++ b/SOURCES/wget-1.14-manpage-tex5.patch @@ -0,0 +1,55 @@ +From a2a34ad8e09117041761fa96830f289aa6e67042 Mon Sep 17 00:00:00 2001 +From: Tomas Hozza +Date: Fri, 22 Feb 2013 12:29:37 +0100 +Subject: [PATCH] Fix @itemx issue when building doc + +@itemx should be used ONLY for second and subsequent item(s). + +Signed-off-by: Tomas Hozza +--- + doc/wget.texi | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/doc/wget.texi b/doc/wget.texi +index c1fc82f..3768156 100644 +--- a/doc/wget.texi ++++ b/doc/wget.texi +@@ -876,7 +876,7 @@ recommendation to block many unrelated users from a web site due to the + actions of one. + + @cindex proxy +-@itemx --no-proxy ++@item --no-proxy + Don't use proxies, even if the appropriate @code{*_proxy} environment + variable is defined. + +@@ -977,7 +977,7 @@ are outside the range of @sc{ascii} characters (that is, greater than + whose encoding does not match the one used locally. + + @cindex IPv6 +-@itemx -4 ++@item -4 + @itemx --inet4-only + @itemx -6 + @itemx --inet6-only +@@ -3094,7 +3094,7 @@ display properly---the same as @samp{-p}. + Change setting of passive @sc{ftp}, equivalent to the + @samp{--passive-ftp} option. + +-@itemx password = @var{string} ++@item password = @var{string} + Specify password @var{string} for both @sc{ftp} and @sc{http} file retrieval. + This command can be overridden using the @samp{ftp_password} and + @samp{http_password} command for @sc{ftp} and @sc{http} respectively. +@@ -3605,7 +3605,7 @@ In addition to the environment variables, proxy location and settings + may be specified from within Wget itself. + + @table @samp +-@itemx --no-proxy ++@item --no-proxy + @itemx proxy = on/off + This option and the corresponding command may be used to suppress the + use of proxy, even if the appropriate environment variables are set. +-- +1.8.1.2 + diff --git a/SOURCES/wget-1.14-set_sock_to_-1_if_no_persistent_conn.patch b/SOURCES/wget-1.14-set_sock_to_-1_if_no_persistent_conn.patch new file mode 100644 index 0000000..9ee37e8 --- /dev/null +++ b/SOURCES/wget-1.14-set_sock_to_-1_if_no_persistent_conn.patch @@ -0,0 +1,32 @@ +From 8760123cee87e07a276b8b13ef48ada3a490ad47 Mon Sep 17 00:00:00 2001 +From: Tomas Hozza +Date: Thu, 11 Jul 2013 11:22:43 +0000 +Subject: Set sock variable to -1 if no persistent conn exists + +Wget should set sock variable to -1 if no persistent +connection exists. Function persistent_available_p() +tests persistent connection but if test_socket_open() +fails it closes the socket but will not set sock variable +to -1. After returning from persistent_available_p() +it is possible that sock has still value of already +closed connection. + +Signed-off-by: Tomas Hozza +--- +diff --git a/src/http.c b/src/http.c +index 669f0fe..a693355 100644 +--- a/src/http.c ++++ b/src/http.c +@@ -1983,6 +1983,10 @@ gethttp (struct url *u, struct http_stat *hs, int *dt, struct url *proxy, + exec_name, quote (relevant->host)); + return HOSTERR; + } ++ else if (sock != -1) ++ { ++ sock = -1; ++ } + } + + if (sock < 0) +-- +cgit v0.9.0.2 diff --git a/SOURCES/wget-1.14-sslreadtimeout.patch b/SOURCES/wget-1.14-sslreadtimeout.patch new file mode 100644 index 0000000..03c29fc --- /dev/null +++ b/SOURCES/wget-1.14-sslreadtimeout.patch @@ -0,0 +1,105 @@ +diff -up wget-1.14/src/openssl.c.ssltimeout wget-1.14/src/openssl.c +--- wget-1.14/src/openssl.c.ssltimeout 2012-08-09 14:30:14.987964706 +0200 ++++ wget-1.14/src/openssl.c 2012-08-09 14:44:05.467660741 +0200 +@@ -256,19 +256,42 @@ struct openssl_transport_context { + char *last_error; /* last error printed with openssl_errstr */ + }; + +-static int +-openssl_read (int fd, char *buf, int bufsize, void *arg) +-{ +- int ret; +- struct openssl_transport_context *ctx = arg; ++struct openssl_read_args { ++ int fd; ++ struct openssl_transport_context *ctx; ++ char *buf; ++ int bufsize; ++ int retval; ++}; ++ ++static void openssl_read_callback(void *arg) { ++ struct openssl_read_args *args = (struct openssl_read_args *) arg; ++ struct openssl_transport_context *ctx = args->ctx; + SSL *conn = ctx->conn; ++ char *buf = args->buf; ++ int bufsize = args->bufsize; ++ int ret; ++ + do + ret = SSL_read (conn, buf, bufsize); +- while (ret == -1 +- && SSL_get_error (conn, ret) == SSL_ERROR_SYSCALL ++ while (ret == -1 && SSL_get_error (conn, ret) == SSL_ERROR_SYSCALL + && errno == EINTR); ++ args->retval = ret; ++} + +- return ret; ++static int ++openssl_read (int fd, char *buf, int bufsize, void *arg) ++{ ++ struct openssl_read_args args; ++ args.fd = fd; ++ args.buf = buf; ++ args.bufsize = bufsize; ++ args.ctx = (struct openssl_transport_context*) arg; ++ ++ if (run_with_timeout(opt.read_timeout, openssl_read_callback, &args)) { ++ return -1; ++ } ++ return args.retval; + } + + static int +@@ -386,6 +409,18 @@ static struct transport_implementation o + openssl_peek, openssl_errstr, openssl_close + }; + ++struct scwt_context { ++ SSL *ssl; ++ int result; ++}; ++ ++static void ++ssl_connect_with_timeout_callback(void *arg) ++{ ++ struct scwt_context *ctx = (struct scwt_context *)arg; ++ ctx->result = SSL_connect(ctx->ssl); ++} ++ + /* Perform the SSL handshake on file descriptor FD, which is assumed + to be connected to an SSL server. The SSL handle provided by + OpenSSL is registered with the file descriptor FD using +@@ -398,6 +433,7 @@ bool + ssl_connect_wget (int fd, const char *hostname) + { + SSL *conn; ++ struct scwt_context scwt_ctx; + struct openssl_transport_context *ctx; + + DEBUGP (("Initiating SSL handshake.\n")); +@@ -425,7 +461,14 @@ ssl_connect_wget (int fd, const char *ho + if (!SSL_set_fd (conn, FD_TO_SOCKET (fd))) + goto error; + SSL_set_connect_state (conn); +- if (SSL_connect (conn) <= 0 || conn->state != SSL_ST_OK) ++ ++ scwt_ctx.ssl = conn; ++ if (run_with_timeout(opt.read_timeout, ssl_connect_with_timeout_callback, ++ &scwt_ctx)) { ++ DEBUGP (("SSL handshake timed out.\n")); ++ goto timeout; ++ } ++ if (scwt_ctx.result <= 0 || conn->state != SSL_ST_OK) + goto error; + + ctx = xnew0 (struct openssl_transport_context); +@@ -441,6 +484,7 @@ ssl_connect_wget (int fd, const char *ho + error: + DEBUGP (("SSL handshake failed.\n")); + print_errors (); ++ timeout: + if (conn) + SSL_free (conn); + return false; diff --git a/SOURCES/wget-1.14-texi2pod_error_perl518.patch b/SOURCES/wget-1.14-texi2pod_error_perl518.patch new file mode 100644 index 0000000..13427a0 --- /dev/null +++ b/SOURCES/wget-1.14-texi2pod_error_perl518.patch @@ -0,0 +1,25 @@ +From 7f43748544f26008d0dd337704f02a6ed3200aaf Mon Sep 17 00:00:00 2001 +From: Dave Reisner +Date: Mon, 17 Jun 2013 23:31:46 +0530 +Subject: [PATCH] Fix error in texi2pod intriduced with Perl 5.18 + +--- + doc/texi2pod.pl | 2 +- + 1 files changed, 1 insertions(+), 1 deletion(-) + +diff --git a/doc/texi2pod.pl b/doc/texi2pod.pl +index 86c4b18..9db6de1 100755 +--- a/doc/texi2pod.pl ++++ b/doc/texi2pod.pl +@@ -291,7 +291,7 @@ while(<$inf>) { + if (defined $1) { + my $thing = $1; + if ($ic =~ /\@asis/) { +- $_ = "\n=item $thing\n"; ++ $_ = "\n=item C<$thing>\n"; + } else { + # Entity escapes prevent munging by the <> processing below. + $_ = "\n=item $ic\<$thing\>\n"; +-- +1.8.1.4 + diff --git a/SOURCES/wget-rh-modified.patch b/SOURCES/wget-rh-modified.patch new file mode 100644 index 0000000..b9d528f --- /dev/null +++ b/SOURCES/wget-rh-modified.patch @@ -0,0 +1,11 @@ +--- configure~ 2011-09-13 03:15:38.000000000 -0500 ++++ configure 2011-12-16 09:19:34.574773958 -0600 +@@ -561,7 +561,7 @@ + PACKAGE_NAME='wget' + PACKAGE_TARNAME='wget' + PACKAGE_VERSION='1.14' +-PACKAGE_STRING='wget 1.14' ++PACKAGE_STRING='wget 1.14 (Red Hat modified)' + PACKAGE_BUGREPORT='bug-wget@gnu.org' + PACKAGE_URL='' + diff --git a/SPECS/wget.spec b/SPECS/wget.spec new file mode 100644 index 0000000..c378543 --- /dev/null +++ b/SPECS/wget.spec @@ -0,0 +1,518 @@ +Summary: A utility for retrieving files using the HTTP or FTP protocols +Name: wget +Version: 1.14 +Release: 8%{?dist} +License: GPLv3+ +Group: Applications/Internet +Url: http://www.gnu.org/software/wget/ +Source: ftp://ftp.gnu.org/gnu/wget/wget-%{version}.tar.xz + +Patch1: wget-rh-modified.patch +Patch2: wget-1.12-path.patch +Patch3: wget-1.14-sslreadtimeout.patch +Patch4: wget-1.14-manpage-tex5.patch +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 +Patch10: wget-1.14-set_sock_to_-1_if_no_persistent_conn.patch +Patch11: wget-1.14-document-backups.patch +Patch12: wget-1.14-fix-backups-to-work-as-documented.patch + +Provides: webclient +Provides: bundled(gnulib) +Requires(post): /sbin/install-info +Requires(preun): /sbin/install-info +BuildRequires: openssl-devel, pkgconfig, texinfo, gettext, autoconf, libidn-devel, libuuid-devel, perl-podlators +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +%description +GNU Wget is a file retrieval utility which can use either the HTTP or +FTP protocols. Wget features include the ability to work in the +background while you are logged out, recursive retrieval of +directories, file name wildcard matching, remote file timestamp +storage and comparison, use of Rest with FTP servers and Range with +HTTP servers to retrieve files over slow or unstable connections, +support for Proxy servers, and configurability. + +%prep +%setup -q +%patch1 -p0 +%patch2 -p1 +%patch3 -p1 -b .sslreadtimeout +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 +%patch9 -p1 +%patch10 -p1 +%patch11 -p1 +%patch12 -p1 + +%build +if pkg-config openssl ; then + CPPFLAGS=`pkg-config --cflags openssl`; export CPPFLAGS + LDFLAGS=`pkg-config --libs openssl`; export LDFLAGS +fi +%configure --with-ssl=openssl --enable-largefile --enable-opie --enable-digest --enable-ntlm --enable-nls --enable-ipv6 --disable-rpath +make %{?_smp_mflags} + +%install +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT CFLAGS="$RPM_OPT_FLAGS" +rm -f $RPM_BUILD_ROOT/%{_infodir}/dir + +%find_lang %{name} + +%post +/sbin/install-info %{_infodir}/wget.info.gz %{_infodir}/dir || : + +%preun +if [ "$1" = 0 ]; then + /sbin/install-info --delete %{_infodir}/wget.info.gz %{_infodir}/dir || : +fi + +%clean +rm -rf $RPM_BUILD_ROOT + +%files -f %{name}.lang +%defattr(-,root,root) +%doc AUTHORS MAILING-LIST NEWS README COPYING doc/sample.wgetrc +%config(noreplace) %{_sysconfdir}/wgetrc +%{_mandir}/man1/wget.* +%{_bindir}/wget +%{_infodir}/* + +%changelog +* Mon Jul 15 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) +- Fix bug when authenticating using user:password@url syntax (#912358) +- Document and fix --backups option + +* Wed Jul 10 2013 Tomas Hozza - 1.14-7 +- Fix double free of iri->orig_url (#981778) + +* Mon Jun 24 2013 Tomas Hozza - 1.14-6 +- add missing options accept-regex and reject-regex to man page +- fix errors in texi2pod introduced in Perl-5.18 + +* Fri Feb 22 2013 Tomas Hozza - 1.14-5 +- Added BuildRequires: perl-podlators for pod2man +- Patched manpage to silent new Tex errors +- Resolves: (#914571) + +* Fri Feb 15 2013 Fedora Release Engineering - 1.14-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Thu Oct 11 2012 Tomas Hozza 1.14-3 +- Added libuuid-devel to BuildRequires to use libuuid functions + in "src/warc.c" functions (#865421) + +* Wed Oct 10 2012 Tomas Hozza 1.14-2 +- Added libidn-devel to BuildRequires to support IDN domains (#680394) + +* Thu Aug 09 2012 Karsten Hopp 1.14-1 +- Update to wget-1.14 + +* Sun Jul 22 2012 Fedora Release Engineering - 1.13.4-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Tue May 29 2012 Karsten Hopp 1.13.4-4 +- fix timeout if http server doesn't answer to SSL handshake (#860727) + +* Tue May 15 2012 Karsten Hopp 1.13.4-3 +- add virtual provides per https://fedoraproject.org/wiki/Packaging:No_Bundled_Libraries + +* Sat Jan 14 2012 Fedora Release Engineering - 1.13.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Fri Dec 16 2011 Jon Ciesla - 1.13.4-1 +- New upstream, BZ 730286. +- Modified path patch. +- subjectAltNames patch upstreamed. +- Specified openssl at config time. + +* Thu Jun 23 2011 Volker Fröhlich - 1.12-4 +- Applied patch to accept subjectAltNames in X509 certificates (#674186) +- New URL (#658969) + +* Mon Feb 07 2011 Fedora Release Engineering - 1.12-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Wed Nov 18 2009 Karsten Hopp 1.12-2 +- don't provide /usr/share/info/dir + +* Tue Nov 17 2009 Karsten Hopp 1.12-1 +- update to wget-1.12 +- fixes CVE-2009-3490 wget: incorrect verification of SSL certificate + with NUL in name + +* Fri Aug 21 2009 Tomas Mraz - 1.11.4-5 +- rebuilt with new openssl + +* Mon Jul 27 2009 Fedora Release Engineering - 1.11.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Wed Feb 25 2009 Fedora Release Engineering - 1.11.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Sun Jan 18 2009 Tomas Mraz 1.11.4-2 +- rebuild with new openssl + +* Wed Aug 13 2008 Karsten Hopp 1.11.4-1 +- update + +* Wed Jun 04 2008 Karsten Hopp 1.11.3-1 +- wget-1.11.3, downgrades the combination of the -N and -O options + to a warning instead of an error + +* Fri May 09 2008 Karsten Hopp 1.11.2-1 +- wget-1.11.2, fixes #179962 + +* Mon Mar 31 2008 Karsten Hopp 1.11.1-1 +- update to bugfix release 1.11.1, fixes p.e. #433606 + +* Tue Feb 19 2008 Fedora Release Engineering - 1.11-2 +- Autorebuild for GCC 4.3 + +* Tue Dec 04 2007 Karsten Hopp 1.10.2-17 +- rebuild to pick up new openssl SONAME + +* Mon Aug 27 2007 Karsten Hopp 1.10.2-16 +- fix license tag +- rebuild + +* Mon Feb 12 2007 Karsten Hopp 1.10.2-15 +- fix discarding of expired cookies +- escape non-printable characters +- drop to11 patch for now (#223754, #227853, #227498) + +* Mon Feb 05 2007 Karsten Hopp 1.10.2-14 +- shut up rpmlint, even though xx isn't a macro + +* Mon Feb 05 2007 Karsten Hopp 1.10.2-13 +- merge review changes (#226538) + - use version/release/... in buildroot tag + - remove BR perl + - use SMP flags + - use make install instead of %%makeinstall + - include copy of license + - use Requires(post)/Requires(preun) + - use optflags + - remove trailing dot from summary + - change tabs to spaces + +* Thu Jan 18 2007 Karsten Hopp 1.10.2-12 +- don't abort (un)install scriptlets when _excludedocs is set (Ville Skyttä) + +* Wed Jan 10 2007 Karsten Hopp 1.10.2-11 +- add fix for CVE-2006-6719 + +* Fri Dec 08 2006 Karsten Hopp 1.10.2-10 +- fix repeated downloads (Tomas Heinrich, #186195) + +* Thu Dec 07 2006 Karsten Hopp 1.10.2-9 +- add distflag, rebuild + +* Thu Dec 07 2006 Karsten Hopp 1.10.2-8 +- Resolves: #218211 + fix double free corruption + +* Sun Oct 01 2006 Jesse Keating - 1.10.2-7 +- rebuilt for unwind info generation, broken in gcc-4.1.1-21 + +* Mon Sep 25 2006 Karsten Hopp 1.10.2-6 +- fix resumed downloads (#205723) + +* Wed Jul 12 2006 Jesse Keating - 1.10.2-5.1 +- rebuild + +* Thu Jun 29 2006 Karsten Hopp 1.10.2-5 +- updated german translations from Robert Scheck + +* Tue Jun 27 2006 Karsten Hopp 1.10.2-4 +- upstream patches + +* Fri Feb 10 2006 Jesse Keating - 1.10.2-3.2.1 +- bump again for double-long bug on ppc(64) + +* Tue Feb 07 2006 Jesse Keating - 1.10.2-3.2 +- rebuilt for new gcc4.1 snapshot and glibc changes + +* Fri Dec 09 2005 Jesse Keating +- rebuilt + +* Thu Nov 10 2005 Tomas Mraz 1.10.2-3 +- rebuilt against new openssl + +* Tue Oct 25 2005 Karsten Hopp 1.10.2-2 +- use %%{_sysconfdir} (#171555) + +* Sat Oct 15 2005 Florian La Roche +- 1.10.2 + +* Thu Sep 08 2005 Karsten Hopp 1.10.1-7 +- fix builtin help of --load-cookies / --save-cookies (#165408) + +* Wed Sep 07 2005 Karsten Hopp 1.10.1-6 +- convert changelog to UTF-8 (#159585) + +* Mon Sep 05 2005 Karsten Hopp 1.10.1-5 +- update +- drop patches which are already in the upstream sources + +* Wed Jul 13 2005 Karsten Hopp 1.10-5 +- update german translation + +* Mon Jul 11 2005 Karsten Hopp 1.10-4 +- update german translation (Robert Scheck) + +* Tue Jul 05 2005 Karsten Hopp 1.10-3 +- fix minor documentation bug +- fix --no-cookies crash + +* Mon Jul 04 2005 Karsten Hopp 1.10-2 +- update to wget-1.10 + - drop passive-ftp patch, already in 1.10 + - drop CVS patch + - drop LFS patch, similar fix in 1.10 + - drop protdir patch, similar fix in 1.10 + - drop actime patch, already in 1.10 + +* Wed Mar 02 2005 Karsten Hopp 1.9.1-22 +- build with gcc-4 + +* Wed Feb 02 2005 Karsten Hopp 1.9.1-21 +- remove old copy of the manpage (#146875, #135597) +- fix garbage in manpage (#117519) + +* Tue Feb 01 2005 Karsten Hopp 1.9.1-20 +- texi2pod doesn't handle texinfo xref's. rewrite some lines so that + the man page doesn't have incomplete sentences anymore (#140470) + +* Mon Jan 31 2005 Karsten Hopp 1.9.1-19 +- Don't set actime to access time of the remote file or tmpwatch might + remove the file again (#146440). Set it to the current time instead. + timestamping checks only modtime, so this should be ok. + +* Thu Jan 20 2005 Karsten Hopp 1.9.1-18 +- add support for --protocol-directories option as documented + in the man page (Ville Skyttä, #145571) + +* Wed Sep 29 2004 Karsten Hopp 1.9.1-17 +- additional LFS patch from Leonid Petrov to fix file lengths in + http downloads + +* Thu Sep 16 2004 Karsten Hopp 1.9.1-16 +- more fixes + +* Tue Sep 14 2004 Karsten Hopp 1.9.1-15 +- added strtol fix from Leonid Petrov, reenable LFS + +* Tue Sep 14 2004 Karsten Hopp 1.9.1-14 +- buildrequires gettext (#132519) + +* Wed Sep 01 2004 Karsten Hopp 1.9.1-13 +- disable LFS patch for now, it breaks normal downloads (123524#c15) + +* Tue Aug 31 2004 Karsten Hopp 1.9.1-12 +- move largefile stuff inside the configure script, it didn't + get appended to CFLAGS + +* Tue Aug 31 2004 Karsten Hopp 1.9.1-11 +- rebuild + +* Tue Aug 31 2004 Karsten Hopp 1.9.1-10 +- fix patch + +* Sun Aug 29 2004 Karsten Hopp 1.9.1-9 +- more cleanups of the manpage (#117519) + +* Fri Aug 27 2004 Karsten Hopp 1.9.1-8 +- rebuild + +* Fri Aug 27 2004 Karsten Hopp 1.9.1-7 +- clean up manpage (#117519) +- buildrequire texinfo (#123780) +- LFS patch, based on wget-LFS-20040630.patch from Leonid Petrov + (#123524, #124628, #115348) + +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Thu Mar 11 2004 Karsten Hopp 1.9.1-3 +- fix documentation (#117517) + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Fri Nov 28 2003 Karsten Hopp 1.9.1-3 +- update to -stable CVS +- document the passive ftp default + +* Fri Nov 28 2003 Karsten Hopp 1.9.1-2 +- add patch from -stable CVS + +* Fri Nov 28 2003 Karsten Hopp 1.9.1-1 +- update to 1.9.1 +- remove obsolete patches + +* Mon Aug 04 2003 Karsten Hopp 1.8.2-15.3 +- fix variable usage + +* Tue Jul 22 2003 Nalin Dahyabhai 1.8.2-15.2 +- rebuild + +* Wed Jun 25 2003 Karsten Hopp 1.8.2-15.1 +- rebuilt + +* Wed Jun 25 2003 Karsten Hopp 1.8.2-15 +- default to passive-ftp (#97996) + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Wed Jun 04 2003 Karsten Hopp 1.8.2-13 +- rebuild + +* Wed Jun 04 2003 Karsten Hopp 1.8.2-12 +- merge debian patch for long URLs +- cleanup filename patch + +* Sun May 11 2003 Karsten Hopp 1.8.2-11 +- rebuild + +* Sun May 11 2003 Karsten Hopp 1.8.2-10 +- upstream fix off-by-one error + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Tue Jan 7 2003 Nalin Dahyabhai 1.8.2-8 +- rebuild + +* Fri Dec 13 2002 Nalin Dahyabhai +- use openssl pkg-config data, if present +- don't bomb out when building with newer openssl + +* Thu Dec 12 2002 Tim Powers 1.8.2-7 +- rebuild on all arches + +* Tue Nov 19 2002 Tim Powers +- rebuild on all arches + +* Fri Oct 4 2002 Karsten Hopp 1.8.2-5 +- fix directory traversal bug + +* Wed Jul 24 2002 Trond Eivind Glomsrød 1.8.2-3 +- Don't segfault when downloading URLs A-B-A (A-A-B worked) #49859 + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Wed May 29 2002 Florian La Roche +- update to 1.8.2 (bug-fix release) + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Mon Apr 29 2002 Florian La Roche +- remove s390 patch, not needed anymore + +* Wed Feb 27 2002 Trond Eivind Glomsrød 1.8.1-4 +- Rebuild + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + +* Fri Dec 28 2001 Florian La Roche +- add hack to not link against libmd5, even if available + +* Fri Dec 28 2001 Florian La Roche +- update to 1.8.1 + +* Thu Dec 13 2001 Florian La Roche +- update to 1.8 +- also include md5global to get it compile + +* Sun Nov 18 2001 Florian La Roche +- update to 1.7.1 + +* Wed Sep 5 2001 Phil Knirsch 1.7-3 +- Added va_args patch required for S390. + +* Mon Sep 3 2001 Trond Eivind Glomsrød 1.7-2 +- Configure with ssl support (duh - #53116) +- s/Copyright/License/ + +* Wed Jun 6 2001 Trond Eivind Glomsrød +- 1.7 +- Require perl for building (to get man pages) +- Don't include the Japanese po file, it's now included +- Use %%{_tmppath} +- no patches necessary +- Make /etc/wgetrc noreplace +- More docs + +* Tue Jan 30 2001 Trond Eivind Glomsrød +- Norwegian isn't a iso-8859-2 locale, neither is Danish. + This fixes #15025. +- langify + +* Sat Jan 6 2001 Bill Nottingham +- escape %%xx characters before fnmatch (#23475, patch from alane@geeksrus.net) + +* Fri Jan 5 2001 Bill Nottingham +- update to 1.6, fix patches accordingly (#23412) +- fix symlink patch (#23411) + +* Mon Dec 18 2000 Yukihiro Nakai +- Add Japanese and Korean Resources + +* Tue Aug 1 2000 Bill Nottingham +- setlocale for LC_CTYPE too, or else all the translations think their + characters are unprintable. + +* Thu Jul 13 2000 Prospector +- automatic rebuild + +* Sun Jun 11 2000 Bill Nottingham +- build in new environment + +* Mon Jun 5 2000 Bernhard Rosenkraenzer +- FHS compliance + +* Thu Feb 3 2000 Bill Nottingham +- handle compressed man pages + +* Thu Aug 26 1999 Jeff Johnson +- don't permit chmod 777 on symlinks (#4725). + +* Sun Mar 21 1999 Cristian Gafton +- auto rebuild in the new build environment (release 4) + +* Fri Dec 18 1998 Bill Nottingham +- build for 6.0 tree +- add Provides + +* Sat Oct 10 1998 Cristian Gafton +- strip binaries +- version 1.5.3 + +* Sat Jun 27 1998 Jeff Johnson +- updated to 1.5.2 + +* Thu Apr 30 1998 Cristian Gafton +- modified group to Applications/Networking + +* Wed Apr 22 1998 Cristian Gafton +- upgraded to 1.5.0 +- they removed the man page from the distribution (Duh!) and I added it back + from 1.4.5. Hey, removing the man page is DUMB! + +* Fri Nov 14 1997 Cristian Gafton +- first build against glibc