From 6ad3cbd8054938719e29066907d53b3da0fc774f Mon Sep 17 00:00:00 2001
From: Florian Fainelli <florian@openwrt.org>
Date: Sun, 4 Jan 2009 12:13:28 +0000
Subject: [PATCH] Update lftp to 3.7.7 (#4413)

SVN-Revision: 13854
---
 net/lftp/Makefile                       |  8 ++++----
 net/lftp/patches/001-libintl.patch      |  6 +++---
 net/lftp/patches/002-gettimeofday.patch | 23 +++++++++++++++++++++++
 3 files changed, 30 insertions(+), 7 deletions(-)
 create mode 100644 net/lftp/patches/002-gettimeofday.patch

diff --git a/net/lftp/Makefile b/net/lftp/Makefile
index f29531cf42..ed81ce3a2b 100644
--- a/net/lftp/Makefile
+++ b/net/lftp/Makefile
@@ -10,12 +10,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=lftp
-PKG_VERSION:=3.7.3
+PKG_VERSION:=3.7.7
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://ftp.yars.free.net/pub/source/lftp/old/
-PKG_MD5SUM:=fc98506620b059d712341d624eb720d6
+PKG_SOURCE_URL:=http://ftp.yars.free.net/pub/source/lftp/
+PKG_MD5SUM:=7b1c58a6289448140b1cd328e1d51f94
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
@@ -44,7 +44,7 @@ CONFIGURE_VARS += \
         CXXFLAGS="$$$$CXXFLAGS -fno-builtin -I$(STAGING_DIR)/usr/include/uClibc++ -nostdinc++" \
         CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/include/uClibc++" \
         LDFLAGS="$$$$LDFLAGS" \
-        LIBS="-nodefaultlibs -lz -lutil -luClibc++ -lcurses -lgcc_s -ldl" \
+        LIBS="-nodefaultlibs -lz -lutil -luClibc++ -lcurses -lgcc -lgcc_s -ldl" \
 
 define Build/Compile
         $(MAKE) -C $(PKG_BUILD_DIR) \
diff --git a/net/lftp/patches/001-libintl.patch b/net/lftp/patches/001-libintl.patch
index ac890ac352..9891ca8501 100644
--- a/net/lftp/patches/001-libintl.patch
+++ b/net/lftp/patches/001-libintl.patch
@@ -1,6 +1,6 @@
-diff -burN lftp-3.7.4.org/lib/gettext.h lftp-3.7.4/lib/gettext.h
---- lftp-3.7.4.org/lib/gettext.h	2008-05-18 07:58:27.000000000 +0200
-+++ lftp-3.7.4/lib/gettext.h	2008-11-05 16:03:37.769820993 +0100
+diff -burN lftp-3.7.7/lib/gettext.h lftp-3.7.7.patched/lib/gettext.h
+--- lftp-3.7.7/lib/gettext.h	2008-05-16 18:28:43.000000000 +0200
++++ lftp-3.7.7.patched/lib/gettext.h	2009-01-03 18:59:05.374184151 +0100
 @@ -22,7 +22,6 @@
  #if ENABLE_NLS
  
diff --git a/net/lftp/patches/002-gettimeofday.patch b/net/lftp/patches/002-gettimeofday.patch
new file mode 100644
index 0000000000..ea6d490b2a
--- /dev/null
+++ b/net/lftp/patches/002-gettimeofday.patch
@@ -0,0 +1,23 @@
+diff -burN lftp-3.7.7/lib/sys_time.in.h lftp-3.7.7.patched/lib/sys_time.in.h
+--- lftp-3.7.7/lib/sys_time.in.h	2008-10-24 16:00:33.000000000 +0200
++++ lftp-3.7.7.patched/lib/sys_time.in.h	2009-01-03 21:20:34.129104049 +0100
+@@ -39,6 +39,10 @@
+ #  include <time.h>
+ # endif
+ 
++#ifdef __cplusplus
++extern "C" {
++#endif 
++
+ # if ! @HAVE_STRUCT_TIMEVAL@
+ struct timeval
+ {
+@@ -53,4 +57,8 @@
+ int gettimeofday (struct timeval *restrict, void *restrict);
+ # endif
+ 
++#ifdef __cplusplus
++}
++#endif 
++
+ #endif /* _GL_SYS_TIME_H */
-- 
2.30.2