Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 12 Dec 2006 11:28:00 +0100 (CET)
From:      Martin Matuska <martin@matuska.org>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/106638: [UPDATE] sysutils/fusefs-curlftpfs 0.8 -> 0.9
Message-ID:  <20061212102800.E7D533F42C@mail.vx.sk>
Resent-Message-ID: <200612121030.kBCAUBXB043377@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         106638
>Category:       ports
>Synopsis:       [UPDATE] sysutils/fusefs-curlftpfs 0.8 -> 0.9
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Dec 12 10:30:05 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Martin Matuska
>Release:        FreeBSD 6.1-RELEASE-p10 i386 amd64
>Organization:
>Environment:
System: FreeBSD 6.1-RELEASE-p10 i386 amd64
>Description:
		Update of curlftpfs from 0.8 to 0.9
		Included patch consists of two parts. More information:
		http://sourceforge.net/tracker/index.php?func=detail&aid=1613815&group_id=160565&atid=816359
		http://curlftpfs.cvs.sourceforge.net/curlftpfs/curlftpfs/ftpfs-ls.c?r1=1.8&r2=1.10
>How-To-Repeat:
>Fix:
--- sysutils/fusefs-curlftpfs/Makefile.orig	Tue Dec 12 10:31:40 2006
+++ sysutils/fusefs-curlftpfs/Makefile	Tue Dec 12 11:12:31 2006
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	curlftpfs
-PORTVERSION=	0.8
+PORTVERSION=	0.9
 CATEGORIES=	sysutils
 MASTER_SITES=	SF
 PKGNAMEPREFIX=	fusefs-
--- sysutils/fusefs-curlftpfs/distinfo.orig	Tue Dec 12 10:31:47 2006
+++ sysutils/fusefs-curlftpfs/distinfo	Tue Dec 12 10:35:55 2006
@@ -1,3 +1,3 @@
-MD5 (curlftpfs-0.8.tar.gz) = 5322877611319397319ca0012ccc61c9
-SHA256 (curlftpfs-0.8.tar.gz) = 610c5e769f23632ff2d14067880b377797228151b661b1da78fea50651ec12d1
-SIZE (curlftpfs-0.8.tar.gz) = 345187
+MD5 (curlftpfs-0.9.tar.gz) = 7e29eb1963d4023bb7ea530a1b4274c4
+SHA256 (curlftpfs-0.9.tar.gz) = b49e17152d9f782309bf0f42c4ef1f90911294861e4323d418cdcadfa28450cc
+SIZE (curlftpfs-0.9.tar.gz) = 347657
--- sysutils/fusefs-curlftpfs/files/patch-ftpfs-ls.c.orig	Tue Dec 12 11:13:43 2006
+++ sysutils/fusefs-curlftpfs/files/patch-ftpfs-ls.c	Tue Dec 12 11:10:08 2006
@@ -0,0 +1,65 @@
+--- ftpfs-ls.c.orig	Tue Dec 12 11:09:37 2006
++++ ftpfs-ls.c	Tue Dec 12 11:09:42 2006
+@@ -6,7 +6,12 @@
+     See the file COPYING.
+ */
+ 
++#ifndef __FreeBSD__
+ #define _XOPEN_SOURCE 600
++#else
++#define _XOPEN_SOURCE
++#endif
++
+ #include <time.h>
+ #include <string.h>
+ #include <sys/types.h>
+@@ -27,7 +32,7 @@
+   long nlink = 1;
+   char user[33];
+   char group[33];
+-  long size;
++  unsigned long long size;
+   char month[4];
+   char day[3];
+   char year[6];
+@@ -42,25 +47,25 @@
+ 
+ #define SPACES "%*[ \t]"
+   res = sscanf(line,
+-               "%11s" SPACES
++               "%11s"
+                "%lu"  SPACES
+                "%32s" SPACES
+                "%32s" SPACES
+-               "%lu"  SPACES
++               "%llu" SPACES
+                "%3s"  SPACES
+                "%2s"  SPACES
+-               "%5s"  SPACES
++               "%5s"  "%*c"
+                "%1023c",
+                mode, &nlink, user, group, &size, month, day, year, file);
+   if (res < 9) {
+     res = sscanf(line,
+-                 "%11s" SPACES
++                 "%11s"
+                  "%32s" SPACES
+                  "%32s" SPACES
+-                 "%lu"  SPACES
++                 "%llu" SPACES
+                  "%3s"  SPACES
+                  "%2s"  SPACES
+-                 "%5s"  SPACES
++                 "%5s"  "%*c"
+                  "%1023c",
+                  mode, user, group, &size, month, day, year, file);
+     if (res < 8) {
+@@ -156,7 +161,7 @@
+   if (!strcmp(size, "<DIR>")) {
+     sbuf->st_mode |= S_IFDIR;
+   } else {
+-    int nsize = strtol(size, NULL, 0);
++    unsigned long long nsize = strtoull(size, NULL, 0);
+     sbuf->st_mode |= S_IFREG;
+     sbuf->st_size = nsize;
+     if (ftpfs.blksize) {
>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20061212102800.E7D533F42C>