CVS commit: pkgsrc/sysutils/bup

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Wed Dec 17 23:46:21 UTC 2025

Modified Files:
        pkgsrc/sysutils/bup: distinfo
Added Files:
        pkgsrc/sysutils/bup/patches: patch-lib_bup___helpers.c

Log Message:
bup: Avoid colliding with libc non-macro htonll.

Should help the SunOS build.


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 pkgsrc/sysutils/bup/distinfo
cvs rdiff -u -r0 -r1.4 pkgsrc/sysutils/bup/patches/patch-lib_bup___helpers.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/bup/distinfo
diff -u pkgsrc/sysutils/bup/distinfo:1.31 pkgsrc/sysutils/bup/distinfo:1.32
--- pkgsrc/sysutils/bup/distinfo:1.31   Sat Sep 13 00:33:37 2025
+++ pkgsrc/sysutils/bup/distinfo        Wed Dec 17 23:46:20 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.31 2025/09/13 00:33:37 gdt Exp $
+$NetBSD: distinfo,v 1.32 2025/12/17 23:46:20 nia Exp $
 
 BLAKE2s (bup-0.33.9.tar.gz) = e31caf1b0252b6690a51c0fe473f696cae78b65f6513d4564c23c4059cca1950
 SHA512 (bup-0.33.9.tar.gz) = 48b0d96a9f1507afd4452136a353df5b35ad5acff8f1c1769477dc5e6aa43c81830f9cd20c74e2d3ada3fa1b681661a7755234488fcbb2391ea75f43b811e01b
@@ -6,4 +6,5 @@ Size (bup-0.33.9.tar.gz) = 501132 bytes
 BLAKE2s (bup-man-0d2bd796c937f347dd830753f82eedd2b7ad6595.tar.gz) = 2ad56c366636e6a4f0d345db468f4ae8bf0221e1fd1e6149a0e64841942ee977
 SHA512 (bup-man-0d2bd796c937f347dd830753f82eedd2b7ad6595.tar.gz) = 080658ecf81a2f173f6efad719f265cfccdeb956ce22164919d4897755017173926ea8ef1682a605be9ffe1d056a205f50c73d63d16fabd0cd4a14690ee771a1
 Size (bup-man-0d2bd796c937f347dd830753f82eedd2b7ad6595.tar.gz) = 34249 bytes
+SHA1 (patch-lib_bup___helpers.c) = 2d0d70118858e9765fb5663a54f899c9084bf51a
 SHA1 (patch-config_configure) = 20560128514d0efd48d843d4ff2e8b5e15c90e9f

Added files:

Index: pkgsrc/sysutils/bup/patches/patch-lib_bup___helpers.c
diff -u /dev/null pkgsrc/sysutils/bup/patches/patch-lib_bup___helpers.c:1.4
--- /dev/null   Wed Dec 17 23:46:21 2025
+++ pkgsrc/sysutils/bup/patches/patch-lib_bup___helpers.c       Wed Dec 17 23:46:21 2025
@@ -0,0 +1,24 @@
+$NetBSD: patch-lib_bup___helpers.c,v 1.4 2025/12/17 23:46:21 nia Exp $
+
+If OS does not define htonll as a macro, avoid colliding with it.
+
+--- lib/bup/_helpers.c.orig    2025-12-17 14:20:36.236008733 +0000
++++ lib/bup/_helpers.c
+@@ -137,7 +137,7 @@ static void *checked_malloc(size_t n, size_t size)
+ // This function should technically be macro'd out if it's going to be used
+ // more than ocasionally.  As of this writing, it'll actually never be called
+ // in real world bup scenarios (because our packs are < MAX_INT bytes).
+-static uint64_t htonll(uint64_t value)
++static uint64_t my_htonll(uint64_t value)
+ {
+     static const int endian_test = 42;
+ 
+@@ -145,6 +145,8 @@ static uint64_t htonll(uint64_t value)
+       return ((uint64_t)htonl(value & 0xFFFFFFFF) << 32) | htonl(value >> 32);
+     return value; // already in network byte order MSB-LSB
+ }
++
++#define htonll my_htonll
+ #endif
+ 
+ #define INTEGRAL_ASSIGNMENT_FITS(dest, src) INT_ADD_OK(src, 0, dest)