libbotan: Update to 3.8.1

This commit is contained in:
Christoph Reiter 2025-05-08 23:38:37 +02:00
parent 71e1110e74
commit 1db185270a
2 changed files with 24 additions and 6 deletions

View File

@ -0,0 +1,12 @@
--- Botan-3.8.1/src/lib/utils/os_utils/os_utils.cpp.orig 2025-05-08 23:36:50.593413800 +0200
+++ Botan-3.8.1/src/lib/utils/os_utils/os_utils.cpp 2025-05-08 23:37:04.652931900 +0200
@@ -664,9 +664,7 @@
static_cast<void>(pthread_set_name_np(thread.native_handle(), name.c_str()));
#elif defined(BOTAN_TARGET_OS_IS_NETBSD)
static_cast<void>(pthread_setname_np(thread.native_handle(), "%s", const_cast<char*>(name.c_str())));
- #elif defined(BOTAN_TARGET_OS_HAS_WIN32) && defined(_LIBCPP_HAS_THREAD_API_PTHREAD)
- static_cast<void>(pthread_setname_np(thread.native_handle(), name.c_str()));
#elif defined(BOTAN_TARGET_OS_HAS_WIN32) && defined(BOTAN_BUILD_COMPILER_IS_MSVC)
typedef HRESULT(WINAPI * std_proc)(HANDLE, PCWSTR);
HMODULE kern = GetModuleHandleA("KernelBase.dll");
std_proc set_thread_name = reinterpret_cast<std_proc>(GetProcAddress(kern, "SetThreadDescription"));

View File

@ -3,7 +3,7 @@
_realname=libbotan
pkgbase="mingw-w64-${_realname}"
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=3.7.1
pkgver=3.8.1
pkgrel=1
pkgdesc='Crypto and TLS Library for Modern C++ (mingw-w64)'
arch=('any')
@ -22,13 +22,16 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
"${MINGW_PACKAGE_PREFIX}-zlib"
"${MINGW_PACKAGE_PREFIX}-xz")
makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
"${MINGW_PACKAGE_PREFIX}-ninja"
"${MINGW_PACKAGE_PREFIX}-python")
source=("https://botan.randombit.net/releases/Botan-${pkgver}.tar.xz"{,.asc}
'002-winsock-link.patch')
'002-winsock-link.patch'
'003-no-pthread.patch')
noextract=("Botan-${pkgver}.tar.xz")
sha256sums=('fc0620463461caaea8e60f06711d7e437a3ad1eebd6de4ac29c14bbd901ccd1b'
sha256sums=('b039681d4b861a2f5853746d8ba806f553e23869ed72d89edbfa3c3dbfa17e68'
'SKIP'
'cf9974f076d91e8f58f7d9688b7ab78cc790720923c73b293871fc7b83fd55c6')
'cf9974f076d91e8f58f7d9688b7ab78cc790720923c73b293871fc7b83fd55c6'
'080efa1f4c1d004a5055201e67b5c57b62953fcdf87e5a8313da0a2ad108c320')
validpgpkeys=('621DAF6411E1851C4CF9A2E16211EBF1EFBADFBC') # Botan Distribution Key
prepare() {
@ -38,6 +41,8 @@ prepare() {
cd "Botan-${pkgver}"
patch -p1 -i "${srcdir}/002-winsock-link.patch"
# https://github.com/randombit/botan/pull/3934#issuecomment-2864372252
patch -p1 -i "${srcdir}/003-no-pthread.patch"
}
build() {
@ -53,6 +58,7 @@ build() {
# on why --disable-modules=thread_utils is here.
MSYS2_ARG_CONV_EXCL="--prefix=;--libdir=;--bindir=" \
${MINGW_PREFIX}/bin/python configure.py \
--build-tool=ninja \
--disable-modules=thread_utils \
--os=mingw \
--cc=${CC} \
@ -66,7 +72,7 @@ build() {
--with-sqlite3 \
--with-zlib
make
ninja
}
check() {
@ -78,7 +84,7 @@ package() {
cd "${srcdir}/build-${MSYSTEM}"
MSYS2_ARG_CONV_EXCL="--prefix=;--libdir=;--bindir=" \
DESTDIR="${pkgdir}" \
make install
ninja install
MSYS2_ARG_CONV_EXCL="-p" python -m compileall \
-o 0 -o 1 -q -s"${pkgdir}" -p"/" "${pkgdir}${MINGW_PREFIX}/lib/python"*