From patchwork Mon Jul 30 14:09:08 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Braun X-Patchwork-Id: 174025 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id 49DB62C008C for ; Tue, 31 Jul 2012 00:09:24 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id C9ACEFFAA2; Mon, 30 Jul 2012 14:09:22 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id lVc1vpI3zspi; Mon, 30 Jul 2012 14:09:17 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id A0583FF983; Mon, 30 Jul 2012 14:09:17 +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 ED3208F753 for ; Mon, 30 Jul 2012 14:09:16 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id E09768300F for ; Mon, 30 Jul 2012 14:09:16 +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 FK5sjl1E4ORX for ; Mon, 30 Jul 2012 14:09:14 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail.sceen.net (shattrath.sceen.net [94.23.252.191]) by whitealder.osuosl.org (Postfix) with ESMTP id 1E3D282759 for ; Mon, 30 Jul 2012 14:09:14 +0000 (UTC) Received: from localhost (localhost.localdomain [127.0.0.1]) by mail.sceen.net (Postfix) with ESMTP id EA07C140856; Mon, 30 Jul 2012 16:09:11 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at sceen.net Received: from mail.sceen.net ([127.0.0.1]) by localhost (mail.sceen.net [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 5PalbOT9JPLW; Mon, 30 Jul 2012 16:09:11 +0200 (CEST) Received: by mail.sceen.net (Postfix, from userid 1000) id 65F0214085D; Mon, 30 Jul 2012 16:09:11 +0200 (CEST) From: Richard Braun To: buildroot@busybox.net Date: Mon, 30 Jul 2012 16:09:08 +0200 Message-Id: <1343657348-28746-1-git-send-email-rbraun@sceen.net> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1343130272-5715-1-git-send-email-rbraun@sceen.net> References: <1343130272-5715-1-git-send-email-rbraun@sceen.net> Subject: [Buildroot] [PATCH v3] curlftpfs: new package 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: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net Signed-off-by: Richard Braun --- package/Config.in | 1 + package/curlftpfs/Config.in | 17 ++++++ .../curlftpfs-000-fix-CURLOPT_INFILESIZE.patch | 11 ++++ ...curlftpfs-001-free_ftpfs_file-memleak-fix.patch | 13 +++++ .../curlftpfs-002-nocache-memleak-fix.patch | 58 ++++++++++++++++++++ package/curlftpfs/curlftpfs.mk | 14 +++++ 6 files changed, 114 insertions(+), 0 deletions(-) create mode 100644 package/curlftpfs/Config.in create mode 100644 package/curlftpfs/curlftpfs-000-fix-CURLOPT_INFILESIZE.patch create mode 100644 package/curlftpfs/curlftpfs-001-free_ftpfs_file-memleak-fix.patch create mode 100644 package/curlftpfs/curlftpfs-002-nocache-memleak-fix.patch create mode 100644 package/curlftpfs/curlftpfs.mk diff --git a/package/Config.in b/package/Config.in index f664b8e..8b0188b 100644 --- a/package/Config.in +++ b/package/Config.in @@ -521,6 +521,7 @@ source "package/ctorrent/Config.in" source "package/cifs-utils/Config.in" source "package/conntrack-tools/Config.in" source "package/cups/Config.in" +source "package/curlftpfs/Config.in" if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS source "package/dhcp/Config.in" endif diff --git a/package/curlftpfs/Config.in b/package/curlftpfs/Config.in new file mode 100644 index 0000000..23c7547 --- /dev/null +++ b/package/curlftpfs/Config.in @@ -0,0 +1,17 @@ +config BR2_PACKAGE_CURLFTPFS + bool "curlftpfs (FUSE)" + select BR2_PACKAGE_LIBFUSE + select BR2_PACKAGE_LIBGLIB2 + select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE + select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE + select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE + select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_LIBCURL + depends on BR2_LARGEFILE + depends on BR2_USE_WCHAR # glib2 + help + CurlFtpFS is a filesystem for accessing FTP hosts based on FUSE + and libcurl. + +comment "curlftpfs requires a toolchain with LARGEFILE and WCHAR support" + depends on !BR2_LARGEFILE || !BR2_USE_WCHAR diff --git a/package/curlftpfs/curlftpfs-000-fix-CURLOPT_INFILESIZE.patch b/package/curlftpfs/curlftpfs-000-fix-CURLOPT_INFILESIZE.patch new file mode 100644 index 0000000..bd14184 --- /dev/null +++ b/package/curlftpfs/curlftpfs-000-fix-CURLOPT_INFILESIZE.patch @@ -0,0 +1,11 @@ +CURLOPT_INFILESIZE does not support -1 arg. This fix bug #556012. +--- curlftpfs-0.9.2/ftpfs.c.old 2009-12-13 14:12:25.000000000 +0100 ++++ curlftpfs-0.9.2/ftpfs.c 2009-12-13 14:12:32.000000000 +0100 +@@ -503,7 +503,6 @@ + + curl_easy_setopt_or_die(fh->write_conn, CURLOPT_URL, fh->full_path); + curl_easy_setopt_or_die(fh->write_conn, CURLOPT_UPLOAD, 1); +- curl_easy_setopt_or_die(fh->write_conn, CURLOPT_INFILESIZE, -1); + curl_easy_setopt_or_die(fh->write_conn, CURLOPT_READFUNCTION, write_data_bg); + curl_easy_setopt_or_die(fh->write_conn, CURLOPT_READDATA, fh); + curl_easy_setopt_or_die(fh->write_conn, CURLOPT_LOW_SPEED_LIMIT, 1); diff --git a/package/curlftpfs/curlftpfs-001-free_ftpfs_file-memleak-fix.patch b/package/curlftpfs/curlftpfs-001-free_ftpfs_file-memleak-fix.patch new file mode 100644 index 0000000..e341b81 --- /dev/null +++ b/package/curlftpfs/curlftpfs-001-free_ftpfs_file-memleak-fix.patch @@ -0,0 +1,13 @@ +Fix a memory leak. See Bug #587250. + +--- a/ftpfs.c 2008-04-30 01:05:47.000000000 +0200 ++++ a/ftpfs.c.slesimple 2010-01-01 22:12:10.000000000 +0100 +@@ -615,6 +615,8 @@ static void free_ftpfs_file(struct ftpfs + sem_destroy(&fh->data_need); + sem_destroy(&fh->data_written); + sem_destroy(&fh->ready); ++ if (fh->buf.size) { buf_free(&fh->buf); } ++ if (fh->stream_buf.size) { buf_free(&fh->stream_buf); } + free(fh); + } + diff --git a/package/curlftpfs/curlftpfs-002-nocache-memleak-fix.patch b/package/curlftpfs/curlftpfs-002-nocache-memleak-fix.patch new file mode 100644 index 0000000..2c351a4 --- /dev/null +++ b/package/curlftpfs/curlftpfs-002-nocache-memleak-fix.patch @@ -0,0 +1,58 @@ +Fix a memory leak when cache is disabled. Closes: #614347. + +diff -ur curlftpfs-0.9.2/cache.c curlftpfs-0.9.2-olexat/cache.c +--- curlftpfs-0.9.2/cache.c 2008-04-30 01:03:09.000000000 +0200 ++++ curlftpfs-0.9.2-olexat/cache.c 2011-02-04 16:43:05.000000000 +0100 +@@ -25,7 +25,7 @@ + time_t last_cleaned; + }; + +-static struct cache cache; ++struct cache cache; + + struct node { + struct stat stat; +diff -ur curlftpfs-0.9.2/ftpfs-ls.c curlftpfs-0.9.2-olexat/ftpfs-ls.c +--- curlftpfs-0.9.2/ftpfs-ls.c 2008-04-23 12:55:41.000000000 +0200 ++++ curlftpfs-0.9.2-olexat/ftpfs-ls.c 2011-02-07 17:23:37.000000000 +0100 +@@ -25,6 +25,13 @@ + #include "charset_utils.h" + #include "ftpfs-ls.h" + ++struct cache { ++ int on; ++ char incomplete[]; ++}; ++ ++extern struct cache cache; ++ + static int parse_dir_unix(const char *line, + struct stat *sbuf, + char *file, +@@ -243,8 +256,10 @@ + reallink = g_strdup(link); + } + int linksize = strlen(reallink); +- cache_add_link(full_path, reallink, linksize+1); +- DEBUG(1, "cache_add_link: %s %s\n", full_path, reallink); ++ if (cache.on) { ++ cache_add_link(full_path, reallink, linksize+1); ++ DEBUG(1, "cache_add_link: %s %s\n", full_path, reallink); ++ } + if (linkbuf && linklen) { + if (linksize > linklen) linksize = linklen - 1; + strncpy(linkbuf, reallink, linksize); +@@ -257,8 +272,10 @@ + DEBUG(1, "filler: %s\n", file); + filler(h, file, &stat_buf); + } else { +- DEBUG(1, "cache_add_attr: %s\n", full_path); +- cache_add_attr(full_path, &stat_buf); ++ if (cache.on) { ++ DEBUG(1, "cache_add_attr: %s\n", full_path); ++ cache_add_attr(full_path, &stat_buf); ++ } + } + + DEBUG(2, "comparing %s %s\n", name, file); + diff --git a/package/curlftpfs/curlftpfs.mk b/package/curlftpfs/curlftpfs.mk new file mode 100644 index 0000000..9e77eb0 --- /dev/null +++ b/package/curlftpfs/curlftpfs.mk @@ -0,0 +1,14 @@ +############################################################# +# +# curlftpfs +# +############################################################# + +CURLFTPFS_VERSION = 0.9.2 +CURLFTPFS_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/curlftpfs/$(CURLFTPFS_VERSION) +CURLFTPFS_DEPENDENCIES = \ + libglib2 libfuse openssl libcurl \ + $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl) \ + $(if $(BR2_ENABLE_LOCALE),,libiconv) + +$(eval $(autotools-package))