[arch-commits] Commit in lftp/repos (6 files)

Andreas Radke andyrtr at nymeria.archlinux.org
Mon May 27 09:11:35 EDT 2013


    Date: Monday, May 27, 2013 @ 15:11:34
  Author: andyrtr
Revision: 186480

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  lftp/repos/extra-i686/PKGBUILD
    (from rev 186479, lftp/trunk/PKGBUILD)
  lftp/repos/extra-i686/f8ee088.diff
    (from rev 186479, lftp/trunk/f8ee088.diff)
  lftp/repos/extra-x86_64/PKGBUILD
    (from rev 186479, lftp/trunk/PKGBUILD)
  lftp/repos/extra-x86_64/f8ee088.diff
    (from rev 186479, lftp/trunk/f8ee088.diff)
Deleted:
  lftp/repos/extra-i686/PKGBUILD
  lftp/repos/extra-x86_64/PKGBUILD

---------------------------+
 /PKGBUILD                 |   78 ++++++++++++++++++++++++++++++++++++++++++++
 extra-i686/PKGBUILD       |   32 ------------------
 extra-i686/f8ee088.diff   |   11 ++++++
 extra-x86_64/PKGBUILD     |   32 ------------------
 extra-x86_64/f8ee088.diff |   11 ++++++
 5 files changed, 100 insertions(+), 64 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2013-05-27 13:11:11 UTC (rev 186479)
+++ extra-i686/PKGBUILD	2013-05-27 13:11:34 UTC (rev 186480)
@@ -1,32 +0,0 @@
-# $Id$
-# Maintainer: Andreas Radke <andyrtr at archlinux.org>
-# Contributor: Aaron Griffin <aaron at archlinux.org>
-
-pkgname=lftp
-pkgver=4.4.7
-pkgrel=1
-pkgdesc="Sophisticated command line based FTP client"
-arch=('i686' 'x86_64')
-license=('GPL3')
-depends=('gcc-libs' 'readline>=6.2' "gnutls" "expat>=2.0.1-4" 'sh')
-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)
-md5sums=('a4e7b88d6b7aca389010ce6d6dca8099')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr \
-    --with-gnutls \
-    --without-openssl \
-    --without-included-regex \
-    --disable-static
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-  rm -rf ${pkgdir}/usr/lib
-}

Copied: lftp/repos/extra-i686/PKGBUILD (from rev 186479, lftp/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2013-05-27 13:11:34 UTC (rev 186480)
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer: Andreas Radke <andyrtr at archlinux.org>
+# Contributor: Aaron Griffin <aaron at archlinux.org>
+
+pkgname=lftp
+pkgver=4.4.7
+pkgrel=2
+pkgdesc="Sophisticated command line based FTP client"
+arch=('i686' 'x86_64')
+license=('GPL3')
+depends=('gcc-libs' 'readline>=6.2' "gnutls" "expat>=2.0.1-4" 'sh')
+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 
+        f8ee088.diff)
+md5sums=('a4e7b88d6b7aca389010ce6d6dca8099'
+         'a8f1c1bb3f5ab60b48507c9722c64d1c')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+
+  # fix sftp transfer - FS#35456
+  # upstream: https://github.com/lavv17/lftp/issues/39
+  patch -Np0 -i ${srcdir}/f8ee088.diff
+
+  ./configure --prefix=/usr \
+    --with-gnutls \
+    --without-openssl \
+    --without-included-regex \
+    --disable-static
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+  rm -rf ${pkgdir}/usr/lib
+}

Copied: lftp/repos/extra-i686/f8ee088.diff (from rev 186479, lftp/trunk/f8ee088.diff)
===================================================================
--- extra-i686/f8ee088.diff	                        (rev 0)
+++ extra-i686/f8ee088.diff	2013-05-27 13:11:34 UTC (rev 186480)
@@ -0,0 +1,11 @@
+--- src/SFtp.cc	2013-04-18 09:24:36.000000000 +0200
++++ src/SFtp.cc.new	2013-05-27 15:06:40.998423663 +0200
+@@ -2256,7 +2256,7 @@
+ 	 return MOVED;
+       }
+       if(b)
+-	 return MOVED;
++	 return m;
+       // eof
+       if(!result && session->IsOpen())
+ 	 result=session.Cast<SFtp>()->GetFileSet();

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2013-05-27 13:11:11 UTC (rev 186479)
+++ extra-x86_64/PKGBUILD	2013-05-27 13:11:34 UTC (rev 186480)
@@ -1,32 +0,0 @@
-# $Id$
-# Maintainer: Andreas Radke <andyrtr at archlinux.org>
-# Contributor: Aaron Griffin <aaron at archlinux.org>
-
-pkgname=lftp
-pkgver=4.4.7
-pkgrel=1
-pkgdesc="Sophisticated command line based FTP client"
-arch=('i686' 'x86_64')
-license=('GPL3')
-depends=('gcc-libs' 'readline>=6.2' "gnutls" "expat>=2.0.1-4" 'sh')
-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)
-md5sums=('a4e7b88d6b7aca389010ce6d6dca8099')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr \
-    --with-gnutls \
-    --without-openssl \
-    --without-included-regex \
-    --disable-static
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-  rm -rf ${pkgdir}/usr/lib
-}

Copied: lftp/repos/extra-x86_64/PKGBUILD (from rev 186479, lftp/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2013-05-27 13:11:34 UTC (rev 186480)
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer: Andreas Radke <andyrtr at archlinux.org>
+# Contributor: Aaron Griffin <aaron at archlinux.org>
+
+pkgname=lftp
+pkgver=4.4.7
+pkgrel=2
+pkgdesc="Sophisticated command line based FTP client"
+arch=('i686' 'x86_64')
+license=('GPL3')
+depends=('gcc-libs' 'readline>=6.2' "gnutls" "expat>=2.0.1-4" 'sh')
+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 
+        f8ee088.diff)
+md5sums=('a4e7b88d6b7aca389010ce6d6dca8099'
+         'a8f1c1bb3f5ab60b48507c9722c64d1c')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+
+  # fix sftp transfer - FS#35456
+  # upstream: https://github.com/lavv17/lftp/issues/39
+  patch -Np0 -i ${srcdir}/f8ee088.diff
+
+  ./configure --prefix=/usr \
+    --with-gnutls \
+    --without-openssl \
+    --without-included-regex \
+    --disable-static
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+  rm -rf ${pkgdir}/usr/lib
+}

Copied: lftp/repos/extra-x86_64/f8ee088.diff (from rev 186479, lftp/trunk/f8ee088.diff)
===================================================================
--- extra-x86_64/f8ee088.diff	                        (rev 0)
+++ extra-x86_64/f8ee088.diff	2013-05-27 13:11:34 UTC (rev 186480)
@@ -0,0 +1,11 @@
+--- src/SFtp.cc	2013-04-18 09:24:36.000000000 +0200
++++ src/SFtp.cc.new	2013-05-27 15:06:40.998423663 +0200
+@@ -2256,7 +2256,7 @@
+ 	 return MOVED;
+       }
+       if(b)
+-	 return MOVED;
++	 return m;
+       // eof
+       if(!result && session->IsOpen())
+ 	 result=session.Cast<SFtp>()->GetFileSet();



More information about the arch-commits mailing list