diff --git a/mingw-w64-libbotan/001-boost-link.patch b/mingw-w64-libbotan/001-boost-link.patch
deleted file mode 100644
index 61c0b59073..0000000000
--- a/mingw-w64-libbotan/001-boost-link.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Botan-1.11.21/src/lib/utils/boost/info.txt.orig 2015-10-12 08:53:49.742291300 +0300
-+++ Botan-1.11.21/src/lib/utils/boost/info.txt 2015-10-12 08:53:54.340367300 +0300
-@@ -5,7 +5,7 @@
- load_on vendor
-
-
--all -> boost_system
-+all -> boost_system-mt
-
-
-
diff --git a/mingw-w64-libbotan/002-winsock-link.patch b/mingw-w64-libbotan/002-winsock-link.patch
index 3cdb776299..a2215a651e 100644
--- a/mingw-w64-libbotan/002-winsock-link.patch
+++ b/mingw-w64-libbotan/002-winsock-link.patch
@@ -1,6 +1,6 @@
---- Botan-2.13.0/src/lib/utils/socket/info.txt.orig 2020-01-12 18:08:42.988545200 +0200
-+++ Botan-2.13.0/src/lib/utils/socket/info.txt 2020-01-12 18:08:51.925072800 +0200
-@@ -10,7 +10,7 @@
+--- Botan-3.2.0/src/lib/utils/socket/info.txt.orig 2023-11-22 07:06:51.114200000 +0100
++++ Botan-3.2.0/src/lib/utils/socket/info.txt 2023-11-22 07:06:27.546845800 +0100
+@@ -14,7 +14,7 @@
linux -> rt
diff --git a/mingw-w64-libbotan/003-enable-shared.patch b/mingw-w64-libbotan/003-enable-shared.patch
deleted file mode 100644
index 908b963a1b..0000000000
--- a/mingw-w64-libbotan/003-enable-shared.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- Botan-2.18.1/src/build-data/os/mingw.txt.orig 2021-09-23 18:31:48.072000200 +0200
-+++ Botan-2.18.1/src/build-data/os/mingw.txt 2021-09-23 18:33:01.963424400 +0200
-@@ -8,6 +8,9 @@
- lib_dir lib
- doc_dir share/doc
-
-+soname_pattern_base "{lib_prefix}{libname}.dll"
-+shared_lib_symlinks no
-+
- # see https://sourceforge.net/p/mingw-w64/bugs/755/
- use_stack_protector no
-
---- Botan-2.18.1/src/scripts/install.py.orig 2021-09-23 21:50:48.316660600 +0200
-+++ Botan-2.18.1/src/scripts/install.py 2021-09-23 21:54:09.336719700 +0200
-@@ -191,6 +191,13 @@
- soname_base = libname + '.dll'
- copy_executable(os.path.join(out_dir, soname_base),
- prepend_destdir(os.path.join(bin_dir, soname_base)))
-+ elif target_os == "mingw":
-+ shared_lib_name = cfg['shared_lib_name']
-+ copy_executable(os.path.join(out_dir, shared_lib_name),
-+ prepend_destdir(os.path.join(bin_dir, shared_lib_name)))
-+ implib_name = shared_lib_name + '.a'
-+ copy_executable(os.path.join(out_dir, implib_name),
-+ prepend_destdir(os.path.join(lib_dir, implib_name)))
- else:
- soname_patch = cfg['soname_patch']
- soname_abi = cfg['soname_abi']
---- Botan-2.18.1/src/build-data/cc/clang.txt.orig 2021-09-23 20:56:10.946000000 +0200
-+++ Botan-2.18.1/src/build-data/cc/clang.txt 2021-09-23 21:24:40.636537000 +0200
-@@ -37,6 +37,8 @@
-
- # The default works for GNU ld and several other Unix linkers
- default -> "$(CXX) -shared -fPIC -Wl,-soname,{soname_abi}"
-+
-+mingw -> "$(CXX) -shared -Wl,--out-implib,{shared_lib_name}.a"
-
-
-
---- Botan-2.18.1/src/build-data/cc/gcc.txt.orig 2021-09-23 20:56:42.407808200 +0200
-+++ Botan-2.18.1/src/build-data/cc/gcc.txt 2021-09-23 21:24:56.862519700 +0200
-@@ -45,6 +45,8 @@
- # AIX and OpenBSD don't use sonames at all
- aix -> "$(CXX) -shared -fPIC"
- openbsd -> "$(CXX) -shared -fPIC"
-+
-+mingw -> "$(CXX) -shared -Wl,--out-implib,{shared_lib_name}.a"
-
-
-
---- Botan-2.18.1/src/python/botan2.py.orig 2021-09-23 22:05:38.880263000 +0200
-+++ Botan-2.18.1/src/python/botan2.py 2021-09-23 22:05:45.327515900 +0200
-@@ -56,6 +56,7 @@
-
- if platform in ['win32', 'cygwin', 'msys']:
- possible_dll_names.append('botan.dll')
-+ possible_dll_names.append('libbotan-2.dll')
- elif platform in ['darwin', 'macos']:
- possible_dll_names.append('libbotan-2.dylib')
- else:
diff --git a/mingw-w64-libbotan/PKGBUILD b/mingw-w64-libbotan/PKGBUILD
index 082fe94b72..1709400acf 100644
--- a/mingw-w64-libbotan/PKGBUILD
+++ b/mingw-w64-libbotan/PKGBUILD
@@ -3,13 +3,14 @@
_realname=libbotan
pkgbase="mingw-w64-${_realname}"
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=2.19.3
-pkgrel=2
+pkgver=3.2.0
+pkgrel=1
arch=('any')
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32')
msys2_references=(
'archlinux: botan'
)
+msys2_repository_url='https://github.com/randombit/botan'
url='https://botan.randombit.net/'
pkgdesc='Botan is a C++ cryptography library released under the permissive Simplified BSD license (mingw-w64)'
depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
@@ -17,26 +18,21 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
"${MINGW_PACKAGE_PREFIX}-bzip2"
"${MINGW_PACKAGE_PREFIX}-sqlite3"
"${MINGW_PACKAGE_PREFIX}-zlib"
- "${MINGW_PACKAGE_PREFIX}-xz"
- $([[ ${MINGW_PACKAGE_PREFIX} != *-clang-* ]] || echo "${MINGW_PACKAGE_PREFIX}-openmp"))
+ "${MINGW_PACKAGE_PREFIX}-xz")
makedepends=("${MINGW_PACKAGE_PREFIX}-python"
"${MINGW_PACKAGE_PREFIX}-python-sphinx"
"${MINGW_PACKAGE_PREFIX}-python-imagesize"
"${MINGW_PACKAGE_PREFIX}-cc")
#"${MINGW_PACKAGE_PREFIX}-doxygen"
#"${MINGW_PACKAGE_PREFIX}-graphviz")
-license=('BSD')
+license=('spdx:BSD-2-Clause')
options=('strip' 'staticlibs' 'docs')
source=("https://botan.randombit.net/releases/Botan-${pkgver}.tar.xz"{,.asc}
- '001-boost-link.patch'
- '002-winsock-link.patch'
- '003-enable-shared.patch')
+ '002-winsock-link.patch')
noextract=("Botan-${pkgver}.tar.xz")
-sha256sums=('dae047f399c5a47f087db5d3d9d9e8f11ae4985d14c928d71da1aff801802d55'
+sha256sums=('049c847835fcf6ef3a9e206b33de05dd38999c325e247482772a5598d9e5ece3'
'SKIP'
- 'c4dfd71c7e6a9592e2a95634e3fabfc071c1110a96ba218c4a3565fa14cb34da'
- '12f676d9c8f66decd7dc52a6a70f0c044737636837c79ae02f96d8d5a2168c46'
- 'eb412004200932ab3b7e8649b81225f2afc44cb06d154adc166b167c73997787')
+ 'cf9974f076d91e8f58f7d9688b7ab78cc790720923c73b293871fc7b83fd55c6')
validpgpkeys=('621DAF6411E1851C4CF9A2E16211EBF1EFBADFBC') # Botan Distribution Key
prepare() {
@@ -44,9 +40,8 @@ prepare() {
# Tarball contains Botan-${pkgver}.tgz/.travis.yml symlink
bsdtar -xJf "Botan-${pkgver}.tar.xz" || true
cd "Botan-${pkgver}"
- patch -p1 -i "${srcdir}/001-boost-link.patch"
+
patch -p1 -i "${srcdir}/002-winsock-link.patch"
- patch -p1 -i "${srcdir}/003-enable-shared.patch"
}
build() {
@@ -73,7 +68,6 @@ build() {
--with-sphinx \
--without-rst2man \
--with-boost \
- --with-openmp \
--with-bzip2 \
--with-lzma \
--with-sqlite3 \