.gitignore

@@ -1,2 +1,2 @@
 SOURCES/wget-1.17-path.patch
-SOURCES/wget-1.21.1.tar.gz
+SOURCES/wget-1.24.5.tar.gz

.wget.metadata

@@ -1,2 +1,2 @@
-5b4e331beb50e54860e0cb819e4c1f14ec4db661 SOURCES/wget-1.17-path.patch
+ba5cd4877aa563c56fc0896bac89f3e0d785b8ed SOURCES/wget-1.17-path.patch
-7a14aeb3871fa4ec5e2580d2718913d1665cb49b SOURCES/wget-1.21.1.tar.gz
+62525de6f09486942831ca2e352ae6802fc2c3dd SOURCES/wget-1.24.5.tar.gz

SOURCES/wget-1.21-metalink-man.patch

@@ -1,8 +1,8 @@
-diff --git a/doc/wget.texi.old b/doc/wget.texi
+diff --git a/doc/wget.texi b/doc/wget.texi
-index adf471d..685eb1a 100644
+index 2331c0f..0a343e2 100644
---- a/doc/wget.texi.old
+--- a/doc/wget.texi
 +++ b/doc/wget.texi
-@@ -513,38 +513,6 @@ treated as @samp{html} if the Content-Type matches @samp{text/html}.
+@@ -513,37 +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.
  
@@ -37,7 +37,6 @@ index adf471d..685eb1a 100644
 -@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

SOURCES/wget-1.21-segfault.patch

@@ -1,36 +0,0 @@
-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))

SOURCES/wget-1.21-strtol.patch

@@ -1,13 +0,0 @@
-diff --git a/src/wget.h.old b/src/wget.h
-index 6f20eab..f422737 100644
---- a/src/wget.h.old
-+++ b/src/wget.h
-@@ -144,7 +144,7 @@ typedef int64_t wgint;
- #define WGINT_MAX INT64_MAX
- typedef wgint SUM_SIZE_INT;
- 
--#define str_to_wgint strtol
-+#define str_to_wgint strtoll
- 
- #include "options.h"
- 

SPECS/wget.spec

@@ -1,23 +1,36 @@
 Summary: A utility for retrieving files using the HTTP or FTP protocols
 Name: wget
-Version: 1.21.1
+Version: 1.24.5
-Release: 8%{?dist}
+Release: 1%{?dist}
-License: GPLv3+
+License: GPL-3.0-or-later AND LGPL-2.1-or-later AND GFDL-1.3-or-later
 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
 Patch5: wget-1.21-CVE-2024-38428.patch
 
 Provides: webclient
 Provides: bundled(gnulib) 
 # needed for test suite
 BuildRequires: make
-BuildRequires: perl(lib), perl(English), perl(HTTP::Daemon), python3
+BuildRequires: perl(lib)
-BuildRequires: gnutls-devel, pkgconfig, texinfo, gettext, autoconf, libidn2-devel, libuuid-devel, perl-podlators, libpsl-devel, gpgme-devel, gcc, zlib-devel
+BuildRequires: perl(English)
+BuildRequires: perl(HTTP::Daemon)
+BuildRequires: python3
+BuildRequires: gnutls-devel
+BuildRequires: pkgconfig
+BuildRequires: texinfo
+BuildRequires: gettext
+BuildRequires: autoconf
+BuildRequires: libidn2-devel
+BuildRequires: libuuid-devel
+BuildRequires: perl-podlators
+BuildRequires: libpsl-devel
+BuildRequires: gpgme-devel
+BuildRequires: gcc
+BuildRequires: zlib-devel
+BuildRequires: git-core
 
 %description
 GNU Wget is a file retrieval utility which can use either the HTTP or
@@ -29,14 +42,12 @@ HTTP servers to retrieve files over slow or unstable connections,
 support for Proxy servers, and configurability.
 
 %prep
-%setup -q
+%autosetup -S git
 
 # modify the package string
 sed -i "s|\(PACKAGE_STRING='wget .*\)'|\1 (Red Hat modified)'|" configure
 grep "PACKAGE_STRING='wget .* (Red Hat modified)'" configure || exit 1
 
-%autopatch -p1
-
 %build
 %configure \
     --with-ssl=gnutls \