Date: Mon, 15 Jun 2009 09:21:15 GMT From: Evgeny Zhirnov <jirnov@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/135591: Update archivemount port from 0.5.3 to 0.6.0 Message-ID: <200906150921.n5F9LFN4066505@www.freebsd.org> Resent-Message-ID: <200906150930.n5F9U3Ij097556@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 135591 >Category: ports >Synopsis: Update archivemount port from 0.5.3 to 0.6.0 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Mon Jun 15 09:30:02 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Evgeny Zhirnov >Release: RELENG_7_2 >Organization: Home >Environment: >Description: Update port archivemount from 0.5.3 to 0.6.0 >How-To-Repeat: >Fix: Patch attached with submission follows: diff -ruN archivemount/Makefile archivemount.0.6.0/Makefile --- archivemount/Makefile 2009-01-06 20:59:22.000000000 +0300 +++ archivemount.0.6.0/Makefile 2009-06-11 11:02:55.000000000 +0400 @@ -6,7 +6,7 @@ # PORTNAME= archivemount -PORTVERSION= 0.5.3 +PORTVERSION= 0.6.0 CATEGORIES= sysutils MASTER_SITES= http://www.cybernoia.de/software/archivemount/ @@ -18,12 +18,11 @@ PLIST_FILES= bin/archivemount +GNU_CONFIGURE= yes + NO_INSTALL_MANPAGES= yes USE_GMAKE= yes USE_ICONV= yes USE_GCC= 4.2+ -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/archivemount ${PREFIX}/bin - .include <bsd.port.mk> diff -ruN archivemount/distinfo archivemount.0.6.0/distinfo --- archivemount/distinfo 2008-06-21 16:46:43.000000000 +0400 +++ archivemount.0.6.0/distinfo 2009-06-11 11:01:09.000000000 +0400 @@ -1,3 +1,3 @@ -MD5 (archivemount-0.5.3.tar.gz) = 1a3b2901388c4854199471e67c303797 -SHA256 (archivemount-0.5.3.tar.gz) = 5bcb193a753395f912bdccff6fd08018ae0fba253a97087bc717ccf87682815a -SIZE (archivemount-0.5.3.tar.gz) = 20267 +MD5 (archivemount-0.6.0.tar.gz) = fb3ee53b1234b4cc25b5f9ad7e4e3d6d +SHA256 (archivemount-0.6.0.tar.gz) = 3e491dee36485c7e9be1cd561ccf27c84492b8770ddafa57f18966312cb8caea +SIZE (archivemount-0.6.0.tar.gz) = 187117 diff -ruN archivemount/files/patch-Makefile archivemount.0.6.0/files/patch-Makefile --- archivemount/files/patch-Makefile 2008-06-21 16:46:43.000000000 +0400 +++ archivemount.0.6.0/files/patch-Makefile 1970-01-01 03:00:00.000000000 +0300 @@ -1,13 +0,0 @@ ---- Makefile.orig 2006-12-28 18:32:47.000000000 +0300 -+++ Makefile 2008-06-20 20:04:50.000000000 +0400 -@@ -12,8 +12,8 @@ - CC = gcc - all: $(EXE) - --CFLAGS += -D_FILE_OFFSET_BITS=64 --LDFLAGS = -larchive -lfuse -+CFLAGS += -D_FILE_OFFSET_BITS=64 -I/usr/local/include/fuse -+LDFLAGS = -larchive -liconv -lfuse -pthread -L/usr/local/lib - - ifeq ($(DEBUG),1) - CFLAGS += -ggdb -O0 diff -ruN archivemount/files/patch-archivemount.c archivemount.0.6.0/files/patch-archivemount.c --- archivemount/files/patch-archivemount.c 2008-06-21 16:46:43.000000000 +0400 +++ archivemount.0.6.0/files/patch-archivemount.c 1970-01-01 03:00:00.000000000 +0300 @@ -1,87 +0,0 @@ ---- archivemount.c.orig 2006-12-28 18:32:47.000000000 +0300 -+++ archivemount.c 2008-06-20 20:31:46.000000000 +0400 -@@ -19,7 +19,7 @@ - #define _GNU_SOURCE 1 - #endif - --#define FUSE_USE_VERSION 22 -+#define FUSE_USE_VERSION 25 - #define MAXBUF 4096 - - #include <fuse.h> -@@ -31,7 +31,9 @@ - #include <fcntl.h> - #include <dirent.h> - #include <errno.h> -+#ifdef HAVE_STATFS - #include <sys/statfs.h> -+#endif - #include <sys/types.h> - #include <sys/stat.h> - #include <time.h> -@@ -42,6 +44,7 @@ - #include <wchar.h> - #include <archive.h> - #include <archive_entry.h> -+#include <limits.h> - - /**********/ - /* macros */ -@@ -433,9 +436,14 @@ - strlen( P_tmpdir ) + - strlen( "_archivemount" ) + - strlen( tmppath ) + 8 ); -- sprintf( *location, "%s/archivemount%s_XXXXXX", P_tmpdir, tmppath ); -+ sprintf( *location, "/tmp/archivemount%s_XXXXXX", tmppath ); - free( tmppath ); -- if( ( fh = mkstemp( *location ) == -1 ) ) { -+ -+ char bsdLocation[PATH_MAX]; -+ -+ strcpy(bsdLocation, *location); -+ -+ if( ( fh = mkstemp(bsdLocation ) == -1 ) ) { - log( "Could not create temp file name %s: %s", - *location, strerror( errno ) ); - free( *location ); -@@ -1449,7 +1457,13 @@ - return tmp; - } - /* create temp file */ -- if( mknod( location, mode, rdev ) == -1 ) { -+ if (S_ISREG( mode )) { -+ tmp = open( location, O_CREAT | O_EXCL | O_WRONLY, mode ); -+ } else if (S_ISFIFO( mode )) -+ tmp = mkfifo( location, mode ); -+ else -+ tmp = mknod( location, mode, rdev ); -+ if( tmp == -1 ) { - log( "Could not create temporary file %s: %s", - location, strerror( errno ) ); - free( location ); -@@ -1604,6 +1618,7 @@ - return 0; - } - -+#ifdef HAVE_STATFS - static int - ar_statfs( const char *path, struct statfs *stbuf ) - { -@@ -1613,6 +1628,7 @@ - - return -ENOSYS; - } -+#endif - - static int - ar_rename( const char *from, const char *to ) -@@ -1753,7 +1769,9 @@ - .open = ar_open, - .read = ar_read, - .write = ar_write, -+#ifdef HAVE_STATFS - .statfs = ar_statfs, -+#endif - .release = ar_release, - .fsync = ar_fsync, - /* >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200906150921.n5F9LFN4066505>