From nobody@FreeBSD.org  Thu Sep 19 19:51:34 2013
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTP id B414156A
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 19 Sep 2013 19:51:34 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from oldred.freebsd.org (oldred.freebsd.org [8.8.178.121])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.freebsd.org (Postfix) with ESMTPS id 91D7325A1
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 19 Sep 2013 19:51:34 +0000 (UTC)
Received: from oldred.freebsd.org ([127.0.1.6])
	by oldred.freebsd.org (8.14.5/8.14.7) with ESMTP id r8JJpYOb090681
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 19 Sep 2013 19:51:34 GMT
	(envelope-from nobody@oldred.freebsd.org)
Received: (from nobody@localhost)
	by oldred.freebsd.org (8.14.5/8.14.5/Submit) id r8JJpYW9090678;
	Thu, 19 Sep 2013 19:51:34 GMT
	(envelope-from nobody)
Message-Id: <201309191951.r8JJpYW9090678@oldred.freebsd.org>
Date: Thu, 19 Sep 2013 19:51:34 GMT
From: Kuan-Chung Chiu <buganini@gmail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [MAINTAINER] update sysutils/fusefs-fusexmp_fh to 2.9.3
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         182238
>Category:       ports
>Synopsis:       [MAINTAINER] update sysutils/fusefs-fusexmp_fh to 2.9.3
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    sunpoet
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Sep 19 20:00:00 UTC 2013
>Closed-Date:    Fri Sep 20 07:26:44 UTC 2013
>Last-Modified:  Fri Sep 20 07:26:44 UTC 2013
>Originator:     Kuan-Chung Chiu
>Release:        
>Organization:
Sixnology Inc.
>Environment:
>Description:
Update sysutils/fusefs-fusexmp_fh to 2.9.3 (current sysutils/fusefs-libs)
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN /usr/ports/sysutils/fusefs-fusexmp_fh/Makefile sysutils/fusefs-fusexmp_fh/Makefile
--- /usr/ports/sysutils/fusefs-fusexmp_fh/Makefile	2013-04-28 02:25:24.000000000 +0800
+++ sysutils/fusefs-fusexmp_fh/Makefile	2013-09-20 02:59:31.479694794 +0800
@@ -2,8 +2,7 @@
 # $FreeBSD: sysutils/fusefs-fusexmp_fh/Makefile 316683 2013-04-27 18:25:24Z mva $
 
 PORTNAME=	fusexmp_fh
-PORTVERSION=	2.7.4
-PORTREVISION=	1
+PORTVERSION=	2.9.3
 CATEGORIES=	sysutils
 MASTER_SITES=	SF/fuse/fuse-2.X/${PORTVERSION}
 PKGNAMEPREFIX=	fusefs-
diff -ruN /usr/ports/sysutils/fusefs-fusexmp_fh/distinfo sysutils/fusefs-fusexmp_fh/distinfo
--- /usr/ports/sysutils/fusefs-fusexmp_fh/distinfo	2012-07-14 22:29:18.000000000 +0800
+++ sysutils/fusefs-fusexmp_fh/distinfo	2013-09-20 02:59:39.391625416 +0800
@@ -1,2 +1,2 @@
-SHA256 (fuse-2.7.4.tar.gz) = c8b070ece5d4e09bd06eea6c28818c718f803d93a4b85bacb9982deb8ded49e6
-SIZE (fuse-2.7.4.tar.gz) = 506658
+SHA256 (fuse-2.9.3.tar.gz) = 0beb83eaf2c5e50730fc553406ef124d77bc02c64854631bdfc86bfd6437391c
+SIZE (fuse-2.9.3.tar.gz) = 572044
diff -ruN /usr/ports/sysutils/fusefs-fusexmp_fh/files/patch-configure sysutils/fusefs-fusexmp_fh/files/patch-configure
--- /usr/ports/sysutils/fusefs-fusexmp_fh/files/patch-configure	2012-07-14 22:29:18.000000000 +0800
+++ sysutils/fusefs-fusexmp_fh/files/patch-configure	1970-01-01 08:00:00.000000000 +0800
@@ -1,10 +0,0 @@
---- configure.orig	2008-06-05 13:58:44.000000000 -0700
-+++ configure	2008-06-05 14:00:32.000000000 -0700
-@@ -12201,6 +12201,7 @@
- _ACEOF
- 
-   fi
-+  LIBICONV=$LTLIBICONV
-   if test "$am_cv_lib_iconv" = yes; then
-     { echo "$as_me:$LINENO: checking how to link with libiconv" >&5
- echo $ECHO_N "checking how to link with libiconv... $ECHO_C" >&6; }
diff -ruN /usr/ports/sysutils/fusefs-fusexmp_fh/files/patch-lib_helper.c sysutils/fusefs-fusexmp_fh/files/patch-lib_helper.c
--- /usr/ports/sysutils/fusefs-fusexmp_fh/files/patch-lib_helper.c	2012-07-14 22:29:18.000000000 +0800
+++ sysutils/fusefs-fusexmp_fh/files/patch-lib_helper.c	2013-09-20 03:02:02.175426789 +0800
@@ -1,6 +1,6 @@
---- lib/helper.c.orig	2007-12-12 09:33:35.000000000 -0500
-+++ lib/helper.c	2008-02-04 00:22:51.000000000 -0500
-@@ -30,7 +30,7 @@
+--- lib/helper.c.orig	2012-04-10 15:28:55.000000000 +0200
++++ lib/helper.c	2012-07-31 00:06:11.384938678 +0200
+@@ -31,7 +31,7 @@
  struct helper_opts {
  	int singlethread;
  	int foreground;
@@ -9,25 +9,25 @@
  	char *mountpoint;
  };
  
