wget: Update to 1.19.5

This commit is contained in:
Alexey Pavlov
2018-10-10 09:06:32 +03:00
parent f5c6929903
commit 1d4954dfd7
3 changed files with 39 additions and 26 deletions

View File

@@ -4,37 +4,38 @@
_realname=wget
pkgbase=mingw-w64-${_realname}
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
pkgver=1.19.2
pkgver=1.19.5
pkgrel=1
pkgdesc='Wget retrieves files using HTTP, HTTPS and FTP (mingw-w64)'
arch=('any')
url='https://www.gnu.org/software/wget/'
license=('GPL3')
depends=("${MINGW_PACKAGE_PREFIX}-pcre"
"${MINGW_PACKAGE_PREFIX}-libidn2"
"${MINGW_PACKAGE_PREFIX}-openssl"
"${MINGW_PACKAGE_PREFIX}-c-ares"
"${MINGW_PACKAGE_PREFIX}-gpgme")
source=("https://ftp.gnu.org/gnu/${_realname}/${_realname}-${pkgver}.tar.lz"{,.sig}
taskbar-progress.patch
openssl-windows-cert-store.patch
gettext-reconfigure.patch)
sha256sums=('d59a745ad2c522970660bb30d38601f9457b151b322e01fa20a5a0da0f55df07'
gettext-reconfigure.patch
remove-void-assignment.patch)
sha256sums=('29fbe6f3d5408430c572a63fe32bd43d5860f32691173dfd84edc06869edca75'
'SKIP'
'd5b662a4ee3f85d1c7d2f6e221c7e45f19189925e6774102114045fbfb2953b7'
'528369e9339eeeec7066632a1badc91a190decc2842810a6bd89a49c62565423'
'01cc37b22cb7f1fb0b9246f96422af703b877beb3145b50636f438fa2802ed29')
'd707a4e223433f6e79dd4f455c26dc162d26de79495d85dc4f2f92b877139325'
'8d7982639318abf1b88ffb13e6edffa54ce2de5c289bdc74950f1321cd837c2c')
options=('strip' '!libtool' 'staticlibs')
prepare() {
cd $srcdir/${_realname}-${pkgver}
cd ${srcdir}/${_realname}-${pkgver}
patch -p1 -i ${srcdir}/gettext-reconfigure.patch
#Patch for support of taskbar-progress in windows cmd
patch -p1 -i $srcdir/taskbar-progress.patch
patch -p1 -i ${srcdir}/taskbar-progress.patch
#Patch for supporting windows certificate store if openssl cacerts is not found
patch -p1 -i $srcdir/openssl-windows-cert-store.patch
patch -p1 -i ${srcdir}/openssl-windows-cert-store.patch
patch -p1 -i ${srcdir}/remove-void-assignment.patch
autoreconf -fiv
}

View File

@@ -2,25 +2,12 @@ diff --git a/configure.ac b/configure.ac
index 686f040..b704755 100644
--- a/configure.ac
+++ b/configure.ac
@@ -184,7 +184,7 @@ dnl
@@ -200,7 +200,7 @@ dnl
dnl Gettext
dnl
AM_GNU_GETTEXT([external],[need-ngettext])
-AM_GNU_GETTEXT_VERSION([0.18.1])
-AM_GNU_GETTEXT_VERSION([0.17])
+AM_GNU_GETTEXT_VERSION([0.19.8])
AC_PROG_RANLIB
diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4
index 895218b..8277581 100644
--- a/m4/gnulib-comp.m4
+++ b/m4/gnulib-comp.m4
@@ -513,7 +513,7 @@ AC_DEFUN([gl_INIT],
fi
gl_SYS_SOCKET_MODULE_INDICATOR([getsockname])
dnl you must add AM_GNU_GETTEXT([external]) or similar to configure.ac.
- AM_GNU_GETTEXT_VERSION([0.18.1])
+ AM_GNU_GETTEXT_VERSION([0.19.8])
AC_SUBST([LIBINTL])
AC_SUBST([LTLIBINTL])
gl_GETTIME

View File

@@ -0,0 +1,25 @@
From 7eff94e881b94d119ba22fc0c29edd65f4e6798b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de>
Date: Tue, 8 May 2018 09:36:45 +0200
Subject: [PATCH] * src/host.c (wait_ares): Remove void assignment
Reported-by: Josef Moellers
---
src/host.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/host.c b/src/host.c
index 4597f46a..b42cd6e8 100644
--- a/src/host.c
+++ b/src/host.c
@@ -732,7 +732,7 @@ wait_ares (ares_channel channel)
ares_process (channel, &read_fds, &write_fds);
}
if (timer)
- timer = ptimer_destroy (timer);
+ ptimer_destroy (timer);
}
static void
--
2.18.0