Open
update to version 2.2.1 #54
Funda WangAdd on May 5
update to version 2.2.1 #54
Open
Merged fromfundawang/wgetmasterintosrc-openeuler/wgetmaster
Total: 7 files changed+108-200
| @@ -1,168 +0,0 @@ | |||
| 1 | -diff --git a/NEWS b/NEWS | ||
| 2 | -index 99c6723..e6c8538 100644 | ||
| 3 | ---- a/NEWS | ||
| 4 | -+++ b/NEWS | ||
| 5 | -@@ -1075,7 +1075,7 @@ distributed with Wget. | ||
| 6 | - | ||
| 7 | - ** Compiles on pre-ANSI compilers. | ||
| 8 | - | ||
| 9 | --** Global wgetrc now goes to /usr/local/etc (i.e. $sysconfdir). | ||
| 10 | -+** Global wgetrc now goes to /etc (i.e. $sysconfdir). | ||
| 11 | - | ||
| 12 | - ** Lots of bugfixes. | ||
| 13 | - | ||
| 14 | -@@ -1138,7 +1138,7 @@ Emacs, standalone info, or converted to HTML, dvi or postscript. | ||
| 15 | - ** Fixed a long-standing bug, so that Wget now works over SLIP | ||
| 16 | - connections. | ||
| 17 | - | ||
| 18 | --** You can have a system-wide wgetrc (/usr/local/lib/wgetrc by | ||
| 19 | -+** You can have a system-wide wgetrc (/etc/wgetrc by | ||
| 20 | - default). Settings in $HOME/.wgetrc override the global ones, of | ||
| 21 | - course :-) | ||
| 22 | - | ||
| 23 | -diff --git a/README b/README | ||
| 24 | -index 3b7cc70..ca51780 100644 | ||
| 25 | ---- a/README | ||
| 26 | -+++ b/README | ||
| 27 | -@@ -33,7 +33,7 @@ for socks. | ||
| 28 | - | ||
| 29 | - Most of the features are configurable, either through command-line | ||
| 30 | - options, or via initialization file .wgetrc. Wget allows you to | ||
| 31 | --install a global startup file (/usr/local/etc/wgetrc by default) for | ||
| 32 | -+install a global startup file (/etc/wgetrc by default) for | ||
| 33 | - site settings. | ||
| 34 | - | ||
| 35 | - Wget works under almost all Unix variants in use today and, unlike | ||
| 36 | -diff --git a/doc/sample.wgetrc b/doc/sample.wgetrc | ||
| 37 | -index c0d0779..9a73ada 100644 | ||
| 38 | ---- a/doc/sample.wgetrc | ||
| 39 | -+++ b/doc/sample.wgetrc | ||
| 40 | -@@ -10,7 +10,7 @@ | ||
| 41 | - ## Or online here: | ||
| 42 | - ## https://www.gnu.org/software/wget/manual/wget.html#Startup-File | ||
| 43 | - ## | ||
| 44 | --## Wget initialization file can reside in /usr/local/etc/wgetrc | ||
| 45 | -+## Wget initialization file can reside in /etc/wgetrc | ||
| 46 | - ## (global, for all users) or $HOME/.wgetrc (for a single user). | ||
| 47 | - ## | ||
| 48 | - ## To use the settings in this file, you will have to uncomment them, | ||
| 49 | -@@ -22,7 +22,7 @@ | ||
| 50 | - | ||
| 51 | - | ||
| 52 | - ## | ||
| 53 | --## Global settings (useful for setting up in /usr/local/etc/wgetrc). | ||
| 54 | -+## Global settings (useful for setting up in /etc/wgetrc). | ||
| 55 | - ## Think well before you change them, since they may reduce wget's | ||
| 56 | - ## functionality, and make it behave contrary to the documentation: | ||
| 57 | - ## | ||
| 58 | -diff --git a/doc/sample.wgetrc.munged_for_texi_inclusion b/doc/sample.wgetrc.munged_for_texi_inclusion | ||
| 59 | -index 3c7f2f4..521ef16 100644 | ||
| 60 | ---- a/doc/sample.wgetrc.munged_for_texi_inclusion | ||
| 61 | -+++ b/doc/sample.wgetrc.munged_for_texi_inclusion | ||
| 62 | -@@ -10,7 +10,7 @@ | ||
| 63 | - ## Or online here: | ||
| 64 | - ## https://www.gnu.org/software/wget/manual/wget.html#Startup-File | ||
| 65 | - ## | ||
| 66 | --## Wget initialization file can reside in /usr/local/etc/wgetrc | ||
| 67 | -+## Wget initialization file can reside in /etc/wgetrc | ||
| 68 | - ## (global, for all users) or $HOME/.wgetrc (for a single user). | ||
| 69 | - ## | ||
| 70 | - ## To use the settings in this file, you will have to uncomment them, | ||
| 71 | -@@ -22,7 +22,7 @@ | ||
| 72 | - | ||
| 73 | - | ||
| 74 | - ## | ||
| 75 | --## Global settings (useful for setting up in /usr/local/etc/wgetrc). | ||
| 76 | -+## Global settings (useful for setting up in /etc/wgetrc). | ||
| 77 | - ## Think well before you change them, since they may reduce wget's | ||
| 78 | - ## functionality, and make it behave contrary to the documentation: | ||
| 79 | - ## | ||
| 80 | -diff --git a/doc/wget.info b/doc/wget.info | ||
| 81 | -index 06ab42f..08c8f49 100644 | ||
| 82 | ---- a/doc/wget.info | ||
| 83 | -+++ b/doc/wget.info | ||
| 84 | -@@ -109,7 +109,7 @@ retrieval through HTTP proxies. | ||
| 85 | - • Most of the features are fully configurable, either through command | ||
| 86 | - line options, or via the initialization file ‘.wgetrc’ (*note | ||
| 87 | - Startup File::). Wget allows you to define “global” startup files | ||
| 88 | -- (‘/usr/local/etc/wgetrc’ by default) for site settings. You can | ||
| 89 | -+ (‘/etc/wgetrc’ by default) for site settings. You can | ||
| 90 | - also specify the location of a startup file with the -config | ||
| 91 | - option. To disable the reading of config files, use -no-config. | ||
| 92 | - If both -config and -no-config are given, -no-config is ignored. | ||
| 93 | -@@ -2855,7 +2855,7 @@ File: wget.info, Node: Wgetrc Location, Next: Wgetrc Syntax, Prev: Startup Fi | ||
| 94 | - =================== | ||
| 95 | - | ||
| 96 | - When initializing, Wget will look for a “global” startup file, | ||
| 97 | --‘/usr/local/etc/wgetrc’ by default (or some prefix other than | ||
| 98 | -+‘/etc/wgetrc’ by default (or some prefix other than | ||
| 99 | - ‘/usr/local’, if Wget was not installed there) and read commands from | ||
| 100 | - there, if it exists. | ||
| 101 | - | ||
| 102 | -@@ -2867,7 +2867,7 @@ further attempts will be made. | ||
| 103 | - | ||
| 104 | - The fact that user's settings are loaded after the system-wide ones | ||
| 105 | - means that in case of collision user's wgetrc _overrides_ the | ||
| 106 | --system-wide wgetrc (in ‘/usr/local/etc/wgetrc’ by default). Fascist | ||
| 107 | -+system-wide wgetrc (in ‘/etc/wgetrc’ by default). Fascist | ||
| 108 | - admins, away! | ||
| 109 | - | ||
| 110 | - | ||
| 111 | -@@ -3410,7 +3410,7 @@ its line. | ||
| 112 | - ## Or online here: | ||
| 113 | - ## https://www.gnu.org/software/wget/manual/wget.html#Startup-File | ||
| 114 | - ## | ||
| 115 | -- ## Wget initialization file can reside in /usr/local/etc/wgetrc | ||
| 116 | -+ ## Wget initialization file can reside in /etc/wgetrc | ||
| 117 | - ## (global, for all users) or $HOME/.wgetrc (for a single user). | ||
| 118 | - ## | ||
| 119 | - ## To use the settings in this file, you will have to uncomment them, | ||
| 120 | -@@ -3422,7 +3422,7 @@ its line. | ||
| 121 | - | ||
| 122 | - | ||
| 123 | - ## | ||
| 124 | -- ## Global settings (useful for setting up in /usr/local/etc/wgetrc). | ||
| 125 | -+ ## Global settings (useful for setting up in /etc/wgetrc). | ||
| 126 | - ## Think well before you change them, since they may reduce wget's | ||
| 127 | - ## functionality, and make it behave contrary to the documentation: | ||
| 128 | - ## | ||
| 129 | -diff --git a/doc/wget.texi b/doc/wget.texi | ||
| 130 | -index d46da37..7089750 100644 | ||
| 131 | ---- a/doc/wget.texi | ||
| 132 | -+++ b/doc/wget.texi | ||
| 133 | -@@ -195,7 +195,7 @@ gauge can be customized to your preferences. | ||
| 134 | - Most of the features are fully configurable, either through command line | ||
| 135 | - options, or via the initialization file @file{.wgetrc} (@pxref{Startup | ||
| 136 | - File}). Wget allows you to define @dfn{global} startup files | ||
| 137 | --(@file{/usr/local/etc/wgetrc} by default) for site settings. You can also | ||
| 138 | -+(@file{/etc/wgetrc} by default) for site settings. You can also | ||
| 139 | - specify the location of a startup file with the --config option. | ||
| 140 | - To disable the reading of config files, use --no-config. | ||
| 141 | - If both --config and --no-config are given, --no-config is ignored. | ||
| 142 | -@@ -204,7 +204,7 @@ If both --config and --no-config are given, --no-config is ignored. | ||
| 143 | - @ignore | ||
| 144 | - @c man begin FILES | ||
| 145 | - @table @samp | ||
| 146 | --@item /usr/local/etc/wgetrc | ||
| 147 | -+@item /etc/wgetrc | ||
| 148 | - Default location of the @dfn{global} startup file. | ||
| 149 | - | ||
| 150 | - @item .wgetrc | ||
| 151 | -@@ -3188,7 +3188,7 @@ commands. | ||
| 152 | - @cindex location of wgetrc | ||
| 153 | - | ||
| 154 | - When initializing, Wget will look for a @dfn{global} startup file, | ||
| 155 | --@file{/usr/local/etc/wgetrc} by default (or some prefix other than | ||
| 156 | -+@file{/etc/wgetrc} by default (or some prefix other than | ||
| 157 | - @file{/usr/local}, if Wget was not installed there) and read commands | ||
| 158 | - from there, if it exists. | ||
| 159 | - | ||
| 160 | -@@ -3200,7 +3200,7 @@ If @code{WGETRC} is not set, Wget will try to load @file{$HOME/.wgetrc}. | ||
| 161 | - | ||
| 162 | - The fact that user's settings are loaded after the system-wide ones | ||
| 163 | - means that in case of collision user's wgetrc @emph{overrides} the | ||
| 164 | --system-wide wgetrc (in @file{/usr/local/etc/wgetrc} by default). | ||
| 165 | -+system-wide wgetrc (in @file{/etc/wgetrc} by default). | ||
| 166 | - Fascist admins, away! | ||
| 167 | - | ||
| 168 | - @node Wgetrc Syntax, Wgetrc Commands, Wgetrc Location, Startup File | ||
Binary files do not support preview
| @@ -1,55 +1,125 @@ | |||
| 1 | -Name: wget | 1 | +Name: wget |
| 2 | -Version: 1.25.0 | 2 | +Version: 2.2.1 |
| 3 | -Release: 1 | 3 | +Release: 1 |
| 4 | -Summary: A package for retrieving files using HTTP, HTTPS, FTP and FTPS the most widely-used Internet protocols. | 4 | +Summary: An advanced file and recursive website downloader |
| 5 | -License: GPL-3.0-or-later AND LGPL-2.1-or-later | ||
| 6 | -Url: https://www.gnu.org/software/wget/ | ||
| 7 | -Source: https://ftp.gnu.org/gnu/wget/wget-%{version}.tar.gz | ||
| 8 | 5 | ||
| 9 | -Patch0: wget-1.25.0-etc-path.patch | 6 | +# Documentation is GFDL |
| 7 | +License: GPL-3.0-or-later AND LGPL-3.0-or-later AND GFDL-1.3-or-later | ||
| 8 | +URL: https://gitlab.com/gnuwget/wget2 | ||
| 9 | +Source0: https://ftp.gnu.org/gnu/wget/wget2-%{version}.tar.gz | ||
| 10 | 10 | ||
| 11 | -Provides: webclient bundled(gnulib) | 11 | +# Buildsystem build requirements |
| 12 | -BuildRequires: make perl-HTTP-Daemon python3 libuuid-devel perl-podlators libpsl-devel libmetalink-devel | 12 | +BuildRequires: autoconf |
| 13 | -BuildRequires: gnutls-devel pkgconfig texinfo gettext autoconf libidn2-devel gpgme-devel zlib-devel | 13 | +BuildRequires: automake |
| 14 | +BuildRequires: libtool | ||
| 15 | +BuildRequires: flex-devel >= 2.5.35 | ||
| 16 | +BuildRequires: gettext >= 0.18.2 | ||
| 14 | BuildRequires: gcc | 17 | BuildRequires: gcc |
| 18 | +BuildRequires: make | ||
| 19 | + | ||
| 20 | +# Documentation build requirements | ||
| 21 | +BuildRequires: doxygen | ||
| 22 | + | ||
| 23 | +# Wget2 build requirements | ||
| 24 | +BuildRequires: bzip2-devel | ||
| 25 | +BuildRequires: python3 | ||
| 26 | +BuildRequires: rsync | ||
| 27 | +BuildRequires: tar | ||
| 28 | +BuildRequires: texinfo | ||
| 29 | +BuildRequires: pkgconfig(gnutls) | ||
| 30 | +BuildRequires: pkgconfig(gpgme) | ||
| 31 | +BuildRequires: pkgconfig(libbrotlidec) | ||
| 32 | +BuildRequires: pkgconfig(libidn2) >= 0.14.0 | ||
| 33 | +BuildRequires: pkgconfig(liblzma) | ||
| 34 | +BuildRequires: pkgconfig(libmicrohttpd) | ||
| 35 | +BuildRequires: pkgconfig(libnghttp2) | ||
| 36 | +BuildRequires: pkgconfig(libpcre2-8) | ||
| 37 | +BuildRequires: pkgconfig(libpsl) | ||
| 38 | +BuildRequires: pkgconfig(libzstd) | ||
| 39 | +BuildRequires: pkgconfig(zlib) | ||
| 40 | + | ||
| 41 | +Provides: webclient | ||
| 42 | +Provides: wget2 = %{version}-%{release} | ||
| 43 | +Provides: wget2%{?_isa} = %{version}-%{release} | ||
| 44 | +Requires: %{name}-libs%{?_isa} = %{version}-%{release} | ||
| 15 | 45 | ||
| 16 | %description | 46 | %description |
| 17 | -GNU Wget is a free software package for retrieving files using HTTP, HTTPS, | 47 | +GNU Wget2 is the successor of GNU Wget, a file and recursive website |
| 18 | -FTP and FTPS the most widely-used Internet protocols. It is a non-interactive | 48 | +downloader. |
| 19 | -commandline tool, so it may easily be called from scripts, cron jobs, terminals | 49 | + |
| 20 | -without X-Windows support, etc. | 50 | +Designed and written from scratch it wraps around libwget, that provides the |
| 51 | +basic functions needed by a web client. | ||
| 52 | + | ||
| 53 | +Wget2 works multi-threaded and uses many features to allow fast operation. | ||
| 54 | +In many cases Wget2 downloads much faster than Wget1.x due to HTTP2, HTTP | ||
| 55 | +compression, parallel connections and use of If-Modified-Since HTTP header. | ||
| 56 | + | ||
| 57 | +%package libs | ||
| 58 | +Summary: Runtime libraries for GNU Wget2 | ||
| 59 | +# There's some gnulib in there :) | ||
| 60 | +Provides: bundled(gnulib) | ||
| 61 | + | ||
| 62 | +%description libs | ||
| 63 | +This package contains the libraries for applications to use | ||
| 64 | +Wget2 functionality. | ||
| 65 | + | ||
| 66 | +%package devel | ||
| 67 | +Summary: Libraries and header files needed for using wget2 libraries | ||
| 68 | +Requires: %{name}-libs%{?_isa} = %{version}-%{release} | ||
| 69 | +Provides: wget2-devel = %{version}-%{release} | ||
| 70 | + | ||
| 71 | +%description devel | ||
| 72 | +Development libraries and headers needed for building applications to | ||
| 73 | +use functionality from GNU Wget2. | ||
| 21 | 74 | ||
| 22 | %package_help | 75 | %package_help |
| 23 | 76 | ||
| 24 | %prep | 77 | %prep |
| 25 | -%autosetup -p1 | 78 | +%autosetup -p1 -n wget2-%{version} |
| 26 | 79 | ||
| 27 | %build | 80 | %build |
| 28 | -%configure --with-ssl=gnutls --with-libpsl --enable-largefile --enable-opie --enable-digest --enable-ntlm --enable-nls --enable-ipv6 --disable-rpath --with-metalink --disable-year2038 | 81 | +%configure --disable-static |
| 29 | - | 82 | +%{?disable_rpath} |
| 30 | %make_build | 83 | %make_build |
| 31 | 84 | ||
| 32 | %install | 85 | %install |
| 33 | -%make_install CFLAGS="$RPM_OPT_FLAGS" | 86 | +%make_install |
| 34 | -%find_lang %{name} | 87 | +%find_lang wget2 |
| 35 | -%find_lang %{name}-gnulib | 88 | + |
| 36 | -rm -f %{buildroot}%{_infodir}/dir | 89 | +install -D -m0644 -t %{buildroot}%{_mandir}/man1/ docs/man/man1/wget2.1 |
| 90 | + | ||
| 91 | +# Delete useless noinstall binary | ||
| 92 | +rm -v %{buildroot}%{_bindir}/wget2_noinstall | ||
| 93 | + | ||
| 94 | +ln -sr %{buildroot}%{_bindir}/wget2 %{buildroot}%{_bindir}/wget | ||
| 95 | +# Link wget(1) to wget2(1) | ||
| 96 | +echo ".so man1/wget2.1" > %{buildroot}%{_mandir}/man1/wget.1 | ||
| 37 | 97 | ||
| 38 | %check | 98 | %check |
| 39 | -make check | 99 | +LD_LIBRARY_PATH=$(pwd)/libwget/.libs %make_build check |
| 40 | 100 | ||
| 41 | -%files -f %{name}.lang -f %{name}-gnulib.lang | 101 | +%files -f wget2.lang |
| 42 | -%license COPYING | 102 | +%license COPYING* |
| 43 | -%doc AUTHORS | 103 | +%doc README.md |
| 44 | -%config(noreplace) %{_sysconfdir}/wgetrc | 104 | +%{_bindir}/* |
| 45 | -%{_bindir}/wget | 105 | + |
| 106 | +%files libs | ||
| 107 | +%license COPYING* | ||
| 108 | +%{_libdir}/libwget*.so.* | ||
| 109 | + | ||
| 110 | +%files devel | ||
| 111 | +%{_includedir}/wget.h | ||
| 112 | +%{_includedir}/wgetver.h | ||
| 113 | +%{_libdir}/libwget*.so | ||
| 114 | +%{_libdir}/pkgconfig/libwget.pc | ||
| 46 | 115 | ||
| 47 | %files help | 116 | %files help |
| 48 | -%doc MAILING-LIST NEWS README doc/sample.wgetrc | 117 | +%{_mandir}/man?/* |
| 49 | -%{_mandir}/man1/wget.* | ||
| 50 | -%{_infodir}/* | ||
| 51 | 118 | ||
| 52 | %changelog | 119 | %changelog |
| 120 | +* Mon May 04 2026 Funda Wang <fundawang@yeah.net> - 2.2.1-1 | ||
| 121 | +- update to wget2 2.2.1 | ||
| 122 | + | ||
| 53 | * Thu Jan 23 2025 Funda Wang <fundawang@yeah.net> - 1.25.0-1 | 123 | * Thu Jan 23 2025 Funda Wang <fundawang@yeah.net> - 1.25.0-1 |
| 54 | - Type:requirements | 124 | - Type:requirements |
| 55 | - ID:NA | 125 | - ID:NA |
| @@ -1,4 +1,4 @@ | |||
| 1 | version_control: git | 1 | version_control: git |
| 2 | -src_repo: https://git.savannah.gnu.org/git/wget.git | 2 | +src_repo: https://gitlab.com/gnuwget/wget2.git |
| 3 | tag_prefix: ^v | 3 | tag_prefix: ^v |
| 4 | separator: . | 4 | separator: . |