-@@ -41,8 +41,7 @@
- 	FUSE_HELPER_OPT("debug",       foreground),
- 	FUSE_HELPER_OPT("-f",	       foreground),
- 	FUSE_HELPER_OPT("-s",	       singlethread),
--	FUSE_HELPER_OPT("fsname=",     nodefault_subtype),
--	FUSE_HELPER_OPT("subtype=",    nodefault_subtype),
-+	FUSE_HELPER_OPT("fsname=",     fsname),
- 
- 	FUSE_OPT_KEY("-h",	    KEY_HELP),
- 	FUSE_OPT_KEY("--help",	    KEY_HELP),
-@@ -52,7 +51,6 @@
- 	FUSE_OPT_KEY("-d",	    FUSE_OPT_KEY_KEEP),
- 	FUSE_OPT_KEY("debug",	    FUSE_OPT_KEY_KEEP),
- 	FUSE_OPT_KEY("fsname=",	    FUSE_OPT_KEY_KEEP),
--	FUSE_OPT_KEY("subtype=",    FUSE_OPT_KEY_KEEP),
+@@ -42,8 +42,7 @@
+ 	FUSE_HELPER_OPT("debug",	foreground),
+ 	FUSE_HELPER_OPT("-f",		foreground),
+ 	FUSE_HELPER_OPT("-s",		singlethread),
+-	FUSE_HELPER_OPT("fsname=",	nodefault_subtype),
+-	FUSE_HELPER_OPT("subtype=",	nodefault_subtype),
++	FUSE_HELPER_OPT("fsname=",	fsname),
+ 
+ 	FUSE_OPT_KEY("-h",		KEY_HELP),
+ 	FUSE_OPT_KEY("--help",		KEY_HELP),
+@@ -53,7 +52,6 @@
+ 	FUSE_OPT_KEY("-d",		FUSE_OPT_KEY_KEEP),
+ 	FUSE_OPT_KEY("debug",		FUSE_OPT_KEY_KEEP),
+ 	FUSE_OPT_KEY("fsname=",		FUSE_OPT_KEY_KEEP),
+-	FUSE_OPT_KEY("subtype=",	FUSE_OPT_KEY_KEEP),
  	FUSE_OPT_END
  };
  
-@@ -122,24 +120,24 @@
+@@ -123,24 +121,24 @@
  	}
  }
  
@@ -59,7 +59,7 @@
  	return res;
  }
  
-@@ -155,8 +153,8 @@
+@@ -156,8 +154,8 @@
  	if (res == -1)
  		return -1;
  
