sergiotarxz/termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wget2: update to 2.0.0 (#7730)

Browse Source
This commit is contained in:
Oskar 2021-10-14 07:23:55 +02:00 committed by GitHub
parent b6af8c5fb6
commit 9e3d5419ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/wget2/build.sh
View File

@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://gitlab.com/gnuwget/wget2
TERMUX_PKG_DESCRIPTION="The successor of GNU Wget, a file and recursive website downloader" TERMUX_PKG_DESCRIPTION="The successor of GNU Wget, a file and recursive website downloader"
TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_LICENSE="GPL-2.0"
TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=1.99.2 TERMUX_PKG_VERSION=2.0.0
TERMUX_PKG_REVISION=3 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/wget/wget2-${TERMUX_PKG_VERSION}.tar.lz
TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/wget/wget2-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=da95b1477fa4ede1ac712f179c1354d9624fbc91e778d89cf8d2ae46aa15e3d2
TERMUX_PKG_SHA256=cbc48f55fa22ed2acbccf032c208c133cc59c7432cda8518a4992eb5882b6563
TERMUX_PKG_DEPENDS="gpgme, libandroid-glob, libassuan, libgnutls, libgpg-error, pcre2" TERMUX_PKG_DEPENDS="gpgme, libandroid-glob, libassuan, libgnutls, libgpg-error, pcre2"
TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
ac_cv_header_spawn_h=no ac_cv_header_spawn_h=no

47
packages/wget2/fix-hardcoded-paths.patch
View File

@ -1,7 +1,7 @@
diff -uNr wget2-1.99.2/lib/tempname.c wget2-1.99.2.mod/lib/tempname.c diff -uNr a/lib/tempname.c b/lib/tempname.c
--- wget2-1.99.2/lib/tempname.c 2019-05-14 12:11:02.000000000 +0300 --- a/lib/tempname.c
+++ wget2-1.99.2.mod/lib/tempname.c 2021-02-08 20:03:45.356173902 +0200 +++ b/lib/tempname.c
@@ -147,8 +147,8 @@ @@ -141,8 +141,8 @@ __path_search (char *tmpl, size_t tmpl_len, const char *dir, const char *pfx,
{ {
if (direxists (P_tmpdir)) if (direxists (P_tmpdir))
dir = P_tmpdir; dir = P_tmpdir;
@ -12,10 +12,10 @@ diff -uNr wget2-1.99.2/lib/tempname.c wget2-1.99.2.mod/lib/tempname.c
else else
{ {
__set_errno (ENOENT); __set_errno (ENOENT);
diff -uNr wget2-1.99.2/libwget/io.c wget2-1.99.2.mod/libwget/io.c diff -uNr a/libwget/io.c b/libwget/io.c
--- wget2-1.99.2/libwget/io.c 2019-08-23 10:59:09.000000000 +0300 --- a/libwget/io.c
+++ wget2-1.99.2.mod/libwget/io.c 2021-02-08 20:02:37.567520848 +0200 +++ b/libwget/io.c
@@ -428,7 +428,7 @@ @@ -377,7 +377,7 @@ int wget_update_file(const char *fname,
// find out system temp directory // find out system temp directory
if (!(tmpdir = getenv("TMPDIR")) && !(tmpdir = getenv("TMP")) if (!(tmpdir = getenv("TMPDIR")) && !(tmpdir = getenv("TMP"))
&& !(tmpdir = getenv("TEMP")) && !(tmpdir = getenv("TEMPDIR"))) && !(tmpdir = getenv("TEMP")) && !(tmpdir = getenv("TEMPDIR")))
@ -24,22 +24,23 @@ diff -uNr wget2-1.99.2/libwget/io.c wget2-1.99.2.mod/libwget/io.c
basename = base_name(fname); basename = base_name(fname);
diff -uNr wget2-1.99.2/libwget/ssl_gnutls.c wget2-1.99.2.mod/libwget/ssl_gnutls.c diff -uNr a/libwget/ssl_gnutls.c b/libwget/ssl_gnutls.c
--- wget2-1.99.2/libwget/ssl_gnutls.c 2019-08-23 10:59:09.000000000 +0300 --- a/libwget/ssl_gnutls.c
+++ wget2-1.99.2.mod/libwget/ssl_gnutls.c 2021-02-08 20:04:36.772666861 +0200 +++ b/libwget/ssl_gnutls.c
@@ -1273,7 +1273,7 @@ @@ -1290,7 +1290,7 @@ void wget_ssl_init(void)
ncerts = gnutls_certificate_set_x509_system_trust(_credentials); ncerts = 0;
#else
if (!strcmp(_config.ca_directory, "system"))
- _config.ca_directory = "/etc/ssl/certs";
+ _config.ca_directory = "@TERMUX_PREFIX@/etc/tls/certs";
#endif
if (ncerts < 0) { if (!strcmp(config.ca_directory, "system"))
diff -uNr wget2-1.99.2/libwget/ssl_openssl.c wget2-1.99.2.mod/libwget/ssl_openssl.c - config.ca_directory = "/etc/ssl/certs";
--- wget2-1.99.2/libwget/ssl_openssl.c 2019-08-30 12:07:38.000000000 +0300 + config.ca_directory = "@TERMUX_PREFIX@/etc/tls/certs";
+++ wget2-1.99.2.mod/libwget/ssl_openssl.c 2021-02-08 20:04:56.100851688 +0200
@@ -424,7 +424,7 @@ if ((dir = opendir(config.ca_directory))) {
struct dirent *dp;
diff -uNr a/libwget/ssl_openssl.c b/libwget/ssl_openssl.c
index c836afd..128ac29 100644
--- a/libwget/ssl_openssl.c
+++ b/libwget/ssl_openssl.c
@@ -462,7 +462,7 @@ static int openssl_load_trust_files(SSL_CTX *ctx, const char *dir)
goto end; goto end;
} }