Added myself as a maintainer. Plugged known memory leaks fixed in debian and fedora.

Package-Manager: portage-2.2.0_alpha177_p3/cvs/Linux x86_64
Manifest-Sign-Key: 0x611FF3AA

6 files changed, 144 insertions, 6 deletions

diff --git a/net-fs/curlftpfs/ChangeLog b/net-fs/curlftpfs/ChangeLog
index 7a7f18a88b22..43da8beec56e 100644
--- a/net-fs/curlftpfs/ChangeLog
+++ b/net-fs/curlftpfs/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-fs/curlftpfs
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/curlftpfs/ChangeLog,v 1.25 2013/06/06 19:33:27 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/curlftpfs/ChangeLog,v 1.26 2013/06/06 20:37:14 slyfox Exp $
+
+*curlftpfs-0.9.2-r2 (06 Jun 2013)
+
+  06 Jun 2013; Sergei Trofimovich <slyfox@gentoo.org>
+  +curlftpfs-0.9.2-r2.ebuild, +files/curlftpfs-0.9.2-memleak-nocache.patch,
+  +files/curlftpfs-0.9.2-memleak.patch, metadata.xml:
+  Added myself as a maintainer. Plugged known memory leaks fixed in debian and
+  fedora.
 
   06 Jun 2013; Sergei Trofimovich <slyfox@gentoo.org> curlftpfs-0.9.2-r1.ebuild:
   Fixed build failure against automake-1.13.1 (obsoleted AM_CONFIG_HEADER, bug
diff --git a/net-fs/curlftpfs/Manifest b/net-fs/curlftpfs/Manifest
index 68396eaf0f7b..88340cbf6ed1 100644
--- a/net-fs/curlftpfs/Manifest
+++ b/net-fs/curlftpfs/Manifest
@@ -3,14 +3,17 @@ Hash: SHA256
 
 AUX curlftpfs-0.9.2-64bit_filesize.patch 626 SHA256 95d880b3a43387f5ae6e5b3ed9309060bbdc3757fb7631af50edf386c7a6805c SHA512 3b23ee31c5008fffec3032c9ab440a584d672a3936f8fae943af31e5936964e8b5641f5778f56b5c656e9af26156d0a1f31e49ef8c4eb526ec8a83ff7076fcb7 WHIRLPOOL 26be2399dca4464cb1e8e130bd3cc2a765d1cc9cca5901e52c5f91a7ba56950c4350cae70161c01c12c96f9eeeb4922ca2a8836f4659db93b4d3e37c76438d10
 AUX curlftpfs-0.9.2-darwin.patch 516 SHA256 46770b2274a3634e399319e1387d9fd67e56fcd3a85056d5a6d1451cea31b8a4 SHA512 1960dc4b08e8f5e3154ff4cbccf1f48f616d8ac92ed464bf5aac8054c680b2575fc3801a56f309d29e7ef3aa7d611fa8f7a67c73fd5894b8dc5a1cce36ff38f9 WHIRLPOOL 42388c8df3c71ce2fb34676c15149c8cc86dfcae524a7e4a88d6157707502b476d91911b9f273d507287bb6b3111184707813852eef81923e1d2272b7b8bafd7
+AUX curlftpfs-0.9.2-memleak-nocache.patch 1810 SHA256 d51e86585061c4dc15145d50d139331d9ae332643332467291e7e7313e3c4e48 SHA512 b53ed1acfea1aa539c0f69ab7dd961a635ded7299500337a7453fa2445e61590ec39a9010ac105d230880b09a90d388b8564295a185e5b44f3398903a6d1d5d4 WHIRLPOOL 8794b31cc4cb6bd75b2f3461d1c82127582d5fb1f78b6621739dfd11eb6e985bc7a0cc69e953a55bfa563411d3cf49305756e7bc479116ccbed3d7cdea1664f1
+AUX curlftpfs-0.9.2-memleak.patch 834 SHA256 b81de7d8eac46a390f1baf4071efde62c77148908562ea9a255acc9fd8d35f97 SHA512 dee0eac27bd09208f44d20d3c0627499da0664601abfb0cb5a3a979c988c71713ef00850f2b72e71c38a9dac09698e55cfbc6249bb1e2196a07a783b0fcd49bc WHIRLPOOL 17e3d417734ca610753c2435e736d3d833183b3346873039bc352d9cb36748f792b34e3c46f1609c1d0d94e30db7d702d17a7544a3edef4766fbfdaf918e9130
 DIST curlftpfs-0.9.2.tar.gz 365503 SHA256 4eb44739c7078ba0edde177bdd266c4cfb7c621075f47f64c85a06b12b3c6958 SHA512 df07c418d175f766c89525017fc56e79726061eee0c3a6607ded0e1bf24f64f1475ba0e546157b65892194e3c4414c120822bf8fb175437e68366f82de216067 WHIRLPOOL c14686eeadafe2f26f9c79fd44ab0d66403e79ec724d5eae28a8b3838ac676755edc1d86583c4de73486fc0dc5d49eabb2b57f7cb477edaccfab33b2aa9f0931
 EBUILD curlftpfs-0.9.2-r1.ebuild 969 SHA256 b01610eda2e8bad3db25c38059e25d432cfc4a2a841a22aa676319f92187dce2 SHA512 383f4a0644a37365560091467d4b40edd8b16552be119329ad21ad3227abb9cf58984517b5be629733e36216f9d4c35217e1c6d2eff732f0a04c5f84aa02b0e7 WHIRLPOOL 2b72ff49a4392a766c37c5828cdd8ba33e2005232c53fc2ef95b5c9488b3bdb8239fd25e95f6a1fbad3acc6f04735da2424d0d175e8769d9aaa80692203846b0
-MISC ChangeLog 3676 SHA256 0cf4bc41d829f902328b797fcf17c03b901bc057a35882a449ccbf68ab168755 SHA512 86bc2375749fd83c26ac9725d9c6963e0f85f3f159c214c3a0ea1e85eb3d764180c918fc50f6495faa17f858427c6f4278c3df2998b41612aef1fc374a3502ca WHIRLPOOL 68343eee954d4d63f2f629f5e0fca6b69663abb9d07a92abc9b58ade7239bd6ebcedfdf0d577ff78773f81c816eb1df2320ec6813d22e422619f973c13b1854c
-MISC metadata.xml 161 SHA256 d067b22721c96499a685d0b0ef3597421713a9f3befc27536b916d78f27c2951 SHA512 0ac0a2db6a1293d06fe3c9fd1810035d486ce6b625ce16129aed37f94c6ba96b0910ab6939ede587f7bf62e8a30f3f337a25c710c03f6c710c2eb6d4d03391d5 WHIRLPOOL c248cf5dac6752f10a180e0bd7e05005ae6c66240004266f15e66d19cb130fadd1fd2a7b9181b4d24f800aeb5a31cc788f2999b834e29ed3b0a4085277bcc13d
+EBUILD curlftpfs-0.9.2-r2.ebuild 1075 SHA256 43b798929a263df7993e1b8eb2c9a134aa33eb68be06633452863d3d616c4bd0 SHA512 ba15b5472c1aa4be4f29e21b1bf140b065ab0f214d75f76618e90cffd5d3d879c4962134041beb714063e03621897f842bebb27ded9d053ddd2e2d3c499a030b WHIRLPOOL 4951ed8394c168db1f8ba84f210783e103e6e0dc2022535661ee80a554ef99cf7c9f3da92e79834266b466ec4ada7943f6921b95013ea92b2b23d4273d7f17bc
+MISC ChangeLog 3985 SHA256 9bea9c12e51d186da1eadab5bfa55ac397a79cdb25b29f2e0d4aab0d5eeced32 SHA512 ca746b4e2737a27ca084f3c945402fe943d39fb06299e1f8d272ee84c525a8b49eb6177c5b0cdf8893482f8f50de8be451828dc927156399bfda677ee76a9cca WHIRLPOOL 46992c36865622582ebea6e14ba09f7752e95214c9e04b5e2bb4bea6d816ee29432c8af32d1ed6bd3776df2d2185883c10216801469af77e07ab8df0cb5e2da0
+MISC metadata.xml 265 SHA256 89560d1b083b008e6d38f31d7fa5a97da8890a72e93d0532ac0bbc8b15b2679e SHA512 0048ece4ab8d1dfdfb3be937d2c33d12428d69621bd0c02c21202ef414c4a7c73869c52e333d46b49466abe82af1ef50b0bedb79f648591d1aea82a429d10857 WHIRLPOOL 8ceef3afb2393cefdf25df36e2b42322dcf19181982c228942de02b586984949023c42e7559093211a63edad2491905f47fc47d19ddadba0a4ba669a597b714b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlGw47gACgkQcaHudmEf86oCCgCfcBHcqhpSAJ4F+2fUGUdRvHzI
-brcAni8hCuAukUjkqPiDSs5O/Vlhesdh
-=gA8h
+iEYEAREIAAYFAlGw8qwACgkQcaHudmEf86oxGACdF2FlpbaWSxCz/Cn1vqTvK8zD
+N9QAniAn5ADJTHmGr42DxgZWi/MJlvZT
+=+1Oa
 -----END PGP SIGNATURE-----
diff --git a/net-fs/curlftpfs/curlftpfs-0.9.2-r2.ebuild b/net-fs/curlftpfs/curlftpfs-0.9.2-r2.ebuild
new file mode 100644
index 000000000000..477ccf560c7a
--- /dev/null
+++ b/net-fs/curlftpfs/curlftpfs-0.9.2-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/curlftpfs/curlftpfs-0.9.2-r2.ebuild,v 1.1 2013/06/06 20:37:14 slyfox Exp $
+
+EAPI=5
+
+inherit eutils autotools
+
+DESCRIPTION="File system for accessing ftp hosts based on FUSE"
+HOMEPAGE="http://curlftpfs.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE=""
+RESTRICT="test" # bug 258460
+
+RDEPEND=">=net-misc/curl-7.17.0
+	>=sys-fs/fuse-2.2
+	>=dev-libs/glib-2.0"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-64bit_filesize.patch
+	epatch "${FILESDIR}"/${PN}-0.9.2-darwin.patch
+	epatch "${FILESDIR}"/${PN}-0.9.2-memleak.patch
+	epatch "${FILESDIR}"/${PN}-0.9.2-memleak-nocache.patch
+
+	# automake-1.13.1 obsoletes AM_* bit #469818
+	sed -i -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac || die
+	eautoreconf
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc README
+}
diff --git a/net-fs/curlftpfs/files/curlftpfs-0.9.2-memleak-nocache.patch b/net-fs/curlftpfs/files/curlftpfs-0.9.2-memleak-nocache.patch
new file mode 100644
index 000000000000..344233c2b83e
--- /dev/null
+++ b/net-fs/curlftpfs/files/curlftpfs-0.9.2-memleak-nocache.patch
@@ -0,0 +1,60 @@
+Picked-from: http://pkgs.fedoraproject.org/cgit/curlftpfs.git/tree/curlftpfs-0.9.2-memleak-cached%23591299.patch?h=f18
+
+@@ -, +, @@ 
+---
+ cache.c    |    2 	1 +	1 -	0 !
+ ftpfs-ls.c |   19 	15 +	4 -	0 !
+ 2 files changed, 16 insertions(+), 5 deletions(-)
+--- b/cache.c	
++++ b/cache.c	
+@@ -25,7 +25,7 @@ struct cache {
+     time_t last_cleaned;
+ };
+ 
+-static struct cache cache;
++struct cache cache;
+ 
+ struct node {
+     struct stat stat;
+--- b/ftpfs-ls.c	
++++ b/ftpfs-ls.c	
+@@ -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 +250,10 @@ int parse_dir(const char* list, const ch
+           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 +266,10 @@ int parse_dir(const char* list, const ch
+         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/net-fs/curlftpfs/files/curlftpfs-0.9.2-memleak.patch b/net-fs/curlftpfs/files/curlftpfs-0.9.2-memleak.patch
new file mode 100644
index 000000000000..27163ac229e0
--- /dev/null
+++ b/net-fs/curlftpfs/files/curlftpfs-0.9.2-memleak.patch
@@ -0,0 +1,24 @@
+Picked-from: https://github.com/jomat/curlftpfs/commit/b8ce5599a17a1f9e00c93cff3a81fe88f51e8bd3
+Upstream-bug: https://sourceforge.net/tracker/?func=detail&aid=2924678&group_id=160565&atid=816357
+
+commit b8ce5599a17a1f9e00c93cff3a81fe88f51e8bd3
+Author: jomat <jomat@copete.de>
+Date:   Sun Oct 16 18:41:37 2011 +0000
+
+    added patch agains memory leak
+    
+    see also https://sourceforge.net/tracker/?func=detail&aid=2924678&group_id=160565&atid=816357
+
+diff --git a/ftpfs.c b/ftpfs.c
+index 0346354..96146f7 100644
+--- a/ftpfs.c
++++ b/ftpfs.c
+@@ -615,6 +615,8 @@ static void free_ftpfs_file(struct ftpfs_file *fh) {
+   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/net-fs/curlftpfs/metadata.xml b/net-fs/curlftpfs/metadata.xml
index ae4618a83b42..7e407e4f147f 100644
--- a/net-fs/curlftpfs/metadata.xml
+++ b/net-fs/curlftpfs/metadata.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+  <maintainer>
+    <email>slyfox@gentoo.org</email>
+    <name>Sergei Trofimovich</name>
+  </maintainer>
   <herd>net-fs</herd>
 </pkgmetadata>