[packages/wget] - rediffed
hawk
hawk at pld-linux.org
Thu May 6 00:08:22 CEST 2021
commit 2dc25f2d30921df3e823887e44ff69ffaf7414d3
Author: Marcin Krol <hawk at tld-linux.org>
Date: Thu May 6 00:08:06 2021 +0200
- rediffed
user.xdg.origin.url.patch | 66 ++++++++++++++---------------------------------
wget-home_etc.patch | 13 +++++-----
wget-info.patch | 10 +++----
wget-wgetrc_path.patch | 42 +++++++++++++++---------------
4 files changed, 51 insertions(+), 80 deletions(-)
---
diff --git a/user.xdg.origin.url.patch b/user.xdg.origin.url.patch
index 0cacc5b..976e93b 100644
--- a/user.xdg.origin.url.patch
+++ b/user.xdg.origin.url.patch
@@ -13,11 +13,10 @@ Subject: [PATCH] Set the 'user.xdg.origin.url' xattr for downloaded files
src/url.h | 4 ++++
4 files changed, 28 insertions(+)
-diff --git a/src/ftp.c b/src/ftp.c
-index 1902242..eeffd88 100644
---- a/src/ftp.c
-+++ b/src/ftp.c
-@@ -1299,6 +1299,8 @@ Error in server response, closing control connection.\n"));
+diff -urNp -x '*.orig' wget-1.21.1.org/src/ftp.c wget-1.21.1/src/ftp.c
+--- wget-1.21.1.org/src/ftp.c 2021-01-08 23:51:43.000000000 +0100
++++ wget-1.21.1/src/ftp.c 2021-05-06 00:07:54.231635623 +0200
+@@ -1534,6 +1534,8 @@ Error in server response, closing contro
else
fp = output_stream;
@@ -26,24 +25,22 @@ index 1902242..eeffd88 100644
if (passed_expected_bytes)
{
print_length (passed_expected_bytes, restval, true);
-diff --git a/src/http.c b/src/http.c
-index 53c9818..c99c417 100644
---- a/src/http.c
-+++ b/src/http.c
-@@ -3123,6 +3123,8 @@ read_header:
- return err;
+diff -urNp -x '*.orig' wget-1.21.1.org/src/http.c wget-1.21.1/src/http.c
+--- wget-1.21.1.org/src/http.c 2021-01-08 23:51:43.000000000 +0100
++++ wget-1.21.1/src/http.c 2021-05-06 00:07:54.232635623 +0200
+@@ -4181,6 +4181,8 @@ gethttp (const struct url *u, struct url
}
+ #endif
+ set_xa (u, fileno(fp));
+
err = read_response_body (hs, sock, fp, contlen, contrange,
chunked_transfer_encoding,
u->url, warc_timestamp_str,
-diff --git a/src/url.c b/src/url.c
-index df63e1c..b41d5ac 100644
---- a/src/url.c
-+++ b/src/url.c
-@@ -37,6 +37,7 @@ as that of the covered work. */
+diff -urNp -x '*.orig' wget-1.21.1.org/src/url.c wget-1.21.1/src/url.c
+--- wget-1.21.1.org/src/url.c 2021-01-08 23:51:43.000000000 +0100
++++ wget-1.21.1/src/url.c 2021-05-06 00:07:54.233635623 +0200
+@@ -36,6 +36,7 @@ as that of the covered work. */
#include <unistd.h>
#include <errno.h>
#include <assert.h>
@@ -51,7 +48,7 @@ index df63e1c..b41d5ac 100644
#include "utils.h"
#include "url.h"
-@@ -2200,6 +2201,25 @@ are_urls_equal (const char *u1, const char *u2)
+@@ -2382,6 +2383,25 @@ are_urls_equal (const char *u1, const ch
return (*p == 0 && *q == 0 ? true : false);
}
@@ -65,7 +62,7 @@ index df63e1c..b41d5ac 100644
+ res = fsetxattr(fd, XA_ORIGIN, url, strlen(url), 0);
+ if (res != 0)
+ {
-+ if (errno == ENOTSUP)
++ if (errno == ENOTSUP || errno == EPERM)
+ res = 0;
+ else
+ logprintf (LOG_NOTQUIET, "fsetxattr: %s\n", strerror (errno));
@@ -77,11 +74,10 @@ index df63e1c..b41d5ac 100644
#ifdef TESTING
/* Debugging and testing support for path_simplify. */
-diff --git a/src/url.h b/src/url.h
-index b1c46c1..72234e9 100644
---- a/src/url.h
-+++ b/src/url.h
-@@ -132,4 +132,8 @@ bool schemes_are_similar_p (enum url_scheme a, enum url_scheme b);
+diff -urNp -x '*.orig' wget-1.21.1.org/src/url.h wget-1.21.1/src/url.h
+--- wget-1.21.1.org/src/url.h 2021-01-08 23:51:43.000000000 +0100
++++ wget-1.21.1/src/url.h 2021-05-06 00:07:54.233635623 +0200
+@@ -133,4 +133,8 @@ bool schemes_are_similar_p (enum url_sch
bool are_urls_equal (const char *u1, const char *u2);
@@ -90,27 +86,3 @@ index b1c46c1..72234e9 100644
+int set_xa (const struct url *, int);
+
#endif /* URL_H */
---
-2.3.3
-
-
-commit 8a15b84d4be480514c650db1a34cbb2122d6590d
-Author: Mantas Mikulėnas <grawity at gmail.com>
-Date: Tue Jun 30 14:56:59 2015 +0300
-
- Ignore 'Operation not permitted' when writing to /dev/null
-
-diff --git a/src/url.c b/src/url.c
-index 30cb86f..cff8683 100644
---- a/src/url.c
-+++ b/src/url.c
-@@ -2242,7 +2242,7 @@ set_xa (const struct url *origin, int fd)
- res = fsetxattr(fd, XA_ORIGIN, url, strlen(url), 0);
- if (res != 0)
- {
-- if (errno == ENOTSUP)
-+ if (errno == ENOTSUP || errno == EPERM)
- res = 0;
- else
- logprintf (LOG_NOTQUIET, "fsetxattr: %s\n", strerror (errno));
-
diff --git a/wget-home_etc.patch b/wget-home_etc.patch
index 9e45903..b6f5073 100644
--- a/wget-home_etc.patch
+++ b/wget-home_etc.patch
@@ -1,12 +1,11 @@
-diff -Nru wget-1.8.2.orig/src/init.c wget-1.8.2/src/init.c
---- wget-1.8.2.orig/src/init.c Sat Mar 1 12:06:06 2003
-+++ wget-1.8.2/src/init.c Mon Nov 3 10:31:43 2003
-@@ -354,6 +354,7 @@
- static char buf[PATH_MAX];
- static char *home;
+diff -urNp -x '*.orig' wget-1.21.1.org/src/init.c wget-1.21.1/src/init.c
+--- wget-1.21.1.org/src/init.c 2021-01-08 23:51:43.000000000 +0100
++++ wget-1.21.1/src/init.c 2021-05-06 00:07:44.234635623 +0200
+@@ -522,6 +522,7 @@ home_dir (void)
+ static char *buf = NULL;
+ static char *home, *ret;
+ home = getenv("HOME_ETC");
if (!home)
{
home = getenv ("HOME");
-
diff --git a/wget-info.patch b/wget-info.patch
index 04397f1..2d15b29 100644
--- a/wget-info.patch
+++ b/wget-info.patch
@@ -1,5 +1,6 @@
---- wget-1.9-beta4/doc/wget.texi.orig 2003-10-12 22:41:49.000000000 +0200
-+++ wget-1.9-beta4/doc/wget.texi 2003-10-12 22:44:56.185263424 +0200
+diff -urNp -x '*.orig' wget-1.21.1.org/doc/wget.texi wget-1.21.1/doc/wget.texi
+--- wget-1.21.1.org/doc/wget.texi 2021-01-08 23:51:43.000000000 +0100
++++ wget-1.21.1/doc/wget.texi 2021-05-06 00:07:21.138635623 +0200
@@ -21,9 +21,9 @@
@set Wget Wget
@c man title Wget The non-interactive network downloader.
@@ -11,8 +12,8 @@
+* Wget: (wget). Non-interactive network downloader
@end direntry
- @ifnottex
-@@ -988,7 +988,7 @@ whose encoding does not match the one us
+ @copying
+@@ -1129,7 +1129,7 @@ whose encoding does not match the one us
@cindex IPv6
@item -4
@itemx --inet4-only
@@ -21,4 +22,3 @@
@itemx --inet6-only
Force connecting to IPv4 or IPv6 addresses. With @samp{--inet4-only}
or @samp{-4}, Wget will only connect to IPv4 hosts, ignoring AAAA
-
diff --git a/wget-wgetrc_path.patch b/wget-wgetrc_path.patch
index 3c27f4a..06ed306 100644
--- a/wget-wgetrc_path.patch
+++ b/wget-wgetrc_path.patch
@@ -1,7 +1,7 @@
-diff -uNr wget-1.8.2.orig/NEWS wget-1.8.2/NEWS
---- wget-1.8.2.orig/NEWS Thu Aug 28 21:45:31 2003
-+++ wget-1.8.2/NEWS Thu Aug 28 21:45:31 2003
-@@ -232,7 +232,7 @@
+diff -urNp -x '*.orig' wget-1.21.1.org/NEWS wget-1.21.1/NEWS
+--- wget-1.21.1.org/NEWS 2021-01-09 10:55:07.000000000 +0100
++++ wget-1.21.1/NEWS 2021-05-06 00:07:34.604635623 +0200
+@@ -1005,7 +1005,7 @@ distributed with Wget.
** Compiles on pre-ANSI compilers.
@@ -9,8 +9,8 @@ diff -uNr wget-1.8.2.orig/NEWS wget-1.8.2/NEWS
+** Global wgetrc now goes to /etc (i.e. $sysconfdir).
** Lots of bugfixes.
-
-@@ -295,9 +295,8 @@
+
+@@ -1068,9 +1068,8 @@ Emacs, standalone info, or converted to
** Fixed a long-standing bug, so that Wget now works over SLIP
connections.
@@ -22,19 +22,19 @@ diff -uNr wget-1.8.2.orig/NEWS wget-1.8.2/NEWS
** You can set up quota in .wgetrc to prevent sucking too much
data. Try `quota = 5M' in .wgetrc (or quota = 100K if you want your
-diff -Nur wget-1.10/doc.orig/sample.wgetrc wget-1.10/doc/sample.wgetrc
---- wget-1.10/doc.orig/sample.wgetrc 2001-11-30 08:32:17.000000000 +0100
-+++ wget-1.10/doc/sample.wgetrc 2005-06-22 09:43:39.000000000 +0200
-@@ -7,7 +7,7 @@
- ## not contain a comprehensive list of commands -- look at the manual
- ## to find out what you can put into this file.
+diff -urNp -x '*.orig' wget-1.21.1.org/doc/sample.wgetrc wget-1.21.1/doc/sample.wgetrc
+--- wget-1.21.1.org/doc/sample.wgetrc 2020-05-05 01:10:59.000000000 +0200
++++ wget-1.21.1/doc/sample.wgetrc 2021-05-06 00:07:34.605635623 +0200
+@@ -10,7 +10,7 @@
+ ## Or online here:
+ ## https://www.gnu.org/software/wget/manual/wget.html#Startup-File
##
-## Wget initialization file can reside in /usr/local/etc/wgetrc
+## Wget initialization file can reside in /etc/wgetrc
## (global, for all users) or $HOME/.wgetrc (for a single user).
##
## To use the settings in this file, you will have to uncomment them,
-@@ -16,7 +16,7 @@
+@@ -22,7 +22,7 @@
##
@@ -43,10 +43,10 @@ diff -Nur wget-1.10/doc.orig/sample.wgetrc wget-1.10/doc/sample.wgetrc
## Think well before you change them, since they may reduce wget's
## functionality, and make it behave contrary to the documentation:
##
-diff -Nur wget-1.10/doc.orig/wget.texi wget-1.10/doc/wget.texi
---- wget-1.10/doc.orig/wget.texi 2005-06-22 09:42:36.000000000 +0200
-+++ wget-1.10/doc/wget.texi 2005-06-22 09:44:02.000000000 +0200
-@@ -191,7 +191,7 @@ gauge can be customized to your preferen
+diff -urNp -x '*.orig' wget-1.21.1.org/doc/wget.texi wget-1.21.1/doc/wget.texi
+--- wget-1.21.1.org/doc/wget.texi 2021-05-06 00:07:34.276635623 +0200
++++ wget-1.21.1/doc/wget.texi 2021-05-06 00:07:34.606635623 +0200
+@@ -195,7 +195,7 @@ gauge can be customized to your preferen
Most of the features are fully configurable, either through command line
options, or via the initialization file @file{.wgetrc} (@pxref{Startup
File}). Wget allows you to define @dfn{global} startup files
@@ -55,7 +55,7 @@ diff -Nur wget-1.10/doc.orig/wget.texi wget-1.10/doc/wget.texi
specify the location of a startup file with the --config option.
To disable the reading of config files, use --no-config.
If both --config and --no-config are given, --no-config is ignored.
-@@ -200,7 +200,7 @@ If both --config and --no-config are giv
+@@ -204,7 +204,7 @@ If both --config and --no-config are giv
@ignore
@c man begin FILES
@table @samp
@@ -64,7 +64,7 @@ diff -Nur wget-1.10/doc.orig/wget.texi wget-1.10/doc/wget.texi
Default location of the @dfn{global} startup file.
@item .wgetrc
-@@ -2411,9 +2411,7 @@
+@@ -3185,9 +3185,7 @@ commands.
@cindex location of wgetrc
When initializing, Wget will look for a @dfn{global} startup file,
@@ -75,7 +75,7 @@ diff -Nur wget-1.10/doc.orig/wget.texi wget-1.10/doc/wget.texi
Then it will look for the user's file. If the environmental variable
@code{WGETRC} is set, Wget will try to load that file. Failing that, no
-@@ -2423,7 +2421,7 @@
+@@ -3197,7 +3195,7 @@ If @code{WGETRC} is not set, Wget will t
The fact that user's settings are loaded after the system-wide ones
means that in case of collision user's wgetrc @emph{overrides} the
@@ -83,4 +83,4 @@ diff -Nur wget-1.10/doc.orig/wget.texi wget-1.10/doc/wget.texi
+system-wide wgetrc (in @file{/etc/wgetrc} by default).
Fascist admins, away!
- @node Wgetrc Syntax
+ @node Wgetrc Syntax, Wgetrc Commands, Wgetrc Location, Startup File
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/wget.git/commitdiff/2dc25f2d30921df3e823887e44ff69ffaf7414d3
More information about the pld-cvs-commit
mailing list