diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-10-01 10:50:46 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-10-01 10:50:46 -0300 |
| commit | 3aff11a8581ae7e5a8ccea02062cd92f873c44c5 (patch) | |
| tree | 05623159a5ae88f6eed2414db216bc9a0d2d71c5 /extra/lftp | |
| parent | d4157e6db6dd7e03802aa9c361a1902e81c2545a (diff) | |
| parent | 9b6be78b0c13a61c14d5278f1363eaf9c6388e4c (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/geany/PKGBUILD
community/linux-tools/PKGBUILD
community/linux-tools/cpupower.conf
community/linux-tools/cpupower.rc
community/stk/PKGBUILD
core/patch/PKGBUILD
core/systemd/PKGBUILD
extra/lftp/PKGBUILD
extra/lftp/lftp-4.3.8-gets.patch
extra/mysql/PKGBUILD
extra/qt/PKGBUILD
extra/transmission/PKGBUILD
gnome-unstable/gcr/PKGBUILD
gnome-unstable/glibmm/PKGBUILD
gnome-unstable/gnome-session/PKGBUILD
gnome-unstable/libgdata/PKGBUILD
gnome-unstable/libgnome-keyring/PKGBUILD
gnome-unstable/pango/PKGBUILD
gnome-unstable/polkit/PKGBUILD
gnome-unstable/telepathy-glib/PKGBUILD
libre/linux-libre/PKGBUILD
multilib/lib32-libphobos-ldc/PKGBUILD
multilib/wine/PKGBUILD
testing/dbus-core/PKGBUILD
testing/dbus/PKGBUILD
testing/libusbx/PKGBUILD
testing/systemd/PKGBUILD
testing/xf86-video-intel/PKGBUILD
Diffstat (limited to 'extra/lftp')
| -rw-r--r-- | extra/lftp/PKGBUILD | 13 | ||||
| -rw-r--r-- | extra/lftp/lftp-4.3.8-gets.patch | 11 |
2 files changed, 12 insertions, 12 deletions
diff --git a/extra/lftp/PKGBUILD b/extra/lftp/PKGBUILD index 53c5482b6..f16db5db5 100644 --- a/extra/lftp/PKGBUILD +++ b/extra/lftp/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 162978 2012-07-04 13:56:20Z andyrtr $ +# $Id: PKGBUILD 167231 2012-09-28 20:06:45Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> pkgname=lftp -pkgver=4.3.8 +pkgver=4.4.0 pkgrel=1 pkgdesc="Sophisticated command line based FTP client" arch=('i686' 'x86_64' 'mips64el') @@ -13,14 +13,13 @@ optdepends=('perl: needed for convert-netscape-cookies and verify-file') url="http://lftp.yar.ru/" backup=('etc/lftp.conf') source=(http://ftp.yars.free.net/pub/source/lftp/${pkgname}-${pkgver}.tar.bz2 - lftp-4.3.8-gets.patch) -md5sums=('adced9c3e0f6b96821811dc87c0a1eeb' - '932db2d498846be7ba90780ee4fcb158') + lftp-4.3.8-gets.patch) +md5sums=('9d6a048bb6be9bc3baecfea53b0d8330' + '77168a7f368b07eec7e079b55496fa97') build() { cd ${srcdir}/${pkgname}-${pkgver} - # A patch from Gentoo fixing build with newer glibc. - patch -Np1 -i "$srcdir/lftp-4.3.8-gets.patch" + patch -Np1 -i ${srcdir}/lftp-4.3.8-gets.patch ./configure --prefix=/usr --with-gnutls \ --without-openssl --disable-static make diff --git a/extra/lftp/lftp-4.3.8-gets.patch b/extra/lftp/lftp-4.3.8-gets.patch index 0c2cb7c8a..d4a11804e 100644 --- a/extra/lftp/lftp-4.3.8-gets.patch +++ b/extra/lftp/lftp-4.3.8-gets.patch @@ -1,15 +1,16 @@ ---- a/lib/stdio.in.h -+++ b/lib/stdio.in.h -@@ -702,10 +702,12 @@ +diff -up lftp-4.3.8/lib/stdio.in.h.gets lftp-4.3.8/lib/stdio.in.h +--- lftp-4.3.8/lib/stdio.in.h.gets 2012-07-22 15:07:15.101115146 -0400 ++++ lftp-4.3.8/lib/stdio.in.h 2012-07-22 15:08:09.777098512 -0400 +@@ -702,10 +702,12 @@ _GL_WARN_ON_USE (getline, "getline is un /* It is very rare that the developer ever has full control of stdin, so any use of gets warrants an unconditional warning; besides, C11 removed it. */ -+#ifdef gets ++#if defined gets #undef gets #if HAVE_RAW_DECL_GETS _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); #endif -+#endif ++#endif // if defined gets #if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@ |