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

[andyrtr at archlinux.org]

    Date: Monday, July 27, 2009 @ 13:41:52
  Author: andyrtr
Revision: 47794

Merged revisions 47793 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/lftp/trunk

........
  r47793 | andyrtr | 2009-07-27 17:41:15 +0000 (Mo, 27 Jul 2009) | 2 lines
  
  upgpkg: lftp 3.7.15-1
      new version 3.7.15; added gnutls patch to fix #15337
........

Added:
  lftp/repos/extra-x86_64/gnutls-pkgconfig.patch
    (from rev 47793, lftp/trunk/gnutls-pkgconfig.patch)
Modified:
  lftp/repos/extra-x86_64/	(properties)
  lftp/repos/extra-x86_64/PKGBUILD

------------------------+
 PKGBUILD               |   15 +++++++++++----
 gnutls-pkgconfig.patch |   16 ++++++++++++++++
 2 files changed, 27 insertions(+), 4 deletions(-)


Property changes on: lftp/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /lftp/trunk:1-42793
   + /lftp/trunk:1-47793

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-07-27 17:41:15 UTC (rev 47793)
+++ extra-x86_64/PKGBUILD	2009-07-27 17:41:52 UTC (rev 47794)
@@ -3,19 +3,26 @@
 # Contributor: Aaron Griffin <aaron at archlinux.org>
 
 pkgname=lftp
-pkgver=3.7.14
-pkgrel=2
+pkgver=3.7.15
+pkgrel=1
 pkgdesc="Sophisticated command line based FTP client"
 arch=('i686' 'x86_64')
 license=('GPL3')
 depends=('gcc-libs' 'readline>=6.0' "gnutls>=2.6.6" "expat>=2.0.1-2" 'perl')
+makedepends=('autoconf')
 url="http://lftp.yar.ru/"
 backup=('etc/lftp.conf')
-source=(http://ftp.yars.free.net/pub/source/lftp/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('723d372833d6a94c15cc78cc98565517')
+source=(http://ftp.yars.free.net/pub/source/lftp/${pkgname}-${pkgver}.tar.bz2
+	gnutls-pkgconfig.patch)
+md5sums=('bb2e116d2fcf3544805efd4b6463316e'
+         'c5e834d35c052891dac6a14ac9fd2da0')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
+  patch -Np1 -i ${srcdir}/gnutls-pkgconfig.patch || return 1
+
+  autoreconf
+
   ./configure --prefix=/usr --with-gnutls \
 	--without-openssl --disable-static
   make || return 1

Copied: lftp/repos/extra-x86_64/gnutls-pkgconfig.patch (from rev 47793, lftp/trunk/gnutls-pkgconfig.patch)
===================================================================
--- extra-x86_64/gnutls-pkgconfig.patch	                        (rev 0)
+++ extra-x86_64/gnutls-pkgconfig.patch	2009-07-27 17:41:52 UTC (rev 47794)
@@ -0,0 +1,16 @@
+--- lftp-3.7.14/configure.ac	2009-05-15 08:22:34.000000000 +0200
++++ lftp.configure.ac	2009-06-13 12:58:39.000000000 +0200
+@@ -266,9 +266,10 @@
+ 			with_gnutls=no;;
+ esac
+ if test x$with_gnutls = xyes; then
+-   AM_PATH_LIBGNUTLS([1.0.0], [
++   PKG_PROG_PKG_CONFIG
++   PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 1.0.0], [
+       AC_DEFINE([USE_GNUTLS], 1, [Define to 1 when using GNU TLS library])
+-      gnutls_version_code=`echo $libgnutls_config_version | $AWK -F. '{ printf "0x%02X%02X%02X\n",$1,$2,$3 }'`
++      gnutls_version_code=`$PKG_CONFIG --modversion gnutls | $AWK -F. '{ printf "0x%02X%02X%02X\n",$1,$2,$3 }'`
+       AC_DEFINE_UNQUOTED([LFTP_LIBGNUTLS_VERSION_CODE], $gnutls_version_code, [Define to libgnutls version, e.g. 0x010203 for 1.2.3])
+    ])
+ fi
+