From 12b6b929a47ede7b8aeef1f291e8069490f751c8 Mon Sep 17 00:00:00 2001 From: fbrosson Date: Fri, 16 Feb 2018 16:12:20 +0000 Subject: [PATCH] wget: bump to 1.19.4. (#2216) --- ...t-1.19.2.patchset => wget-1.19.4.patchset} | 44 +++++++++---------- ...{wget-1.19.2.recipe => wget-1.19.4.recipe} | 10 +++-- 2 files changed, 28 insertions(+), 26 deletions(-) rename net-misc/wget/patches/{wget-1.19.2.patchset => wget-1.19.4.patchset} (86%) rename net-misc/wget/{wget-1.19.2.recipe => wget-1.19.4.recipe} (85%) diff --git a/net-misc/wget/patches/wget-1.19.2.patchset b/net-misc/wget/patches/wget-1.19.4.patchset similarity index 86% rename from net-misc/wget/patches/wget-1.19.2.patchset rename to net-misc/wget/patches/wget-1.19.4.patchset index d2138df09..78c0a81e7 100644 --- a/net-misc/wget/patches/wget-1.19.2.patchset +++ b/net-misc/wget/patches/wget-1.19.4.patchset @@ -5,7 +5,7 @@ Subject: apply wget-1.14.patch diff --git a/configure.ac b/configure.ac -index 13debe2..3a3e453 100644 +index d9f0098..33fe5b2 100644 --- a/configure.ac +++ b/configure.ac @@ -238,6 +238,7 @@ AC_HEADER_STDBOOL @@ -27,10 +27,10 @@ index 13debe2..3a3e453 100644 PKG_CHECK_MODULES([LIBPSL], libpsl, [ with_libpsl=yes diff --git a/src/config.h.in b/src/config.h.in -index 5131d55..84d8a4b 100644 +index 5a51490..5ed9f67 100644 --- a/src/config.h.in +++ b/src/config.h.in -@@ -862,6 +862,9 @@ +@@ -944,6 +944,9 @@ /* Define if libcares is available. */ #undef HAVE_LIBCARES @@ -40,7 +40,7 @@ index 5131d55..84d8a4b 100644 /* Define to 1 if you have the `dl' library (-ldl). */ #undef HAVE_LIBDL -@@ -874,6 +877,9 @@ +@@ -956,6 +959,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_LIBINTL_H @@ -51,10 +51,10 @@ index 5131d55..84d8a4b 100644 #undef HAVE_LIBPCRE diff --git a/src/connect.c b/src/connect.c -index d665d6d..1cf4db2 100644 +index 37dae21..460260d 100644 --- a/src/connect.c +++ b/src/connect.c -@@ -47,7 +47,7 @@ as that of the covered work. */ +@@ -45,7 +45,7 @@ as that of the covered work. */ # include # endif /* def __VMS [else] */ # include @@ -64,10 +64,10 @@ index d665d6d..1cf4db2 100644 # endif #endif /* not WINDOWS */ diff --git a/src/host.h b/src/host.h -index 785a570..3ef63cd 100644 +index 042d44d..e33b651 100644 --- a/src/host.h +++ b/src/host.h -@@ -42,9 +42,9 @@ as that of the covered work. */ +@@ -40,9 +40,9 @@ as that of the covered work. */ # endif /* def __VMS [else] */ # include # include @@ -81,7 +81,7 @@ index 785a570..3ef63cd 100644 struct url; -- -2.7.0 +2.16.1 From e2eec5007e57bad624765a1985a773520fa1d9ed Mon Sep 17 00:00:00 2001 @@ -91,10 +91,10 @@ Subject: apply and augment wget-1.14-build-fixes.patch diff --git a/src/utils.c b/src/utils.c -index 81f2801..27b36df 100644 +index 6f41fab..aa53484 100644 --- a/src/utils.c +++ b/src/utils.c -@@ -64,7 +64,9 @@ as that of the covered work. */ +@@ -59,7 +59,9 @@ as that of the covered work. */ /* For TIOCGWINSZ and friends: */ #ifndef WINDOWS @@ -105,7 +105,7 @@ index 81f2801..27b36df 100644 #endif -- -2.7.0 +2.16.1 From f762289dbee26754a4257f42f15f0ec0e29d21e3 Mon Sep 17 00:00:00 2001 @@ -115,10 +115,10 @@ Subject: Move wget-hsts out of home directory. diff --git a/src/main.c b/src/main.c -index f9759c3..f784cdd 100644 +index d19437e..f718f58 100644 --- a/src/main.c +++ b/src/main.c -@@ -80,6 +80,10 @@ as that of the covered work. */ +@@ -81,6 +81,10 @@ as that of the covered work. */ # include "vms.h" #endif /* __VMS */ @@ -129,7 +129,7 @@ index f9759c3..f784cdd 100644 #ifndef PATH_SEPARATOR # define PATH_SEPARATOR '/' #endif -@@ -163,6 +167,16 @@ get_hsts_database (void) +@@ -172,6 +176,16 @@ get_hsts_database (void) if (opt.hsts_file) return xstrdup (opt.hsts_file); @@ -147,7 +147,7 @@ index f9759c3..f784cdd 100644 if (home) { -- -2.7.0 +2.16.1 From c2dd748d260ae1ad24ba8d63ff26adfeabdf4ae4 Mon Sep 17 00:00:00 2001 @@ -157,10 +157,10 @@ Subject: gcc2 patch diff --git a/src/init.c b/src/init.c -index 1064883..d68d21a 100644 +index 6807e36..c0f3cf4 100644 --- a/src/init.c +++ b/src/init.c -@@ -894,7 +894,7 @@ setval_internal (int comind, const char *com, const char *val) +@@ -893,7 +893,7 @@ setval_internal (int comind, const char *com, const char *val) assert (0 <= comind && ((size_t) comind) < countof (commands)); if ((unsigned) comind >= countof (commands)) @@ -170,7 +170,7 @@ index 1064883..d68d21a 100644 DEBUGP (("Setting %s (%s) to %s\n", com, commands[comind].name, val)); return commands[comind].action (com, val, commands[comind].place); -- -2.7.0 +2.16.1 From 93e869f8a6f7f1289e49d23bfd8ea339453d9aec Mon Sep 17 00:00:00 2001 @@ -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 0404d2d..99f7f8c 100644 +index 6af38db..f7f99d5 100644 --- a/src/openssl.c +++ b/src/openssl.c -@@ -359,9 +359,11 @@ static void openssl_read_callback(void *arg) +@@ -387,9 +387,11 @@ static void openssl_read_callback(void *arg) int bufsize = args->bufsize; int ret; @@ -205,5 +205,5 @@ index 0404d2d..99f7f8c 100644 args->retval = ret; } -- -2.7.0 +2.16.1 diff --git a/net-misc/wget/wget-1.19.2.recipe b/net-misc/wget/wget-1.19.4.recipe similarity index 85% rename from net-misc/wget/wget-1.19.2.recipe rename to net-misc/wget/wget-1.19.4.recipe index 5c45211cf..0f548c5fa 100644 --- a/net-misc/wget/wget-1.19.2.recipe +++ b/net-misc/wget/wget-1.19.4.recipe @@ -3,11 +3,11 @@ 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" +COPYRIGHT="1996-2018 Free Software Foundation" LICENSE="GNU GPL v3" -REVISION="2" -SOURCE_URI="http://ftpmirror.gnu.org/wget/wget-$portVersion.tar.gz" -CHECKSUM_SHA256="4f4a673b6d466efa50fbfba796bd84a46ae24e370fa562ede5b21ab53c11a920" +REVISION="1" +SOURCE_URI="https://ftpmirror.gnu.org/wget/wget-$portVersion.tar.gz" +CHECKSUM_SHA256="93fb96b0f48a20ff5be0d9d9d3c4a986b469cb853131f9d5fe4cc9cecbc8b5b5" PATCHES="wget-$portVersion.patchset" ARCHITECTURES="x86_gcc2 x86 x86_64" @@ -65,6 +65,8 @@ INSTALL() make install # Tells wget where to find certificates echo "ca_certificate=/boot/system/data/ssl/CARootCertificates.pem" > $settingsDir/wgetrc + rm -f "$infoDir"/dir + rm -f "$libDir"/charset.alias } TEST()