Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1711802421219860"
MIME-Version: 1.0
Date: Sat, 30 Mar 2024 12:40:21 +0000
From: "Havard Eidnes" <he@netbsd.org>
Subject: CVS commit: pkgsrc/security/botan3
To: pkgsrc-changes@NetBSD.org
Reply-To: he@netbsd.org
Message-Id: <20240330124021.80848FA2C@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1711802421219860
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	he
Date:		Sat Mar 30 12:40:21 UTC 2024

Modified Files:
	pkgsrc/security/botan3: distinfo
Added Files:
	pkgsrc/security/botan3/patches: patch-src_lib_utils_simd_simd__32.h

Log Message:
security/botan: fix build on 32-bit powerpc systems (non-VSX).

Ref. https://github.com/randombit/botan/issues/3958


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/security/botan3/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/security/botan3/patches/patch-src_lib_utils_simd_simd__32.h

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


--_----------=_1711802421219860
Content-Disposition: inline
Content-Length: 2292
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/security/botan3/distinfo
diff -u pkgsrc/security/botan3/distinfo:1.5 pkgsrc/security/botan3/distinfo:1.6
--- pkgsrc/security/botan3/distinfo:1.5	Sun Feb 25 14:58:00 2024
+++ pkgsrc/security/botan3/distinfo	Sat Mar 30 12:40:21 2024
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.5 2024/02/25 14:58:00 wiz Exp $
+$NetBSD: distinfo,v 1.6 2024/03/30 12:40:21 he Exp $
 
 BLAKE2s (Botan-3.3.0.tar.xz) = d590464efbb88c78d7bb9661a9a436b0f6ad878f2eefef1b12f4a2fa4a55d6e3
 SHA512 (Botan-3.3.0.tar.xz) = 90930add225a2b4376046b3ed0177c71e7d19e983fb2b99c40751de5e6c3959b520eaa1e836782eb02ebc8aff8e9a4fd928f585de5e6b1798a8ad4aa0464f19b
 Size (Botan-3.3.0.tar.xz) = 7164024 bytes
+SHA1 (patch-src_lib_utils_simd_simd__32.h) = 5547adde559696927279414b9ff6e27b10ea0b6b
 SHA1 (patch-src_scripts_install.py) = c8ac2a6315e0e53a0292447e8e6b967572de9d24

Added files:

Index: pkgsrc/security/botan3/patches/patch-src_lib_utils_simd_simd__32.h
diff -u /dev/null pkgsrc/security/botan3/patches/patch-src_lib_utils_simd_simd__32.h:1.1
--- /dev/null	Sat Mar 30 12:40:21 2024
+++ pkgsrc/security/botan3/patches/patch-src_lib_utils_simd_simd__32.h	Sat Mar 30 12:40:21 2024
@@ -0,0 +1,33 @@
+$NetBSD: patch-src_lib_utils_simd_simd__32.h,v 1.1 2024/03/30 12:40:21 he Exp $
+
+Avoid VSX operations on 32-bit ppc, even if we have altivec.
+Ref. https://github.com/randombit/botan/issues/3958
+
+--- src/lib/utils/simd/simd_32.h.orig	2024-02-20 17:28:54.000000000 +0000
++++ src/lib/utils/simd/simd_32.h
+@@ -21,6 +21,9 @@
+    #undef vector
+    #undef bool
+    #define BOTAN_SIMD_USE_ALTIVEC
++#ifdef __VSX__
++   #define BOTAN_SIMD_USE_VSX
++#endif
+ 
+ #elif defined(BOTAN_TARGET_SUPPORTS_NEON)
+    #include <botan/internal/cpuid.h>
+@@ -480,7 +483,15 @@ class SIMD_4x32 final {
+          return SIMD_4x32(_mm_or_si128(_mm_srli_epi16(T, 8), _mm_slli_epi16(T, 8)));
+ 
+ #elif defined(BOTAN_SIMD_USE_ALTIVEC)
++#ifdef BOTAN_SIMD_USE_VSX
+          return SIMD_4x32(vec_revb(m_simd));
++#else
++	const __vector unsigned char rev[1] = {
++	   { 3,2,1,0, 7,6,5,4, 11,10,9,8, 15,14,13,12 },
++	};
++
++	 return SIMD_4x32(vec_perm(m_simd, m_simd, rev[0]));
++#endif
+ 
+ #elif defined(BOTAN_SIMD_USE_NEON)
+          return SIMD_4x32(vreinterpretq_u32_u8(vrev32q_u8(vreinterpretq_u8_u32(m_simd))));


--_----------=_1711802421219860--