Attachment #78101 for bug #112346

View | Details | Raw Unified | Return to bug 112346
Collapse All | Expand All

Lines 6-12 Link Here

(-)ports/sysutils/fusefs-curlftpfs/Makefile (-2 / +12 lines)
6	#	6	#
7		7
8	PORTNAME= curlftpfs	8	PORTNAME= curlftpfs
9	PORTVERSION= 0.9	9	PORTVERSION= 0.9.1
10	CATEGORIES= sysutils	10	CATEGORIES= sysutils
11	MASTER_SITES= SF	11	MASTER_SITES= SF
12	PKGNAMEPREFIX= fusefs-	12	PKGNAMEPREFIX= fusefs-
Lines 20-32 Link Here
20		20
21	GNU_CONFIGURE= yes	21	GNU_CONFIGURE= yes
22	USE_GNOME= glib20	22	USE_GNOME= glib20
23	MAN1= ${PORTNAME}.1
24	PLIST_FILES= bin/curlftpfs	23	PLIST_FILES= bin/curlftpfs
		24	INSTALL_TARGET= install-exec
		25	.if !defined(NO_INSTALL_MANPAGES)
		26	MAN1= ${PORTNAME}.1
		27	.endif
25		28
26	.include <bsd.port.pre.mk>	29	.include <bsd.port.pre.mk>
27		30
		31	CONFIGURE_ARGS+= --mandir="${MANPREFIX}/man"
		32
28	.if ${OSVERSION} < 600000	33	.if ${OSVERSION} < 600000
29	IGNORE= depends on kernel module that requires FreeBSD 6 or later	34	IGNORE= depends on kernel module that requires FreeBSD 6 or later
30	.endif	35	.endif
31		36
		37	post-install:
		38	.if !defined(NO_INSTALL_MANPAGES)
		39	@cd ${WRKSRC}/doc && ${MAKE} install-man
		40	.endif
		41
32	.include <bsd.port.post.mk>	42	.include <bsd.port.post.mk>

Lines 1-3 Link Here

(-)ports/sysutils/fusefs-curlftpfs/distinfo (-3 / +3 lines)
1	MD5 (curlftpfs-0.9.tar.gz) = 7e29eb1963d4023bb7ea530a1b4274c4	1	MD5 (curlftpfs-0.9.1.tar.gz) = 969998e9cf1663824f44739e94c703a1
2	SHA256 (curlftpfs-0.9.tar.gz) = b49e17152d9f782309bf0f42c4ef1f90911294861e4323d418cdcadfa28450cc	2	SHA256 (curlftpfs-0.9.1.tar.gz) = 9f50cdf02c0dc31ef148410345b2374d294d8853d2dae11775e36b0268ad227d
3	SIZE (curlftpfs-0.9.tar.gz) = 347657	3	SIZE (curlftpfs-0.9.1.tar.gz) = 362542




--- 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) {

Return to bug 112346

Removed Link Here

(-)ports/sysutils/fusefs-curlftpfs/files/patch-ftpfs-ls.c (-65 lines)
1	--- ftpfs-ls.c.orig Tue Dec 12 11:09:37 2006
2	+++ ftpfs-ls.c Tue Dec 12 11:09:42 2006
3	@@ -6,7 +6,12 @@
4	See the file COPYING.
5	*/
6
7	+#ifndef __FreeBSD__
8	#define _XOPEN_SOURCE 600
9	+#else
10	+#define _XOPEN_SOURCE
11	+#endif
12	+
13	#include <time.h>
14	#include <string.h>
15	#include <sys/types.h>
16	@@ -27,7 +32,7 @@
17	long nlink = 1;
18	char user[33];
19	char group[33];
20	- long size;
21	+ unsigned long long size;
22	char month[4];
23	char day[3];
24	char year[6];
25	@@ -42,25 +47,25 @@
26
27	#define SPACES "%*[ \t]"
28	res = sscanf(line,
29	- "%11s" SPACES
30	+ "%11s"
31	"%lu" SPACES
32	"%32s" SPACES
33	"%32s" SPACES
34	- "%lu" SPACES
35	+ "%llu" SPACES
36	"%3s" SPACES
37	"%2s" SPACES
38	- "%5s" SPACES
39	+ "%5s" "%*c"
40	"%1023c",
41	mode, &nlink, user, group, &size, month, day, year, file);
42	if (res < 9) {
43	res = sscanf(line,
44	- "%11s" SPACES
45	+ "%11s"
46	"%32s" SPACES
47	"%32s" SPACES
48	- "%lu" SPACES
49	+ "%llu" SPACES
50	"%3s" SPACES
51	"%2s" SPACES
52	- "%5s" SPACES
53	+ "%5s" "%*c"
54	"%1023c",
55	mode, user, group, &size, month, day, year, file);
56	if (res < 8) {
57	@@ -156,7 +161,7 @@
58	if (!strcmp(size, "<DIR>")) {
59	sbuf->st_mode \|= S_IFDIR;
60	} else {
61	- int nsize = strtol(size, NULL, 0);
62	+ unsigned long long nsize = strtoull(size, NULL, 0);
63	sbuf->st_mode \|= S_IFREG;
64	sbuf->st_size = nsize;
65	if (ftpfs.blksize) {