wget: Update to 1.16

This commit is contained in:
Alexpux
2014-10-29 10:05:25 +03:00
parent 9549e4157f
commit fca71afbff
2 changed files with 7 additions and 75 deletions

View File

@@ -1,8 +1,8 @@
# Maintainer: Alexey Pavlov <alexpux@gmail.com>
pkgname=wget
pkgver=1.15
pkgrel=3
pkgver=1.16
pkgrel=1
pkgdesc="A network utility to retrieve files from the Web"
arch=('i686' 'x86_64')
url="http://www.gnu.org/software/wget/wget.html"
@@ -16,15 +16,17 @@ install=wget.install
source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig}
1.13.4-sysconfdir.patch
wget-1.14-msys2.patch)
sha1sums=('e9fb1d25fa04f9c69e74e656a3174dca02700ba1'
sha1sums=('08d991acc80726abe57043a278f9da469c454503'
'SKIP'
'da9a76951c305b456931c7ed462c12b99fd94d79'
'ffdba68b87e1ffd59a6bd71075c6f554d0d13d3e')
'6ce8d54edf11cef9223780e2c249231f331194f9')
prepare() {
cd "${srcdir}/${pkgname}-${pkgver}"
patch -p2 -i "${srcdir}/1.13.4-sysconfdir.patch"
patch -p1 -i "${srcdir}/wget-1.14-msys2.patch"
autoreconf -fiv
cat >> doc/sample.wgetrc <<EOF
# default root certs location
@@ -44,8 +46,7 @@ build() {
--without-libpth-prefix \
--without-libssl-prefix \
--without-libgnutls-prefix
#ac_cv_header_spawn_h=no
make
}

View File

@@ -80,63 +80,6 @@ diff -Naur wget-1.14-orig/build-aux/config.rpath wget-1.14/build-aux/config.rpat
shrext=.dll
library_names_spec='$libname.dll.a $libname.lib'
;;
diff -Naur wget-1.14-orig/configure wget-1.14/configure
--- wget-1.14-orig/configure 2012-08-06 00:17:11.000000000 +0400
+++ wget-1.14/configure 2013-07-18 11:12:30.333984400 +0400
@@ -6239,7 +6239,7 @@
else
case "$host_os" in
osf*) gl_use_threads=no ;;
- cygwin*)
+ cygwin* | msys*)
case `uname -r` in
1.[0-5].*) gl_use_threads=no ;;
*) gl_use_threads=yes ;;
@@ -11081,7 +11081,7 @@
# special semantics and is distinct from /, please report it to
# <bug-gnulib@gnu.org>.
case $host in
- *-cygwin | i370-ibm-openedition)
+ *-cygwin | *-msys | i370-ibm-openedition)
gl_cv_double_slash_root=yes ;;
*)
# Be optimistic and assume that / and // are the same when we
@@ -20515,7 +20515,7 @@
case "$host_os" in
# Guess no on Cygwin.
- cygwin*) gl_cv_func_btowc_nul="guessing no" ;;
+ cygwin* | msys*) gl_cv_func_btowc_nul="guessing no" ;;
# Guess yes otherwise.
*) gl_cv_func_btowc_nul="guessing yes" ;;
esac
@@ -20897,7 +20897,7 @@
# special semantics and is distinct from /, please report it to
# <bug-gnulib@gnu.org>.
case $host in
- *-cygwin | i370-ibm-openedition)
+ *-cygwin | *-msys | i370-ibm-openedition)
gl_cv_double_slash_root=yes ;;
*)
# Be optimistic and assume that / and // are the same when we
@@ -20939,7 +20939,7 @@
case "$host_os" in
mingw*) # on this platform, dup2 always returns 0 for success
gl_cv_func_dup2_works="guessing no" ;;
- cygwin*) # on cygwin 1.5.x, dup2(1,1) returns 0
+ cygwin* | msys*) # on cygwin 1.5.x, dup2(1,1) returns 0
gl_cv_func_dup2_works="guessing no" ;;
linux*) # On linux between 2008-07-27 and 2009-05-11, dup2 of a
# closed fd may yield -EBADF instead of -1 / errno=EBADF.
@@ -24615,7 +24615,7 @@
case "$host_os" in
# Guess yes on platforms where we know the result.
*-gnu* | freebsd* | netbsd* | openbsd* \
- | hpux* | solaris* | cygwin* | mingw*)
+ | hpux* | solaris* | cygwin* | msys* | mingw*)
ac_cv_func_malloc_0_nonnull=yes ;;
# If we don't know, assume the worst.
*) ac_cv_func_malloc_0_nonnull=no ;;
diff -Naur wget-1.14-orig/lib/Makefile.am wget-1.14/lib/Makefile.am
--- wget-1.14-orig/lib/Makefile.am 2012-08-06 00:16:46.000000000 +0400
+++ wget-1.14/lib/Makefile.am 2013-07-18 11:14:12.365234400 +0400
@@ -145,18 +88,6 @@ diff -Naur wget-1.14-orig/lib/Makefile.am wget-1.14/lib/Makefile.am
darwin[56]*) \
need_charset_alias=true ;; \
- darwin* | cygwin* | mingw* | pw32* | cegcc*) \
+ darwin* | cygwin* | msys* | mingw* | pw32* | cegcc*) \
need_charset_alias=false ;; \
*) \
need_charset_alias=true ;; \
diff -Naur wget-1.14-orig/lib/Makefile.in wget-1.14/lib/Makefile.in
--- wget-1.14-orig/lib/Makefile.in 2012-08-06 00:17:16.000000000 +0400
+++ wget-1.14/lib/Makefile.in 2013-07-18 11:10:14.520507800 +0400
@@ -2088,7 +2088,7 @@
case '$(host_os)' in \
darwin[56]*) \
need_charset_alias=true ;; \
- darwin* | cygwin* | mingw* | pw32* | cegcc*) \
+ darwin* | cygwin* | msys* | mingw* | pw32* | cegcc*) \
need_charset_alias=false ;; \
*) \