From 1d65d76faccdb5688bd6cd3a0f0c237cd78de189 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Dec 07 2021 16:56:53 +0000
Subject: import wget-1.21.1-7.el9


---

diff --git a/SOURCES/wget-1.21-metalink-man.patch b/SOURCES/wget-1.21-metalink-man.patch
new file mode 100644
index 0000000..322f686
--- /dev/null
+++ b/SOURCES/wget-1.21-metalink-man.patch
@@ -0,0 +1,43 @@
+diff --git a/doc/wget.texi.old b/doc/wget.texi
+index adf471d..685eb1a 100644
+--- a/doc/wget.texi.old
++++ b/doc/wget.texi
+@@ -513,38 +513,6 @@ treated as @samp{html} if the Content-Type matches @samp{text/html}.
+ Furthermore, the @var{file}'s location will be implicitly used as base
+ href if none was specified.
+ 
+-@cindex input-metalink
+-@item --input-metalink=@var{file}
+-Downloads files covered in local Metalink @var{file}. Metalink version 3
+-and 4 are supported.
+-
+-@cindex keep-badhash
+-@item --keep-badhash
+-Keeps downloaded Metalink's files with a bad hash. It appends .badhash
+-to the name of Metalink's files which have a checksum mismatch, except
+-without overwriting existing files.
+-
+-@cindex metalink-over-http
+-@item --metalink-over-http
+-Issues HTTP HEAD request instead of GET and extracts Metalink metadata
+-from response headers. Then it switches to Metalink download.
+-If no valid Metalink metadata is found, it falls back to ordinary HTTP download.
+-Enables @samp{Content-Type: application/metalink4+xml} files download/processing.
+-
+-@cindex metalink-index
+-@item --metalink-index=@var{number}
+-Set the Metalink @samp{application/metalink4+xml} metaurl ordinal
+-NUMBER. From 1 to the total number of ``application/metalink4+xml''
+-available.  Specify 0 or @samp{inf} to choose the first good one.
+-Metaurls, such as those from a @samp{--metalink-over-http}, may have
+-been sorted by priority key's value; keep this in mind to choose the
+-right NUMBER.
+-
+-@cindex preferred-location
+-@item --preferred-location
+-Set preferred location for Metalink resources. This has effect if multiple
+-resources with same priority are available.
+-
+ @cindex xattr
+ @item --xattr
+ Enable use of file system's extended attributes to save the
diff --git a/SOURCES/wget-1.21-segfault.patch b/SOURCES/wget-1.21-segfault.patch
new file mode 100644
index 0000000..fb787c1
--- /dev/null
+++ b/SOURCES/wget-1.21-segfault.patch
@@ -0,0 +1,36 @@
+diff --git a/src/ftp.c b/src/ftp.c
+index ea7621e0..ab6802a6 100644
+--- a/src/ftp.c
++++ b/src/ftp.c
+@@ -992,9 +992,6 @@ Error in server response, closing control connection.\n"));
+ 
+           /* 2004-09-20 SMS. */
+ 
+-          if (target != targetbuf)
+-            xfree (target);
+-
+         } /* else */
+     }
+   else /* do not CWD */
+diff --git a/src/ftp.c b/src/ftp.c
+index a1fcaa50..e821b0f3 100644
+--- a/src/ftp.c
++++ b/src/ftp.c
+@@ -2083,7 +2083,7 @@ ftp_loop_internal (struct url *u, struct url *original_url, struct fileinfo *f,
+             /* --dont-remove-listing was specified, so do count this towards the
+                number of bytes and files downloaded. */
+             {
+-              total_downloaded_bytes += qtyread;
++              total_downloaded_bytes += (qtyread - restval);
+               numurls++;
+             }
+ 
+@@ -2098,7 +2098,7 @@ ftp_loop_internal (struct url *u, struct url *original_url, struct fileinfo *f,
+              downloaded if they're going to be deleted.  People seeding proxies,
+              for instance, may want to know how many bytes and files they've
+              downloaded through it. */
+-          total_downloaded_bytes += qtyread;
++          total_downloaded_bytes += (qtyread - restval);
+           numurls++;
+ 
+           if (opt.delete_after && !input_file_url (opt.input_filename))
diff --git a/SPECS/wget.spec b/SPECS/wget.spec
index b5f504f..5d1c77e 100644
--- a/SPECS/wget.spec
+++ b/SPECS/wget.spec
@@ -1,13 +1,15 @@
 Summary: A utility for retrieving files using the HTTP or FTP protocols
 Name: wget
 Version: 1.21.1
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv3+
 Url: http://www.gnu.org/software/wget/
 Source: ftp://ftp.gnu.org/gnu/wget/wget-%{version}.tar.gz
 
 Patch1: wget-1.17-path.patch
 Patch2: wget-1.21-strtol.patch
+Patch3: wget-1.21-metalink-man.patch
+Patch4: wget-1.21-segfault.patch
 
 Provides: webclient
 Provides: bundled(gnulib) 
@@ -67,6 +69,10 @@ make check
 %{_infodir}/*
 
 %changelog
+* Tue Nov 02 2021 Michal Ruprich <mruprich@redhat.com> - 1.21.1-7
+- Resolves: #2017842 - Two different segfaults when downloading multiple files
+- Removing metalink from manpage
+
 * Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 1.21.1-6
 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
   Related: rhbz#1991688