From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Oct 31 07:30:15 2005 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 [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C414416A41F for ; Mon, 31 Oct 2005 07:30:15 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2BDED43D48 for ; Mon, 31 Oct 2005 07:30:15 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j9V7UEpe070745 for ; Mon, 31 Oct 2005 07:30:14 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j9V7UEBa070744; Mon, 31 Oct 2005 07:30:14 GMT (envelope-from gnats) Resent-Date: Mon, 31 Oct 2005 07:30:14 GMT Resent-Message-Id: <200510310730.j9V7UEBa070744@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 [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E5A7116A41F for ; Mon, 31 Oct 2005 07:24:21 +0000 (GMT) (envelope-from amistry@am-productions.biz) Received: from smtp3.fuse.net (mail-out3.fuse.net [216.68.8.176]) by mx1.FreeBSD.org (Postfix) with ESMTP id BD1DE43D6D for ; Mon, 31 Oct 2005 07:24:09 +0000 (GMT) (envelope-from amistry@am-productions.biz) Received: from gx4.fuse.net ([69.61.164.22]) by smtp3.fuse.net (InterMail vM.6.01.04.04 201-2131-118-104-20050224) with ESMTP id <20051031072408.KSTA19666.smtp3.fuse.net@gx4.fuse.net> for ; Mon, 31 Oct 2005 02:24:08 -0500 Received: from kevin.united-ware.com ([69.61.164.22]) by gx4.fuse.net (InterMail vG.1.02.00.02 201-2136-104-102-20041210) with ESMTP id <20051031072408.OLBW24825.gx4.fuse.net@kevin.united-ware.com> for ; Mon, 31 Oct 2005 02:24:08 -0500 Message-Id: <1130743536.0@kevin.united-ware.com> Date: Mon, 31 Oct 2005 02:25:36 -0500 From: "Anish Mistry" To: "FreeBSD gnats submit" X-Send-Pr-Version: gtk-send-pr 0.4.6 Cc: Subject: ports/88265: Update fusefs-sshfs to 1.3 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, 31 Oct 2005 07:30:15 -0000 >Number: 88265 >Category: ports >Synopsis: Update fusefs-sshfs to 1.3 >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 Oct 31 07:30:14 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Anish Mistry >Release: FreeBSD 6.0-BETA5 i386 >Organization: >Environment: System: FreeBSD 6.0-BETA5 #4: Thu Oct 6 14:54:43 EDT 2005 root@kevin.united-ware.com:/usr/obj/usr/src/sys/KEVIN >Description: >How-To-Repeat: >Fix: --- fusefs-sshfs-1.3.patch begins here --- diff -ruN fusefs-sshfs.orig/Makefile fusefs-sshfs/Makefile --- fusefs-sshfs.orig/Makefile Mon Oct 31 02:52:37 2005 +++ fusefs-sshfs/Makefile Mon Oct 31 02:52:54 2005 @@ -5,7 +5,7 @@ # PORTNAME= sshfs -PORTVERSION= 1.2 +PORTVERSION= 1.3 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 Oct 31 02:52:37 2005 +++ fusefs-sshfs/distinfo Mon Oct 31 02:53:02 2005 @@ -1,2 +1,2 @@ -MD5 (sshfs-fuse-1.2.tar.gz) = 685dc6611e20242602105fe4960a6ab9 -SIZE (sshfs-fuse-1.2.tar.gz) = 86239 +MD5 (sshfs-fuse-1.3.tar.gz) = 40fe4a353d03b80f8b37e4b0cc6159d3 +SIZE (sshfs-fuse-1.3.tar.gz) = 88738 diff -ruN fusefs-sshfs.orig/files/patch-sshfs.c fusefs-sshfs/files/patch-sshfs.c --- fusefs-sshfs.orig/files/patch-sshfs.c Mon Oct 31 02:52:37 2005 +++ fusefs-sshfs/files/patch-sshfs.c Mon Oct 31 03:00:22 2005 @@ -1,5 +1,5 @@ ---- sshfs.c.orig Mon Aug 15 05:07:08 2005 -+++ sshfs.c Sun Oct 9 13:12:45 2005 +--- sshfs.c.orig Fri Oct 28 08:15:35 2005 ++++ sshfs.c Mon Oct 31 02:59:33 2005 @@ -14,7 +14,11 @@ #include #include @@ -27,7 +27,7 @@ #include "cache.h" #include "opts.h" -@@ -970,7 +981,11 @@ +@@ -1070,7 +1081,11 @@ err = req->error; goto out; } @@ -39,7 +39,7 @@ if (req->reply_type != expect_type && req->reply_type != SSH_FXP_STATUS) { fprintf(stderr, "protocol error\n"); goto out; -@@ -985,21 +1000,35 @@ +@@ -1085,21 +1100,35 @@ if (expect_type == SSH_FXP_STATUS) err = 0; else @@ -76,19 +76,19 @@ } } else { buf_init(outbuf, req->reply.size - req->reply.len); -@@ -1039,7 +1068,11 @@ +@@ -1142,7 +1171,11 @@ err = sftp_request(SSH_FXP_LSTAT, &buf, SSH_FXP_ATTRS, &outbuf); if (!err) { - if (buf_get_attrs(&outbuf, stbuf) == -1) + if (buf_get_attrs(&outbuf, stbuf, NULL) == -1) +#ifdef EPROTO err = -EPROTO; +#else -+ err = -EPROTONOSUPPORT; ++ err = -EPROTONOSUPPORT; +#endif buf_free(&outbuf); } buf_free(&buf); -@@ -1061,7 +1094,11 @@ +@@ -1164,7 +1197,11 @@ if (!err) { uint32_t count; char *link; @@ -100,7 +100,7 @@ if(buf_get_uint32(&name, &count) != -1 && count == 1 && buf_get_string(&name, &link) != -1) { strncpy(linkbuf, link, size-1); -@@ -1092,7 +1129,11 @@ +@@ -1195,7 +1232,11 @@ err = sftp_request(SSH_FXP_READDIR, &handle, SSH_FXP_NAME, &name); if (!err) { if (buf_get_entries(&name, h, filler) == -1) @@ -112,7 +112,7 @@ buf_free(&name); } } while (!err); -@@ -1377,7 +1418,11 @@ +@@ -1528,7 +1569,11 @@ err = sftp_request(SSH_FXP_READ, &buf, SSH_FXP_DATA, &data); if (!err) { uint32_t retsize; @@ -124,7 +124,7 @@ if (buf_get_uint32(&data, &retsize) != -1) { if (retsize > size) fprintf(stderr, "long read\n"); -@@ -1399,7 +1444,11 @@ +@@ -1550,7 +1595,11 @@ if (req->error) chunk->res = req->error; else if (req->replied) { @@ -136,3 +136,12 @@ if (req->reply_type == SSH_FXP_STATUS) { uint32_t serr; +@@ -1771,7 +1820,7 @@ + { + (void) path; + +- buf->f_namelen = 255; ++ buf->f_namemax = 255; + buf->f_bsize = 512; + buf->f_blocks = 999999999 * 2; + buf->f_bfree = 999999999 * 2; --- fusefs-sshfs-1.3.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: