From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Dec 4 20:08:53 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D5E3116A416 for ; Mon, 4 Dec 2006 20:08:52 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40]) by mx1.FreeBSD.org (Postfix) with ESMTP id D18474408C for ; Mon, 4 Dec 2006 20:00:09 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id kB4K0RhS002847 for ; Mon, 4 Dec 2006 20:00:27 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id kB4K0Rtq002846; Mon, 4 Dec 2006 20:00:27 GMT (envelope-from gnats) Resent-Date: Mon, 4 Dec 2006 20:00:27 GMT Resent-Message-Id: <200612042000.kB4K0Rtq002846@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Anish Mistry" Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 123F516A501 for ; Mon, 4 Dec 2006 19:53:06 +0000 (UTC) (envelope-from amistry@am-productions.biz) Received: from ms-smtp-03.ohiordc.rr.com (ms-smtp-03.ohiordc.rr.com [65.24.5.137]) by mx1.FreeBSD.org (Postfix) with ESMTP id 59EEE43CB0 for ; Mon, 4 Dec 2006 19:52:29 +0000 (GMT) (envelope-from amistry@am-productions.biz) Received: from bigguy.am-productions.biz (cpe-24-210-75-119.columbus.res.rr.com [24.210.75.119]) by ms-smtp-03.ohiordc.rr.com (8.13.6/8.13.6) with ESMTP id kB4JqwRF008325 for ; Mon, 4 Dec 2006 14:52:59 -0500 (EST) Message-Id: <1165262076.97799@bigguy.am-productions.biz> Date: Mon, 4 Dec 2006 14:54:36 -0500 From: "Anish Mistry" To: "FreeBSD gnats submit" X-Send-Pr-Version: gtk-send-pr 0.4.7 Cc: Subject: ports/106344: Update sysutils/fusefs-sshfs to 1.7 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Dec 2006 20:08:53 -0000 >Number: 106344 >Category: ports >Synopsis: Update sysutils/fusefs-sshfs to 1.7 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Mon Dec 04 20:00:22 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Anish Mistry >Release: FreeBSD 6.2-RC1 i386 >Organization: AM Productions >Environment: System: FreeBSD 6.2-RC1 #3: Sat Dec 2 20:20:28 EST 2006 amistry@bigguy.am-productions.biz:/usr/home/amistry/storage/temp/usr/home/amistry/windows-share/build/src/sys/BIGGUY >Description: Update to 1.7 >How-To-Repeat: >Fix: --- fusefs-sshfs-1.7.patch begins here --- diff -ruN fusefs-sshfs.orig/Makefile fusefs-sshfs/Makefile --- fusefs-sshfs.orig/Makefile Mon Dec 4 14:23:28 2006 +++ fusefs-sshfs/Makefile Mon Dec 4 14:23:46 2006 @@ -5,7 +5,7 @@ # PORTNAME= sshfs -PORTVERSION= 1.6 +PORTVERSION= 1.7 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= fuse diff -ruN fusefs-sshfs.orig/distinfo fusefs-sshfs/distinfo --- fusefs-sshfs.orig/distinfo Mon Dec 4 14:23:28 2006 +++ fusefs-sshfs/distinfo Mon Dec 4 14:24:19 2006 @@ -1,3 +1,3 @@ -MD5 (sshfs-fuse-1.6.tar.gz) = 04fa75c1357bea362537efe15805e7da -SHA256 (sshfs-fuse-1.6.tar.gz) = 2d8a983c37a1e443bd1ba46a0d68ea3f0b5360471b7d65a0a1a30b745d9e363a -SIZE (sshfs-fuse-1.6.tar.gz) = 98049 +MD5 (sshfs-fuse-1.7.tar.gz) = e91a2fed1da952a375798408dc6e41a0 +SHA256 (sshfs-fuse-1.7.tar.gz) = 9f39b71d5b247535ac0d44f559125c4e904b0a0303ad5a976161fb3d91807fe1 +SIZE (sshfs-fuse-1.7.tar.gz) = 101424 diff -ruN fusefs-sshfs.orig/files/patch-sshfs.c fusefs-sshfs/files/patch-sshfs.c --- fusefs-sshfs.orig/files/patch-sshfs.c Wed Dec 31 19:00:00 1969 +++ fusefs-sshfs/files/patch-sshfs.c Mon Dec 4 14:43:26 2006 @@ -0,0 +1,64 @@ +--- sshfs.c.orig Fri Aug 18 10:38:37 2006 +0000 ++++ sshfs.c Fri Sep 29 14:22:54 2006 +0000 +@@ -147,6 +147,7 @@ struct sshfs_file { + int is_seq; + int connver; + int modifver; ++ int refs; + }; + + struct sshfs { +@@ -1768,6 +1769,7 @@ static int sshfs_open_common(const char + pthread_cond_init(&sf->write_finished, NULL); + /* Assume random read after open */ + sf->is_seq = 0; ++ sf->refs = 1; + sf->next_pos = 0; + sf->modifver= sshfs.modifver; + sf->connver = sshfs.connver; +@@ -1851,6 +1853,19 @@ static int sshfs_fsync(const char *path, + return sshfs_flush(path, fi); + } + ++static void sshfs_file_put(struct sshfs_file *sf) ++{ ++ sf->refs--; ++ if (!sf->refs) ++ g_free(sf); ++} ++ ++static struct sshfs_file *sshfs_file_get(struct sshfs_file *sf) ++{ ++ sf->refs++; ++ return sf; ++} ++ + static int sshfs_release(const char *path, struct fuse_file_info *fi) + { + struct sshfs_file *sf = get_sshfs_file(fi); +@@ -1861,7 +1876,7 @@ static int sshfs_release(const char *pat + } + buf_free(handle); + chunk_put_locked(sf->readahead); +- g_free(sf); ++ sshfs_file_put(sf); + return 0; + } + +@@ -2084,6 +2099,7 @@ static void sshfs_write_end(struct reque + } + list_del(&req->list); + pthread_cond_broadcast(&sf->write_finished); ++ sshfs_file_put(sf); + } + + static int sshfs_write(const char *path, const char *wbuf, size_t size, +@@ -2110,7 +2126,7 @@ static int sshfs_write(const char *path, + iov[1].iov_len = size; + if (!sshfs.sync_write && !sf->write_error) + err = sftp_request_send(SSH_FXP_WRITE, iov, 2, sshfs_write_begin, +- sshfs_write_end, 0, sf, NULL); ++ sshfs_write_end, 0, sshfs_file_get(sf), NULL); + else + err = sftp_request_iov(SSH_FXP_WRITE, iov, 2, SSH_FXP_STATUS, NULL); + buf_free(&buf); \ No newline at end of file --- fusefs-sshfs-1.7.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: