main/lftp: upgrade to 4.5.0

3 files changed, 5 insertions, 87 deletions

diff --git a/main/lftp/0001-run-the-gunlib-checks-with-same-compiler-as-when-bui.patch b/main/lftp/0001-run-the-gunlib-checks-with-same-compiler-as-when-bui.patch
deleted file mode 100644
index 2e7a93af3d..0000000000
--- a/main/lftp/0001-run-the-gunlib-checks-with-same-compiler-as-when-bui.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From d78ec3f29eca74d17a01d717e10ef6fad1a85a15 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Mon, 17 Feb 2014 08:20:41 +0000
-Subject: [PATCH] run the gunlib checks with same compiler as when building
-
-The gnulib will be built with $CC and not $CXX so we should not run the
-gnulib tests with $CXX.
-
-This fixes lavv17/lftp#59
----
- configure.ac | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index faca8e5..5d52f1a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -237,9 +237,7 @@ fi
- AM_PROG_LIBTOOL
- LIBTOOL="$LIBTOOL --silent"
- 
--AC_LANG_PUSH(C++)
- gl_INIT
--AC_LANG_POP(C++)
- 
- if test x$ac_cv_func_wcwidth != xyes || test x$REPLACE_WCWIDTH = x1; then
-    gl_LIBOBJ([wcwidth])
--- 
-1.8.5.4
-
diff --git a/main/lftp/APKBUILD b/main/lftp/APKBUILD
index ab1cd7892f..b1966fec85 100644
--- a/main/lftp/APKBUILD
+++ b/main/lftp/APKBUILD
@@ -1,19 +1,16 @@
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
 # Maintainer: Carlo Landmeter <clandmeter@gmail.com>
 pkgname=lftp
-pkgver=4.4.16
+pkgver=4.5.0
 pkgrel=0
 pkgdesc="LFTP is sophisticated ftp/http client"
 url="http://lftp.yar.ru/"
 arch="all"
 license="GPL"
 depends=
-makedepends="gnutls-dev readline-dev ncurses-dev gettext-dev autoconf automake
-	libtool"
+makedepends="gnutls-dev readline-dev ncurses-dev gettext-dev"
 subpackages="$pkgname-doc"
 source="http://lftp.yar.ru/ftp/lftp-$pkgver.tar.xz
-	0001-run-the-gunlib-checks-with-same-compiler-as-when-bui.patch
-	stdc-limit-macros.patch
 	"
 
 _builddir="$srcdir/$pkgname-$pkgver"
@@ -26,8 +23,6 @@ prepare() {
                 *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
                 esac
         done
-	libtoolize --force && aclocal -I m4 && autoconf \
-		&& automake --add-missing || return 1
 }
 
 build() {
@@ -57,12 +52,6 @@ package() {
 	rm -f "$pkgdir"/usr/lib/charset.alias
 }
 
-md5sums="73e9084731e4ba9bd886a86fdccec519  lftp-4.4.16.tar.xz
-91de52bcbda9490d62cea72be78ab72a  0001-run-the-gunlib-checks-with-same-compiler-as-when-bui.patch
-c2e3e6b4aabd97658fe8488ff6859ea0  stdc-limit-macros.patch"
-sha256sums="0b0ee4e3f6ea793842058a470dad5a6511d377b5f43f3370e552b10335a662c8  lftp-4.4.16.tar.xz
-e50ae5f0db272a31146cc29909bd07a1b7c11c78dad6e9a51eb3ad4231b5c323  0001-run-the-gunlib-checks-with-same-compiler-as-when-bui.patch
-9dcb0f0ef32e3a27c955aadf6af4d60ce98d14df8bc9bc0fcf72f7c6479d555b  stdc-limit-macros.patch"
-sha512sums="f6e5336ea32aa87666d740fe594eecd6710757d32d11e0160b30b0d56ba9c742d04939dc17df0598266d8622ebaf44cac96c2ec7b01428405150a41e2234aef6  lftp-4.4.16.tar.xz
-3f7e7958787c323b148415ba42d8748d27a515da2dbc62c087e778190806cf6f683900966c359829d3ba1a4d8d06a874d35c41316c89059b1c85806328f422cc  0001-run-the-gunlib-checks-with-same-compiler-as-when-bui.patch
-ba7ae5f68382a8bb24ed4a2313a224cf5ac5e105bc15ab22c3f43578cb4cb6cc436d8f7327e5da2b9f3c28ab5532123f7db6ea12d9ba3cba12b8f9cf71bb3632  stdc-limit-macros.patch"
+md5sums="cddbbf3f958047f7ce5a2e4386b36fc8  lftp-4.5.0.tar.xz"
+sha256sums="479471a5dbd8b782435a9557758c1fa09ae7a6dfe7b3e1661390d634356954c4  lftp-4.5.0.tar.xz"
+sha512sums="870de07eab845c00f5261d5b022eecb7eab9dbb902814ffec91fe84325d3d2c6ce0e9ca1ad93030b99e3814afe4bb51b014eae4cf13edcb5251cab1909c7aec8  lftp-4.5.0.tar.xz"
diff --git a/main/lftp/stdc-limit-macros.patch b/main/lftp/stdc-limit-macros.patch
deleted file mode 100644
index 3124fdede8..0000000000
--- a/main/lftp/stdc-limit-macros.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 5d52f1a..2f4142d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -127,6 +127,7 @@ CXX_DYNAMIC_INITIALIZERS
- LFTP_CXX_BOOL
- LFTP_CXX__BOOL
- LFTP_CXX_ANSI_SCOPE
-+LFTP_CXX_STDC_LIMIT_MACROS
- 
- AC_ISC_POSIX
- 
-diff --git a/m4/lftp.m4 b/m4/lftp.m4
-index 1aae69e..72d594a 100644
---- a/m4/lftp.m4
-+++ b/m4/lftp.m4
-@@ -311,3 +311,23 @@ AC_DEFUN([LFTP_POSIX_FADVISE_CHECK],[
-       AC_DEFINE(HAVE_POSIX_FADVISE, 1, [Define if posix_fadvise() is available])
-    fi
- ])
-+
-+AC_DEFUN([LFTP_CXX_STDC_LIMIT_MACROS],[
-+   dnl * Old glibcs requires that __STDC_LIMIT_MACROS is defined for using
-+   dnl * stdint.h in c++ mode
-+   AC_MSG_CHECKING(whether stdint.h needs __STDC_LIMIT_MACROS in C++ mode)
-+   AC_CACHE_VAL(lftp_cv_cxx_stdc_limit_macros,
-+   [
-+      AC_LANG_PUSH(C++)
-+      AC_TRY_COMPILE([
-+         #include <stdint.h>
-+	 int i = INT_MIN==INT32_MIN && INT_MAX == INT32_MAX;],[],
-+	 [lftp_cv_cxx_stdc_limit_macros=no],[lftp_cv_cxx_stdc_limit_macros=yes])
-+      AC_LANG_POP(C++)
-+   ])
-+   AC_MSG_RESULT($lftp_cv_cxx_stdc_limit_macros)
-+   if test x$lftp_cv_cxx_stdc_limit_macros = xyes; then
-+      AC_DEFINE(__STDC_LIMIT_MACROS, 1, [Use STDC Limit Macros in C++])
-+   fi
-+])
-+
-