Attachment 196072 Details for Bug 230521 – Update

[patch] Update

unionfs (text/plain), 3.35 KB, created by Nathan on 2018-08-11 05:38:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nathan

Created: 2018-08-11 05:38:29 UTC

Size: 3.35 KB

patch

obsolete

>sysutils/fusefs-unionfs: Update to 2.0
>
>Changelog: https://raw.githubusercontent.com/rpodgorny/unionfs-fuse/e1e9a60323deda18c1ed236a256d999b62cb0381/NEWS
>
>Index: sysutils/fusefs-unionfs/Makefile
>===================================================================
>--- sysutils/fusefs-unionfs/Makefile	(revision 476788)
>+++ sysutils/fusefs-unionfs/Makefile	(working copy)
>@@ -2,12 +2,12 @@
> # $FreeBSD$
> 
> PORTNAME=	unionfs
>-PORTVERSION=	1.0
>+PORTVERSION=	2.0
> DISTVERSIONPREFIX=	v
> CATEGORIES=	sysutils
> PKGNAMEPREFIX=	fusefs-
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	ndowens@yahoo.com
> COMMENT=	FUSE based implementation of the well-known unionfs
> 
> LICENSE=	BSD3CLAUSE
>Index: sysutils/fusefs-unionfs/distinfo
>===================================================================
>--- sysutils/fusefs-unionfs/distinfo	(revision 476788)
>+++ sysutils/fusefs-unionfs/distinfo	(working copy)
>@@ -1,2 +1,3 @@
>-SHA256 (rpodgorny-unionfs-fuse-v1.0_GH0.tar.gz) = 2ee80bd0634a61adb2159212e155d607a0a82ad659214ae6edb3530396cccc09
>-SIZE (rpodgorny-unionfs-fuse-v1.0_GH0.tar.gz) = 48149
>+TIMESTAMP = 1533965149
>+SHA256 (rpodgorny-unionfs-fuse-v2.0_GH0.tar.gz) = f24d7dd64c678cefacbebf2727b61e3127b8ecb6bb9176d7117dd31503455643
>+SIZE (rpodgorny-unionfs-fuse-v2.0_GH0.tar.gz) = 46537
>Index: sysutils/fusefs-unionfs/files/patch-src__unionfs.c
>===================================================================
>--- sysutils/fusefs-unionfs/files/patch-src__unionfs.c	(revision 476788)
>+++ sysutils/fusefs-unionfs/files/patch-src__unionfs.c	(nonexistent)
>@@ -1,51 +0,0 @@
>---- src/unionfs.c.orig	2015-01-14 10:08:20 UTC
>-+++ src/unionfs.c
>-@@ -65,6 +65,13 @@
>- #include "conf.h"
>- #include "uioctl.h"
>- 
>-+// Patch pushed upstream: 
>-+// https://github.com/rpodgorny/unionfs-fuse/pull/40
>-+// Remove this as soon as pushed into a release.
>-+#ifdef IOCPARM_LEN
>-+#define _IOC_SIZE(nr) IOCPARM_LEN(nr)
>-+#endif
>-+
>- static struct fuse_opt unionfs_opts[] = {
>- 	FUSE_OPT_KEY("chroot=%s,", KEY_CHROOT),
>- 	FUSE_OPT_KEY("cow", KEY_COW),
>-@@ -92,7 +99,12 @@ static int unionfs_chmod(const char *pat
>- 	char p[PATHLEN_MAX];
>- 	if (BUILD_PATH(p, uopt.branches[i].path, path)) RETURN(-ENAMETOOLONG);
>- 
>-+// Unsure of origin. Patch needs review.
>-+#if __FreeBSD__
>-+	int res = lchmod(p, mode);
>-+#else
>- 	int res = chmod(p, mode);
>-+#endif
>- 	if (res == -1) RETURN(-errno);
>- 
>- 	RETURN(0);
>-@@ -671,6 +683,9 @@ static int unionfs_truncate(const char *
>- 	RETURN(0);
>- }
>- 
>-+// Patch pushed upstream: 
>-+// https://github.com/rpodgorny/unionfs-fuse/pull/39
>-+// Remove this as soon as pushed into a release.
>- static int unionfs_utimens(const char *path, const struct timespec ts[2]) {
>- 	DBG("%s\n", path);
>- 
>-@@ -685,9 +700,9 @@ static int unionfs_utimens(const char *p
>- #else
>- 	struct timeval tv[2];
>- 	tv[0].tv_sec = ts[0].tv_sec;
>--	tv[0].tv_usec = ts[0].tv_nsec * 1000;
>-+	tv[0].tv_usec = ts[0].tv_nsec / 1000;
>- 	tv[1].tv_sec = ts[1].tv_sec;
>--	tv[1].tv_usec = ts[1].tv_nsec * 1000;
>-+	tv[1].tv_usec = ts[1].tv_nsec / 1000;
>- 	int res = utimes(p, tv);
>- #endif
>- 
>
>Property changes on: sysutils/fusefs-unionfs/files/patch-src__unionfs.c
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property

Flags:

ndowens04: maintainer-approval+

Actions: View | Diff

Attachments on bug 230521: 196072