[botan] update to 3.7.1 (#43849)

microsoft · Feb 14, 2025 · ca5eab2 · ca5eab2
1 parent 87cd03f
commit ca5eab2
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 34 deletions.
diff --git a/ports/botan/0009-fix-regression-f2bf049-85491b3.patch b/ports/botan/0009-fix-regression-f2bf049-85491b3.patch
@@ -1,8 +1,8 @@
 diff --git a/configure.py b/configure.py
-index be0dc23..27f48b8 100644
+index fcf9e7e..c0f72df 100755
 --- a/configure.py
 +++ b/configure.py
-@@ -2322,6 +2322,8 @@ def create_template_vars(source_paths, build_paths, options, modules, disabled_m
+@@ -2351,6 +2351,8 @@ def create_template_vars(source_paths, build_paths, options, modules, disabled_m
          # just transfer them over to just the compiler invocations
          variables['cc_compile_flags'] = '%s %s' % (variables['cxx_abi_flags'], variables['cc_compile_flags'])
          variables['cxx_abi_flags'] = ''
@@ -11,29 +11,3 @@ index be0dc23..27f48b8 100644
 
      variables['lib_flags'] = cc.gen_lib_flags(options, variables)
 
-diff --git a/src/build-data/makefile.in b/src/build-data/makefile.in
-index 7696aa7..4dbf192 100644
---- a/src/build-data/makefile.in
-+++ b/src/build-data/makefile.in
-@@ -16,7 +16,7 @@ LANG_EXE_FLAGS = %{cc_lang_binary_linker_flags}
- CXXFLAGS       = %{cc_compile_flags}
- WARN_FLAGS     = %{cc_warning_flags}
- LIB_FLAGS      = %{lib_flags}
--LDFLAGS        = %{ldflags} %{cc_compile_flags}
-+LDFLAGS        = %{ldflags}
-
- EXE_LINK_CMD   = %{exe_link_cmd}
-
-diff --git a/src/build-data/ninja.in b/src/build-data/ninja.in
-index a6279d3..414663a 100644
---- a/src/build-data/ninja.in
-+++ b/src/build-data/ninja.in
-@@ -10,7 +10,7 @@ LANG_EXE_FLAGS = %{cc_lang_binary_linker_flags}
- CXXFLAGS       = %{cc_compile_flags}
- WARN_FLAGS     = %{cc_warning_flags}
-
--LDFLAGS        = %{ldflags} %{cc_compile_flags}
-+LDFLAGS        = %{ldflags}
-
- EXE_LINK_CMD   = %{exe_link_cmd}
-
diff --git a/ports/botan/libcxx-winpthread-fixes.patch b/ports/botan/libcxx-winpthread-fixes.patch
@@ -1,14 +1,14 @@
 diff --git a/src/tests/tests.h b/src/tests/tests.h
-index d198376..12f001a 100644
+index 284cf28..ad4996b 100644
 --- a/src/tests/tests.h
 +++ b/src/tests/tests.h
-@@ -17,7 +17,9 @@
+@@ -18,7 +18,9 @@
  #include <map>
  #include <memory>
  #include <optional>
 +#ifndef __ANDROID__
  #include <ranges>
 +#endif
  #include <set>
+ #include <span>
  #include <sstream>
- #include <string>
diff --git a/ports/botan/portfile.cmake b/ports/botan/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO randombit/botan
     REF "${VERSION}"
-    SHA512 dcd9ac8e748422d55854c38e565704e4a239418b6855836bdea85bd4dc3ab45e218d320471b98b6a451fc63d8518895f3813a50c94dee90227c09d12d96ca1dc
+    SHA512 596f4c5c167d1a8d3e387b764fab95fc01827988df93da9cdf3c10d632c8e662d3f9a2121a43c79ab44534a45b7e63c0e1adef61c7666d7851b83f6065815788 
     HEAD_REF master
     PATCHES
         embed-debug-info.patch

diff --git a/ports/botan/vcpkg.json b/ports/botan/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "botan",
-  "version": "3.6.1",
+  "version": "3.7.1",
   "description": "A cryptography library written in C++11",
   "homepage": "https://botan.randombit.net",
   "license": "BSD-2-Clause",

diff --git a/versions/b-/botan.json b/versions/b-/botan.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "312e72bd6bbd815b4a10035fd6bd48a7fdb32825",
+      "version": "3.7.1",
+      "port-version": 0
+    },
     {
       "git-tree": "eb6faea666501a265f3603c014bdee929c0174c3",
       "version": "3.6.1",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -1365,7 +1365,7 @@
       "port-version": 0
     },
     "botan": {
-      "baseline": "3.6.1",
+      "baseline": "3.7.1",
       "port-version": 0
     },
     "box2d": {