已开启
Upgrade to version 1.24.5 #40
no_coke创建于 2024年10月18日
Upgrade to version 1.24.5 #40
已开启
no_coke创建于 2024年10月18日
从refs/pull/40/head合入到master
共 3 个文件变更+50-22
@@ -1,8 +1,22 @@
1+From e5fb6d1938c11c315bf1b1e5f9506969d6924222 Mon Sep 17 00:00:00 2001
2+From: Guo Ce <guoce@kylinos.cn>
3+Date: Fri, 18 Oct 2024 15:37:18 +0800
4+Subject: [PATCH] backport wget 1.17 patch
5+ 
6+---
7+ NEWS | 4 ++--
8+ README | 2 +-
9+ doc/sample.wgetrc | 4 ++--
10+ doc/sample.wgetrc.munged_for_texi_inclusion | 4 ++--
11+ doc/wget.info | 12 ++++++------
12+ doc/wget.texi | 10 +++++-----
13+ 6 files changed, 18 insertions(+), 18 deletions(-)
14+ 
1diff --git a/NEWS b/NEWS15diff --git a/NEWS b/NEWS
2-index d23ae95..aa3247f 10064416+index c1e3227..1ead593 100644
3--- a/NEWS17--- a/NEWS
4+++ b/NEWS18+++ b/NEWS
5-@@ -935,7 +935,7 @@ distributed with Wget.19+@@ -1063,7 +1063,7 @@ distributed with Wget.
6 20
7 ** Compiles on pre-ANSI compilers.21 ** Compiles on pre-ANSI compilers.
8 22
@@ -11,7 +25,7 @@ index d23ae95..aa3247f 100644
11 25
12 ** Lots of bugfixes.26 ** Lots of bugfixes.
13 27
14-@@ -998,7 +998,7 @@ Emacs, standalone info, or converted to HTML, dvi or postscript.28+@@ -1126,7 +1126,7 @@ Emacs, standalone info, or converted to HTML, dvi or postscript.
15 ** Fixed a long-standing bug, so that Wget now works over SLIP29 ** Fixed a long-standing bug, so that Wget now works over SLIP
16 connections.30 connections.
17 31
@@ -21,7 +35,7 @@ index d23ae95..aa3247f 100644
21 course :-)35 course :-)
22 36
23diff --git a/README b/README37diff --git a/README b/README
24-index 692e1c6..38231c9 10064438+index 301d51f..caef201 100644
25--- a/README39--- a/README
26+++ b/README40+++ b/README
27@@ -33,7 +33,7 @@ for socks.41@@ -33,7 +33,7 @@ for socks.
@@ -78,7 +92,7 @@ index 3c7f2f4..521ef16 100644
78 ## functionality, and make it behave contrary to the documentation:92 ## functionality, and make it behave contrary to the documentation:
79 ##93 ##
80diff --git a/doc/wget.info b/doc/wget.info94diff --git a/doc/wget.info b/doc/wget.info
81-index 40ce0d4..89c6652 10064495+index 8e47756..ee85cb4 100644
82--- a/doc/wget.info96--- a/doc/wget.info
83+++ b/doc/wget.info97+++ b/doc/wget.info
84@@ -109,7 +109,7 @@ retrieval through HTTP proxies.98@@ -109,7 +109,7 @@ retrieval through HTTP proxies.
@@ -87,10 +101,10 @@ index 40ce0d4..89c6652 100644
87 Startup File::). Wget allows you to define “global” startup files101 Startup File::). Wget allows you to define “global” startup files
88- (‘/usr/local/etc/wgetrc’ by default) for site settings. You can102- (‘/usr/local/etc/wgetrc’ by default) for site settings. You can
89+ (‘/etc/wgetrc’ by default) for site settings. You can103+ (‘/etc/wgetrc’ by default) for site settings. You can
90- also specify the location of a startup file with the –config104+ also specify the location of a startup file with the -config
91- option. To disable the reading of config files, use –no-config.105+ option. To disable the reading of config files, use -no-config.
92- If both –config and –no-config are given, –no-config is ignored.106+ If both -config and -no-config are given, -no-config is ignored.
93-@@ -2825,8 +2825,8 @@ File: wget.info, Node: Wgetrc Location, Next: Wgetrc Syntax, Prev: Startup Fi107+@@ -2851,8 +2851,8 @@ File: wget.info, Node: Wgetrc Location, Next: Wgetrc Syntax, Prev: Startup Fi
94 ===================108 ===================
95 109
96 When initializing, Wget will look for a “global” startup file,110 When initializing, Wget will look for a “global” startup file,
@@ -100,17 +114,17 @@ index 40ce0d4..89c6652 100644
100+‘/etc’, if Wget was not installed there) and read commands from114+‘/etc’, if Wget was not installed there) and read commands from
101 there, if it exists.115 there, if it exists.
102 116
103- Then it will look for the user’s file. If the environmental variable117+ Then it will look for the user's file. If the environmental variable
104-@@ -2837,7 +2837,7 @@ further attempts will be made.118+@@ -2863,7 +2863,7 @@ further attempts will be made.
105 119
106- The fact that user’s settings are loaded after the system-wide ones120+ The fact that user's settings are loaded after the system-wide ones
107- means that in case of collision user’s wgetrc _overrides_ the121+ means that in case of collision user's wgetrc _overrides_ the
108-system-wide wgetrc (in ‘/usr/local/etc/wgetrc’ by default). Fascist122-system-wide wgetrc (in ‘/usr/local/etc/wgetrc’ by default). Fascist
109+system-wide wgetrc (in ‘/etc/wgetrc’ by default). Fascist123+system-wide wgetrc (in ‘/etc/wgetrc’ by default). Fascist
110 admins, away!124 admins, away!
111 125
112 126 
113-@@ -3380,7 +3380,7 @@ its line.127+@@ -3406,7 +3406,7 @@ its line.
114 ## Or online here:128 ## Or online here:
115 ## https://www.gnu.org/software/wget/manual/wget.html#Startup-File129 ## https://www.gnu.org/software/wget/manual/wget.html#Startup-File
116 ##130 ##
@@ -119,7 +133,7 @@ index 40ce0d4..89c6652 100644
119 ## (global, for all users) or $HOME/.wgetrc (for a single user).133 ## (global, for all users) or $HOME/.wgetrc (for a single user).
120 ##134 ##
121 ## To use the settings in this file, you will have to uncomment them,135 ## To use the settings in this file, you will have to uncomment them,
122-@@ -3392,7 +3392,7 @@ its line.136+@@ -3418,7 +3418,7 @@ its line.
123 137
124 138
125 ##139 ##
@@ -129,10 +143,10 @@ index 40ce0d4..89c6652 100644
129 ## functionality, and make it behave contrary to the documentation:143 ## functionality, and make it behave contrary to the documentation:
130 ##144 ##
131diff --git a/doc/wget.texi b/doc/wget.texi145diff --git a/doc/wget.texi b/doc/wget.texi
132-index eaf6b38..608d008 100644146+index 6d26fbb..2331c0f 100644
133--- a/doc/wget.texi147--- a/doc/wget.texi
134+++ b/doc/wget.texi148+++ b/doc/wget.texi
135-@@ -190,7 +190,7 @@ gauge can be customized to your preferences.149+@@ -195,7 +195,7 @@ gauge can be customized to your preferences.
136 Most of the features are fully configurable, either through command line150 Most of the features are fully configurable, either through command line
137 options, or via the initialization file @file{.wgetrc} (@pxref{Startup151 options, or via the initialization file @file{.wgetrc} (@pxref{Startup
138 File}). Wget allows you to define @dfn{global} startup files152 File}). Wget allows you to define @dfn{global} startup files
@@ -141,7 +155,7 @@ index eaf6b38..608d008 100644
141 specify the location of a startup file with the --config option.155 specify the location of a startup file with the --config option.
142 To disable the reading of config files, use --no-config.156 To disable the reading of config files, use --no-config.
143 If both --config and --no-config are given, --no-config is ignored.157 If both --config and --no-config are given, --no-config is ignored.
144-@@ -199,7 +199,7 @@ If both --config and --no-config are given, --no-config is ignored.158+@@ -204,7 +204,7 @@ If both --config and --no-config are given, --no-config is ignored.
145 @ignore159 @ignore
146 @c man begin FILES160 @c man begin FILES
147 @table @samp161 @table @samp
@@ -150,7 +164,7 @@ index eaf6b38..608d008 100644
150 Default location of the @dfn{global} startup file.164 Default location of the @dfn{global} startup file.
151 165
152 @item .wgetrc166 @item .wgetrc
153-@@ -3154,8 +3154,8 @@ commands.167+@@ -3185,8 +3185,8 @@ commands.
154 @cindex location of wgetrc168 @cindex location of wgetrc
155 169
156 When initializing, Wget will look for a @dfn{global} startup file,170 When initializing, Wget will look for a @dfn{global} startup file,
@@ -161,7 +175,7 @@ index eaf6b38..608d008 100644
161 from there, if it exists.175 from there, if it exists.
162 176
163 Then it will look for the user's file. If the environmental variable177 Then it will look for the user's file. If the environmental variable
164-@@ -3166,7 +3166,7 @@ If @code{WGETRC} is not set, Wget will try to load @file{$HOME/.wgetrc}.178+@@ -3197,7 +3197,7 @@ If @code{WGETRC} is not set, Wget will try to load @file{$HOME/.wgetrc}.
165 179
166 The fact that user's settings are loaded after the system-wide ones180 The fact that user's settings are loaded after the system-wide ones
167 means that in case of collision user's wgetrc @emph{overrides} the181 means that in case of collision user's wgetrc @emph{overrides} the
@@ -170,3 +184,6 @@ index eaf6b38..608d008 100644
170 Fascist admins, away!184 Fascist admins, away!
171 185
172 @node Wgetrc Syntax, Wgetrc Commands, Wgetrc Location, Startup File186 @node Wgetrc Syntax, Wgetrc Commands, Wgetrc Location, Startup File
187+--
188+2.33.0
189+ 
Rwget-1.21.4.tar.gz→wget-1.24.5.tar.gz+0-0
Binary files do not support preview
Mwget.spec+13-2
@@ -1,6 +1,6 @@
1Name: wget1Name: wget
2-Version: 1.21.42+Version: 1.24.5
3-Release: 23+Release: 1
4Summary: A package for retrieving files using HTTP, HTTPS, FTP and FTPS the most widely-used Internet protocols.4Summary: A package for retrieving files using HTTP, HTTPS, FTP and FTPS the most widely-used Internet protocols.
5License: GPL-3.0-or-later AND LGPL-2.1-or-later5License: GPL-3.0-or-later AND LGPL-2.1-or-later
6Url: http://www.gnu.org/software/wget/6Url: http://www.gnu.org/software/wget/
@@ -55,6 +55,17 @@ make check
55%{_infodir}/*55%{_infodir}/*
56 56 
57%changelog57%changelog
58+* Fri Oct 18 2024 GuoCe <guoce@kylinos.cn> - 1.24.5-1
59+- Type:update
60+- ID:NA
61+- SUG:NA
62+- DESC:Upgrade to version 1.24.5
63+ - Support reading fetchmail style "user" and "passwd"
64+ fields from netrc.
65+ - Fixes a minor issue where cookies may be leaked to
66+ the wrong domain.
67+ - Support extremely fast download speeds (TB/s).
68+ 
58* Sun Jun 16 2024 xuchenchen <xuchenchen@kylinos.cn> -1.21.4-269* Sun Jun 16 2024 xuchenchen <xuchenchen@kylinos.cn> -1.21.4-2
59- Type:CVES70- Type:CVES
60- ID:NA71- ID:NA