diff -ruN /usr/ports/sysutils/fusefs-fusexmp_fh/files/patch-lib_mount_bsd.c sysutils/fusefs-fusexmp_fh/files/patch-lib_mount_bsd.c
--- /usr/ports/sysutils/fusefs-fusexmp_fh/files/patch-lib_mount_bsd.c	2012-07-14 22:29:18.000000000 +0800
+++ sysutils/fusefs-fusexmp_fh/files/patch-lib_mount_bsd.c	2013-09-20 03:02:02.169625014 +0800
@@ -1,10 +1,69 @@
---- lib/mount_bsd.c.orig	2008-07-07 08:01:09.000000000 +0200
-+++ lib/mount_bsd.c	2008-07-07 08:01:59.000000000 +0200
-@@ -10,6 +10,7 @@
+--- lib/mount_bsd.c.orig	2013-07-01 09:40:53.000000000 +0200
++++ lib/mount_bsd.c	2013-07-24 16:20:34.533073286 +0200
+@@ -10,6 +10,8 @@
  #include "fuse_misc.h"
  #include "fuse_opt.h"
  
 +#include <sys/param.h>
++#include <sys/mount.h>
  #include <sys/stat.h>
  #include <sys/wait.h>
  #include <sys/sysctl.h>
+@@ -192,56 +194,12 @@
+ 	free(umount_cmd);
+ }
+ 
+-static void do_unmount(char *dev, int fd)
+-{
+-	char device_path[SPECNAMELEN + 12];
+-	const char *argv[4];
+-	const char umount_cmd[] = "/sbin/umount";
+-	pid_t pid;
+-
+-	snprintf(device_path, SPECNAMELEN + 12, _PATH_DEV "%s", dev);
+-
+-	argv[0] = umount_cmd;
+-	argv[1] = "-f";
+-	argv[2] = device_path;
+-	argv[3] = NULL;
+-
+-	pid = fork();
+-
+-	if (pid == -1)
+-		return;
+-
+-	if (pid == 0) {
+-		close(fd);
+-		execvp(umount_cmd, (char **)argv);
+-		exit(1);
+-	}
+-
+-	waitpid(pid, NULL, 0);
+-}
+-
+ void fuse_kern_unmount(const char *mountpoint, int fd)
+ {
+ 	char *ep, dev[128];
+ 	struct stat sbuf;
+ 
+-	(void)mountpoint;
+-
+-	if (fstat(fd, &sbuf) == -1)
+-		goto out;
+-
+-	devname_r(sbuf.st_rdev, S_IFCHR, dev, 128);
+-
+-	if (strncmp(dev, "fuse", 4))
+-		goto out;
+-
+-	strtol(dev + 4, &ep, 10);
+-	if (*ep != '\0')
+-		goto out;
+-
+-	do_unmount(dev, fd);
+-
+-out:
++	unmount(mountpoint, MNT_FORCE);
+ 	close(fd);
+ }
+ 


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-bugs->freebsd-ports-bugs 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Thu Sep 19 20:26:39 UTC 2013 
Responsible-Changed-Why:  
ports PR. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=182238 
Class-Changed-From-To: sw-bug->maintainer-update 
Class-Changed-By: edwin 
Class-Changed-When: Thu Sep 19 20:26:57 UTC 2013 
Class-Changed-Why:  
Fix category (submitter is maintainer) (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=182238 
Responsible-Changed-From-To: freebsd-ports-bugs->sunpoet 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Thu Sep 19 20:26:59 UTC 2013 
Responsible-Changed-Why:  
sunpoet@ wants this submitter's PRs (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=182238 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/182238: commit references a PR
Date: Fri, 20 Sep 2013 06:34:44 +0000 (UTC)

 Author: sunpoet
 Date: Fri Sep 20 06:34:35 2013
 New Revision: 327659
 URL: http://svnweb.freebsd.org/changeset/ports/327659
 
 Log:
   - Update to 2.9.3
   - While I'm here:
     - Add LICENSE
     - Remove contiguous blank lines
   
   Changes:	http://sourceforge.net/p/fuse/fuse/ci/master/tree/ChangeLog
   		http://sourceforge.net/p/fuse/fuse/ci/master/tree/NEWS
   PR:		ports/182238
   Submitted by:	Kuan-Chung Chiu <buganini@gmail.com> (maintainer)
 
 Deleted:
   head/sysutils/fusefs-fusexmp_fh/files/patch-configure
 Modified:
   head/sysutils/fusefs-fusexmp_fh/Makefile
   head/sysutils/fusefs-fusexmp_fh/distinfo   (contents, props changed)
   head/sysutils/fusefs-fusexmp_fh/files/patch-lib_helper.c   (contents, props changed)
   head/sysutils/fusefs-fusexmp_fh/files/patch-lib_mount_bsd.c   (contents, props changed)
 
 Modified: head/sysutils/fusefs-fusexmp_fh/Makefile
 ==============================================================================
 --- head/sysutils/fusefs-fusexmp_fh/Makefile	Fri Sep 20 06:34:19 2013	(r327658)
 +++ head/sysutils/fusefs-fusexmp_fh/Makefile	Fri Sep 20 06:34:35 2013	(r327659)
 @@ -2,8 +2,7 @@
  # $FreeBSD$
  
  PORTNAME=	fusexmp_fh
 -PORTVERSION=	2.7.4
 -PORTREVISION=	1
 +PORTVERSION=	2.9.3
  CATEGORIES=	sysutils
  MASTER_SITES=	SF/fuse/fuse-2.X/${PORTVERSION}
  PKGNAMEPREFIX=	fusefs-
 @@ -12,7 +11,6 @@ DISTNAME=	fuse-${PORTVERSION}
  MAINTAINER=	buganini@gmail.com
  COMMENT=	Dummy driver from fusefs-libs example
  
 -
  USE_AUTOTOOLS=	libtool
  USES=		fuse pathfix iconv
  USE_LDCONFIG=	yes
 
 Modified: head/sysutils/fusefs-fusexmp_fh/distinfo
 ==============================================================================
 --- head/sysutils/fusefs-fusexmp_fh/distinfo	Fri Sep 20 06:34:19 2013	(r327658)
 +++ head/sysutils/fusefs-fusexmp_fh/distinfo	Fri Sep 20 06:34:35 2013	(r327659)
 @@ -1,2 +1,2 @@
 -SHA256 (fuse-2.7.4.tar.gz) = c8b070ece5d4e09bd06eea6c28818c718f803d93a4b85bacb9982deb8ded49e6
 -SIZE (fuse-2.7.4.tar.gz) = 506658
 +SHA256 (fuse-2.9.3.tar.gz) = 0beb83eaf2c5e50730fc553406ef124d77bc02c64854631bdfc86bfd6437391c
 +SIZE (fuse-2.9.3.tar.gz) = 572044
 
 Modified: head/sysutils/fusefs-fusexmp_fh/files/patch-lib_helper.c
 ==============================================================================
 --- head/sysutils/fusefs-fusexmp_fh/files/patch-lib_helper.c	Fri Sep 20 06:34:19 2013	(r327658)
 +++ head/sysutils/fusefs-fusexmp_fh/files/patch-lib_helper.c	Fri Sep 20 06:34:35 2013	(r327659)
 @@ -1,6 +1,6 @@
 ---- lib/helper.c.orig	2007-12-12 09:33:35.000000000 -0500
 -+++ lib/helper.c	2008-02-04 00:22:51.000000000 -0500
 -@@ -30,7 +30,7 @@
 +--- lib/helper.c.orig	2012-04-10 15:28:55.000000000 +0200
 ++++ lib/helper.c	2012-07-31 00:06:11.384938678 +0200
 +@@ -31,7 +31,7 @@
   struct helper_opts {
   	int singlethread;
   	int foreground;
 @@ -9,25 +9,25 @@
   	char *mountpoint;
   };
   
 -@@ -41,8 +41,7 @@
 - 	FUSE_HELPER_OPT("debug",       foreground),
 - 	FUSE_HELPER_OPT("-f",	       foreground),
 - 	FUSE_HELPER_OPT("-s",	       singlethread),
 --	FUSE_HELPER_OPT("fsname=",     nodefault_subtype),
 --	FUSE_HELPER_OPT("subtype=",    nodefault_subtype),
 -+	FUSE_HELPER_OPT("fsname=",     fsname),
 - 
 - 	FUSE_OPT_KEY("-h",	    KEY_HELP),
 - 	FUSE_OPT_KEY("--help",	    KEY_HELP),
 -@@ -52,7 +51,6 @@
 - 	FUSE_OPT_KEY("-d",	    FUSE_OPT_KEY_KEEP),
 - 	FUSE_OPT_KEY("debug",	    FUSE_OPT_KEY_KEEP),
 - 	FUSE_OPT_KEY("fsname=",	    FUSE_OPT_KEY_KEEP),
 --	FUSE_OPT_KEY("subtype=",    FUSE_OPT_KEY_KEEP),
 +@@ -42,8 +42,7 @@
 + 	FUSE_HELPER_OPT("debug",	foreground),
 + 	FUSE_HELPER_OPT("-f",		foreground),
 + 	FUSE_HELPER_OPT("-s",		singlethread),
 +-	FUSE_HELPER_OPT("fsname=",	nodefault_subtype),
 +-	FUSE_HELPER_OPT("subtype=",	nodefault_subtype),
 ++	FUSE_HELPER_OPT("fsname=",	fsname),
 + 
 + 	FUSE_OPT_KEY("-h",		KEY_HELP),
 + 	FUSE_OPT_KEY("--help",		KEY_HELP),
 +@@ -53,7 +52,6 @@
 + 	FUSE_OPT_KEY("-d",		FUSE_OPT_KEY_KEEP),
 + 	FUSE_OPT_KEY("debug",		FUSE_OPT_KEY_KEEP),
 + 	FUSE_OPT_KEY("fsname=",		FUSE_OPT_KEY_KEEP),
 +-	FUSE_OPT_KEY("subtype=",	FUSE_OPT_KEY_KEEP),
   	FUSE_OPT_END
   };
   
 -@@ -122,24 +120,24 @@
 +@@ -123,24 +121,24 @@
   	}
   }
   
 @@ -59,7 +59,7 @@
   	return res;
   }
   
 -@@ -155,8 +153,8 @@
 +@@ -156,8 +154,8 @@
   	if (res == -1)
   		return -1;
   
 
 Modified: head/sysutils/fusefs-fusexmp_fh/files/patch-lib_mount_bsd.c
 ==============================================================================
 --- head/sysutils/fusefs-fusexmp_fh/files/patch-lib_mount_bsd.c	Fri Sep 20 06:34:19 2013	(r327658)
 +++ head/sysutils/fusefs-fusexmp_fh/files/patch-lib_mount_bsd.c	Fri Sep 20 06:34:35 2013	(r327659)
 @@ -1,10 +1,68 @@
 ---- lib/mount_bsd.c.orig	2008-07-07 08:01:09.000000000 +0200
 -+++ lib/mount_bsd.c	2008-07-07 08:01:59.000000000 +0200
 -@@ -10,6 +10,7 @@
 +--- lib/mount_bsd.c.orig	2013-07-01 09:40:53.000000000 +0200
 ++++ lib/mount_bsd.c	2013-07-24 16:20:34.533073286 +0200
 +@@ -10,6 +10,8 @@
   #include "fuse_misc.h"
   #include "fuse_opt.h"
   
  +#include <sys/param.h>
 ++#include <sys/mount.h>
   #include <sys/stat.h>
   #include <sys/wait.h>
   #include <sys/sysctl.h>
 +@@ -192,56 +194,12 @@
 + 	free(umount_cmd);
 + }
 + 
 +-static void do_unmount(char *dev, int fd)
 +-{
 +-	char device_path[SPECNAMELEN + 12];
 +-	const char *argv[4];
 +-	const char umount_cmd[] = "/sbin/umount";
 +-	pid_t pid;
 +-
 +-	snprintf(device_path, SPECNAMELEN + 12, _PATH_DEV "%s", dev);
 +-
 +-	argv[0] = umount_cmd;
 +-	argv[1] = "-f";
 +-	argv[2] = device_path;
 +-	argv[3] = NULL;
 +-
 +-	pid = fork();
 +-
 +-	if (pid == -1)
 +-		return;
 +-
 +-	if (pid == 0) {
 +-		close(fd);
 +-		execvp(umount_cmd, (char **)argv);
 +-		exit(1);
 +-	}
 +-
 +-	waitpid(pid, NULL, 0);
 +-}
 +-
 + void fuse_kern_unmount(const char *mountpoint, int fd)
 + {
 + 	char *ep, dev[128];
 + 	struct stat sbuf;
 + 
 +-	(void)mountpoint;
 +-
 +-	if (fstat(fd, &sbuf) == -1)
 +-		goto out;
 +-
 +-	devname_r(sbuf.st_rdev, S_IFCHR, dev, 128);
 +-
 +-	if (strncmp(dev, "fuse", 4))
 +-		goto out;
 +-
 +-	strtol(dev + 4, &ep, 10);
 +-	if (*ep != '\0')
 +-		goto out;
 +-
 +-	do_unmount(dev, fd);
 +-
 +-out:
 ++	unmount(mountpoint, MNT_FORCE);
 + 	close(fd);
 + }
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: open->closed 
State-Changed-By: sunpoet 
State-Changed-When: Fri Sep 20 07:26:43 UTC 2013 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=182238 
>Unformatted:
