From: Omar Polo <op@omarpolo.com>
Subject: Re: [Maintainer Update] archivers/zpaqfranz-60.7
To: tux0r <tux0r@rosaelefanten.org>
Cc: "ports@openbsd.org" <ports@openbsd.org>
Date: Sun, 20 Oct 2024 15:14:50 +0200

On 2024/10/08 20:37:37 +0200, tux0r <tux0r@rosaelefanten.org> wrote:
> New version with a few new features. Patch attached.
> 
> Change "log":
> https://github.com/fcorbelli/zpaqfranz/releases/tag/60.7

It fails to build here since it calls sysctlbyname() which we do not
provide.  Also, it seems to use hw.ncpu while it'd be better to use
hw.ncpuonline since on some architectures hw.ncpu counts also the
hyperthread cores that are disabled by default.

Can you try this patch and see if it works for you?  The tests are
passing.  We could also try to upstream it.


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	20 Oct 2024 12:55:52 -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 60.7 .
 CATEGORIES =	archivers
 MAINTAINER =	tux0r <tux0r@rosaelefanten.org>
 
@@ -13,6 +13,8 @@ COMPILER=	base-clang ports-gcc base-gcc
 WANTLIB =	${COMPILER_LIBCXX} c m
 
 USE_WXNEEDED =	Yes
+
+FIX_CRLF_FILES = zpaqfranz.cpp
 
 CPPFLAGS +=	-Dunix
 .if ${MACHINE_ARCH:Mamd64}
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	20 Oct 2024 11:16:04 -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-60.7.tar.gz) = 12CiLPkHVBssY7KmatcRM+Of7ApOxU72fxs6Kc6mJVQ=
+SIZE (fcorbelli-zpaqfranz-60.7.tar.gz) = 1989165
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	20 Oct 2024 13:11:27 -0000
@@ -0,0 +1,24 @@
+use hw.ncpuonline instead of hw.ncpu
+
+Index: zpaqfranz.cpp
+--- zpaqfranz.cpp.orig
++++ zpaqfranz.cpp
+@@ -41147,7 +41147,7 @@ int numberOfProcessors() 
+ 	if (flaght)
+ 	{
+ 		size_t rclen=sizeof(rc);
+-		int mib[2]={CTL_HW, HW_NCPU};
++		int mib[2]={CTL_HW, HW_NCPUONLINE};
+ 		if (sysctl(mib, 2, &rc, &rclen, 0, 0)!=0)
+ 			perror("sysctl");
+ 	}
+@@ -41155,7 +41155,8 @@ int numberOfProcessors() 
+ 	{
+ 		size_t len 			= sizeof(rc);
+ #if defined(__FreeBSD__) || defined(__OpenBSD__)
+-		if (sysctlbyname("hw.ncpu", &rc, &len, NULL, 0) < 0) 
++		int mib[2]={CTL_HW, HW_NCPUONLINE};
++		if (sysctl(mib, 2, &rc, &len, NULL, 0) < 0) 
+ 		{
+ 			myprintf("41220! hw.ncpu KAPUTT\n");
+ 			return 1;