diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-14 19:22:06 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-14 19:22:06 +0000 |
commit | 5ecaa3a7f798e0da8bd46ed1757c21c0d6334505 (patch) | |
tree | 6947e7c36a88bbb00e0a950ee6b33e2aaf6254ff /ci-legacy | |
parent | Adding upstream version 0.17.0. (diff) | |
download | rnp-upstream.tar.xz rnp-upstream.zip |
Adding upstream version 0.17.1.upstream/0.17.1upstream
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
-rwxr-xr-x | ci-legacy/build_package_rpm.sh (renamed from ci/build_package_rpm.sh) | 0 | ||||
-rw-r--r-- | ci-legacy/env-common.inc.sh (renamed from ci/env-common.inc.sh) | 4 | ||||
-rw-r--r-- | ci-legacy/env-freebsd.inc.sh (renamed from ci/env-freebsd.inc.sh) | 0 | ||||
-rw-r--r-- | ci-legacy/env-linux.inc.sh (renamed from ci/env-linux.inc.sh) | 0 | ||||
-rw-r--r-- | ci-legacy/env.inc.sh (renamed from ci/env.inc.sh) | 0 | ||||
-rw-r--r-- | ci-legacy/gha/setup-env.inc.sh (renamed from ci/gha/setup-env.inc.sh) | 0 | ||||
-rwxr-xr-x | ci-legacy/install.sh (renamed from ci/install.sh) | 0 | ||||
-rwxr-xr-x | ci-legacy/install_cacheable_dependencies.sh (renamed from ci/install_cacheable_dependencies.sh) | 0 | ||||
-rwxr-xr-x | ci-legacy/install_noncacheable_dependencies.sh (renamed from ci/install_noncacheable_dependencies.sh) | 0 | ||||
-rw-r--r-- | ci-legacy/lib/cacheable_install_functions.inc.sh (renamed from ci/lib/cacheable_install_functions.inc.sh) | 24 | ||||
-rw-r--r-- | ci-legacy/lib/install_functions.inc.sh (renamed from ci/lib/install_functions.inc.sh) | 0 | ||||
-rwxr-xr-x | ci-legacy/local.sh (renamed from ci/local.sh) | 0 | ||||
-rwxr-xr-x | ci-legacy/main.sh (renamed from ci/main.sh) | 0 | ||||
-rwxr-xr-x | ci-legacy/run.sh (renamed from ci/run.sh) | 0 | ||||
-rwxr-xr-x | ci-legacy/style-check.sh (renamed from ci/style-check.sh) | 0 | ||||
-rwxr-xr-x | ci-legacy/success.sh (renamed from ci/success.sh) | 0 | ||||
-rw-r--r-- | ci-legacy/utils.inc.sh (renamed from ci/utils.inc.sh) | 0 |
17 files changed, 15 insertions, 13 deletions
diff --git a/ci/build_package_rpm.sh b/ci-legacy/build_package_rpm.sh index 645bf5d..645bf5d 100755 --- a/ci/build_package_rpm.sh +++ b/ci-legacy/build_package_rpm.sh diff --git a/ci/env-common.inc.sh b/ci-legacy/env-common.inc.sh index 11712f0..1e2f9ed 100644 --- a/ci/env-common.inc.sh +++ b/ci-legacy/env-common.inc.sh @@ -21,9 +21,5 @@ if [ "$BUILD_MODE" = "sanitize" ]; then export CC=clang fi -BOTAN_MODULES=$(<ci/botan-modules tr '\n' ',') - -export BOTAN_MODULES - # Don't clean up tempdirs when in CI runners to save time. Unset to disable. export RNP_KEEP_TEMP=1 diff --git a/ci/env-freebsd.inc.sh b/ci-legacy/env-freebsd.inc.sh index 3509111..3509111 100644 --- a/ci/env-freebsd.inc.sh +++ b/ci-legacy/env-freebsd.inc.sh diff --git a/ci/env-linux.inc.sh b/ci-legacy/env-linux.inc.sh index 9267972..9267972 100644 --- a/ci/env-linux.inc.sh +++ b/ci-legacy/env-linux.inc.sh diff --git a/ci/env.inc.sh b/ci-legacy/env.inc.sh index ab2271f..ab2271f 100644 --- a/ci/env.inc.sh +++ b/ci-legacy/env.inc.sh diff --git a/ci/gha/setup-env.inc.sh b/ci-legacy/gha/setup-env.inc.sh index c0aca85..c0aca85 100644 --- a/ci/gha/setup-env.inc.sh +++ b/ci-legacy/gha/setup-env.inc.sh diff --git a/ci/install.sh b/ci-legacy/install.sh index 9d90265..9d90265 100755 --- a/ci/install.sh +++ b/ci-legacy/install.sh diff --git a/ci/install_cacheable_dependencies.sh b/ci-legacy/install_cacheable_dependencies.sh index ea23ad6..ea23ad6 100755 --- a/ci/install_cacheable_dependencies.sh +++ b/ci-legacy/install_cacheable_dependencies.sh diff --git a/ci/install_noncacheable_dependencies.sh b/ci-legacy/install_noncacheable_dependencies.sh index bfb93da..bfb93da 100755 --- a/ci/install_noncacheable_dependencies.sh +++ b/ci-legacy/install_noncacheable_dependencies.sh diff --git a/ci/lib/cacheable_install_functions.inc.sh b/ci-legacy/lib/cacheable_install_functions.inc.sh index 6ef35bb..b58d8d9 100644 --- a/ci/lib/cacheable_install_functions.inc.sh +++ b/ci-legacy/lib/cacheable_install_functions.inc.sh @@ -14,20 +14,26 @@ install_botan() { # botan local botan_build=${LOCAL_BUILDS}/botan - if [[ ! -e "${BOTAN_INSTALL}/lib/libbotan-2.so" ]] && \ - [[ ! -e "${BOTAN_INSTALL}/lib/libbotan-2.dylib" ]] && \ - [[ ! -e "${BOTAN_INSTALL}/lib/libbotan-2.a" ]]; then + local botan_v=${BOTAN_VERSION::1} + if [[ ! -e "${BOTAN_INSTALL}/lib/libbotan-${botan_v}.so" ]] && \ + [[ ! -e "${BOTAN_INSTALL}/lib/libbotan-${botan_v}.dylib" ]] && \ + [[ ! -e "${BOTAN_INSTALL}/lib/libbotan-${botan_v}.a" ]]; then if [[ -d "${botan_build}" ]]; then rm -rf "${botan_build}" fi git clone --depth 1 --branch "${BOTAN_VERSION}" https://github.com/randombit/botan "${botan_build}" - pushd "${botan_build}" local osparam=() local cpuparam=() local run=run + local osslparam=() + local modules="" + [[ "${botan_v}" == "2" ]] && osslparam+=("--without-openssl") && modules=$(<ci/botan-modules tr '\n' ',') + [[ "${botan_v}" == "3" ]] && modules=$(<ci/botan3-modules tr '\n' ',') + + pushd "${botan_build}" # Position independent code is a default for shared libraries at any xNIX platform # but it makes no sense and is not supported for Windows local extra_cflags="-fPIC" @@ -47,8 +53,8 @@ install_botan() { is_use_static_dependencies && build_target="static,cli" "${run}" ./configure.py --prefix="${BOTAN_INSTALL}" --with-debug-info --extra-cxxflags="-fno-omit-frame-pointer ${extra_cflags}" \ - ${osparam+"${osparam[@]}"} ${cpuparam+"${cpuparam[@]}"} --without-documentation --without-openssl --build-targets="${build_target}" \ - --minimized-build --enable-modules="$BOTAN_MODULES" + ${osparam+"${osparam[@]}"} ${cpuparam+"${cpuparam[@]}"} --without-documentation ${osslparam+"${osslparam[@]}"} --build-targets="${build_target}" \ + --minimized-build --enable-modules="$modules" ${MAKE} -j"${MAKE_PARALLEL}" install popd fi @@ -224,11 +230,11 @@ install_gpg() { # npth libgpg-error libgcrypt libassuan libksba pinentry gnupg _install_gpg component-version 1.6 1.46 1.8.10 2.5.5 1.6.3 1.2.1 2.2.41 ;; - beta) + # beta) # npth libgpg-error libgcrypt libassuan libksba pinentry gnupg - _install_gpg component-git-ref 2501a48 f73605e d9c4183 909133b 3df0cd3 0e2e53c c6702d7 + # _install_gpg component-git-ref 2501a48 f73605e d9c4183 909133b 3df0cd3 0e2e53c c6702d7 # _install_gpg component-git-ref 7e45b50 c66594d cf88dca 57cf9d6 4243085 6e8ad31 d4e5979 - ;; + # ;; "2.3.1") # npth libgpg-error libgcrypt libassuan libksba pinentry gnupg _install_gpg component-version 1.6 1.42 1.9.3 2.5.5 1.6.0 1.1.1 2.3.1 diff --git a/ci/lib/install_functions.inc.sh b/ci-legacy/lib/install_functions.inc.sh index 98acc82..98acc82 100644 --- a/ci/lib/install_functions.inc.sh +++ b/ci-legacy/lib/install_functions.inc.sh diff --git a/ci/local.sh b/ci-legacy/local.sh index db687ff..db687ff 100755 --- a/ci/local.sh +++ b/ci-legacy/local.sh diff --git a/ci/main.sh b/ci-legacy/main.sh index c8d80c9..c8d80c9 100755 --- a/ci/main.sh +++ b/ci-legacy/main.sh diff --git a/ci/run.sh b/ci-legacy/run.sh index b9e366c..b9e366c 100755 --- a/ci/run.sh +++ b/ci-legacy/run.sh diff --git a/ci/style-check.sh b/ci-legacy/style-check.sh index 683bbcd..683bbcd 100755 --- a/ci/style-check.sh +++ b/ci-legacy/style-check.sh diff --git a/ci/success.sh b/ci-legacy/success.sh index 1a34be7..1a34be7 100755 --- a/ci/success.sh +++ b/ci-legacy/success.sh diff --git a/ci/utils.inc.sh b/ci-legacy/utils.inc.sh index 618df78..618df78 100644 --- a/ci/utils.inc.sh +++ b/ci-legacy/utils.inc.sh |