From 84715ad733956846e2c54fd4aa4191ce41bc578a Mon Sep 17 00:00:00 2001 From: Steffen Michels Date: Fri, 8 Oct 2021 14:14:04 +0200 Subject: [PATCH] include and use CA certificate of GEANT, as this seems not to be known by curl/wget, which causes builds to fail --- .../cross-android-32-linux-x64/setup.sh | 2 +- clean-base/linux-arm64/build.sh | 2 +- clean-base/linux-x64/setup.sh | 2 +- clean-base/linux-x86/setup.sh | 2 +- clean-base/macos-x64/setup.sh | 2 +- clean-base/windows-x64/setup.sh | 2 +- clean-base/windows-x86/setup.sh | 2 +- clean-classic/linux-arm32/setup.sh | 2 +- clean-classic/linux-arm64/setup.sh | 2 +- clean-classic/linux-thumb/setup.sh | 2 +- clean-classic/linux-x64/setup.sh | 2 +- clean-classic/linux-x86/setup.sh | 2 +- clean-classic/macos-x64/setup.sh | 3 +- clean-classic/windows-x64/setup.sh | 2 +- clean-classic/windows-x86/setup.sh | 2 +- geant.pem | 39 +++++++++++++++++++ generic/setup.sh | 4 +- 17 files changed, 56 insertions(+), 18 deletions(-) create mode 100644 geant.pem diff --git a/clean-base/cross-android-32-linux-x64/setup.sh b/clean-base/cross-android-32-linux-x64/setup.sh index 6d18369..81b86f6 100755 --- a/clean-base/cross-android-32-linux-x64/setup.sh +++ b/clean-base/cross-android-32-linux-x64/setup.sh @@ -1,6 +1,6 @@ #!/bin/sh mkdir -p dependencies -curl -L -o dependencies/clean.tgz https://ftp.cs.ru.nl/Clean/builds/linux-x64/clean-bundle-complete-linux-x64-latest.tgz +curl --cacert geant.pem -L -o dependencies/clean.tgz https://ftp.cs.ru.nl/Clean/builds/linux-x64/clean-bundle-complete-linux-x64-latest.tgz (cd dependencies mkdir -p clean tar -xzf clean.tgz -C clean --strip-components=1 diff --git a/clean-base/linux-arm64/build.sh b/clean-base/linux-arm64/build.sh index bf9f364..ecb9691 100755 --- a/clean-base/linux-arm64/build.sh +++ b/clean-base/linux-arm64/build.sh @@ -15,7 +15,7 @@ ARCH=$3 build_bootstrap_clean () { # Download bootstrap version for x64 (cd build - curl https://ftp.cs.ru.nl/Clean/Clean30/linux/clean3.0_64_boot.tar.gz | tar xz + curl --cacert ../geant.pem https://ftp.cs.ru.nl/Clean/Clean30/linux/clean3.0_64_boot.tar.gz | tar xz ) # Copy previously built clm diff --git a/clean-base/linux-x64/setup.sh b/clean-base/linux-x64/setup.sh index 4e2af03..4add420 100755 --- a/clean-base/linux-x64/setup.sh +++ b/clean-base/linux-x64/setup.sh @@ -1,6 +1,6 @@ #!/bin/bash mkdir -p dependencies -curl -L -o dependencies/bootstrap-clean.tgz https://ftp.cs.ru.nl/Clean/Clean30/linux/clean3.0_64.tar.gz +curl --cacert geant.pem -L -o dependencies/bootstrap-clean.tgz https://ftp.cs.ru.nl/Clean/Clean30/linux/clean3.0_64.tar.gz (cd dependencies tar -xzf bootstrap-clean.tgz mv clean bootstrap-clean diff --git a/clean-base/linux-x86/setup.sh b/clean-base/linux-x86/setup.sh index daccefd..8582d0e 100755 --- a/clean-base/linux-x86/setup.sh +++ b/clean-base/linux-x86/setup.sh @@ -1,6 +1,6 @@ #!/bin/bash mkdir -p dependencies -curl -L -o dependencies/bootstrap-clean.tgz https://ftp.cs.ru.nl/Clean/Clean30/linux/clean3.0_32.tar.gz +curl --cacert geant.pem -L -o dependencies/bootstrap-clean.tgz https://ftp.cs.ru.nl/Clean/Clean30/linux/clean3.0_32.tar.gz (cd dependencies tar -xzf bootstrap-clean.tgz mv clean bootstrap-clean diff --git a/clean-base/macos-x64/setup.sh b/clean-base/macos-x64/setup.sh index f873003..ce61ab9 100755 --- a/clean-base/macos-x64/setup.sh +++ b/clean-base/macos-x64/setup.sh @@ -1,6 +1,6 @@ #!/bin/bash mkdir -p dependencies -curl -L -o dependencies/bootstrap-clean.zip https://ftp.cs.ru.nl/Clean/Clean30/macosx/clean3.0.zip +curl --cacert geant.pem -L -o dependencies/bootstrap-clean.zip https://ftp.cs.ru.nl/Clean/Clean30/macosx/clean3.0.zip (cd dependencies unzip bootstrap-clean.zip mv clean bootstrap-clean diff --git a/clean-base/windows-x64/setup.sh b/clean-base/windows-x64/setup.sh index 8157506..cac63fb 100644 --- a/clean-base/windows-x64/setup.sh +++ b/clean-base/windows-x64/setup.sh @@ -1,6 +1,6 @@ #!/bin/sh mkdir -p dependencies -curl -L -o dependencies/bootstrap-clean.zip https://ftp.cs.ru.nl/Clean/Clean30/windows/Clean_3.0_64.zip +curl --cacert geant.pem -L -o dependencies/bootstrap-clean.zip https://ftp.cs.ru.nl/Clean/Clean30/windows/Clean_3.0_64.zip (cd dependencies unzip bootstrap-clean.zip mv "Clean 3.0" "bootstrap-clean" diff --git a/clean-base/windows-x86/setup.sh b/clean-base/windows-x86/setup.sh index 9abb3b4..8e96a84 100644 --- a/clean-base/windows-x86/setup.sh +++ b/clean-base/windows-x86/setup.sh @@ -1,6 +1,6 @@ #!/bin/sh mkdir -p dependencies -curl -L -o dependencies/bootstrap-clean.zip https://ftp.cs.ru.nl/Clean/Clean30/windows/Clean_3.0_32.zip +curl --cacert geant.pem -L -o dependencies/bootstrap-clean.zip https://ftp.cs.ru.nl/Clean/Clean30/windows/Clean_3.0_32.zip (cd dependencies unzip bootstrap-clean.zip mv "Clean 3.0" "bootstrap-clean" diff --git a/clean-classic/linux-arm32/setup.sh b/clean-classic/linux-arm32/setup.sh index 42b3cb8..dc3c039 100755 --- a/clean-classic/linux-arm32/setup.sh +++ b/clean-classic/linux-arm32/setup.sh @@ -13,7 +13,7 @@ rm -rf clean-classic/macos-x64 rm -rf clean-classic/windows-x64 rm -rf clean-classic/windows-x86 -curl -L -o boot_clean.tgz https://ftp.cs.ru.nl/Clean/Clean30/linux/clean3.0_32_boot.tar.gz +curl --cacert geant.pem -L -o boot_clean.tgz https://ftp.cs.ru.nl/Clean/Clean30/linux/clean3.0_32_boot.tar.gz rm -Rf boot_compiler tar -xzf boot_clean.tgz diff --git a/clean-classic/linux-arm64/setup.sh b/clean-classic/linux-arm64/setup.sh index 28ca3ca..ed9bfb7 100755 --- a/clean-classic/linux-arm64/setup.sh +++ b/clean-classic/linux-arm64/setup.sh @@ -14,7 +14,7 @@ rm -rf clean-classic/macos-x64 rm -rf clean-classic/windows-x64 rm -rf clean-classic/windows-x86 -curl -L -o boot_clean.tgz https://ftp.cs.ru.nl/Clean/Clean30/linux/clean3.0_64_boot.tar.gz +curl --cacert geant.pem -L -o boot_clean.tgz https://ftp.cs.ru.nl/Clean/Clean30/linux/clean3.0_64_boot.tar.gz tar -xzf boot_clean.tgz mv clean boot_compiler diff --git a/clean-classic/linux-thumb/setup.sh b/clean-classic/linux-thumb/setup.sh index d24a8cf..1e0a070 100755 --- a/clean-classic/linux-thumb/setup.sh +++ b/clean-classic/linux-thumb/setup.sh @@ -13,7 +13,7 @@ rm -rf clean-classic/macos-x64 rm -rf clean-classic/windows-x64 rm -rf clean-classic/windows-x86 -curl -L -o boot_clean.tgz https://ftp.cs.ru.nl/Clean/Clean30/linux/clean3.0_32_boot.tar.gz +curl --cacert geant.pem -L -o boot_clean.tgz https://ftp.cs.ru.nl/Clean/Clean30/linux/clean3.0_32_boot.tar.gz rm -Rf boot_compiler tar -xzf boot_clean.tgz diff --git a/clean-classic/linux-x64/setup.sh b/clean-classic/linux-x64/setup.sh index 5e7cac5..fcac62d 100755 --- a/clean-classic/linux-x64/setup.sh +++ b/clean-classic/linux-x64/setup.sh @@ -14,7 +14,7 @@ rm -rf clean-classic/macos-x64 rm -rf clean-classic/windows-x64 rm -rf clean-classic/windows-x86 -curl -L -o boot_clean.tgz https://ftp.cs.ru.nl/Clean/Clean30/linux/clean3.0_64.tar.gz +curl --cacert geant.pem -L -o boot_clean.tgz https://ftp.cs.ru.nl/Clean/Clean30/linux/clean3.0_64.tar.gz tar -xzf boot_clean.tgz mv clean boot_compiler diff --git a/clean-classic/linux-x86/setup.sh b/clean-classic/linux-x86/setup.sh index 258f83a..e5c1123 100755 --- a/clean-classic/linux-x86/setup.sh +++ b/clean-classic/linux-x86/setup.sh @@ -14,7 +14,7 @@ rm -rf clean-classic/macos-x64 rm -rf clean-classic/windows-x64 rm -rf clean-classic/windows-x86 -curl -L -o boot_clean.tgz https://ftp.cs.ru.nl/Clean/Clean30/linux/clean3.0_32.tar.gz +curl --cacert geant.pem -L -o boot_clean.tgz https://ftp.cs.ru.nl/Clean/Clean30/linux/clean3.0_32.tar.gz tar -xzf boot_clean.tgz mv clean boot_compiler diff --git a/clean-classic/macos-x64/setup.sh b/clean-classic/macos-x64/setup.sh index d68e260..81bc8d8 100755 --- a/clean-classic/macos-x64/setup.sh +++ b/clean-classic/macos-x64/setup.sh @@ -14,8 +14,7 @@ rm -rf clean-classic/linux-x86 rm -rf clean-classic/windows-x64 rm -rf clean-classic/windows-x86 -#curl -L -o clean.zip https://ftp.cs.ru.nl/Clean/nightly/clean-itasks-osx-20160630.zip -curl -L -o clean.zip https://ftp.cs.ru.nl/Clean/Clean30/macosx/clean3.0.zip +curl --cacert geant.pem -L -o clean.zip https://ftp.cs.ru.nl/Clean/Clean30/macosx/clean3.0.zip unzip clean.zip mv clean boot_compiler rm clean.zip diff --git a/clean-classic/windows-x64/setup.sh b/clean-classic/windows-x64/setup.sh index 4825b28..f2105a5 100644 --- a/clean-classic/windows-x64/setup.sh +++ b/clean-classic/windows-x64/setup.sh @@ -1,5 +1,5 @@ #!/bin/sh -wget http://ftp.cs.ru.nl/Clean/Clean30/windows/Clean_3.0_64.zip +wget --ca-certificate=geant.pem http://ftp.cs.ru.nl/Clean/Clean30/windows/Clean_3.0_64.zip unzip Clean_3.0_64.zip rm Clean_3.0_64.zip mv "Clean 3.0" "Clean_3.0_64" diff --git a/clean-classic/windows-x86/setup.sh b/clean-classic/windows-x86/setup.sh index 8ae8a52..f0609f9 100644 --- a/clean-classic/windows-x86/setup.sh +++ b/clean-classic/windows-x86/setup.sh @@ -1,5 +1,5 @@ #!/bin/sh -curl -L -o Clean_3.0_32.zip http://ftp.cs.ru.nl/Clean/Clean30/windows/Clean_3.0_32.zip +curl --cacert geant.pem -L -o Clean_3.0_32.zip http://ftp.cs.ru.nl/Clean/Clean30/windows/Clean_3.0_32.zip unzip Clean_3.0_32.zip rm Clean_3.0_32.zip mv "Clean 3.0" "Clean_3.0_32" diff --git a/geant.pem b/geant.pem new file mode 100644 index 0000000..43cf989 --- /dev/null +++ b/geant.pem @@ -0,0 +1,39 @@ +-----BEGIN CERTIFICATE----- +MIIG5TCCBM2gAwIBAgIRANpDvROb0li7TdYcrMTz2+AwDQYJKoZIhvcNAQEMBQAw +gYgxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpOZXcgSmVyc2V5MRQwEgYDVQQHEwtK +ZXJzZXkgQ2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMS4wLAYD +VQQDEyVVU0VSVHJ1c3QgUlNBIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTIw +MDIxODAwMDAwMFoXDTMzMDUwMTIzNTk1OVowRDELMAkGA1UEBhMCTkwxGTAXBgNV +BAoTEEdFQU5UIFZlcmVuaWdpbmcxGjAYBgNVBAMTEUdFQU5UIE9WIFJTQSBDQSA0 +MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEApYhi1aEiPsg9ZKRMAw9Q +r8Mthsr6R20VSfFeh7TgwtLQi6RSRLOh4or4EMG/1th8lijv7xnBMVZkTysFiPmT +PiLOfvz+QwO1NwjvgY+Jrs7fSoVA/TQkXzcxu4Tl3WHi+qJmKLJVu/JOuHud6mOp +LWkIbhODSzOxANJ24IGPx9h4OXDyy6/342eE6UPXCtJ8AzeumTG6Dfv5KVx24lCF +TGUzHUB+j+g0lSKg/Sf1OzgCajJV9enmZ/84ydh48wPp6vbWf1H0O3Rd3LhpMSVn +TqFTLKZSbQeLcx/l9DOKZfBCC9ghWxsgTqW9gQ7v3T3aIfSaVC9rnwVxO0VjmDdP +FNbdoxnh0zYwf45nV1QQgpRwZJ93yWedhp4ch1a6Ajwqs+wv4mZzmBSjovtV0mKw +d+CQbSToalEUP4QeJq4Udz5WNmNMI4OYP6cgrnlJ50aa0DZPlJqrKQPGL69KQQz1 +2WgxvhCuVU70y6ZWAPopBa1ykbsttpLxADZre5cH573lIuLHdjx7NjpYIXRx2+QJ +URnX2qx37eZIxYXz8ggM+wXH6RDbU3V2o5DP67hXPHSAbA+p0orjAocpk2osxHKo +NSE3LCjNx8WVdxnXvuQ28tKdaK69knfm3bB7xpdfsNNTPH9ElcjscWZxpeZ5Iij8 +lyrCG1z0vSWtSBsgSnUyG/sCAwEAAaOCAYswggGHMB8GA1UdIwQYMBaAFFN5v1qq +K0rPVIDh2JvAnfKyA2bLMB0GA1UdDgQWBBRvHTVJEGwy+lmgnryK6B+VvnF6DDAO +BgNVHQ8BAf8EBAMCAYYwEgYDVR0TAQH/BAgwBgEB/wIBADAdBgNVHSUEFjAUBggr +BgEFBQcDAQYIKwYBBQUHAwIwOAYDVR0gBDEwLzAtBgRVHSAAMCUwIwYIKwYBBQUH +AgEWF2h0dHBzOi8vc2VjdGlnby5jb20vQ1BTMFAGA1UdHwRJMEcwRaBDoEGGP2h0 +dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9VU0VSVHJ1c3RSU0FDZXJ0aWZpY2F0aW9u +QXV0aG9yaXR5LmNybDB2BggrBgEFBQcBAQRqMGgwPwYIKwYBBQUHMAKGM2h0dHA6 +Ly9jcnQudXNlcnRydXN0LmNvbS9VU0VSVHJ1c3RSU0FBZGRUcnVzdENBLmNydDAl +BggrBgEFBQcwAYYZaHR0cDovL29jc3AudXNlcnRydXN0LmNvbTANBgkqhkiG9w0B +AQwFAAOCAgEAUtlC3e0xj/1BMfPhdQhUXeLjb0xp8UE28kzWE5xDzGKbfGgnrT2R +lw5gLIx+/cNVrad//+MrpTppMlxq59AsXYZW3xRasrvkjGfNR3vt/1RAl8iI31lG +hIg6dfIX5N4esLkrQeN8HiyHKH6khm4966IkVVtnxz5CgUPqEYn4eQ+4eeESrWBh +AqXaiv7HRvpsdwLYekAhnrlGpioZ/CJIT2PTTxf+GHM6cuUnNqdUzfvrQgA8kt1/ +ASXx2od/M+c8nlJqrGz29lrJveJOSEMX0c/ts02WhsfMhkYa6XujUZLmvR1Eq08r +48/EZ4l+t5L4wt0DV8VaPbsEBF1EOFpz/YS2H6mSwcFaNJbnYqqJHIvm3PLJHkFm +EoLXRVrQXdCT+3wgBfgU6heCV5CYBz/YkrdWES7tiiT8sVUDqXmVlTsbiRNiyLs2 +bmEWWFUl76jViIJog5fongEqN3jLIGTG/mXrJT1UyymIcobnIGrbwwRVz/mpFQo0 +vBYIi1k2ThVh0Dx88BbF9YiP84dd8Fkn5wbE6FxXYJ287qfRTgmhePecPc73Yrzt +apdRcsKVGkOpaTIJP/l+lAHRLZxk/dUtyN95G++bOSQqnOCpVPabUGl2E/OEyFrp +Ipwgu2L/WJclvd6g+ZA/iWkLSMcpnFb+uX6QBqvD6+RNxul1FaB5iHY= +-----END CERTIFICATE----- diff --git a/generic/setup.sh b/generic/setup.sh index 887a72f..896e40e 100755 --- a/generic/setup.sh +++ b/generic/setup.sh @@ -19,9 +19,9 @@ mkdir -p dependencies function download_dependency() { if [ $OS == "windows" ]; then - curl -L -o dependencies/$dep.zip $SERVER/$OS-$ARCH/$1-$OS-$ARCH-latest.zip + curl --cacert geant.pem -L -o dependencies/$dep.zip $SERVER/$OS-$ARCH/$1-$OS-$ARCH-latest.zip else - curl -L -o dependencies/$dep.tgz $SERVER/$OS-$ARCH/$1-$OS-$ARCH-latest.tgz + curl --cacert geant.pem -L -o dependencies/$dep.tgz $SERVER/$OS-$ARCH/$1-$OS-$ARCH-latest.tgz fi (cd dependencies if [ $OS == "windows" ]; then -- GitLab