ftp: add --ftp-recurse-symlink-dirs to descend into symlink directories

.gitlab-ci.yml

@@ -69,9 +69,6 @@ Build-Tarball:
         - make -j$(nproc) syntax-check
         - make -j$(nproc) dist
         - mv wget-*.gz ..
-    tags:
-        - shared
-        - linux
     except:
         - coverity-scan@gnuwget/wget
     artifacts:
@@ -100,9 +97,6 @@ Valgrind:
         - cd wget-*/
         - ./configure $CONFIGURE_BASE_FLAGS --cache-file ../cache/config.cache
         - make check-valgrind
-    tags:
-        - shared
-        - linux
     except:
         - coverity-scan@gnuwget/wget
     dependencies:
@@ -131,9 +125,6 @@ Minimal:
           --disable-iri --disable-ntlm --disable-pcre --without-libpsl --without-libuuid
           --without-libintl-prefix
         - make -j$(nproc) check-valgrind
-    tags:
-        - shared
-        - linux
     except:
         - coverity-scan@gnuwget/wget
     dependencies:
@@ -160,9 +151,6 @@ Debian-OldStable:
         - ./configure $CONFIGURE_BASE_FLAGS --cache-file ../cache/config.cache
         - make
         - make -j$(nproc) check
-    tags:
-        - shared
-        - linux
     except:
         - coverity-scan@gnuwget/wget
     dependencies:
@@ -188,9 +176,6 @@ Debian-Stable:
         - cd wget-*/
         - ./configure $CONFIGURE_BASE_FLAGS --cache-file ../cache/config.cache
         - make -j$(nproc) check
-    tags:
-        - shared
-        - linux
     except:
         - coverity-scan@gnuwget/wget
     dependencies:
@@ -217,9 +202,6 @@ CentOS-OldLTS:
         - ./configure $CONFIGURE_BASE_FLAGS --cache-file ../cache/config.cache
         - make -j$(nproc)
         - make -j$(nproc) check
-    tags:
-        - shared
-        - linux
     except:
         - coverity-scan@gnuwget/wget
     dependencies:
@@ -250,9 +232,6 @@ TLS/OpenSSL:
         - ./configure $CONFIGURE_BASE_FLAGS --cache-file ../cache/config.cache --with-ssl=openssl
         - make -j$(nproc)
         - make -j$(nproc) check-valgrind
-    tags:
-        - shared
-        - linux
     except:
         - coverity-scan@gnuwget/wget
     dependencies:
@@ -281,9 +260,6 @@ TLS/GnuTLS:
         - ./configure $CONFIGURE_BASE_FLAGS --cache-file ../cache/config.cache --with-ssl=gnutls
         - make -j$(nproc)
         - make -j$(nproc) check-valgrind
-    tags:
-        - shared
-        - linux
     except:
         - coverity-scan@gnuwget/wget
     dependencies:
@@ -316,9 +292,6 @@ Sanitizers:
         - ./configure $CONFIGURE_BASE_FLAGS --cache-file ../cache/config.cache
             --enable-fsanitize-asan --enable-fsanitize-ubsan
         - make -j$(nproc) check
-    tags:
-        - shared
-        - linux
     except:
         - coverity-scan@gnuwget/wget
     dependencies:
@@ -346,9 +319,6 @@ Scan-Build:
         - make -C lib -j$(nproc)
         - make -C src css_.o
         - scan-build -v -enable-checker nullability --keep-empty --status-bugs -o ../scan-build make -j$(nproc)
-    tags:
-        - shared
-        - linux
     except:
         - tags
         - coverity-scan@gnuwget/wget
@@ -379,9 +349,6 @@ CoverageReports:
         - make -j$(nproc) fuzz-coverage
         - mv lcov ../fuzz-coverage
         - make dist
-    tags:
-        - shared
-        - linux
     dependencies:
         - Build-Tarball
     needs: ["Build-Tarball"]
@@ -390,8 +357,8 @@ CoverageReports:
         paths:
             - test-coverage/
             - fuzz-coverage/
-    only:
-        - master
+#    only:
+#        - master
 
 MinGW64:
     stage: test-from-tarball
@@ -413,9 +380,6 @@ MinGW64:
         - make -j$(nproc)
         - cp -p src/wget.exe src/wget
         - make check -j$(nproc) LOG_COMPILER=wine
-    tags:
-        - shared
-        - linux
     except:
         - tags
         - coverity-scan@gnuwget/wget
@@ -446,9 +410,6 @@ ArchLinux:
         - ./configure $CONFIGURE_BASE_FLAGS
         - make -j$(nproc)
         - make check -j$(nproc)
-    tags:
-        - shared
-        - linux
     except:
         - coverity-scan@gnuwget/wget
     needs: []
@@ -472,9 +433,6 @@ Fedora:
         - touch .manywarnings
         - ./configure $CONFIGURE_BASE_FLAGS
         - make -j$(nproc) check
-    tags:
-        - shared
-        - linux
     except:
         - coverity-scan@gnuwget/wget
     needs: []

.prev-version

@@ -1 +1 @@
-1.24.5
+1.25.0

Makefile.am

@@ -1,5 +1,6 @@
 # Makefile for `Wget' utility
