From 42763a8a798a613ab2e524df263e04b19208afb1 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Wed, 16 Dec 2015 21:41:02 +0000 Subject: [PATCH] wget: bump version. --- ...t-1.17.0.patchset => wget-1.17.1.patchset} | 47 +++++-------------- ...{wget-1.17.0.recipe => wget-1.17.1.recipe} | 5 +- 2 files changed, 14 insertions(+), 38 deletions(-) rename net-misc/wget/patches/{wget-1.17.0.patchset => wget-1.17.1.patchset} (76%) rename net-misc/wget/{wget-1.17.0.recipe => wget-1.17.1.recipe} (90%) diff --git a/net-misc/wget/patches/wget-1.17.0.patchset b/net-misc/wget/patches/wget-1.17.1.patchset similarity index 76% rename from net-misc/wget/patches/wget-1.17.0.patchset rename to net-misc/wget/patches/wget-1.17.1.patchset index 41e319588..ea588a2a8 100644 --- a/net-misc/wget/patches/wget-1.17.0.patchset +++ b/net-misc/wget/patches/wget-1.17.1.patchset @@ -1,14 +1,14 @@ -From 16a5b177ebc8fdf7c9ba666292fd08179c111f7e Mon Sep 17 00:00:00 2001 +From 51397febfa301d6a04a0405db997df15768ec110 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 01ea237..c31da2c 100644 +index 09b81e6..18b156d 100644 --- a/configure.ac +++ b/configure.ac -@@ -231,6 +231,7 @@ AC_HEADER_STDBOOL +@@ -234,6 +234,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) @@ -38,10 +38,10 @@ index 777e973..5a8b75d 100644 diff --git a/src/config.h.in b/src/config.h.in -index 3953a4d..26c33a8 100644 +index e8f4170..664bad4 100644 --- a/src/config.h.in +++ b/src/config.h.in -@@ -741,6 +741,9 @@ +@@ -747,6 +747,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_LANGINFO_H @@ -51,7 +51,7 @@ index 3953a4d..26c33a8 100644 /* Define to 1 if you have the `dl' library (-ldl). */ #undef HAVE_LIBDL -@@ -753,6 +756,9 @@ +@@ -759,6 +762,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_LIBINTL_H @@ -62,7 +62,7 @@ index 3953a4d..26c33a8 100644 #undef HAVE_LIBNSL diff --git a/src/connect.c b/src/connect.c -index c9dd6fb..0afc248 100644 +index 024b231..433f451 100644 --- a/src/connect.c +++ b/src/connect.c @@ -46,7 +46,7 @@ as that of the covered work. */ @@ -75,7 +75,7 @@ index c9dd6fb..0afc248 100644 # endif #endif /* not WINDOWS */ diff --git a/src/host.h b/src/host.h -index 84f3d13..e664e7f 100644 +index 785a570..3ef63cd 100644 --- a/src/host.h +++ b/src/host.h @@ -42,9 +42,9 @@ as that of the covered work. */ @@ -92,17 +92,17 @@ index 84f3d13..e664e7f 100644 struct url; -- -1.8.3.4 +2.2.2 -From 578731992b9028da3ffee8b498d0c294ded0bb00 Mon Sep 17 00:00:00 2001 +From 9204da59c1b70c5c3ffdc6e1db7de45007b6eff0 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 3cc7d97..9f173f3 100644 +index 5222851..4e5a5c2 100644 --- a/src/utils.c +++ b/src/utils.c @@ -65,7 +65,9 @@ as that of the covered work. */ @@ -116,28 +116,5 @@ index 3cc7d97..9f173f3 100644 #endif -- -1.8.3.4 - - -From 375ccd60aa09df33db4ae51fbe7ab297e43478ae Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Tue, 3 Mar 2015 17:18:24 +0000 -Subject: gettext version issue - - -diff --git a/configure.ac b/configure.ac -index c31da2c..6a30b9d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -177,7 +177,7 @@ dnl - dnl Gettext - dnl - AM_GNU_GETTEXT([external],[need-ngettext]) --AM_GNU_GETTEXT_VERSION([0.17]) -+AM_GNU_GETTEXT_VERSION([0.18]) - - AC_PROG_RANLIB - --- -1.8.3.4 +2.2.2 diff --git a/net-misc/wget/wget-1.17.0.recipe b/net-misc/wget/wget-1.17.1.recipe similarity index 90% rename from net-misc/wget/wget-1.17.0.recipe rename to net-misc/wget/wget-1.17.1.recipe index 6cc8fa9eb..e5775613b 100644 --- a/net-misc/wget/wget-1.17.0.recipe +++ b/net-misc/wget/wget-1.17.1.recipe @@ -5,9 +5,8 @@ such as HTTP, HTTPS and FTP. wget is non-interactive, so it can be called from \ scripts. " HOMEPAGE="http://www.gnu.org/software/wget" -SOURCE_URI="http://ftp.gnu.org/gnu/wget/wget-1.17.tar.gz" -CHECKSUM_SHA256="3e04ad027c5b6ebd67c616eec13e66fbedb3d4d8cbe19cc29dadde44b92bda55" -SOURCE_DIR="wget-1.17" +SOURCE_URI="http://ftp.gnu.org/gnu/wget/wget-$portVersion.tar.gz" +CHECKSUM_SHA256="029fbb93bdc1c0c5a7507b6076a6ec2f8d34204a85aa87e5b2f61a9405b290f5" LICENSE="GNU GPL v3" COPYRIGHT="1996-2014 Free Software Foundation" REVISION="1"