From owner-svn-ports-all@freebsd.org Mon Jun 27 05:46:39 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 25783B845B9; Mon, 27 Jun 2016 05:46:39 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DE1C92D50; Mon, 27 Jun 2016 05:46:38 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u5R5kcFW059691; Mon, 27 Jun 2016 05:46:38 GMT (envelope-from pi@FreeBSD.org) Received: (from pi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u5R5kbfo059688; Mon, 27 Jun 2016 05:46:37 GMT (envelope-from pi@FreeBSD.org) Message-Id: <201606270546.u5R5kbfo059688@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pi set sender to pi@FreeBSD.org using -f From: Kurt Jaeger Date: Mon, 27 Jun 2016 05:46:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r417634 - head/sysutils/fusefs-encfs/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Jun 2016 05:46:39 -0000 Author: pi Date: Mon Jun 27 05:46:37 2016 New Revision: 417634 URL: https://svnweb.freebsd.org/changeset/ports/417634 Log: sysutils/fusefs-encfs: Fix "Function not implemented" on create operations Upstream fix was: https://github.com/vgough/encfs/commit/aacce54f42add2e4560b53c9138835151c332362 PR: 210532 Submitted by: Dmitri Goutnik (maintainer) Modified: head/sysutils/fusefs-encfs/files/patch-encfs_encfs.cpp head/sysutils/fusefs-encfs/files/patch-encfs_main.cpp head/sysutils/fusefs-encfs/files/patch-encfs_makeKey.cpp Modified: head/sysutils/fusefs-encfs/files/patch-encfs_encfs.cpp ============================================================================== --- head/sysutils/fusefs-encfs/files/patch-encfs_encfs.cpp Mon Jun 27 05:36:44 2016 (r417633) +++ head/sysutils/fusefs-encfs/files/patch-encfs_encfs.cpp Mon Jun 27 05:46:37 2016 (r417634) @@ -1,16 +1,14 @@ --- encfs/encfs.cpp.orig 2015-03-24 20:45:16 UTC +++ encfs/encfs.cpp -@@ -529,6 +529,17 @@ int encfs_open(const char *path, struct +@@ -529,6 +529,15 @@ int encfs_open(const char *path, struct return res; } -+int encfs_create(const char *path, mode_t mode, struct fuse_file_info *file) -+{ -+ int res; -+ -+ res = encfs_mknod(path, mode, 0); -+ if (res) ++int encfs_create(const char *path, mode_t mode, struct fuse_file_info *file) { ++ int res = encfs_mknod(path, mode, 0); ++ if (res) { + return res; ++ } + + return encfs_open(path, file); +} Modified: head/sysutils/fusefs-encfs/files/patch-encfs_main.cpp ============================================================================== --- head/sysutils/fusefs-encfs/files/patch-encfs_main.cpp Mon Jun 27 05:36:44 2016 (r417633) +++ head/sysutils/fusefs-encfs/files/patch-encfs_main.cpp Mon Jun 27 05:46:37 2016 (r417634) @@ -1,4 +1,4 @@ ---- encfs/main.cpp.orig 2016-06-18 20:53:13 UTC +--- encfs/main.cpp.orig 2015-03-24 20:45:16 UTC +++ encfs/main.cpp @@ -27,6 +27,7 @@ #include @@ -8,3 +8,12 @@ #include +@@ -599,7 +600,7 @@ int main(int argc, char *argv[]) { + encfs_oper.init = encfs_init; + encfs_oper.destroy = encfs_destroy; + // encfs_oper.access = encfs_access; +- // encfs_oper.create = encfs_create; ++ encfs_oper.create = encfs_create; + encfs_oper.ftruncate = encfs_ftruncate; + encfs_oper.fgetattr = encfs_fgetattr; + // encfs_oper.lock = encfs_lock; Modified: head/sysutils/fusefs-encfs/files/patch-encfs_makeKey.cpp ============================================================================== --- head/sysutils/fusefs-encfs/files/patch-encfs_makeKey.cpp Mon Jun 27 05:36:44 2016 (r417633) +++ head/sysutils/fusefs-encfs/files/patch-encfs_makeKey.cpp Mon Jun 27 05:46:37 2016 (r417634) @@ -1,4 +1,4 @@ ---- encfs/makeKey.cpp.orig 2016-06-18 20:53:44 UTC +--- encfs/makeKey.cpp.orig 2015-03-24 20:45:16 UTC +++ encfs/makeKey.cpp @@ -25,6 +25,7 @@ #include "openssl.h"