Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 0 additions & 13 deletions ports/botan/0009-fix-regression-f2bf049-85491b3.patch

This file was deleted.

79 changes: 0 additions & 79 deletions ports/botan/fix-cmake-usage.patch

This file was deleted.

43 changes: 43 additions & 0 deletions ports/botan/fix-x86-msvc-amalgamation.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
commit d3856e94deb950ad6ae08049ca0b8758ab027f33
Author: Rene Meusel <[email protected]>
Date: Thu Jan 8 10:14:28 2026 +0100

FIX: build failure on MSVC x86 due to fault constraint

Frankly, I'm not sure why this shows up on x86 MSVC only but
relaxing this constraint is consistent with the calling function
and also makes sense semantically.

diff --git a/src/lib/utils/bitvector/bitvector.h b/src/lib/utils/bitvector/bitvector.h
index 4551dceb8..8ae6aaa4b 100644
--- a/src/lib/utils/bitvector/bitvector.h
+++ b/src/lib/utils/bitvector/bitvector.h
@@ -1184,7 +1184,7 @@ class bitvector_base final {

private:
template <std::unsigned_integral... BlockTs>
- requires(all_same_v<BlockTs...>)
+ requires(all_same_v<std::remove_cv_t<BlockTs>...>)
constexpr static auto apply(FnT fn, size_type bits, BlockTs... blocks) {
if constexpr(needs_mask) {
return fn(blocks..., make_mask<detail::first_t<BlockTs...>>(bits));

commit 1e83c70ceb13cf5b712ecd1da3c5c1ad41d83151
Author: Rene Meusel <[email protected]>
Date: Thu Jan 8 10:51:29 2026 +0100

FIX: implicit conversion warning on MSVC x86

diff --git a/src/examples/hash.cpp b/src/examples/hash.cpp
index e886220ac..fa720d89c 100644
--- a/src/examples/hash.cpp
+++ b/src/examples/hash.cpp
@@ -12,7 +12,7 @@ int main() {
while(std::cin.good()) {
// read STDIN to buffer
std::cin.read(reinterpret_cast<char*>(buf.data()), static_cast<std::streamsize>(buf.size()));
- size_t readcount = std::cin.gcount();
+ const auto readcount = static_cast<size_t>(std::cin.gcount());
// update hash computations with read data
hash1->update(std::span{buf}.first(readcount));
hash2->update(std::span{buf}.first(readcount));
14 changes: 0 additions & 14 deletions ports/botan/libcxx-winpthread-fixes.patch

This file was deleted.

27 changes: 7 additions & 20 deletions ports/botan/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,15 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO randombit/botan
REF "${VERSION}"
SHA512 596f4c5c167d1a8d3e387b764fab95fc01827988df93da9cdf3c10d632c8e662d3f9a2121a43c79ab44534a45b7e63c0e1adef61c7666d7851b83f6065815788
SHA512 83e8d9c877a7e1c253efb94953758dde141ef23f74c727294c3a9af60db02401e1aef92368908b297bad1fc005d155e6c63bd726ccc48ea831f46cc5c1915633
HEAD_REF master
PATCHES
embed-debug-info.patch
pkgconfig.patch
verbose-install.patch
configure-zlib.patch
fix_android.patch
libcxx-winpthread-fixes.patch
fix-cmake-usage.patch
0009-fix-regression-f2bf049-85491b3.patch # extract from PR 4255
fix-x86-msvc-amalgamation.patch
)
file(COPY "${CMAKE_CURRENT_LIST_DIR}/configure" DESTINATION "${SOURCE_PATH}")

Expand Down Expand Up @@ -79,20 +77,14 @@ endif()
if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
vcpkg_list(APPEND configure_arguments --os=windows)

if(VCPKG_DETECTED_CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
vcpkg_list(APPEND configure_arguments --cc=msvc)
endif()

# When compiling with Clang, -mrdrand is required to enable the RDRAND intrinsics. Botan will
# check for RDRAND at runtime before trying to use it, so we should be safe to specify this
# without triggering illegal instruction faults on older CPUs.
if(VCPKG_DETECTED_CMAKE_CXX_COMPILER MATCHES "clang-cl(\.exe)?$")
vcpkg_list(APPEND configure_arguments "--extra-cxxflags=${VCPKG_DETECTED_CMAKE_CXX_FLAGS} -mrdrnd")
else()
# ...otherwise just forward the detected CXXFLAGS.
vcpkg_list(APPEND configure_arguments "--extra-cxxflags=${VCPKG_DETECTED_CMAKE_CXX_FLAGS}")
vcpkg_list(APPEND configure_arguments "--cc=clangcl")
elseif(VCPKG_DETECTED_CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
vcpkg_list(APPEND configure_arguments "--cc=msvc")
endif()

vcpkg_list(APPEND configure_arguments "--extra-cxxflags=${VCPKG_DETECTED_CMAKE_CXX_FLAGS}")

if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
vcpkg_list(APPEND configure_arguments --enable-shared-library --disable-static-library)
else()
Expand Down Expand Up @@ -197,9 +189,4 @@ file(REMOVE_RECURSE
"${CURRENT_PACKAGES_DIR}/include/botan-3"
)

vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/botan/build.h" "#define BOTAN_INSTALL_PREFIX R\"(${CURRENT_PACKAGES_DIR})\"" "")
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/botan/build.h" "#define BOTAN_INSTALL_LIB_DIR R\"(${CURRENT_PACKAGES_DIR}\\lib)\"" "" IGNORE_UNCHANGED)
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/botan/build.h" "#define BOTAN_INSTALL_LIB_DIR R\"(${CURRENT_PACKAGES_DIR}/lib)\"" "" IGNORE_UNCHANGED)
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/botan/build.h" "--prefix=${CURRENT_PACKAGES_DIR}" "")

vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/license.txt")
2 changes: 1 addition & 1 deletion ports/botan/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "botan",
"version": "3.7.1",
"version": "3.10.0",
"description": "A cryptography library written in C++11",
"homepage": "https://botan.randombit.net",
"license": "BSD-2-Clause",
Expand Down
5 changes: 5 additions & 0 deletions versions/b-/botan.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "5e08c248836403a7fa5ae4f128909266f79dca8f",
"version": "3.10.0",
"port-version": 0
},
{
"git-tree": "312e72bd6bbd815b4a10035fd6bd48a7fdb32825",
"version": "3.7.1",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -1449,7 +1449,7 @@
"port-version": 0
},
"botan": {
"baseline": "3.7.1",
"baseline": "3.10.0",
"port-version": 0
},
"box2d": {
Expand Down