Hi,
This is an update to fuse-zip.
Port changes:
* Version update
* Removed include sys/sysmacros.h (not needed)
* Removed include sys/xattr.h und copied the missing defines from linux
* Adjusted test case to reflect OpenBSD device major
Note: I adapted the test case based on the test output. All other
device nodes matched, so my assumption is that OpenBSD is different
here, but it could as well be an issue.
Testing:
I did some testing and mounted a few zip files and successfully copied
data in and out of them. (amd64)
portcheck, lib-depends-check, make test (after device major fix) are ok.
Software changes:
* Released 0.7.2:
- Allow pkg-config binary override (patch from François Degros).
- Fix compiler warning (patch from thanhminhmr).
- Add .gitignore since BitBucket repository are now in git format.
* Released 0.7.1:
- Issue #67: treat file nodes with zero file type bits as regular files.
* Released 0.7.0:
- PKWARE NTFS extra field support. Support high-precision timestamps
via this extension.
- PKWARE NTFS extra field: preserve 'reserved' field and unknown tags.
- Full read support for PKWARE UNIX extra field features. Write
support for all PKWARE UNIX features except hard links.
- Full support for block/character devices, sockets and FIFOs.
- Read only support for hard links.
- Support for file and archive comments.
- Work-around for PKWARE's interpretation of 'version made by' field.
- Support FUSE 2.9.
- Update ctime on rename.
- Now requires C++11-compilant compiler to build.
OK?
Best regards,
Stefan
Index: archivers/fuse-zip/Makefile
===================================================================
RCS file: /cvs/ports/archivers/fuse-zip/Makefile,v
retrieving revision 1.15
diff -u -p -u -p -r1.15 Makefile
--- archivers/fuse-zip/Makefile 9 Feb 2020 15:31:02 -0000 1.15
+++ archivers/fuse-zip/Makefile 10 Sep 2021 13:10:11 -0000
@@ -2,7 +2,7 @@
COMMENT = navigate zip archives through FUSE
-DISTNAME = fuse-zip-0.6.2
+DISTNAME = fuse-zip-0.7.2
CATEGORIES = archivers
Index: archivers/fuse-zip/distinfo
===================================================================
RCS file: /cvs/ports/archivers/fuse-zip/distinfo,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 distinfo
--- archivers/fuse-zip/distinfo 9 Feb 2020 15:31:02 -0000 1.6
+++ archivers/fuse-zip/distinfo 10 Sep 2021 13:10:11 -0000
@@ -1,2 +1,2 @@
-SHA256 (fuse-zip-0.6.2.tar.gz) = 05/QZLezTjUeMJ3mKXNCwh3MbK9g4igE+IjHwfkFSY4=
-SIZE (fuse-zip-0.6.2.tar.gz) = 692612
+SHA256 (fuse-zip-0.7.2.tar.gz) = PdC+AFZ3RC8f2XaaAt/AtPzdOesWflaX2y8U9P7liRU=
+SIZE (fuse-zip-0.7.2.tar.gz) = 713290
Index: archivers/fuse-zip/patches/patch-fuse-zip_1
===================================================================
RCS file: /cvs/ports/archivers/fuse-zip/patches/patch-fuse-zip_1,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-fuse-zip_1
--- archivers/fuse-zip/patches/patch-fuse-zip_1 7 Dec 2018 13:20:31 -0000
1.2
+++ archivers/fuse-zip/patches/patch-fuse-zip_1 10 Sep 2021 13:10:11 -0000
@@ -2,7 +2,7 @@ $OpenBSD: patch-fuse-zip_1,v 1.2 2018/12
Index: fuse-zip.1
--- fuse-zip.1.orig
+++ fuse-zip.1
-@@ -75,10 +75,6 @@ Be patient. Wait for fuse-zip process finish after unm
+@@ -86,10 +86,6 @@ Be patient. Wait for fuse-zip process finish after unm
.SH "PERMISSIONS"
Access check will not be performed unless
\fB-o default_permissions\fP mount option is given.
Index: archivers/fuse-zip/patches/patch-lib_extraField_cpp
===================================================================
RCS file: archivers/fuse-zip/patches/patch-lib_extraField_cpp
diff -N archivers/fuse-zip/patches/patch-lib_extraField_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ archivers/fuse-zip/patches/patch-lib_extraField_cpp 10 Sep 2021 13:10:11
-0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: lib/extraField.cpp
+--- lib/extraField.cpp.orig
++++ lib/extraField.cpp
+@@ -21,7 +21,7 @@
+
+ #include <sys/stat.h>
+
+-#if ! __APPLE__
++#if ! __APPLE__ && ! __OpenBSD__
+ # include <sys/sysmacros.h>
+ #endif // !__APPLE__
+
Index: archivers/fuse-zip/patches/patch-lib_fuse-zip_cpp
===================================================================
RCS file: archivers/fuse-zip/patches/patch-lib_fuse-zip_cpp
diff -N archivers/fuse-zip/patches/patch-lib_fuse-zip_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ archivers/fuse-zip/patches/patch-lib_fuse-zip_cpp 10 Sep 2021 13:10:11
-0000
@@ -0,0 +1,26 @@
+$OpenBSD$
+
+Required xattr.h defines from linux
+
+Index: lib/fuse-zip.cpp
+--- lib/fuse-zip.cpp.orig
++++ lib/fuse-zip.cpp
+@@ -35,7 +35,6 @@
+ #include <syslog.h>
+ #include <sys/types.h>
+ #include <sys/statvfs.h>
+-#include <sys/xattr.h>
+
+ #include <cerrno>
+ #include <cstring>
+@@ -47,6 +46,10 @@
+ #include "types.h"
+ #include "fileNode.h"
+ #include "fuseZipData.h"
++
++/* xattr.h */
++#define XATTR_CREATE 0x1
++#define XATTR_REPLACE 0x2
+
+ static const char FILE_COMMENT_XATTR_NAME[] = "user.comment";
+ static const size_t FILE_COMMENT_XATTR_NAME_LENZ = 13; // length including
NULL-byte
Index: archivers/fuse-zip/patches/patch-tests_whitebox_extraFieldTest_cpp
===================================================================
RCS file: archivers/fuse-zip/patches/patch-tests_whitebox_extraFieldTest_cpp
diff -N archivers/fuse-zip/patches/patch-tests_whitebox_extraFieldTest_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ archivers/fuse-zip/patches/patch-tests_whitebox_extraFieldTest_cpp 10 Sep
2021 13:10:11 -0000
@@ -0,0 +1,24 @@
+$OpenBSD$
+
+Device major on OpenBSD is different
+
+Index: tests/whitebox/extraFieldTest.cpp
+--- tests/whitebox/extraFieldTest.cpp.orig
++++ tests/whitebox/extraFieldTest.cpp
+@@ -6,7 +6,6 @@
+ #include <cstring>
+
+ #include <sys/stat.h>
+-#include <sys/sysmacros.h>
+ #include <zip.h>
+
+ #define private public
+@@ -407,7 +406,7 @@ void pkware_create_device () {
+ 0x72, 0xE3, 0xC7, 0x52, // mtime
+ 0x02, 0x01, // UID
+ 0x04, 0x03, // GID
+- 0x34, 0x12, 0x00, 0x00, // device major
++ 0x34, 0x00, 0x00, 0x00, // device major
+ 0x78, 0x56, 0x00, 0x00 // device minor
+ };
+
Index: archivers/fuse-zip/patches/patch-tests_whitebox_fuseInterfaceTest_cpp
===================================================================
RCS file: archivers/fuse-zip/patches/patch-tests_whitebox_fuseInterfaceTest_cpp
diff -N archivers/fuse-zip/patches/patch-tests_whitebox_fuseInterfaceTest_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ archivers/fuse-zip/patches/patch-tests_whitebox_fuseInterfaceTest_cpp
10 Sep 2021 13:10:11 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: tests/whitebox/fuseInterfaceTest.cpp
+--- tests/whitebox/fuseInterfaceTest.cpp.orig
++++ tests/whitebox/fuseInterfaceTest.cpp
+@@ -4,7 +4,7 @@
+ #include <fuse.h>
+
+ #include <sys/stat.h>
+-#include <sys/sysmacros.h>
++//#include <sys/sysmacros.h>
+
+ #include <cassert>
+ #include <cstdlib>
