From 5b5f65be47a6806dabba0366475e7204b02c435a Mon Sep 17 00:00:00 2001
From: bket <bket@openbsd.org>
Date: Tue, 4 Oct 2022 04:14:53 +0000
Subject: [PATCH] Update to unionfs-fuse-3.2

Changes: https://github.com/rpodgorny/unionfs-fuse/blob/v3.2/NEWS
---
 sysutils/unionfs-fuse/Makefile                |  5 ++++-
 sysutils/unionfs-fuse/distinfo                |  4 ++--
 .../unionfs-fuse/patches/patch-src_Makefile   | 22 -------------------
 .../unionfs-fuse/patches/patch-src_fuse_ops_c | 12 ++++++++++
 4 files changed, 18 insertions(+), 25 deletions(-)
 delete mode 100644 sysutils/unionfs-fuse/patches/patch-src_Makefile
 create mode 100644 sysutils/unionfs-fuse/patches/patch-src_fuse_ops_c

diff --git a/sysutils/unionfs-fuse/Makefile b/sysutils/unionfs-fuse/Makefile
index ad69c8aff10..8e8de89f58d 100644
--- a/sysutils/unionfs-fuse/Makefile
+++ b/sysutils/unionfs-fuse/Makefile
@@ -2,7 +2,7 @@ COMMENT =	unionfs filesystem implementation
 
 GH_ACCOUNT =	rpodgorny
 GH_PROJECT =	unionfs-fuse
-GH_TAGNAME =	v2.2
+GH_TAGNAME =	v3.2
 
 CATEGORIES =	sysutils
 
@@ -13,6 +13,9 @@ PERMIT_PACKAGE =	Yes
 
 WANTLIB =	c fuse pthread
 
+MAKE_FLAGS =	CPPFLAGS="-DFUSE_USE_VERSION=29 -DDISABLE_XATTR" \
+		LIB="-lfuse -lpthread"
+
 ALL_TARGET =	build
 
 do-install:
diff --git a/sysutils/unionfs-fuse/distinfo b/sysutils/unionfs-fuse/distinfo
index 1d512ec4365..5acb269431a 100644
--- a/sysutils/unionfs-fuse/distinfo
+++ b/sysutils/unionfs-fuse/distinfo
@@ -1,2 +1,2 @@
-SHA256 (unionfs-fuse-2.2.tar.gz) = JIoP7pl5FGt5sF/HKGIYadpZNsH0OifjbnUVswGBfkM=
-SIZE (unionfs-fuse-2.2.tar.gz) = 47955
+SHA256 (unionfs-fuse-3.2.tar.gz) = FqTeRI3WlkQ91QjEIXwr8TqCnzSX4aDp+m8JSHrEZsE=
+SIZE (unionfs-fuse-3.2.tar.gz) = 53631
diff --git a/sysutils/unionfs-fuse/patches/patch-src_Makefile b/sysutils/unionfs-fuse/patches/patch-src_Makefile
deleted file mode 100644
index f2f9d2bf6e9..00000000000
--- a/sysutils/unionfs-fuse/patches/patch-src_Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: src/Makefile
---- src/Makefile.orig
-+++ src/Makefile
-@@ -2,15 +2,15 @@ CFLAGS += -Wall -fPIC
- CPPFLAGS += $(shell pkg-config --cflags fuse)
- CPPFLAGS += -DFUSE_USE_VERSION=29
- 
--CPPFLAGS += -DLIBC_XATTR # glibc nowadays includes xattr
-+# CPPFLAGS += -DLIBC_XATTR # glibc nowadays includes xattr
- # CPPFLAGS += -DLIBATTR_XATTR # define this to libattr xattr include
- 
--# CPPFLAGS += -DDISABLE_XATTR # disable xattr support
-+CPPFLAGS += -DDISABLE_XATTR # disable xattr support
- # CPPFLAGS += -DDISABLE_AT    # disable *at function support
- 
- LDFLAGS +=
- 
--LIB = $(shell pkg-config --libs fuse) -lpthread
-+LIB = -lfuse -lpthread
- 
- HASHTABLE_OBJ = hashtable.o hashtable_itr.o
- LIBUNIONFS_OBJ = fuse_ops.o opts.o debug.o findbranch.o readdir.o \
diff --git a/sysutils/unionfs-fuse/patches/patch-src_fuse_ops_c b/sysutils/unionfs-fuse/patches/patch-src_fuse_ops_c
new file mode 100644
index 00000000000..8431bad5bd6
--- /dev/null
+++ b/sysutils/unionfs-fuse/patches/patch-src_fuse_ops_c
@@ -0,0 +1,12 @@
+Index: src/fuse_ops.c
+--- src/fuse_ops.c.orig
++++ src/fuse_ops.c
+@@ -886,7 +886,7 @@ struct fuse_operations unionfs_oper = {
+ 	.getattr = unionfs_getattr,
+ 	.access = unionfs_access,
+ 	.init = unionfs_init,
+-	.ioctl = unionfs_ioctl,
++	// .ioctl = unionfs_ioctl,
+ 	.link = unionfs_link,
+ 	.mkdir = unionfs_mkdir,
+ 	.mknod = unionfs_mknod,