haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-23 12:10:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

wget: bump version.

Browse Source
This commit is contained in:
Jerome Duval
2019-09-10 21:57:31 +02:00
parent c14e7fd36f
commit 22a97e922d
2 changed files with 149 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

268
net-misc/wget/patches/wget-1.20.1.patchset → net-misc/wget/patches/wget-1.20.3.patchset
View File

@@ -1,14 +1,14 @@
From d0412fae5979853cdfb405ff8dfd278f2f5eb2d0 Mon Sep 17 00:00:00 2001
From 1bc5fbc916fbae452197457afcd41c17f7c6ed84 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Mon, 19 May 2014 15:38:37 +0000
Subject: apply wget-1.14.patch
diff --git a/configure.ac b/configure.ac
index 167882f..12e362d 100644
index 53cf142..2596bbd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -254,6 +254,7 @@ AC_HEADER_STDBOOL
@@ -263,6 +263,7 @@ AC_HEADER_STDBOOL
AC_CHECK_HEADERS(unistd.h sys/time.h)
AC_CHECK_HEADERS(termios.h sys/ioctl.h sys/select.h utime.h sys/utime.h)
AC_CHECK_HEADERS(stdint.h inttypes.h pwd.h wchar.h dlfcn.h)
@@ -16,7 +16,7 @@ index 167882f..12e362d 100644
AC_CHECK_DECLS(h_errno,,,[#include <netdb.h>])
@@ -321,6 +322,9 @@ dnl
@@ -331,6 +332,9 @@ dnl
PKG_PROG_PKG_CONFIG
@@ -27,7 +27,7 @@ index 167882f..12e362d 100644
PKG_CHECK_MODULES([LIBPSL], libpsl, [
with_libpsl=yes
diff --git a/src/config.h.in b/src/config.h.in
index b4673c9..fdd6d63 100644
index 1dcbf68..0f71c4a 100644
--- a/src/config.h.in
+++ b/src/config.h.in
@@ -920,6 +920,9 @@
@@ -51,10 +51,10 @@ index b4673c9..fdd6d63 100644
#undef HAVE_LIBPCRE
diff --git a/src/connect.c b/src/connect.c
index 37dae21..460260d 100644
index 7b0dbbd..b231714 100644
--- a/src/connect.c
+++ b/src/connect.c
@@ -45,7 +45,7 @@ as that of the covered work. */
@@ -46,7 +46,7 @@ as that of the covered work. */
# include <netdb.h>
# endif /* def __VMS [else] */
# include <netinet/in.h>
@@ -64,10 +64,10 @@ index 37dae21..460260d 100644
# endif
#endif /* not WINDOWS */
diff --git a/src/host.h b/src/host.h
index 042d44d..e33b651 100644
index 560391d..b105e03 100644
--- a/src/host.h
+++ b/src/host.h
@@ -40,9 +40,9 @@ as that of the covered work. */
@@ -41,9 +41,9 @@ as that of the covered work. */
# endif /* def __VMS [else] */
# include <sys/socket.h>
# include <netinet/in.h>
@@ -81,20 +81,20 @@ index 042d44d..e33b651 100644
struct url;
--
2.19.1
2.23.0
From c441738ed448186b57c2309c8c59b2fb0716f5a6 Mon Sep 17 00:00:00 2001
From e51cec62b3e033d562397220f5cc21daaddc34d6 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Mon, 19 May 2014 15:47:24 +0000
Subject: apply and augment wget-1.14-build-fixes.patch
diff --git a/src/utils.c b/src/utils.c
index 2289a47..7f7e294 100644
index 89a87b0..f68b209 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -59,7 +59,9 @@ as that of the covered work. */
@@ -60,7 +60,9 @@ as that of the covered work. */
/* For TIOCGWINSZ and friends: */
#ifndef WINDOWS
@@ -105,17 +105,17 @@ index 2289a47..7f7e294 100644
#endif
--
2.19.1
2.23.0
From 2f23d2f6f5489397355807aa21b23a8456643a0d Mon Sep 17 00:00:00 2001
From 146c81df840142f4d4c542262ed922c625b621ec Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sun, 14 Feb 2016 11:05:10 +0100
Subject: Move wget-hsts out of home directory.
diff --git a/src/main.c b/src/main.c
index 4408ffb..5bb1910 100644
index 65b7f3f..bf6f9c2 100644
--- a/src/main.c
+++ b/src/main.c
@@ -87,6 +87,10 @@ as that of the covered work. */
@@ -147,17 +147,17 @@ index 4408ffb..5bb1910 100644
{
char *dir = aprintf ("%s/.wget-hsts", opt.homedir);
--
2.19.1
2.23.0
From 9ecdcc7d352a5c6233de87634a55127a60b6fabf Mon Sep 17 00:00:00 2001
From eeaeab445325e205ae8504a493d6c27968204cf0 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Mon, 22 May 2017 18:46:27 +0200
Subject: gcc2 patch
diff --git a/src/init.c b/src/init.c
index 51b6361..bb36a14 100644
index 9b6665a..4c603a9 100644
--- a/src/init.c
+++ b/src/init.c
@@ -894,7 +894,7 @@ setval_internal (int comind, const char *com, const char *val)
@@ -170,10 +170,10 @@ index 51b6361..bb36a14 100644
DEBUGP (("Setting %s (%s) to %s\n", com, commands[comind].name, val));
return commands[comind].action (com, val, commands[comind].place);
--
2.19.1
2.23.0
From 5960501f289248ff8479488980e50bab9ea85037 Mon Sep 17 00:00:00 2001
From f41fb048231046df5f88292a6372622de72ca362 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Thu, 23 Nov 2017 09:09:48 +0100
Subject: Handle SSL_ERROR_WANT_READ.
@@ -187,10 +187,10 @@ This allows EINTR detection to work, so no error happens when you
resize terminal anymore.
diff --git a/src/openssl.c b/src/openssl.c
index 73e7f0f..b4793cc 100644
index a150217..00bb950 100644
--- a/src/openssl.c
+++ b/src/openssl.c
@@ -412,9 +412,11 @@ static void openssl_read_callback(void *arg)
@@ -444,9 +444,11 @@ static void openssl_read_callback(void *arg)
int bufsize = args->bufsize;
int ret;
@@ -205,20 +205,20 @@ index 73e7f0f..b4793cc 100644
args->retval = ret;
}
--
2.19.1
2.23.0
From e109c014ad8ac5a54b4892c6223e3c79f43a3f48 Mon Sep 17 00:00:00 2001
From 67d8c9938774ce78c7f310fa6440708ddf92846d Mon Sep 17 00:00:00 2001
From: Crestwave <crest.wave@yahoo.com>
Date: Sun, 25 Nov 2018 12:01:08 +0000
Subject: Also move wget-hsts out of the home directory in hsts.c.
diff --git a/src/hsts.c b/src/hsts.c
index 64149e4..697bb25 100644
index b91bc56..0b5c474 100644
--- a/src/hsts.c
+++ b/src/hsts.c
@@ -48,6 +48,10 @@ as that of the covered work. */
@@ -49,6 +49,10 @@ as that of the covered work. */
#include <stdio.h>
#include <sys/file.h>
@@ -229,7 +229,7 @@ index 64149e4..697bb25 100644
struct hsts_store {
struct hash_table *table;
time_t last_mtime;
@@ -627,6 +631,16 @@ get_hsts_store_filename (void)
@@ -628,6 +632,16 @@ get_hsts_store_filename (void)
char *filename = NULL;
FILE *fp = NULL;
@@ -247,57 +247,20 @@ index 64149e4..697bb25 100644
{
filename = aprintf ("%s/.wget-hsts-test", opt.homedir);
--
2.19.1
2.23.0
From a2ee5521e8cb02244dfdac1fd3eb54978c77d9d9 Mon Sep 17 00:00:00 2001
From: Crestwave <crest.wave@yahoo.com>
Date: Sun, 25 Nov 2018 11:15:19 +0000
Subject: Remove -ldl flag from ld.
diff --git a/fuzz/Makefile.am b/fuzz/Makefile.am
index a6d4b67..a937bb5 100644
--- a/fuzz/Makefile.am
+++ b/fuzz/Makefile.am
@@ -5,8 +5,7 @@ LDADD = ../lib/libgnu.a \
$(GETADDRINFO_LIB) $(HOSTENT_LIB) $(INET_NTOP_LIB) $(INET_PTON_LIB) \
$(LIBSOCKET) $(LIB_CLOCK_GETTIME) $(LIB_CRYPTO) $(LIB_GETLOGIN) $(LIB_NANOSLEEP) $(LIB_POLL) \
$(LIB_POSIX_SPAWN) $(LIB_PTHREAD_SIGMASK) $(LIB_SELECT) $(LIBICONV) $(LIBINTL) \
- $(LIBMULTITHREAD) $(LIBTHREAD) $(SERVENT_LIB) @INTL_MACOSX_LIBS@ \
- -ldl
+ $(LIBMULTITHREAD) $(LIBTHREAD) $(SERVENT_LIB) @INTL_MACOSX_LIBS@
WGET_TESTS = \
wget_css_fuzzer$(EXEEXT) \
diff --git a/fuzz/Makefile.in b/fuzz/Makefile.in
index 7ecc25b..ad7b1fd 100644
--- a/fuzz/Makefile.in
+++ b/fuzz/Makefile.in
@@ -1665,7 +1665,7 @@ LDADD = ../lib/libgnu.a $(GETADDRINFO_LIB) $(HOSTENT_LIB) \
$(LIB_NANOSLEEP) $(LIB_POLL) $(LIB_POSIX_SPAWN) \
$(LIB_PTHREAD_SIGMASK) $(LIB_SELECT) $(LIBICONV) $(LIBINTL) \
$(LIBMULTITHREAD) $(LIBTHREAD) $(SERVENT_LIB) \
- @INTL_MACOSX_LIBS@ -ldl $(am__append_1)
+ @INTL_MACOSX_LIBS@ $(am__append_1)
WGET_TESTS = \
wget_css_fuzzer$(EXEEXT) \
wget_cookie_fuzzer$(EXEEXT) \
--
2.19.1
From 0a506c368971850477120c71ab16a02d2ac38da1 Mon Sep 17 00:00:00 2001
From 0eb18282d23626203244e7b439ac2ec7e9257c6e Mon Sep 17 00:00:00 2001
From: Crestwave <crest.wave@yahoo.com>
Date: Mon, 26 Nov 2018 07:13:07 +0000
Subject: Fix segmentation violation when executing fuzzers.
diff --git a/fuzz/wget_cookie_fuzzer.c b/fuzz/wget_cookie_fuzzer.c
index 121e2e2..40882f6 100644
index cf27c61..f3dd400 100644
--- a/fuzz/wget_cookie_fuzzer.c
+++ b/fuzz/wget_cookie_fuzzer.c
@@ -56,6 +56,7 @@ FILE *fopen_wgetrc(const char *pathname, const char *mode)
@@ -58,11 +58,13 @@ FILE *fopen_wgetrc(const char *pathname, const char *mode)
return NULL;
}
@@ -305,8 +268,6 @@ index 121e2e2..40882f6 100644
#ifdef FUZZING
void exit_wget(int status)
{
@@ -65,6 +66,7 @@ void exit(int status)
{
}
#endif
+#endif
@@ -314,19 +275,19 @@ index 121e2e2..40882f6 100644
int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size)
{
diff --git a/fuzz/wget_css_fuzzer.c b/fuzz/wget_css_fuzzer.c
index bcdeb5e..f7600d4 100644
index d2d8b09..b332bc9 100644
--- a/fuzz/wget_css_fuzzer.c
+++ b/fuzz/wget_css_fuzzer.c
@@ -68,6 +68,7 @@ FILE *fopen_wgetrc(const char *pathname, const char *mode)
}
@@ -69,6 +69,7 @@ FILE *fopen_wgetrc(const char *pathname, const char *mode)
static int do_jump;
static jmp_buf jmpbuf;
+#ifndef __HAIKU__
#ifdef FUZZING
void exit_wget(int status)
{
@@ -79,6 +80,7 @@ void exit(int status)
longjmp(jmpbuf, 1);
@@ -89,6 +90,7 @@ void exit(int status)
}
}
#endif
+#endif
@@ -334,19 +295,19 @@ index bcdeb5e..f7600d4 100644
int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size)
{
diff --git a/fuzz/wget_ftpls_fuzzer.c b/fuzz/wget_ftpls_fuzzer.c
index 138a549..2c04ed0 100644
index 2b67485..19d0f38 100644
--- a/fuzz/wget_ftpls_fuzzer.c
+++ b/fuzz/wget_ftpls_fuzzer.c
@@ -59,6 +59,7 @@ FILE *fopen_wgetrc(const char *pathname, const char *mode)
return NULL;
}
@@ -61,6 +61,7 @@ FILE *fopen_wgetrc(const char *pathname, const char *mode)
static int do_jump;
static jmp_buf jmpbuf;
+#ifndef __HAIKU__
#ifdef FUZZING
void exit_wget(int status)
{
@@ -68,6 +69,7 @@ void exit(int status)
{
@@ -81,6 +82,7 @@ void exit(int status)
}
}
#endif
+#endif
@@ -354,10 +315,10 @@ index 138a549..2c04ed0 100644
int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size)
{
diff --git a/fuzz/wget_html_fuzzer.c b/fuzz/wget_html_fuzzer.c
index a6c4fdc..dcb9929 100644
index 75c8153..e31bf68 100644
--- a/fuzz/wget_html_fuzzer.c
+++ b/fuzz/wget_html_fuzzer.c
@@ -68,6 +68,7 @@ FILE *fopen_wgetrc(const char *pathname, const char *mode)
@@ -68,11 +68,13 @@ FILE *fopen_wgetrc(const char *pathname, const char *mode)
#endif
}
@@ -365,8 +326,6 @@ index a6c4fdc..dcb9929 100644
#ifdef FUZZING
void exit_wget(int status)
{
@@ -77,6 +78,7 @@ void exit(int status)
{
}
#endif
+#endif
@@ -374,19 +333,19 @@ index a6c4fdc..dcb9929 100644
int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size)
{
diff --git a/fuzz/wget_netrc_fuzzer.c b/fuzz/wget_netrc_fuzzer.c
index 97d472e..9f6abbe 100644
index b0d1c0f..d30ec96 100644
--- a/fuzz/wget_netrc_fuzzer.c
+++ b/fuzz/wget_netrc_fuzzer.c
@@ -56,6 +56,7 @@ FILE *fopen_wgetrc(const char *pathname, const char *mode)
return NULL;
}
@@ -60,6 +60,7 @@ FILE *fopen_wgetrc(const char *pathname, const char *mode)
static int do_jump;
static jmp_buf jmpbuf;
+#ifndef __HAIKU__
#ifdef FUZZING
void exit_wget(int status)
{
@@ -65,6 +66,7 @@ void exit(int status)
{
@@ -80,6 +81,7 @@ void exit(int status)
}
}
#endif
+#endif
@@ -394,19 +353,19 @@ index 97d472e..9f6abbe 100644
int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size)
{
diff --git a/fuzz/wget_options_fuzzer.c b/fuzz/wget_options_fuzzer.c
index d3dcaff..c62a3e4 100644
index 9813ab4..2f8e2a2 100644
--- a/fuzz/wget_options_fuzzer.c
+++ b/fuzz/wget_options_fuzzer.c
@@ -61,6 +61,7 @@ FILE *fopen_wgetrc(const char *pathname, const char *mode)
}
@@ -62,6 +62,7 @@ FILE *fopen_wgetrc(const char *pathname, const char *mode)
static int do_jump;
static jmp_buf jmpbuf;
+#ifndef __HAIKU__
#ifdef FUZZING
void exit_wget(int status)
{
@@ -72,6 +73,7 @@ void exit(int status)
longjmp(jmpbuf, 1);
@@ -82,6 +83,7 @@ void exit(int status)
}
}
#endif
+#endif
@@ -414,10 +373,10 @@ index d3dcaff..c62a3e4 100644
int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size)
{
diff --git a/fuzz/wget_robots_fuzzer.c b/fuzz/wget_robots_fuzzer.c
index e6b3bd1..c284990 100644
index a62e1f5..4cfe708 100644
--- a/fuzz/wget_robots_fuzzer.c
+++ b/fuzz/wget_robots_fuzzer.c
@@ -59,6 +59,7 @@ FILE *fopen_wgetrc(const char *pathname, const char *mode)
@@ -59,11 +59,13 @@ FILE *fopen_wgetrc(const char *pathname, const char *mode)
return NULL;
}
@@ -425,8 +384,6 @@ index e6b3bd1..c284990 100644
#ifdef FUZZING
void exit_wget(int status)
{
@@ -68,6 +69,7 @@ void exit(int status)
{
}
#endif
+#endif
@@ -434,10 +391,10 @@ index e6b3bd1..c284990 100644
int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size)
{
diff --git a/fuzz/wget_url_fuzzer.c b/fuzz/wget_url_fuzzer.c
index ad05ff8..a0f002e 100644
index b62ab78..c16f005 100644
--- a/fuzz/wget_url_fuzzer.c
+++ b/fuzz/wget_url_fuzzer.c
@@ -56,6 +56,7 @@ FILE *fopen_wgetrc(const char *pathname, const char *mode)
@@ -58,11 +58,13 @@ FILE *fopen_wgetrc(const char *pathname, const char *mode)
return NULL;
}
@@ -445,8 +402,6 @@ index ad05ff8..a0f002e 100644
#ifdef FUZZING
void exit_wget(int status)
{
@@ -65,6 +66,7 @@ void exit(int status)
{
}
#endif
+#endif
@@ -454,17 +409,17 @@ index ad05ff8..a0f002e 100644
int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size)
{
--
2.19.1
2.23.0
From b9befb372eb213bd5f24ebe35d09ec672f5e7754 Mon Sep 17 00:00:00 2001
From 71785d01e475dcaa6858bd6ce0668600226bb335 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sat, 30 Mar 2019 14:19:17 +0100
Subject: gcc2 patch for version 1.20.1
Subject: gcc2 patch for version 1.20.3
diff --git a/lib/md5.c b/lib/md5.c
index 554d421..7f693f6 100644
index 5c8bcf9..3463426 100644
--- a/lib/md5.c
+++ b/lib/md5.c
@@ -144,19 +144,20 @@ md5_finish_ctx (struct md5_ctx *ctx, void *resbuf)
@@ -492,10 +447,63 @@ index 554d421..7f693f6 100644
/* Iterate over full file contents. */
while (1)
diff --git a/lib/mktime.c b/lib/mktime.c
index 557712f..5e5b097 100644
index e3783d7..0e6a5bf 100644
--- a/lib/mktime.c
+++ b/lib/mktime.c
@@ -528,8 +528,9 @@ mktime (struct tm *tp)
@@ -274,6 +274,8 @@ ranged_convert (struct tm *(*convert) (const time_t *, struct tm *),
long_int t1 = (*t < mktime_min ? mktime_min
: *t <= mktime_max ? *t : mktime_max);
struct tm *r = convert_time (convert, t1, tp);
+ long_int bad, ok;
+ struct tm oktm;
if (r)
{
*t = t1;
@@ -282,9 +284,9 @@ ranged_convert (struct tm *(*convert) (const time_t *, struct tm *),
if (errno != EOVERFLOW)
return NULL;
- long_int bad = t1;
- long_int ok = 0;
- struct tm oktm; oktm.tm_sec = -1;
+ bad = t1;
+ ok = 0;
+ oktm.tm_sec = -1;
/* BAD is a known out-of-range value, and OK is a known in-range one.
Use binary search to narrow the range between BAD and OK until
@@ -366,6 +368,7 @@ __mktime_internal (struct tm *tp,
int negative_offset_guess;
int sec_requested = sec;
+ long_int t0, t, t1, t2;
if (LEAP_SECONDS_POSSIBLE)
{
@@ -381,18 +384,19 @@ __mktime_internal (struct tm *tp,
time. */
INT_SUBTRACT_WRAPV (0, off, &negative_offset_guess);
- long_int t0 = ydhms_diff (year, yday, hour, min, sec,
+ t0 = ydhms_diff (year, yday, hour, min, sec,
EPOCH_YEAR - TM_YEAR_BASE, 0, 0, 0,
negative_offset_guess);
- long_int t = t0, t1 = t0, t2 = t0;
+ t = t0, t1 = t0, t2 = t0;
/* Repeatedly use the error to improve the guess. */
while (true)
{
+ long_int dt;
if (! ranged_convert (convert, &t, &tm))
return -1;
- long_int dt = tm_diff (year, yday, hour, min, sec, &tm);
+ dt = tm_diff (year, yday, hour, min, sec, &tm);
if (dt == 0)
break;
@@ -530,8 +534,9 @@ mktime (struct tm *tp)
__tzset ();
# if defined _LIBC || NEED_MKTIME_WORKING
@@ -507,10 +515,10 @@ index 557712f..5e5b097 100644
# undef mktime
return mktime (tp);
diff --git a/lib/regexec.c b/lib/regexec.c
index 8b82ea5..efabb42 100644
index f464869..3a944b0 100644
--- a/lib/regexec.c
+++ b/lib/regexec.c
@@ -3293,6 +3293,7 @@ build_trtable (const re_dfa_t *dfa, re_dfastate_t *state)
@@ -3298,6 +3298,7 @@ build_trtable (const re_dfa_t *dfa, re_dfastate_t *state)
re_node_set follows, *dests_node;
bitset_t *dests_ch;
bitset_t acceptable;
@@ -518,7 +526,7 @@ index 8b82ea5..efabb42 100644
struct dests_alloc
{
@@ -3343,7 +3344,7 @@ build_trtable (const re_dfa_t *dfa, re_dfastate_t *state)
@@ -3348,7 +3349,7 @@ build_trtable (const re_dfa_t *dfa, re_dfastate_t *state)
goto out_free;
/* Avoid arithmetic overflow in size calculation. */
@@ -528,7 +536,7 @@ index 8b82ea5..efabb42 100644
/ (3 * sizeof (re_dfastate_t *)));
if (__glibc_unlikely (ndests_max < ndests))
diff --git a/lib/sha1.c b/lib/sha1.c
index cd79dfa..7ee2def 100644
index d94c437..a56090a 100644
--- a/lib/sha1.c
+++ b/lib/sha1.c
@@ -132,19 +132,20 @@ sha1_finish_ctx (struct sha1_ctx *ctx, void *resbuf)
@@ -556,7 +564,7 @@ index cd79dfa..7ee2def 100644
/* Iterate over full file contents. */
while (1)
diff --git a/lib/sha256.c b/lib/sha256.c
index c518517..9dcde43 100644
index 721e944..68df9b6 100644
--- a/lib/sha256.c
+++ b/lib/sha256.c
@@ -182,19 +182,20 @@ shaxxx_stream (FILE *stream, char const *alg, void *resblock,
@@ -584,7 +592,7 @@ index c518517..9dcde43 100644
/* Iterate over full file contents. */
while (1)
diff --git a/lib/sha512.c b/lib/sha512.c
index e854951..609066d 100644
index e7f5bd5..80a7897 100644
--- a/lib/sha512.c
+++ b/lib/sha512.c
@@ -183,19 +183,20 @@ shaxxx_stream (FILE *stream, char const *alg, void *resblock,
@@ -612,7 +620,7 @@ index e854951..609066d 100644
/* Iterate over full file contents. */
while (1)
diff --git a/src/ftp.c b/src/ftp.c
index 6b8bdf8..d27e407 100644
index 03d7deb..2c5ae52 100644
--- a/src/ftp.c
+++ b/src/ftp.c
@@ -2572,6 +2572,8 @@ ftp_retrieve_glob (struct url *u, struct url *original_url,
@@ -647,7 +655,7 @@ index 6b8bdf8..d27e407 100644
#endif /* def __VMS [else] */
diff --git a/src/main.c b/src/main.c
index 5bb1910..d357e32 100644
index bf6f9c2..25893dc 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1372,11 +1372,12 @@ main (int argc, char **argv)
@@ -664,6 +672,26 @@ index 5bb1910..d357e32 100644
total_downloaded_bytes = 0;
program_name = argv[0];
diff --git a/src/openssl.c b/src/openssl.c
index 00bb950..93e5cc0 100644
--- a/src/openssl.c
+++ b/src/openssl.c
@@ -338,6 +338,7 @@ ssl_init (void)
* intermediate CA to clients, can be used as a trust anchor without
* the entire IdentTrust PKI.
*/
+{
X509_VERIFY_PARAM *param = X509_VERIFY_PARAM_new();
if (param)
{
@@ -357,6 +358,7 @@ ssl_init (void)
logprintf(LOG_NOTQUIET, _("OpenSSL: Failed to allocate verification param\n"));
/* We continue on error */
}
+}
#endif
if (opt.crl_file)
--
2.19.1
2.23.0

2
net-misc/wget/wget-1.20.1.recipe → net-misc/wget/wget-1.20.3.recipe
View File

@@ -7,7 +7,7 @@ COPYRIGHT="1996-2018 Free Software Foundation"
LICENSE="GNU GPL v3"
REVISION="1"
SOURCE_URI="https://ftpmirror.gnu.org/wget/wget-$portVersion.tar.gz"
CHECKSUM_SHA256="b783b390cb571c837b392857945f5a1f00ec6b043177cc42abb8ee1b542ee1b3"
CHECKSUM_SHA256="31cccfc6630528db1c8e3a06f6decf2a370060b982841cfab2b8677400a5092e"
PATCHES="wget-$portVersion.patchset"
ARCHITECTURES="x86_gcc2 x86 x86_64"