[Lunar-commits] <moonbase-core> Merge branch 'Florin65-ftp'

[Stefan Wold]

commit c3e06613cfee75389a25f67abcac1c973d4a15e8
Author: Stefan Wold <ratler at lunar-linux.org>
Date: Thu, 07 Aug 2014 19:52:53 +0200
URL: https://github.com/lunar-linux/moonbase-core/commit/c3e06613cfee75389a25f67abcac1c973d4a15e8

Merge branch 'Florin65-ftp'
---
  ftp/lftp/BUILD     | +10/-20   
  ftp/lftp/CONFIGURE | +1/-1     
  ftp/lftp/DETAILS   | +3/-3     
  3 files changed, 14 insertions(+), 24 deletions(-)

--- a/ftp/lftp/BUILD
+++ b/ftp/lftp/BUILD
@@ -1,20 +1,10 @@
-(
-
-  # fix compiling with glibc 2.16.0
-  sedit '/gets is a security hole/d' lib/stdio.in.h  &&
-
-  # get the alias
-  SSL=`unalias %SSL` &&
-
-  # setting the ssl option
-  if [[ $SSL == "openssl" ]] && module_installed "openssl" ; then
-        OPTS+=" --with-openssl --without-gnutls"
-  elif [[ $SSL == "gnutls" ]] && module_installed "gnutls" ; then
-        OPTS+=" --with-gnutls --without-openssl"
-  else
-        OPTS+=" --without-openssl --without-gnutls"
-  fi &&
-
-  default_build
-
-) > $C_FIFO 2>&1
+# setting the ssl option
+if in_depends $MODULE openssl && module_installed "openssl" ; then
+  OPTS+=" --with-openssl --without-gnutls"
+elif in_depends $MODULE gnutls && module_installed "gnutls" ; then
+  OPTS+=" --with-gnutls --without-openssl"
+else
+  OPTS+=" --without-openssl --without-gnutls"
+fi &&
+
+default_build
--- a/ftp/lftp/CONFIGURE
+++ b/ftp/lftp/CONFIGURE
@@ -1,4 +1,4 @@
 mquery CONFIG_NLS "Do you want NLS enabled?" \
-                  n                          \
+                  y                          \
                   "--enable-nls"             \
                   "--disable-nls"
--- a/ftp/lftp/DETAILS
+++ b/ftp/lftp/DETAILS
@@ -1,13 +1,13 @@
           MODULE=lftp
-         VERSION=4.5.3
+         VERSION=4.5.4
           SOURCE=$MODULE-$VERSION.tar.xz
    SOURCE_URL[0]=ftp://ftp.yars.free.net/pub/source/$MODULE
    SOURCE_URL[1]=ftp://ftp.cs.tu-berlin.de/pub/net/ftp/$MODULE
    SOURCE_URL[2]=http://lftp.yar.ru/ftp/
-      SOURCE_VFY=sha1:572d0a459c7a2399ae51e687de6f9c68098267aa
+      SOURCE_VFY=sha1:056d05725401ee3ca08a92415c93ffbbaa5e634d
         WEB_SITE=http://lftp.yar.ru
          ENTERED=20010922
-         UPDATED=20140708
+         UPDATED=20140807
            SHORT="A sophisticated ftp/http client, file transfer program"
 
 cat << EOF