-# Copyright (C) 1995-1997, 2006-2024 Free Software Foundation, Inc.
+# Copyright (C) 1995-1997, 2006-2024, 2026 Free Software Foundation,
+# Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -89,21 +90,21 @@ clean-lcov:
 
 check-coverage: clean clean-lcov
 	$(MAKE) CFLAGS="$(CFLAGS) --coverage" LDFLAGS="$(LDFLAGS) --coverage"
-	lcov --capture --initial --directory src/ --output-file $(LCOV_INFO)
+	lcov --capture --initial --ignore-errors source,range --directory src/ --output-file $(LCOV_INFO)
 	$(MAKE) CFLAGS="$(CFLAGS) --coverage" LDFLAGS="$(LDFLAGS) --coverage" VALGRIND_TESTS=0 check
-	lcov --capture --directory src/ --output-file $(LCOV_INFO)
-	lcov --remove $(LCOV_INFO) --ignore-errors unused '/usr/include/*' '*/lib/*' -o $(LCOV_INFO)
-	genhtml --prefix . --ignore-errors source --ignore-errors unmapped $(LCOV_INFO) --legend --title "Wget" --output-directory=lcov
+	lcov --capture --ignore-errors source,range --directory src/ --output-file $(LCOV_INFO)
+	lcov --remove $(LCOV_INFO) --ignore-errors source,range,unused '/usr/include/*' '*/lib/*' '*/src/css.l' -o $(LCOV_INFO)
+	genhtml --prefix . --ignore-errors source,range,unmapped $(LCOV_INFO) --legend --title "Wget" --output-directory=lcov
 	@echo
 	@echo "You can now view the coverage report with 'xdg-open lcov/index.html'"
 
 fuzz-coverage: clean clean-lcov
 	$(MAKE) -C lib
 	$(MAKE) -C src CFLAGS="$(CFLAGS) --coverage" LDFLAGS="$(LDFLAGS) --coverage"
 	$(MAKE) -C fuzz check CFLAGS="$(CFLAGS) --coverage" LDFLAGS="$(LDFLAGS) --coverage"
-	lcov --capture --initial --directory fuzz --directory src --output-file $(LCOV_INFO)
-	lcov --capture --directory fuzz --directory src --output-file $(LCOV_INFO)
-	lcov --remove $(LCOV_INFO) '/usr/include/*' '*/lib/*' -o $(LCOV_INFO)
-	genhtml --prefix . --ignore-errors source $(LCOV_INFO) --legend --title "Wget-fuzz" --output-directory=lcov
+	lcov --capture --initial --ignore-errors source,range --directory fuzz --directory src --output-file $(LCOV_INFO)
+	lcov --capture --ignore-errors source,range --directory fuzz --directory src --output-file $(LCOV_INFO)
+	lcov --remove $(LCOV_INFO) --ignore-errors source,range '/usr/include/*' '*/lib/*' '*/src/css.l' -o $(LCOV_INFO)
+	genhtml --prefix . --ignore-errors source,range $(LCOV_INFO) --legend --title "Wget-fuzz" --output-directory=lcov
 	@echo
 	@echo "You can now view the coverage report with 'xdg-open lcov/index.html'"

NEWS

@@ -2,6 +2,22 @@ GNU Wget NEWS -- history of user-visible changes.
 
 * Noteworthy changes in release ?.? (????-??-??) [?]
 
+** Add --ftp-recurse-symlink-dirs option to descend into FTP directory
+   symlinks during recursive retrieval.  Cycle detection prevents
+   infinite loops from circular symlinks.
+
+
+* Noteworthy changes in release 1.25.0 (2024-11-10) [stable]
+
+** [Breaking change] Drop support for shorthand FTP URLs (CVE-2024-10524)
+
+** [Breaking change] Switch to continuous reading from stdin pipes
+
+** Reimplement user-info parsing based on RFC 2396
+
+** Fix a build issue with libproxy and --disable-debug
+
+
 
 * Noteworthy changes in release 1.24.5 (2024-03-10) [stable]
 
@@ -1218,7 +1234,7 @@ geturl -vo log http://fly.cc.fer.hr/
 ----------------------------------------------------------------------
 Copyright information:
 
-Copyright (C) 1997-2024 Free Software Foundation, Inc.
+Copyright (C) 1997-2024, 2026 Free Software Foundation, Inc.
 
    Permission is granted to anyone to make or distribute verbatim
    copies of this document as received, in any medium, provided that

README

@@ -63,7 +63,7 @@ the file AUTHORS for a list of major contributors, and the ChangeLogs
 for a detailed listing of all contributions.
 
 
-Copyright (C) 1995-2024 Free Software Foundation, Inc.
+Copyright (C) 1995-2024, 2026 Free Software Foundation, Inc.
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -75,10 +75,10 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
-USA.
+A copy of the GNU General Public License can be found in the file LICENSE
+in the top directory of the official source distribution. The license is
+also available in several formats through the World Wide Web, or
+via http://www.gnu.org/licenses/licenses.html#GPL .
 
 Additional permission under GNU GPL version 3 section 7
 

README.checkout

@@ -161,7 +161,7 @@ Testing and development
  that bug, which might be tedious. Tests should only be run through GDB for that purpose.
 
 
- Copyright (C) 2008, 2010, 2014-2015, 2018-2024 Free Software
+ Copyright (C) 2008, 2010, 2014-2015, 2018-2024, 2026 Free Software
  Foundation, Inc.
  License GPLv3+: GNU GPL version 3 or later
  <https://www.gnu.org/licenses/gpl.html>.