Update to fuse-zip-0.7.2 and fix test suite

OK bket@ and solene@
This commit is contained in:
sdk 2021-10-13 08:49:03 +00:00
parent a33fa2137a
commit 77d0d94a08
8 changed files with 97 additions and 6 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.15 2020/02/09 15:31:02 bket Exp $
# $OpenBSD: Makefile,v 1.16 2021/10/13 08:49:03 sdk Exp $
COMMENT = navigate zip archives through FUSE
DISTNAME = fuse-zip-0.6.2
DISTNAME = fuse-zip-0.7.2
CATEGORIES = archivers

View File

@ -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

View File

@ -1,8 +1,8 @@
$OpenBSD: patch-fuse-zip_1,v 1.2 2018/12/07 13:20:31 bket Exp $
$OpenBSD: patch-fuse-zip_1,v 1.3 2021/10/13 08:49:03 sdk Exp $
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.

View File

@ -0,0 +1,14 @@
$OpenBSD: patch-lib_extraField_cpp,v 1.1 2021/10/13 08:49:03 sdk Exp $
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__

View File

@ -0,0 +1,26 @@
$OpenBSD: patch-lib_fuse-zip_cpp,v 1.1 2021/10/13 08:49:03 sdk Exp $
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

View File

@ -0,0 +1,24 @@
$OpenBSD: patch-tests_whitebox_extraFieldTest_cpp,v 1.1 2021/10/13 08:49:03 sdk Exp $
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
};

View File

@ -0,0 +1,13 @@
$OpenBSD: patch-tests_whitebox_fuseInterfaceTest_cpp,v 1.1 2021/10/13 08:49:03 sdk Exp $
Index: tests/whitebox/fuseInterfaceTest.cpp
--- tests/whitebox/fuseInterfaceTest.cpp.orig
+++ tests/whitebox/fuseInterfaceTest.cpp
@@ -4,7 +4,6 @@
#include <fuse.h>
#include <sys/stat.h>
-#include <sys/sysmacros.h>
#include <cassert>
#include <cstdlib>

View File

@ -0,0 +1,14 @@
$OpenBSD: patch-tests_whitebox_fuseInterfaceTest_cpp.orig,v 1.1 2021/10/13 08:49:03 sdk Exp $
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>