From patchwork Fri Jan 24 15:07:55 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Arnaud_R=C3=A9billout?= X-Patchwork-Id: 313926 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 4C6872C00A0 for ; Sat, 25 Jan 2014 02:08:20 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 316B09331F; Fri, 24 Jan 2014 15:08:18 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 4A1olUfwd5wm; Fri, 24 Jan 2014 15:08:16 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 18CCC932C7; Fri, 24 Jan 2014 15:08:16 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 0D5091BF9D3 for ; Fri, 24 Jan 2014 15:08:15 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 05B1E8A546 for ; Fri, 24 Jan 2014 15:08:15 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Mkz-w7-moCIo for ; Fri, 24 Jan 2014 15:08:13 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from smtp4.infomaniak.ch (smtp4.infomaniak.ch [84.16.68.92]) by whitealder.osuosl.org (Postfix) with ESMTPS id 4E4D389D87 for ; Fri, 24 Jan 2014 15:08:12 +0000 (UTC) Received: from S-RD-3.syscom.ch ([62.12.146.154]) (authenticated bits=0) by smtp4.infomaniak.ch (8.14.5/8.14.5) with ESMTP id s0OF7w3L005398 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NO); Fri, 24 Jan 2014 16:08:09 +0100 From: =?UTF-8?q?Arnaud=20R=C3=A9billout?= To: buildroot@busybox.net Date: Fri, 24 Jan 2014 16:07:55 +0100 Message-Id: <1390576075-16900-1-git-send-email-rebillout@syscom.ch> X-Mailer: git-send-email 1.8.5.3 MIME-Version: 1.0 Subject: [Buildroot] [PATCH] lftp: bump to 4.4.15 and remove cross-compile patch. X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net The patch has been accepted upstream. See: http://www.mail-archive.com/lftp-devel%40uniyar.ac.ru/msg01841.html Signed-off-by: Arnaud Rébillout --- ..._fallocate-m4-check-for-cross-compilation.patch | 46 ---------------------- package/lftp/lftp.mk | 2 +- 2 files changed, 1 insertion(+), 47 deletions(-) delete mode 100644 package/lftp/0001-Fix-posix_fallocate-m4-check-for-cross-compilation.patch diff --git a/package/lftp/0001-Fix-posix_fallocate-m4-check-for-cross-compilation.patch b/package/lftp/0001-Fix-posix_fallocate-m4-check-for-cross-compilation.patch deleted file mode 100644 index 66f8a80..0000000 --- a/package/lftp/0001-Fix-posix_fallocate-m4-check-for-cross-compilation.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 450ed0f38159a9944460ecff65793fe6de206df4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Arnaud=20R=C3=A9billout?= -Date: Mon, 25 Nov 2013 11:03:59 +0100 -Subject: [PATCH] Fix posix_fallocate m4 check for cross-compilation. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -If we're cross-compiling, we can't test if the code run, we can only -test that it compiles and links. If it does, assume posix_fallocate -works, because cross-compilation for AIX or old glibc is unlikely. - -Signed-off-by: Arnaud Rébillout ---- - m4/lftp.m4 | 15 +++++++++++++++ - 1 file changed, 15 insertions(+) - -diff --git a/m4/lftp.m4 b/m4/lftp.m4 -index 6d7ad9c..b38364d 100644 ---- a/m4/lftp.m4 -+++ b/m4/lftp.m4 -@@ -271,6 +271,21 @@ AC_DEFUN([LFTP_POSIX_FALLOCATE_CHECK],[ - i_cv_posix_fallocate_works=yes - ], [ - i_cv_posix_fallocate_works=no -+ ], [ -+ dnl * Cross-compilation: we can only test if the code compiles and links. -+ dnl * If it does, assume that it works, because cross-compilation for AIX or old glibc is unlikely. -+ AC_CACHE_VAL([i_cv_posix_fallocate_works],[ -+ AC_LINK_IFELSE([ -+ #include -+ int main() { -+ posix_fallocate(0, 0, 0); -+ } -+ ], [ -+ i_cv_posix_fallocate_works=yes -+ ], [ -+ i_cv_posix_fallocate_works=no -+ ]) -+ ]) - ]) - ]) - if test x$i_cv_posix_fallocate_works = xyes; then --- -1.8.4.4 - diff --git a/package/lftp/lftp.mk b/package/lftp/lftp.mk index faf9f37..0b00594 100644 --- a/package/lftp/lftp.mk +++ b/package/lftp/lftp.mk @@ -4,7 +4,7 @@ # ################################################################################ -LFTP_VERSION = 4.4.10 +LFTP_VERSION = 4.4.15 LFTP_SITE = http://lftp.yar.ru/ftp LFTP_LICENSE = GPLv3+ LFTP_LICENSE_FILES = COPYING