Index | Thread | Search

From:
"Omar Polo" <op@omarpolo.com>
Subject:
Re: [Maintainer Update] archivers/zpaqfranz-61.4
To:
tux0r <tux0r@rosaelefanten.org>
Cc:
ports@openbsd.org
Date:
Tue, 17 Jun 2025 10:46:40 +0200

Download raw body.

Thread
Hello,

tux0r <tux0r@rosaelefanten.org> wrote:
> I have mostly given up hope that my port updates will ever be accepted
> by this point, but just for completeness: patch attached :-)

i missed the previous mail, sorry.

The port however did not built, here's an attempt of fixing the build.
Tests are passing, can you confirm it's working for you as well?


Thanks,
Omar Polo


Index: Makefile
===================================================================
RCS file: /home/cvs/ports/archivers/zpaqfranz/Makefile,v
diff -u -p -r1.32 Makefile
--- Makefile	25 Aug 2024 19:43:45 -0000	1.32
+++ Makefile	17 Jun 2025 08:28:11 -0000
@@ -1,7 +1,7 @@
 BROKEN-sparc64 = SIGBUS due to unaligned access when running tests
 
 COMMENT =	journaling archiver for incremental backup, fork of ZPAQ
-DIST_TUPLE =	github fcorbelli zpaqfranz 60.6 .
+DIST_TUPLE =	github fcorbelli zpaqfranz 61.4 .
 CATEGORIES =	archivers
 MAINTAINER =	tux0r <tux0r@rosaelefanten.org>
 
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/archivers/zpaqfranz/distinfo,v
diff -u -p -r1.29 distinfo
--- distinfo	25 Aug 2024 19:43:45 -0000	1.29
+++ distinfo	17 Jun 2025 08:28:11 -0000
@@ -1,2 +1,2 @@
-SHA256 (fcorbelli-zpaqfranz-60.6.tar.gz) = CFk/X9C3Eg9ClCrr8C9nSsT/ZTnc5rYkFPwEcuSd8G8=
-SIZE (fcorbelli-zpaqfranz-60.6.tar.gz) = 1976227
+SHA256 (fcorbelli-zpaqfranz-61.4.tar.gz) = uclvqXZQV1QBPdkJ9UgTjDMauVtF9g19ukQEjcwjdtg=
+SIZE (fcorbelli-zpaqfranz-61.4.tar.gz) = 2050403
Index: patches/patch-zpaqfranz_cpp
===================================================================
RCS file: patches/patch-zpaqfranz_cpp
diff -N patches/patch-zpaqfranz_cpp
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-zpaqfranz_cpp	17 Jun 2025 08:42:38 -0000
@@ -0,0 +1,38 @@
+Index: zpaqfranz.cpp
+--- zpaqfranz.cpp.orig
++++ zpaqfranz.cpp
+@@ -65631,7 +65631,7 @@ int get_creation_time(const char* filepath, time_t* cr
+     struct stat st;
+     if (lstat(filepath, &st) == 0) 
+ 	{
+-        *creation_time = st.st_birthtime;
++        *creation_time = st.__st_birthtime;
+         return 0;
+     }
+ #else
+@@ -65745,11 +65745,11 @@ int savefilemetadata(const char* filepath, struct fran
+         strncpy(metadata->gname, "unknown", sizeof(metadata->gname));
+     
+     snprintf(metadata->mode, sizeof(metadata->mode), "%07o", fileInfo.st_mode & 07777);
+-    snprintf(metadata->mtime, sizeof(metadata->mtime), "%ld", fileInfo.st_mtime);
+-    snprintf(metadata->atime, sizeof(metadata->atime), "%ld", fileInfo.st_atime);
++    snprintf(metadata->mtime, sizeof(metadata->mtime), "%lld", (long long)fileInfo.st_mtime);
++    snprintf(metadata->atime, sizeof(metadata->atime), "%lld", (long long)fileInfo.st_atime);
+     time_t creation_time = 0;
+     get_creation_time(filepath, &creation_time);
+-    snprintf(metadata->ctime, sizeof(metadata->ctime), "%ld", creation_time);
++    snprintf(metadata->ctime, sizeof(metadata->ctime), "%lld", (long long)creation_time);
+     
+     if (S_ISLNK(fileInfo.st_mode)) 
+     {
+@@ -104047,8 +104047,9 @@ bool ripristinantfs(const std::string& image_path, con
+ #elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
+     #include <sys/ioctl.h>
+     #include <sys/disk.h>
+-    #ifdef __FreeBSD__
++    #if defined(__FreeBSD__) || defined(__OpenBSD__)
+         #include <sys/disklabel.h>
++        #include <sys/dkio.h>
+     #endif
+ #elif defined(__APPLE__)
+     #include <sys/ioctl.h>