Attachment #69445 for bug #101633

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

Lines 6-12 Link Here

(-)/home/staff/gslin/work/fusefs-unionfs/Makefile (-2 / +2 lines)
6	#	6	#
7		7
8	PORTNAME= unionfs	8	PORTNAME= unionfs
9	PORTVERSION= 0.14	9	PORTVERSION= 0.15
10	CATEGORIES= sysutils	10	CATEGORIES= sysutils
11	MASTER_SITES= http://podgorny.cz/unionfs-fuse/releases/	11	MASTER_SITES= http://podgorny.cz/unionfs-fuse/releases/
12	PKGNAMEPREFIX= fusefs-	12	PKGNAMEPREFIX= fusefs-
Lines 25-31 Link Here
25	do-build:	25	do-build:
26	(cd ${WRKSRC} && \	26	(cd ${WRKSRC} && \
27	${CC} ${CFLAGS} -I${LOCALBASE}/include/fuse \	27	${CC} ${CFLAGS} -I${LOCALBASE}/include/fuse \
28	-D_FILE_OFFSET_BITS=64 -DFUSE_USE_VERSION=25 \	28	-D_FILE_OFFSET_BITS=64 -DFUSE_USE_VERSION=26 \
29	-o unionfs *.c -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lfuse)	29	-o unionfs *.c -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lfuse)
30		30
31	do-install:	31	do-install:

Lines 1-3 Link Here

(-)/home/staff/gslin/work/fusefs-unionfs/distinfo (-3 / +3 lines)
1	MD5 (unionfs-fuse-0.14.tar.bz2) = 7730e9b99830f50a2c8f884e5a8c0870	1	MD5 (unionfs-fuse-0.15.tar.bz2) = 5631e14b9c57e59ee729ba5eb774fe43
2	SHA256 (unionfs-fuse-0.14.tar.bz2) = dd32cd853e650c742f87ee5f4aa92892e74add38e72bf9b518dec6783249fe0d	2	SHA256 (unionfs-fuse-0.15.tar.bz2) = 0145679ff29c13782bed8cb8d49aa69820520b81f1ce9eccdf69c76c5ee93d71
3	SIZE (unionfs-fuse-0.14.tar.bz2) = 6025	3	SIZE (unionfs-fuse-0.15.tar.bz2) = 6112




--- unionfs.c.orig	Mon Aug  7 07:20:13 2006
+++ unionfs.c	Tue Aug  8 13:53:17 2006
@@ -188,12 +188,7 @@
 
 	if (stats_enabled && strcmp(path, STATS_FILENAME) == 0) return 0;
 
-	int res;
-	if (isdatasync) {
-		res = fdatasync(fi->fh);
-	} else {
-		res = fsync(fi->fh);
-	}
+	int res = fsync(fi->fh);
 
 	if (res == -1) return -errno;
 
@@ -928,5 +923,5 @@
 	}
 
 	umask(0);
-	return fuse_main(args.argc, args.argv, &unionfs_oper, NULL);
+	return fuse_main(args.argc, args.argv, &unionfs_oper);
 }

Return to bug 101633

Lines 1-16 Link Here

(-)/home/staff/gslin/work/fusefs-unionfs/files/patch-unionfs.c (-12 / +19 lines)
1	--- unionfs.c.orig Sun Jul 16 19:02:07 2006	1	--- unionfs.c.orig Mon Aug 7 07:20:13 2006
2	+++ unionfs.c Sun Jul 16 19:05:45 2006	2	+++ unionfs.c Tue Aug 8 13:53:17 2006
3	@@ -189,9 +189,13 @@	3	@@ -188,12 +188,7 @@
		4
4	if (stats_enabled && strcmp(path, STATS_FILENAME) == 0) return 0;	5	if (stats_enabled && strcmp(path, STATS_FILENAME) == 0) return 0;
5		6
6	int res;	7	- int res;
7	+#if FUSE_USE_VERSION >= 26	8	- if (isdatasync) {
8	if (isdatasync) {	9	- res = fdatasync(fi->fh);
9	res = fdatasync(fi->fh);	10	- } else {
10	} else {	11	- res = fsync(fi->fh);
11	+#else	12	- }
12	+ {	13	+ int res = fsync(fi->fh);
13	+#endif	14
14	res = fsync(fi->fh);	15	if (res == -1) return -errno;
		16
		17	@@ -928,5 +923,5 @@
15	}	18	}
16		19
		20	umask(0);
		21	- return fuse_main(args.argc, args.argv, &unionfs_oper, NULL);
		22	+ return fuse_main(args.argc, args.argv, &unionfs_oper);
		23	}