From d74d99b38c2973186f2881ff64361c91f6fbeb98 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sat, 30 Mar 2019 13:52:31 +0100 Subject: [PATCH] wget: bump version. --- net-misc/wget/patches/wget-1.18.patchset | 162 ----------- ...t-1.19.5.patchset => wget-1.20.1.patchset} | 269 ++++++++++++++++-- net-misc/wget/wget-1.18.recipe | 74 ----- ...{wget-1.19.5.recipe => wget-1.20.1.recipe} | 2 +- 4 files changed, 242 insertions(+), 265 deletions(-) delete mode 100644 net-misc/wget/patches/wget-1.18.patchset rename net-misc/wget/patches/{wget-1.19.5.patchset => wget-1.20.1.patchset} (59%) delete mode 100644 net-misc/wget/wget-1.18.recipe rename net-misc/wget/{wget-1.19.5.recipe => wget-1.20.1.recipe} (95%) diff --git a/net-misc/wget/patches/wget-1.18.patchset b/net-misc/wget/patches/wget-1.18.patchset deleted file mode 100644 index bd7588351..000000000 --- a/net-misc/wget/patches/wget-1.18.patchset +++ /dev/null @@ -1,162 +0,0 @@ -From e20d11eff28c8075768c5cffbcccca4af551ad50 Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Mon, 19 May 2014 15:38:37 +0000 -Subject: apply wget-1.14.patch - - -diff --git a/configure.ac b/configure.ac -index eb303f0..0385d0f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -238,6 +238,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) -+AC_CHECK_HEADERS(arpa/inet.h) - - AC_CHECK_DECLS(h_errno,,,[#include ]) - -diff --git a/m4/wget.m4 b/m4/wget.m4 -index 777e973..5a8b75d 100644 ---- a/m4/wget.m4 -+++ b/m4/wget.m4 -@@ -88,6 +88,7 @@ AC_DEFUN([WGET_POSIX_CLOCK], [ - - dnl Check whether we need to link with -lnsl and -lsocket, as is the - dnl case on e.g. Solaris. -+dnl Haiku needs libnetwork - - AC_DEFUN([WGET_NSL_SOCKET], [ - dnl On Solaris, -lnsl is needed to use gethostbyname. But checking -@@ -107,6 +108,8 @@ AC_DEFUN([WGET_NSL_SOCKET], [ - AC_CHECK_LIB(nsl, $wget_check_in_nsl) - fi - AC_CHECK_LIB(socket, socket) -+ AC_CHECK_LIB(network, gethostbyname) -+ AC_CHECK_LIB(network, socket) - ]) - - -diff --git a/src/config.h.in b/src/config.h.in -index 8b39c52..bf125e3 100644 ---- a/src/config.h.in -+++ b/src/config.h.in -@@ -750,6 +750,9 @@ - /* Define if libcares is available. */ - #undef HAVE_LIBCARES - -+/* Define to 1 if you have the `bind' library (-lbind). */ -+#undef HAVE_LIBBIND -+ - /* Define to 1 if you have the `dl' library (-ldl). */ - #undef HAVE_LIBDL - -@@ -762,6 +765,9 @@ - /* Define to 1 if you have the header file. */ - #undef HAVE_LIBINTL_H - -+/* Define to 1 if you have the `network' library (-lnetwork). */ -+#undef HAVE_LIBNETWORK -+ - /* Define to 1 if you have the `nsl' library (-lnsl). */ - #undef HAVE_LIBNSL - -diff --git a/src/connect.c b/src/connect.c -index 0704000..4810fb3 100644 ---- a/src/connect.c -+++ b/src/connect.c -@@ -46,7 +46,7 @@ as that of the covered work. */ - # include - # endif /* def __VMS [else] */ - # include --# ifndef __BEOS__ -+# ifdef HAVE_ARPA_INET_H - # include - # endif - #endif /* not WINDOWS */ -diff --git a/src/host.h b/src/host.h -index 785a570..3ef63cd 100644 ---- a/src/host.h -+++ b/src/host.h -@@ -42,9 +42,9 @@ as that of the covered work. */ - # endif /* def __VMS [else] */ - # include - # include --#ifndef __BEOS__ --# include --#endif -+# ifdef HAVE_ARPA_INET_H -+# include -+# endif - #endif - - struct url; --- -2.2.2 - - -From a1b6a03da5fc9ae858648d3610182f201efa744e Mon Sep 17 00:00:00 2001 -From: Jerome Duval -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 b07da9f..561598c 100644 ---- a/src/utils.c -+++ b/src/utils.c -@@ -63,7 +63,9 @@ as that of the covered work. */ - - /* For TIOCGWINSZ and friends: */ - #ifndef WINDOWS -+#ifndef __HAIKU__ - # include -+#endif - # include - #endif - --- -2.2.2 - - -From 35fc251c6ace586a16b0d843b916f465ccd9fce5 Mon Sep 17 00:00:00 2001 -From: Adrien Destugues -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 e7d5c66..046ff9d 100644 ---- a/src/main.c -+++ b/src/main.c -@@ -78,6 +78,10 @@ as that of the covered work. */ - # include "vms.h" - #endif /* __VMS */ - -+#ifdef __HAIKU__ -+#include "FindDirectory.h" -+#endif -+ - #ifndef PATH_SEPARATOR - # define PATH_SEPARATOR '/' - #endif -@@ -161,6 +165,16 @@ get_hsts_database (void) - if (opt.hsts_file) - return xstrdup (opt.hsts_file); - -+#ifdef __HAIKU__ -+ { -+ char buffer[256]; -+ if (find_directory(B_USER_SETTINGS_DIRECTORY, 0, false, buffer, sizeof(buffer)) == B_OK) { -+ home = aprintf("%s/wget-hsts", buffer); -+ return home; -+ } -+ } -+#endif -+ - home = home_dir (); - if (home) - { --- -2.2.2 - diff --git a/net-misc/wget/patches/wget-1.19.5.patchset b/net-misc/wget/patches/wget-1.20.1.patchset similarity index 59% rename from net-misc/wget/patches/wget-1.19.5.patchset rename to net-misc/wget/patches/wget-1.20.1.patchset index 180ee3fe2..a2daf41e0 100644 --- a/net-misc/wget/patches/wget-1.19.5.patchset +++ b/net-misc/wget/patches/wget-1.20.1.patchset @@ -1,11 +1,11 @@ -From c23a269e8fe093b4c57d1d7122abd5ad98fd3fb2 Mon Sep 17 00:00:00 2001 +From d0412fae5979853cdfb405ff8dfd278f2f5eb2d0 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Mon, 19 May 2014 15:38:37 +0000 Subject: apply wget-1.14.patch diff --git a/configure.ac b/configure.ac -index e273db9..034b6e2 100644 +index 167882f..12e362d 100644 --- a/configure.ac +++ b/configure.ac @@ -254,6 +254,7 @@ AC_HEADER_STDBOOL @@ -27,10 +27,10 @@ index e273db9..034b6e2 100644 PKG_CHECK_MODULES([LIBPSL], libpsl, [ with_libpsl=yes diff --git a/src/config.h.in b/src/config.h.in -index 3179044..ad657c4 100644 +index b4673c9..fdd6d63 100644 --- a/src/config.h.in +++ b/src/config.h.in -@@ -953,6 +953,9 @@ +@@ -920,6 +920,9 @@ /* Define if libcares is available. */ #undef HAVE_LIBCARES @@ -40,7 +40,7 @@ index 3179044..ad657c4 100644 /* Define to 1 if you have the `dl' library (-ldl). */ #undef HAVE_LIBDL -@@ -965,6 +968,9 @@ +@@ -932,6 +935,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_LIBINTL_H @@ -84,14 +84,14 @@ index 042d44d..e33b651 100644 2.19.1 -From e2eec5007e57bad624765a1985a773520fa1d9ed Mon Sep 17 00:00:00 2001 +From c441738ed448186b57c2309c8c59b2fb0716f5a6 Mon Sep 17 00:00:00 2001 From: Jerome Duval 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 ec55f2e0..0feea1b1 100644 +index 2289a47..7f7e294 100644 --- a/src/utils.c +++ b/src/utils.c @@ -59,7 +59,9 @@ as that of the covered work. */ @@ -108,14 +108,14 @@ index ec55f2e0..0feea1b1 100644 2.19.1 -From f762289dbee26754a4257f42f15f0ec0e29d21e3 Mon Sep 17 00:00:00 2001 +From 2f23d2f6f5489397355807aa21b23a8456643a0d Mon Sep 17 00:00:00 2001 From: Adrien Destugues 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 81db931..5e08a68 100644 +index 4408ffb..5bb1910 100644 --- a/src/main.c +++ b/src/main.c @@ -87,6 +87,10 @@ as that of the covered work. */ @@ -150,17 +150,17 @@ index 81db931..5e08a68 100644 2.19.1 -From c2dd748d260ae1ad24ba8d63ff26adfeabdf4ae4 Mon Sep 17 00:00:00 2001 +From 9ecdcc7d352a5c6233de87634a55127a60b6fabf Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Mon, 22 May 2017 18:46:27 +0200 Subject: gcc2 patch diff --git a/src/init.c b/src/init.c -index eb81ab4..af833fa 100644 +index 51b6361..bb36a14 100644 --- a/src/init.c +++ b/src/init.c -@@ -899,7 +899,7 @@ setval_internal (int comind, const char *com, const char *val) +@@ -894,7 +894,7 @@ setval_internal (int comind, const char *com, const char *val) assert (0 <= comind && ((size_t) comind) < countof (commands)); if ((unsigned) comind >= countof (commands)) @@ -173,8 +173,7 @@ index eb81ab4..af833fa 100644 2.19.1 - -From 93e869f8a6f7f1289e49d23bfd8ea339453d9aec Mon Sep 17 00:00:00 2001 +From 5960501f289248ff8479488980e50bab9ea85037 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Thu, 23 Nov 2017 09:09:48 +0100 Subject: Handle SSL_ERROR_WANT_READ. @@ -188,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 6cf4afe9..c92d6338 100644 +index 73e7f0f..b4793cc 100644 --- a/src/openssl.c +++ b/src/openssl.c -@@ -408,9 +408,11 @@ static void openssl_read_callback(void *arg) +@@ -412,9 +412,11 @@ static void openssl_read_callback(void *arg) int bufsize = args->bufsize; int ret; @@ -208,14 +207,15 @@ index 6cf4afe9..c92d6338 100644 -- 2.19.1 -From 8a0312531a0fd8caf678982d91c935de93ae593f Mon Sep 17 00:00:00 2001 + +From e109c014ad8ac5a54b4892c6223e3c79f43a3f48 Mon Sep 17 00:00:00 2001 From: Crestwave 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 61ca413..ff2fb49 100644 +index 64149e4..697bb25 100644 --- a/src/hsts.c +++ b/src/hsts.c @@ -48,6 +48,10 @@ as that of the covered work. */ @@ -249,34 +249,35 @@ index 61ca413..ff2fb49 100644 -- 2.19.1 -From e08f854073550e67c64a6b394b92aa2cb12913a0 Mon Sep 17 00:00:00 2001 + +From a2ee5521e8cb02244dfdac1fd3eb54978c77d9d9 Mon Sep 17 00:00:00 2001 From: Crestwave 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 2e0b6b9..3db9f10 100644 +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) $(LTLIBICONV) $(LTLIBINTL) \ -- $(LTLIBMULTITHREAD) $(LTLIBTHREAD) $(SERVENT_LIB) @INTL_MACOSX_LIBS@ \ + $(LIB_POSIX_SPAWN) $(LIB_PTHREAD_SIGMASK) $(LIB_SELECT) $(LIBICONV) $(LIBINTL) \ +- $(LIBMULTITHREAD) $(LIBTHREAD) $(SERVENT_LIB) @INTL_MACOSX_LIBS@ \ - -ldl -+ $(LTLIBMULTITHREAD) $(LTLIBTHREAD) $(SERVENT_LIB) @INTL_MACOSX_LIBS@ ++ $(LIBMULTITHREAD) $(LIBTHREAD) $(SERVENT_LIB) @INTL_MACOSX_LIBS@ WGET_TESTS = \ wget_css_fuzzer$(EXEEXT) \ diff --git a/fuzz/Makefile.in b/fuzz/Makefile.in -index e258637..31d70ac 100644 +index 7ecc25b..ad7b1fd 100644 --- a/fuzz/Makefile.in +++ b/fuzz/Makefile.in -@@ -1636,7 +1636,7 @@ LDADD = ../lib/libgnu.a $(GETADDRINFO_LIB) $(HOSTENT_LIB) \ +@@ -1665,7 +1665,7 @@ LDADD = ../lib/libgnu.a $(GETADDRINFO_LIB) $(HOSTENT_LIB) \ $(LIB_NANOSLEEP) $(LIB_POLL) $(LIB_POSIX_SPAWN) \ - $(LIB_PTHREAD_SIGMASK) $(LIB_SELECT) $(LTLIBICONV) \ - $(LTLIBINTL) $(LTLIBMULTITHREAD) $(LTLIBTHREAD) $(SERVENT_LIB) \ + $(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 = \ @@ -285,7 +286,8 @@ index e258637..31d70ac 100644 -- 2.19.1 -From 49fffacd6c335be3f0dce938f9bc10a44b308d63 Mon Sep 17 00:00:00 2001 + +From 0a506c368971850477120c71ab16a02d2ac38da1 Mon Sep 17 00:00:00 2001 From: Crestwave Date: Mon, 26 Nov 2018 07:13:07 +0000 Subject: Fix segmentation violation when executing fuzzers. @@ -454,3 +456,214 @@ index ad05ff8..a0f002e 100644 -- 2.19.1 + +From b9befb372eb213bd5f24ebe35d09ec672f5e7754 Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Sat, 30 Mar 2019 14:19:17 +0100 +Subject: gcc2 patch for version 1.20.1 + + +diff --git a/lib/md5.c b/lib/md5.c +index 554d421..7f693f6 100644 +--- a/lib/md5.c ++++ b/lib/md5.c +@@ -144,19 +144,20 @@ md5_finish_ctx (struct md5_ctx *ctx, void *resbuf) + int + md5_stream (FILE *stream, void *resblock) + { ++ char *buffer; ++ struct md5_ctx ctx; ++ size_t sum; + switch (afalg_stream (stream, "md5", resblock, MD5_DIGEST_SIZE)) + { + case 0: return 0; + case -EIO: return 1; + } + +- char *buffer = malloc (BLOCKSIZE + 72); ++ buffer = malloc (BLOCKSIZE + 72); + if (!buffer) + return 1; + +- struct md5_ctx ctx; + md5_init_ctx (&ctx); +- size_t sum; + + /* Iterate over full file contents. */ + while (1) +diff --git a/lib/mktime.c b/lib/mktime.c +index 557712f..5e5b097 100644 +--- a/lib/mktime.c ++++ b/lib/mktime.c +@@ -528,8 +528,9 @@ mktime (struct tm *tp) + __tzset (); + + # if defined _LIBC || NEED_MKTIME_WORKING +- static mktime_offset_t localtime_offset; ++{ static mktime_offset_t localtime_offset; + return __mktime_internal (tp, __localtime_r, &localtime_offset); ++} + # else + # undef mktime + return mktime (tp); +diff --git a/lib/regexec.c b/lib/regexec.c +index 8b82ea5..efabb42 100644 +--- a/lib/regexec.c ++++ b/lib/regexec.c +@@ -3293,6 +3293,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; ++ size_t ndests_max; + + struct dests_alloc + { +@@ -3343,7 +3344,7 @@ build_trtable (const re_dfa_t *dfa, re_dfastate_t *state) + goto out_free; + + /* Avoid arithmetic overflow in size calculation. */ +- size_t ndests_max ++ ndests_max + = ((SIZE_MAX - (sizeof (re_node_set) + sizeof (bitset_t)) * SBC_MAX) + / (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 +--- a/lib/sha1.c ++++ b/lib/sha1.c +@@ -132,19 +132,20 @@ sha1_finish_ctx (struct sha1_ctx *ctx, void *resbuf) + int + sha1_stream (FILE *stream, void *resblock) + { ++ char *buffer; ++ struct sha1_ctx ctx; ++ size_t sum; + switch (afalg_stream (stream, "sha1", resblock, SHA1_DIGEST_SIZE)) + { + case 0: return 0; + case -EIO: return 1; + } + +- char *buffer = malloc (BLOCKSIZE + 72); ++ buffer = malloc (BLOCKSIZE + 72); + if (!buffer) + return 1; + +- struct sha1_ctx ctx; + sha1_init_ctx (&ctx); +- size_t sum; + + /* Iterate over full file contents. */ + while (1) +diff --git a/lib/sha256.c b/lib/sha256.c +index c518517..9dcde43 100644 +--- a/lib/sha256.c ++++ b/lib/sha256.c +@@ -182,19 +182,20 @@ shaxxx_stream (FILE *stream, char const *alg, void *resblock, + ssize_t hashlen, void (*init_ctx) (struct sha256_ctx *), + void *(*finish_ctx) (struct sha256_ctx *, void *)) + { ++ char *buffer; ++ struct sha256_ctx ctx; ++ size_t sum; + switch (afalg_stream (stream, alg, resblock, hashlen)) + { + case 0: return 0; + case -EIO: return 1; + } + +- char *buffer = malloc (BLOCKSIZE + 72); ++ buffer = malloc (BLOCKSIZE + 72); + if (!buffer) + return 1; + +- struct sha256_ctx ctx; + init_ctx (&ctx); +- size_t sum; + + /* Iterate over full file contents. */ + while (1) +diff --git a/lib/sha512.c b/lib/sha512.c +index e854951..609066d 100644 +--- a/lib/sha512.c ++++ b/lib/sha512.c +@@ -183,19 +183,20 @@ shaxxx_stream (FILE *stream, char const *alg, void *resblock, + ssize_t hashlen, void (*init_ctx) (struct sha512_ctx *), + void *(*finish_ctx) (struct sha512_ctx *, void *)) + { ++ char *buffer; ++ struct sha512_ctx ctx; ++ size_t sum; + switch (afalg_stream (stream, alg, resblock, hashlen)) + { + case 0: return 0; + case -EIO: return 1; + } + +- char *buffer = malloc (BLOCKSIZE + 72); ++ buffer = malloc (BLOCKSIZE + 72); + if (!buffer) + return 1; + +- struct sha512_ctx ctx; + init_ctx (&ctx); +- size_t sum; + + /* Iterate over full file contents. */ + while (1) +diff --git a/src/ftp.c b/src/ftp.c +index 6b8bdf8..d27e407 100644 +--- a/src/ftp.c ++++ b/src/ftp.c +@@ -2572,6 +2572,8 @@ ftp_retrieve_glob (struct url *u, struct url *original_url, + { + struct fileinfo *f, *start; + uerr_t res; ++ int (*matcher) (const char *, const char *, int); ++ int (*cmp) (const char *, const char *); + + con->cmd |= LEAVE_PENDING; + +@@ -2580,7 +2582,7 @@ ftp_retrieve_glob (struct url *u, struct url *original_url, + return res; + + // Set the function used for glob matching. +- int (*matcher) (const char *, const char *, int) ++ matcher + = opt.ignore_case ? fnmatch_nocase : fnmatch; + + // Set the function used to compare strings +@@ -2594,10 +2596,10 @@ ftp_retrieve_glob (struct url *u, struct url *original_url, + * the senseless type cast clears the complaint, and looks + * harmless. + */ +- int (*cmp) (const char *, const char *) ++ cmp + = opt.ignore_case ? strcasecmp : (int (*)())strcmp; + #else /* def __VMS */ +- int (*cmp) (const char *, const char *) ++ cmp + = opt.ignore_case ? strcasecmp : strcmp; + #endif /* def __VMS [else] */ + +diff --git a/src/main.c b/src/main.c +index 5bb1910..d357e32 100644 +--- a/src/main.c ++++ b/src/main.c +@@ -1372,11 +1372,12 @@ main (int argc, char **argv) + bool use_userconfig = false; + bool noconfig = false; + bool append_to_log = false; ++ double start_time; + + cleaned_up = 0; /* do cleanup later */ + + timer = ptimer_new (); +- double start_time = ptimer_measure (timer); ++ start_time = ptimer_measure (timer); + + total_downloaded_bytes = 0; + program_name = argv[0]; +-- +2.19.1 + diff --git a/net-misc/wget/wget-1.18.recipe b/net-misc/wget/wget-1.18.recipe deleted file mode 100644 index a56e549f7..000000000 --- a/net-misc/wget/wget-1.18.recipe +++ /dev/null @@ -1,74 +0,0 @@ -SUMMARY="A tool for downloading files from the internet" -DESCRIPTION="wget is a tool that can download files from the internet through \ -protocols such as HTTP, HTTPS and FTP. wget is non-interactive, so it can be \ -called from scripts." -HOMEPAGE="https://www.gnu.org/software/wget/" -COPYRIGHT="1996-2016 Free Software Foundation" -LICENSE="GNU GPL v3" -REVISION="2" -SOURCE_URI="http://ftpmirror.gnu.org/wget/wget-$portVersion.tar.gz" -CHECKSUM_SHA256="a00a65fab84cc46e24c53ce88c45604668a7a479276e037dc2f558e34717fb2d" -PATCHES="wget-$portVersion.patchset" - -ARCHITECTURES="x86_gcc2 x86 x86_64" -SECONDARY_ARCHITECTURES="x86 x86_gcc2" - -GLOBAL_WRITABLE_FILES=" - settings/wgetrc keep-old - " -USER_SETTINGS_FILES=" - settings/wgetrc - " - -PROVIDES=" - wget$secondaryArchSuffix = $portVersion - cmd:wget$secondaryArchSuffix = $portVersion - " -REQUIRES=" - haiku$secondaryArchSuffix - lib:libcrypto$secondaryArchSuffix - lib:libiconv$secondaryArchSuffix - lib:libintl$secondaryArchSuffix - lib:libssl$secondaryArchSuffix - lib:libz$secondaryArchSuffix - " - -BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel - devel:libcrypto$secondaryArchSuffix - devel:libssl$secondaryArchSuffix - devel:libz$secondaryArchSuffix >= 1.2.3 - " -BUILD_PREREQUIRES=" - cmd:aclocal - cmd:autoconf - cmd:find - cmd:gcc$secondaryArchSuffix - cmd:gettext - cmd:libtoolize$secondaryArchSuffix - cmd:make - cmd:makeinfo - cmd:pkg_config$secondaryArchSuffix - cmd:pod2man - " - -BUILD() -{ - AUTOPOINT=true autoreconf -fi - runConfigure ./configure --with-ssl=openssl - make -} - -INSTALL() -{ - make install - # Tells wget where to find certificates - echo "ca_certificate=/boot/system/data/ssl/CARootCertificates.pem" > $settingsDir/wgetrc -} - -TEST() -{ - [ -d .git ] && mv .git .git-temp - make check || true - [ -d .git-temp ] && mv .git-temp .git -} diff --git a/net-misc/wget/wget-1.19.5.recipe b/net-misc/wget/wget-1.20.1.recipe similarity index 95% rename from net-misc/wget/wget-1.19.5.recipe rename to net-misc/wget/wget-1.20.1.recipe index 4dac84a50..7082cabb4 100644 --- a/net-misc/wget/wget-1.19.5.recipe +++ b/net-misc/wget/wget-1.20.1.recipe @@ -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="b39212abe1a73f2b28f4c6cb223c738559caac91d6e416a6d91d4b9d55c9faee" +CHECKSUM_SHA256="b783b390cb571c837b392857945f5a1f00ec6b043177cc42abb8ee1b542ee1b3" PATCHES="wget-$portVersion.patchset" ARCHITECTURES="x86_gcc2 x86 x86_64"