ports/174886: sysutils/fusefs-unionfs: Update to 0.26

[Baptiste Daroussin]

>Number:         174886
>Category:       ports
>Synopsis:       sysutils/fusefs-unionfs: Update to 0.26
>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 Jan 01 17:10:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Baptiste Daroussin
>Release:        FreeBSD 10.0-CURRENT amd64
>Organization:
>Environment:
System: FreeBSD thorgal.lan 10.0-CURRENT FreeBSD 10.0-CURRENT #5 r244484: Thu Dec 20 19:57:32 CET 2012 root at thorgal.lan:/usr/obj/usr/src/sys/THORGAL amd64


	
>Description:
	Here is a patch to update fusefs-unionfs to the latest version I will
	send the needed patches upstream.

	regards,
	Bapt

>How-To-Repeat:
	
>Fix:

	

--- fusefs-unionfs-0.26.diff begins here ---
Index: Makefile
===================================================================
--- Makefile	(revision 309592)
+++ Makefile	(working copy)
@@ -1,12 +1,8 @@
-# New ports collection makefile for:	fusefs-unionfs
-# Date created:		2006-07-16
-# Whom:			Gea-Suan Lin <gslin at gslin.org>
-#
+# Created by: Gea-Suan Lin <gslin at gslin.org>
 # $FreeBSD$
-#
 
 PORTNAME=	unionfs
-PORTVERSION=	0.24
+PORTVERSION=	0.26
 CATEGORIES=	sysutils
 MASTER_SITES=	http://podgorny.cz/unionfs-fuse/releases/
 PKGNAMEPREFIX=	fusefs-
@@ -18,15 +14,14 @@
 PLIST_FILES=	bin/unionfs
 
 USE_FUSE=	yes
-USE_BZIP2=	yes
+USE_XZ=	yes
+CFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+USE_CMAKE=	yes
 
-do-build:
-	(cd ${WRKSRC}/src && \
-	 ${CC} ${CFLAGS} -I${LOCALBASE}/include/fuse \
-	 -D_FILE_OFFSET_BITS=64 -DFUSE_USE_VERSION=26 -U_POSIX_SYNCHRONIZED_IO \
-	 -o unionfs *.c -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lfuse -lm)
+MAN8+=		unionfs-fuse.8
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/unionfs ${PREFIX}/bin
+post-patch:
+	@${REINPLACE_CMD} "s,share/man,man,g" ${WRKSRC}/man/CMakeLists.txt
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
--- distinfo	(revision 309592)
+++ distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (unionfs-fuse-0.24.tar.bz2) = d8abc855eb618ac356b1e716599c82f8f0f74dbaee36d4062edc707567121937
-SIZE (unionfs-fuse-0.24.tar.bz2) = 30381
+SHA256 (unionfs-fuse-0.26.tar.xz) = 8d5c9dcb51ecb9a9b03890e16d17e37d602b0c1f23ed6a9ddec2b0f719c9f662
+SIZE (unionfs-fuse-0.26.tar.xz) = 38600
Index: files/patch-CMakeLists.txt
===================================================================
--- files/patch-CMakeLists.txt	(revision 0)
+++ files/patch-CMakeLists.txt	(working copy)
@@ -0,0 +1,15 @@
+--- ./CMakeLists.txt.orig	2012-09-11 00:06:32.000000000 +0200
++++ ./CMakeLists.txt	2012-12-20 23:22:45.393358707 +0100
+@@ -9,12 +9,6 @@
+ 	SET(CMAKE_BUILD_TYPE RelWithDebInfo)
+ ENDIF(NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
+ 
+-# Select flags.
+-SET(CMAKE_C_FLAGS "-pipe -W -Wall -DFORTIFY_SOURCE=2")
+-SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g")
+-SET(CMAKE_C_FLAGS_RELEASE "-O2")
+-SET(CMAKE_C_FLAGS_DEBUG "-O0 -g -DDEBUG")
+-
+ add_definitions(-D_FILE_OFFSET_BITS=64 -DFUSE_USE_VERSION=26)
+ 
+ option(WITH_XATTR "Enable support for extended attributes" OFF)

Property changes on: files/patch-CMakeLists.txt
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: files/patch-src__unionfs.c
===================================================================
--- files/patch-src__unionfs.c	(revision 0)
+++ files/patch-src__unionfs.c	(working copy)
@@ -0,0 +1,19 @@
+--- ./src/unionfs.c.orig	2012-09-11 00:06:32.000000000 +0200
++++ ./src/unionfs.c	2012-12-20 23:27:25.425374588 +0100
+@@ -663,7 +663,16 @@
+ 	char p[PATHLEN_MAX];
+ 	if (BUILD_PATH(p, uopt.branches[i].path, path)) RETURN(-ENAMETOOLONG);
+ 
++#ifdef __FreeBSD__
++	struct timeval tv[2];
++	tv[0].tv_sec = ts[0].tv_sec;
++	tv[0].tv_usec = ts[0].tv_nsec / 1000;
++	tv[1].tv_sec = ts[0].tv_sec;
++	tv[1].tv_usec = ts[0].tv_nsec / 1000;
++	int res = lutimes(p, tv);
++#else
+ 	int res = utimensat(0, p, ts, AT_SYMLINK_NOFOLLOW);
++#endif
+ 
+ 	if (res == -1) RETURN(-errno);
+ 

Property changes on: files/patch-src__unionfs.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: files/patch-src__usyslog.c
===================================================================
--- files/patch-src__usyslog.c	(revision 0)
+++ files/patch-src__usyslog.c	(working copy)
@@ -0,0 +1,10 @@
+--- ./src/usyslog.c.orig	2012-09-11 00:06:32.000000000 +0200
++++ ./src/usyslog.c	2012-12-20 23:22:45.415360026 +0100
+@@ -20,7 +20,6 @@
+ #include <string.h>
+ #include <stdlib.h>
+ #include <errno.h>
+-#include <malloc.h>
+ #include <pthread.h>
+ #include <stdarg.h>
+ 

Property changes on: files/patch-src__usyslog.c
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
--- fusefs-unionfs-0.26.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: