resolved conflict

.gitignore

@@ -2,6 +2,7 @@
 
 CMakeCache.txt
 Makefile
+CMakeFiles
 # Compiled source #
 ###################
 *.com

ext/botan/.github/workflows/ci.yml

@@ -0,0 +1,88 @@
+
+# (C) 2020 Jack Lloyd
+# Botan is released under the Simplified BSD License (see license.txt)
+
+name: ci
+
+on:
+  push:
+    branches: [ release-2 ]
+  pull_request:
+    branches: [ release-2 ]
+
+jobs:
+  ci:
+    runs-on: ${{ matrix.host_os }}
+
+    env:
+      ANDROID_NDK: android-ndk-r21d
+
+    strategy:
+      fail-fast: false
+
+      matrix:
+        include:
+          - target: coverage
+            compiler: gcc
+            host_os: ubuntu-20.04
+          - target: shared
+            compiler: gcc
+            host_os: ubuntu-20.04
+          - target: shared
+            compiler: clang
+            host_os: ubuntu-20.04
+          - target: valgrind
+            compiler: gcc
+            host_os: ubuntu-20.04
+          - target: fuzzers
+            compiler: gcc
+            host_os: ubuntu-20.04
+          - target: cross-i386
+            compiler: gcc
+            host_os: ubuntu-20.04
+          - target: cross-arm64
+            compiler: gcc
+            host_os: ubuntu-20.04
+          - target: cross-ppc64
+            compiler: gcc
+            host_os: ubuntu-20.04
+          - target: cross-android-arm32
+            compiler: clang
+            host_os: ubuntu-20.04
+          - target: cross-android-arm64
+            compiler: clang
+            host_os: ubuntu-20.04
+          - target: cross-win64
+            compiler: gcc
+            host_os: ubuntu-20.04
+          - target: baremetal
+            compiler: gcc
+            host_os: ubuntu-20.04
+          - target: minimized
+            compiler: gcc
+            host_os: ubuntu-20.04
+          - target: bsi
+            compiler: gcc
+            host_os: ubuntu-20.04
+          - target: lint
+            compiler: gcc
+            host_os: ubuntu-20.04
+          - target: shared
+            compiler: clang
+            host_os: macos-latest
+          - target: cross-ios-arm64
+            compiler: clang
+            host_os: macos-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/cache@v2
+        with:
+            path: |
+              ~/.ccache
+              /Users/runner/Library/Caches/ccache
+            key: release-2-${{ runner.os }}-${{ matrix.compiler }}-${{ matrix.target }}-${{ github.run_id }}
+            restore-keys: |
+               release-2-${{ runner.os }}-${{ matrix.compiler }}-${{ matrix.target }}-
+      - run: ./src/scripts/ci/setup_gh_actions.sh ${{ matrix.target }}
+      - run: ./src/scripts/ci_build.py --cc '${{ matrix.compiler }}' ${{ matrix.target }}

ext/botan/.gitignore

@@ -0,0 +1,86 @@
+/Makefile
+CMakeLists.txt*
+libbotan*.so.*
+*.a
+*.so
+*.dylib
+*.exp
+*.lib
+*.pdb
+*.ilk
+*.dll
+*.exe
+*.manifest
+build
+build.log
+botan
+botan-test
+
+core.*
+vgcore.*
+
+# Text file backups (e.g. gedit, joe)
+*~
+\#*\#
+.\#*
+
+# Archive files
+*.tgz
+*.tar
+
+# Logs
+*.log
+
+# Patch files
+*.patch
+*.diff
+*.orig
+*.rej
+
+# Cache and temporary files
+*.pyc
+.DS_Store
+*.swp
+
+# ctags/etags files
+/TAGS
+/tags
+
+# Amalgamation code
+botan_all.h
+botan_all_internal.h
+botan_all.cpp
+botan_all_*.cpp
+
+# Coverage output
+coverage.info
+coverage.info.raw
+coverage/
+lcov-out/
+
+/fuzzer_corpus
+
+# Profiler outputs
+cachegrind.*
+callgrind.*
+
+# Ignore stuff in the top level dir that shouldn't be checked in
+/*.c
+/*.cpp
+/*.h
+/*.py
+/*.key
+/*.pem
+/*.der
+/*.ber
+/*.gpg
+/*.pub
+/*.crt
+/*.txt
+/*.rst
+
+# Add back files from the toplevel
+!/news.rst
+!/readme.rst
+!/configure.py
+!/license.txt

ext/botan/.lgtm.yml

@@ -0,0 +1 @@
+src/scripts/ci/lgtm.yml

ext/botan/.travis.yml

@@ -0,0 +1 @@
+src/scripts/ci/travis.yml