[rpms/varnish] rawhide: small upstream patch for 32bit builds

[rpms/varnish] rawhide: small upstream patch for 32bit builds

[Ingvar Hagelund]

A new commit has been pushed.

Repo   : rpms/varnish
Branch : rawhide
Commit : 7ddde012d668c5235268ee25884d41d8497ea9ed
Author : Ingvar Hagelund <ingvar@redpill-linpro.com>
Date   : 2026-09-21T17:40:02+02:00
Stats  : +57/-0 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/varnish/c/7ddde012d668c5235268ee25884d41d8497ea9ed?branch=rawhide

Log:
small upstream patch for 32bit builds

---
diff --git a/32bit_build_fixes.patch b/32bit_build_fixes.patch
new file mode 100644
index 0000000..313be2f
--- /dev/null
+++ b/32bit_build_fixes.patch
@@ -0,0 +1,52 @@
+From 9bba5daeb12decd506122533f98f837a7ff47f4f Mon Sep 17 00:00:00 2001
+From: Daniel Néri <dne+commits@rb67.eu>
+Date: Thu, 17 Sep 2026 13:20:59 +0200
+Subject: [PATCH] cache_http: Fix incorrect format string length modifier
+
+Breaks build on 32-bit architectures, since sizeof (intmax_t) != sizeof (ssize_t).
+---
+ bin/vinyld/cache/cache_http.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/bin/vinyld/cache/cache_http.c b/bin/vinyld/cache/cache_http.c
+index 7984ad7..e4839ce 100644
+--- a/bin/vinyld/cache/cache_http.c
++++ b/bin/vinyld/cache/cache_http.c
+@@ -1052,7 +1052,7 @@ http_GetContentLength(struct http *hp)
+ 
+ 	if (cl >= 0 && need) {
+ 		// we have deleted all headers above
+-		http_PrintfHeader(hp, "Content-Length: %jd", cl);
++		http_PrintfHeader(hp, "Content-Length: %zd", cl);
+ 	}
+ 
+ 	return (cl);
+--
+libgit2 1.9.7
+
+From faf9d75632f0579e3752a3696ad1479aaba8ef54 Mon Sep 17 00:00:00 2001
+From: Dridi Boukelmoune <dridi.boukelmoune@gmail.com>
+Date: Thu, 17 Sep 2026 12:59:10 +0200
+Subject: [PATCH] vcc_expr: Proper intmax_t format for BYTES expressions
+
+Spotted by @daghf
+---
+ lib/libvcc/vcc_expr.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/libvcc/vcc_expr.c b/lib/libvcc/vcc_expr.c
+index 68ba4b0..12a5257 100644
+--- a/lib/libvcc/vcc_expr.c
++++ b/lib/libvcc/vcc_expr.c
+@@ -740,7 +740,7 @@ vcc_number(struct vcc *tl, struct expr **e, vcc_type_t fmt, const char *sign)
+ 	if (fmt == BYTES) {
+ 		vcc_ByteVal(tl, &vi);
+ 		ERRCHK(tl);
+-		e1 = vcc_mk_expr(BYTES, "%ju", (intmax_t)vi);
++		e1 = vcc_mk_expr(BYTES, "%jd", (intmax_t)vi);
+ 	} else {
+ 		t = tl->t;
+ 		vcc_NextToken(tl);
+--
+libgit2 1.9.7
+

diff --git a/varnish.spec b/varnish.spec
index bb5f550..6703fdc 100644
--- a/varnish.spec
+++ b/varnish.spec
@@ -45,6 +45,9 @@ Source4: varnish.tmpfiles
 # https://github.com/varnish/varnish/issues/32
 Patch1:   varnish-9.0.1_openssl_4.0_asn1.patch
 
+# 32bit fixes, picked from vinyl cache upstream
+Patch2:   32bit_build_fixes.patch
+
 %if %{with bundled_jemalloc}
 # bundled jemalloc patch
 Patch100: jemalloc-5.3.0_fno-builtin.patch
@@ -157,6 +160,7 @@ Documentation files for %name
 %if 0%{?fedora} > 44 || 0%{?rhel} > 10
 %patch 1 -p1
 %endif
+%patch 2 -p1
 tar xzf %SOURCE1
 ln -s pkg-varnish-cache-%{commit1}/redhat redhat
 ln -s pkg-varnish-cache-%{commit1}/debian debian
@@ -430,6 +434,7 @@ test -f /etc/varnish/secret || (uuidgen > /etc/varnish/secret && chmod 0600 /etc
 * Mon Sep 21 2026 Ingvar Hagelund <ingvar@redpill-linpro.com> - 9.0.4-1
 - New upstream release, a security release
 - Includes fix for VSV00020 (CVE pending)
+- Added small patch from upstream for 32bit builds
 
 * Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 9.0.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild