NetBSD Problem Report #52866
From root@lyrion.ch Wed Dec 27 16:46:06 2017
Return-Path: <root@lyrion.ch>
Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified))
by mollari.NetBSD.org (Postfix) with ESMTPS id 2FD5A7A104
for <gnats-bugs@gnats.NetBSD.org>; Wed, 27 Dec 2017 16:46:06 +0000 (UTC)
Message-Id: <20171227164602.7BFC321AFE50@lyrion.ch>
Date: Wed, 27 Dec 2017 16:06:05 +0100 (CET)
From: dziltener@lyrion.ch
Reply-To: dziltener@lyrion.ch
To: gnats-bugs@NetBSD.org
Subject: Updated filesystems/fuse-unionfs to version 2.0.
X-Send-Pr-Version: 3.95
>Number: 52866
>Category: pkg
>Synopsis: Updated filesystems/fuse-unionfs to version 2.0.
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: pkg-manager
>State: closed
>Class: change-request
>Submitter-Id: net
>Arrival-Date: Wed Dec 27 16:50:01 +0000 2017
>Closed-Date: Mon Sep 17 14:04:56 +0000 2018
>Last-Modified: Mon Sep 17 14:05:01 +0000 2018
>Originator: dziltener@lyrion.ch
>Release: NetBSD 7.1
>Organization:
>Environment:
System: NetBSD lyrion.ch 7.1 NetBSD 7.1 (GENERIC.201703111743Z) amd64
Architecture: x86_64
Machine: amd64
>Description:
Version 2 of this library has been released in the meantime. This updates it.
>How-To-Repeat:
Does not apply here.
>Fix:
fuse-unionfs.patch follows:
diff -ENwbur /usr/pkgsrc/filesystems/fuse-unionfs/Makefile /usr/pkgsrc/filesystems/fuse-unionfs/Makefile
--- /usr/pkgsrc/filesystems/fuse-unionfs/Makefile 2017-12-27 16:00:14.000000000 +0100
+++ /usr/pkgsrc/filesystems/fuse-unionfs/Makefile 2017-12-27 15:58:26.000000000 +0100
@@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.6 2017/08/19 00:20:50 jlam Exp $
#
-DISTNAME= v1.0
+DISTNAME= v2.0
DIST_SUBDIR= ${PKGBASE}
PKGNAME= fuse-unionfs-${DISTNAME:S/v//}
CATEGORIES= filesystems
@@ -17,13 +17,11 @@
INSTALLATION_DIRS= bin ${PKGMANDIR}/man8
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/src/unionfs \
- ${DESTDIR}${PREFIX}/bin/unionfs
- ${INSTALL_PROGRAM} ${WRKSRC}/src/unionfsctl \
- ${DESTDIR}${PREFIX}/bin/unionfsctl
- ${INSTALL_MAN} ${WRKSRC}/man/unionfs.8 \
- ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
-
.include "../../mk/fuse.buildlink3.mk"
+
+pre-install:
+ mkdir -p ${DESTDIR}${PREFIX}/bin
+ mkdir -p ${DESTDIR}${PREFIX}/sbin
+ mkdir -p ${DESTDIR}${PREFIX}/man/man8
+
.include "../../mk/bsd.pkg.mk"
diff -ENwbur /usr/pkgsrc/filesystems/fuse-unionfs/PLIST /usr/pkgsrc/filesystems/fuse-unionfs/PLIST
--- /usr/pkgsrc/filesystems/fuse-unionfs/PLIST 2017-12-27 16:00:14.000000000 +0100
+++ /usr/pkgsrc/filesystems/fuse-unionfs/PLIST 2017-12-27 15:58:26.000000000 +0100
@@ -1,4 +1,5 @@
@comment $NetBSD: PLIST,v 1.2 2016/02/01 02:41:21 jmmv Exp $
bin/unionfs
bin/unionfsctl
+sbin/mount.unionfs
man/man8/unionfs.8
diff -ENwbur /usr/pkgsrc/filesystems/fuse-unionfs/distinfo /usr/pkgsrc/filesystems/fuse-unionfs/distinfo
--- /usr/pkgsrc/filesystems/fuse-unionfs/distinfo 2017-12-27 16:00:14.000000000 +0100
+++ /usr/pkgsrc/filesystems/fuse-unionfs/distinfo 2017-12-27 15:58:26.000000000 +0100
@@ -1,8 +1,7 @@
$NetBSD: distinfo,v 1.5 2016/02/01 02:41:21 jmmv Exp $
-SHA1 (fuse-unionfs/v1.0.tar.gz) = f35e5a3f0e033291981766f50cd9895d23fae649
-RMD160 (fuse-unionfs/v1.0.tar.gz) = 9bfed432a36e1736ed197c3292c02d6d57469bf5
-SHA512 (fuse-unionfs/v1.0.tar.gz) = 805151acaeae8526fba430701a1690f6eb0ad8331a9e730095ee538dc2b148d02fe996a63e8a7f6471d1ef622cc5c03d82bd2b2faad1ebe3b614ec343c2f55de
-Size (fuse-unionfs/v1.0.tar.gz) = 48149 bytes
-SHA1 (patch-cow_utils.h) = 78322cee0b3c240df7e63b6ec405ad1a6cdefc2c
-SHA1 (patch-unionfs.c) = dd05ff561ff1def121619fa1cce4f9f3206c625f
+SHA1 (fuse-unionfs/v2.0.tar.gz) = a883bcd5d57345d7b154998908e72249946f6ad2
+RMD160 (fuse-unionfs/v2.0.tar.gz) = f135f854f316bc9fd6272450b8aa11a420c15d31
+SHA512 (fuse-unionfs/v2.0.tar.gz) = 5b60204632f498931fff7671cc9f40b1800d34cb8c0d0de0773626e2653eb0a36647566c92c1d0cf79543e01b934602ef5603a06508407f352e48ef27a7ee758
+Size (fuse-unionfs/v2.0.tar.gz) = 46537 bytes
+SHA1 (patch-Makefile) = 8aae25ea134e6846b2eba156918aee90f8096a5f
diff -ENwbur /usr/pkgsrc/filesystems/fuse-unionfs/patches/CVS/Entries /usr/pkgsrc/filesystems/fuse-unionfs/patches/CVS/Entries
--- /usr/pkgsrc/filesystems/fuse-unionfs/patches/CVS/Entries 2017-12-27 15:59:27.000000000 +0100
+++ /usr/pkgsrc/filesystems/fuse-unionfs/patches/CVS/Entries 2017-12-27 15:58:26.000000000 +0100
@@ -1,3 +1,3 @@
-/patch-cow_utils.h/1.1/Wed Dec 27 14:59:27 2017//Tpkgsrc-2017Q3
-/patch-unionfs.c/1.1/Wed Dec 27 14:59:27 2017//Tpkgsrc-2017Q3
+/patch-cow_utils.h/1.1/Mon Feb 1 02:41:21 2016//Tpkgsrc-2017Q3
+/patch-unionfs.c/1.1/Mon Feb 1 02:41:21 2016//Tpkgsrc-2017Q3
D
diff -ENwbur /usr/pkgsrc/filesystems/fuse-unionfs/patches/patch-Makefile /usr/pkgsrc/filesystems/fuse-unionfs/patches/patch-Makefile
--- /usr/pkgsrc/filesystems/fuse-unionfs/patches/patch-Makefile 1970-01-01 01:00:00.000000000 +0100
+++ /usr/pkgsrc/filesystems/fuse-unionfs/patches/patch-Makefile 2017-12-27 15:58:26.000000000 +0100
@@ -0,0 +1,21 @@
+$NetBSD$
+
+--- Makefile.orig 2017-12-27 14:52:34.000000000 +0000
++++ Makefile
+@@ -1,4 +1,4 @@
+-PREFIX=/usr/local
++PREFIX=/usr/pkg
+ BINDIR=/bin
+ SBINDIR=/sbin
+
+@@ -28,8 +28,8 @@ coverage:
+ install: build
+ install -d $(DESTDIR)$(PREFIX)$(BINDIR)
+ install -d $(DESTDIR)$(PREFIX)$(SBINDIR)
+- install -d $(DESTDIR)$(PREFIX)/share/man/man8
++ install -d $(DESTDIR)$(PREFIX)/man/man8
+ install -m 0755 src/unionfs $(DESTDIR)$(PREFIX)$(BINDIR)
+ install -m 0755 src/unionfsctl $(DESTDIR)$(PREFIX)$(BINDIR)
+ install -m 0755 mount.unionfs $(DESTDIR)$(PREFIX)$(SBINDIR)
+- install -m 0644 man/unionfs.8 $(DESTDIR)$(PREFIX)/share/man/man8/
++ install -m 0644 man/unionfs.8 $(DESTDIR)$(PREFIX)/man/man8/
diff -ENwbur /usr/pkgsrc/filesystems/fuse-unionfs/patches/patch-cow_utils.h /usr/pkgsrc/filesystems/fuse-unionfs/patches/patch-cow_utils.h
--- /usr/pkgsrc/filesystems/fuse-unionfs/patches/patch-cow_utils.h 2017-12-27 15:59:27.000000000 +0100
+++ /usr/pkgsrc/filesystems/fuse-unionfs/patches/patch-cow_utils.h 1970-01-01 01:00:00.000000000 +0100
@@ -1,14 +0,0 @@
-$NetBSD: patch-cow_utils.h,v 1.1 2016/02/01 02:41:21 jmmv Exp $
-
---- src/cow_utils.h.orig 2015-01-14 10:08:20.000000000 +0000
-+++ src/cow_utils.h
-@@ -8,7 +8,9 @@
- #define COW_UTILS_H
-
- #define VM_AND_BUFFER_CACHE_SYNCHRONIZED
-+#if !defined(MAXBSIZE)
- #define MAXBSIZE 4096
-+#endif
-
- struct cow {
- mode_t umask;
diff -ENwbur /usr/pkgsrc/filesystems/fuse-unionfs/patches/patch-unionfs.c /usr/pkgsrc/filesystems/fuse-unionfs/patches/patch-unionfs.c
--- /usr/pkgsrc/filesystems/fuse-unionfs/patches/patch-unionfs.c 2017-12-27 15:59:27.000000000 +0100
+++ /usr/pkgsrc/filesystems/fuse-unionfs/patches/patch-unionfs.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,42 +0,0 @@
-$NetBSD: patch-unionfs.c,v 1.1 2016/02/01 02:41:21 jmmv Exp $
-
---- src/unionfs.c.orig 2015-01-14 10:08:20.000000000 +0000
-+++ src/unionfs.c
-@@ -23,8 +23,10 @@
-
- #if __APPLE__
- #include <fuse_common.h>
--#else
-+#elif defined linux
- #include <fuse/fuse_common.h>
-+#else
-+#include <fuse.h>
- #endif
-
- #include <stdio.h>
-@@ -267,6 +269,7 @@ static int unionfs_link(const char *from
- RETURN(0);
- }
-
-+#if defined(FUSE_IOCTL_COMPAT)
- static int unionfs_ioctl(const char *path, int cmd, void *arg, struct fuse_file_info *fi, unsigned int flags, void *data) {
- (void) path;
- (void) arg; // avoid compiler warning
-@@ -303,6 +306,7 @@ static int unionfs_ioctl(const char *pat
-
- return 0;
- }
-+#endif
-
- /**
- * unionfs mkdir() implementation
-@@ -806,7 +810,9 @@ static struct fuse_operations unionfs_op
- .fsync = unionfs_fsync,
- .getattr = unionfs_getattr,
- .init = unionfs_init,
-+#if defined(FUSE_IOCTL_COMPAT)
- .ioctl = unionfs_ioctl,
-+#endif
- .link = unionfs_link,
- .mkdir = unionfs_mkdir,
- .mknod = unionfs_mknod,
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed
State-Changed-By: maya@NetBSD.org
State-Changed-When: Mon, 17 Sep 2018 14:04:56 +0000
State-Changed-Why:
Thanks! I committed the changes. Future notes:
- It's good to provide a changelog for the changes. This was available in the NEWS file.
- It's good to test your changes with PKG_DEVELOPER=yes set in /etc/mk.conf, this would have shown that the mount_unionfs script is looking for /bin/bash. I've added bash as a runtime dependency and used REPLACE_BASH.
From: "Maya Rashish" <maya@netbsd.org>
To: gnats-bugs@gnats.NetBSD.org
Cc:
Subject: PR/52866 CVS commit: pkgsrc/filesystems/fuse-unionfs
Date: Mon, 17 Sep 2018 14:03:09 +0000
Module Name: pkgsrc
Committed By: maya
Date: Mon Sep 17 14:03:09 UTC 2018
Modified Files:
pkgsrc/filesystems/fuse-unionfs: Makefile PLIST distinfo
Added Files:
pkgsrc/filesystems/fuse-unionfs/patches: patch-Makefile
Removed Files:
pkgsrc/filesystems/fuse-unionfs/patches: patch-cow_utils.h
patch-unionfs.c
Log Message:
fuse-unionfs: update to 2.0
- fixed NEWS file ;-)
- reverted meta directory name back to .unionfs (from .unionfs-fuse)
this was never meant to be changed and slipped in in 1.0 release
- fixes and speed improvements
from dziltener in PR pkg/52866 with some changes from myself
(I did not test functionality following the changes)
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/filesystems/fuse-unionfs/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/filesystems/fuse-unionfs/PLIST
cvs rdiff -u -r1.5 -r1.6 pkgsrc/filesystems/fuse-unionfs/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/filesystems/fuse-unionfs/patches/patch-Makefile
cvs rdiff -u -r1.1 -r0 \
pkgsrc/filesystems/fuse-unionfs/patches/patch-cow_utils.h \
pkgsrc/filesystems/fuse-unionfs/patches/patch-unionfs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
>Unformatted:
(Contact us)
$NetBSD: query-full-pr,v 1.43 2018/01/16 07:36:43 maya Exp $
$NetBSD: gnats_config.sh,v 1.9 2014/08/02 14:16:04 spz Exp $
Copyright © 1994-2017
The NetBSD Foundation, Inc. ALL RIGHTS RESERVED.