Skip to content

Commit

Permalink
Bump libssh2 to v1.9.0, use MbedTLS on all platforms (#33089)
Browse files Browse the repository at this point in the history 
* Bump libssh2 to `v1.9.0`, use MbedTLS on all platforms

* Remove patches from source builds

(cherry picked from commit d3250fe)
  • Loading branch information
@staticfloat
staticfloat authored and Kristoffer Carlsson committed Sep 3, 2019
1 parent 5f214ab commit 8c51a52
Show file tree
Hide file tree
Showing 61 changed files with 33 additions and 520 deletions.
2 changes: 1 addition & 1 deletion deps/Versions.make
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ MPFR_BB_REL = 1
PATCHELF_VER = 0.9
MBEDTLS_VER = 2.16.0
MBEDTLS_BB_REL = v0.17.0
LIBSSH2_VER = 1.8.2
LIBSSH2_VER = 1.9.0
LIBSSH2_BB_REL = 0
CURL_VER = 7.61.0
CURL_BB_REL = 1
Expand Down
1 change: 0 additions & 1 deletion deps/checksums/LibSSH2.v1.8.2-0.aarch64-linux-gnu.tar.gz/md5
View file

This file was deleted.

1 change: 0 additions & 1 deletion deps/checksums/LibSSH2.v1.8.2-0.aarch64-linux-gnu.tar.gz/sha512
View file

This file was deleted.

1 change: 0 additions & 1 deletion deps/checksums/LibSSH2.v1.8.2-0.aarch64-linux-musl.tar.gz/md5
View file

This file was deleted.

1 change: 0 additions & 1 deletion deps/checksums/LibSSH2.v1.8.2-0.aarch64-linux-musl.tar.gz/sha512
View file

This file was deleted.

1 change: 0 additions & 1 deletion deps/checksums/LibSSH2.v1.8.2-0.arm-linux-gnueabihf.tar.gz/md5
View file

This file was deleted.

1 change: 0 additions & 1 deletion deps/checksums/LibSSH2.v1.8.2-0.arm-linux-gnueabihf.tar.gz/sha512
View file

This file was deleted.

1 change: 0 additions & 1 deletion deps/checksums/LibSSH2.v1.8.2-0.arm-linux-musleabihf.tar.gz/md5
View file

This file was deleted.

1 change: 0 additions & 1 deletion deps/checksums/LibSSH2.v1.8.2-0.arm-linux-musleabihf.tar.gz/sha512
View file

This file was deleted.

1 change: 0 additions & 1 deletion deps/checksums/LibSSH2.v1.8.2-0.i686-linux-gnu.tar.gz/md5
View file

This file was deleted.

1 change: 0 additions & 1 deletion deps/checksums/LibSSH2.v1.8.2-0.i686-linux-gnu.tar.gz/sha512
View file

This file was deleted.

1 change: 0 additions & 1 deletion deps/checksums/LibSSH2.v1.8.2-0.i686-linux-musl.tar.gz/md5
View file

This file was deleted.

1 change: 0 additions & 1 deletion deps/checksums/LibSSH2.v1.8.2-0.i686-linux-musl.tar.gz/sha512
View file

This file was deleted.

1 change: 0 additions & 1 deletion deps/checksums/LibSSH2.v1.8.2-0.i686-w64-mingw32.tar.gz/md5
View file

This file was deleted.

1 change: 0 additions & 1 deletion deps/checksums/LibSSH2.v1.8.2-0.i686-w64-mingw32.tar.gz/sha512
View file

This file was deleted.

1 change: 0 additions & 1 deletion deps/checksums/LibSSH2.v1.8.2-0.powerpc64le-linux-gnu.tar.gz/md5
View file

This file was deleted.

1 change: 0 additions & 1 deletion deps/checksums/LibSSH2.v1.8.2-0.powerpc64le-linux-gnu.tar.gz/sha512
View file

This file was deleted.

1 change: 0 additions & 1 deletion deps/checksums/LibSSH2.v1.8.2-0.x86_64-apple-darwin14.tar.gz/md5
View file

This file was deleted.

1 change: 0 additions & 1 deletion deps/checksums/LibSSH2.v1.8.2-0.x86_64-apple-darwin14.tar.gz/sha512
View file

This file was deleted.

1 change: 0 additions & 1 deletion deps/checksums/LibSSH2.v1.8.2-0.x86_64-linux-gnu.tar.gz/md5
View file

This file was deleted.

1 change: 0 additions & 1 deletion deps/checksums/LibSSH2.v1.8.2-0.x86_64-linux-gnu.tar.gz/sha512
View file

This file was deleted.

1 change: 0 additions & 1 deletion deps/checksums/LibSSH2.v1.8.2-0.x86_64-linux-musl.tar.gz/md5
View file

This file was deleted.

1 change: 0 additions & 1 deletion deps/checksums/LibSSH2.v1.8.2-0.x86_64-linux-musl.tar.gz/sha512
View file

This file was deleted.

1 change: 0 additions & 1 deletion deps/checksums/LibSSH2.v1.8.2-0.x86_64-unknown-freebsd11.1.tar.gz/md5
View file

This file was deleted.

1 change: 0 additions & 1 deletion deps/checksums/LibSSH2.v1.8.2-0.x86_64-unknown-freebsd11.1.tar.gz/sha512
View file

This file was deleted.

1 change: 0 additions & 1 deletion deps/checksums/LibSSH2.v1.8.2-0.x86_64-w64-mingw32.tar.gz/md5
View file

This file was deleted.

1 change: 0 additions & 1 deletion deps/checksums/LibSSH2.v1.8.2-0.x86_64-w64-mingw32.tar.gz/sha512
View file

This file was deleted.

1 change: 1 addition & 0 deletions deps/checksums/LibSSH2.v1.9.0-0.aarch64-linux-gnu.tar.gz/md5
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1de9f0816b41dd7c15640d6fd7bb8d5e
1 change: 1 addition & 0 deletions deps/checksums/LibSSH2.v1.9.0-0.aarch64-linux-gnu.tar.gz/sha512
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
c2dbbd47befc923c11efa66f05ec1e1d38a3e3da438dcd5da29748f2e6c6ec944ac1d5e8f0062f4c46513faa39e903c8194df8f680b816458e0337d60ccbd9fa
1 change: 1 addition & 0 deletions deps/checksums/LibSSH2.v1.9.0-0.aarch64-linux-musl.tar.gz/md5
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
6d7a76ebedd2425b53d23ccebd6a4592
1 change: 1 addition & 0 deletions deps/checksums/LibSSH2.v1.9.0-0.aarch64-linux-musl.tar.gz/sha512
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
b62666ef1f84c8236924188cb31701070356e36f7587d2d3bf13c4049996df06c96e3c4cdf4527fa0091491c5b3103cdfbf07a8fe37601359b86fe87741a2db4
1 change: 1 addition & 0 deletions deps/checksums/LibSSH2.v1.9.0-0.arm-linux-gnueabihf.tar.gz/md5
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ecc04e3bd5dfde850c58506320810c6e
1 change: 1 addition & 0 deletions deps/checksums/LibSSH2.v1.9.0-0.arm-linux-gnueabihf.tar.gz/sha512
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
93f7f3f92834d375da5a1fb2e766a7097628422c2d1dcdcc2f5e2388f31d1fbb2736ad8df3bf68c6a0b17e843c76b27c9c0d01b39bb2ea4df57cf6d5b753d322
1 change: 1 addition & 0 deletions deps/checksums/LibSSH2.v1.9.0-0.arm-linux-musleabihf.tar.gz/md5
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
d9bc4c981347f8efa5083eaa9be8198a
1 change: 1 addition & 0 deletions deps/checksums/LibSSH2.v1.9.0-0.arm-linux-musleabihf.tar.gz/sha512
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
8a24b413f144499d866cace7dd32d3f366e6ba43bd170bf7a4924c985781144fa050573afcef9e1f4cedb0f70ec75625752656f6b71c208d95df2f067d9a04fc
1 change: 1 addition & 0 deletions deps/checksums/LibSSH2.v1.9.0-0.i686-linux-gnu.tar.gz/md5
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
65d5f6fa0a77175cf62ddb6a157715d7
1 change: 1 addition & 0 deletions deps/checksums/LibSSH2.v1.9.0-0.i686-linux-gnu.tar.gz/sha512
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ef93dc51651338e42b23039fbcee8a48e4cfea7e4b9dcd1d0f4049a752e7ec563ed1f0a951157a5402be8b206def82da253f7fa3652c1480a1507bc6faaae382
1 change: 1 addition & 0 deletions deps/checksums/LibSSH2.v1.9.0-0.i686-linux-musl.tar.gz/md5
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
de5c00c9e4b0a9a4d26afe0a73d528b9
1 change: 1 addition & 0 deletions deps/checksums/LibSSH2.v1.9.0-0.i686-linux-musl.tar.gz/sha512
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
7c496df3e147991994bd3c37497e2c51c0ce00e709adb86a8789c8b252af7e8148f7e2e71439e435e78fde4cd7695444a8f532e02529698fc8c795f8ebafff10
1 change: 1 addition & 0 deletions deps/checksums/LibSSH2.v1.9.0-0.i686-w64-mingw32.tar.gz/md5
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
6908e848c335c58c8685859916ca840e
1 change: 1 addition & 0 deletions deps/checksums/LibSSH2.v1.9.0-0.i686-w64-mingw32.tar.gz/sha512
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
f4a004e919b95bba227f0fa2595a60c7caab168f3558ad5559d6f7ab2777dec70eefb434294e8fbafe7414ea15d6669f6a8d09e882183cb8a6efc59298517b1f
1 change: 1 addition & 0 deletions deps/checksums/LibSSH2.v1.9.0-0.powerpc64le-linux-gnu.tar.gz/md5
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
72ab7a7bb11e4961036b935c1dd4dfd7
1 change: 1 addition & 0 deletions deps/checksums/LibSSH2.v1.9.0-0.powerpc64le-linux-gnu.tar.gz/sha512
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
aaf4e21768ab22a91848116615aea6eb1d9763894a7080bbd88ca50a40382488ad42dde61e220a730ad30a4062f658c233ef0ac298913e7a35f3de62476a31f6
1 change: 1 addition & 0 deletions deps/checksums/LibSSH2.v1.9.0-0.x86_64-apple-darwin14.tar.gz/md5
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
f383418e3c79f80a8b808e5a11653acb
1 change: 1 addition & 0 deletions deps/checksums/LibSSH2.v1.9.0-0.x86_64-apple-darwin14.tar.gz/sha512
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
5a49877bd90cb314628e1acd120a6c15319e1b10e7b6326cb3f420f6d1921348c0e2331b50af52388fbc31309cf54bdb31235f1c58571f870756fbe3947cfa22
1 change: 1 addition & 0 deletions deps/checksums/LibSSH2.v1.9.0-0.x86_64-linux-gnu.tar.gz/md5
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
dcab51c5abd84cea28ab5eb8f279fae4
1 change: 1 addition & 0 deletions deps/checksums/LibSSH2.v1.9.0-0.x86_64-linux-gnu.tar.gz/sha512
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
a7888e271801b0992b8b61d1e8d6e4fa3cf69920655bc756d35aafbb685d07df8a2f5af48217b47135edc6bad50748f2c122181bf6c8e7ac77a08ab5c2206ada
1 change: 1 addition & 0 deletions deps/checksums/LibSSH2.v1.9.0-0.x86_64-linux-musl.tar.gz/md5
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
7d64466c8210cd691295ae9ecbb3ae7e
1 change: 1 addition & 0 deletions deps/checksums/LibSSH2.v1.9.0-0.x86_64-linux-musl.tar.gz/sha512
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
87f0beae3ec9a82cd4df54a480c84b1b04c401fed0cec1515665832aa4a5a2b86923e97beaa37dad8eb259fc1e707b4a47e05747ad88137def12becf1d82a144
1 change: 1 addition & 0 deletions deps/checksums/LibSSH2.v1.9.0-0.x86_64-unknown-freebsd11.1.tar.gz/md5
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
82147c4cfe14c5e9213776dc8a3162fe
1 change: 1 addition & 0 deletions deps/checksums/LibSSH2.v1.9.0-0.x86_64-unknown-freebsd11.1.tar.gz/sha512
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ce64acd2655fc2b6af56ec00c910ff0123b32995bb62af9e1d6cf48194ef994fecb3e4f2b16d0e8060c9740206fae178e3b6fe89cf95992289e7dee8fdccb982
1 change: 1 addition & 0 deletions deps/checksums/LibSSH2.v1.9.0-0.x86_64-w64-mingw32.tar.gz/md5
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
5e751cb7817a151a88b828dc077f0982
1 change: 1 addition & 0 deletions deps/checksums/LibSSH2.v1.9.0-0.x86_64-w64-mingw32.tar.gz/sha512
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
8e8c70a993a30e88e06c11eb7042d7ec45f2737790eda7d14bca8e8689d713eda7ca791b4011bbfe5bbec16039c4bfd5cec068bf0194c104fcaf446d48bf0c1a
1 change: 0 additions & 1 deletion deps/checksums/libssh2-02ecf17a6d5f9837699e8fb3aad0c804caa67eeb.tar.gz/md5
View file

This file was deleted.

1 change: 0 additions & 1 deletion deps/checksums/libssh2-02ecf17a6d5f9837699e8fb3aad0c804caa67eeb.tar.gz/sha512
View file

This file was deleted.

1 change: 1 addition & 0 deletions deps/checksums/libssh2-42d37aa63129a1b2644bf6495198923534322d64.tar.gz/md5
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
253c2c3eef1f5c9c54be3e677512ea28
1 change: 1 addition & 0 deletions deps/checksums/libssh2-42d37aa63129a1b2644bf6495198923534322d64.tar.gz/sha512
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1fb3202ab793024dc83a419bc7138c4bce9aa37f1bd6aa199388df9a7d78f3838c1fba38b5a82fe2b912f2cf742f476f0c8f2e30a253d1313317d844ac315606
14 changes: 2 additions & 12 deletions deps/libssh2.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,7 @@ ifeq ($(LIBSSH2_ENABLE_TESTS), 0)
LIBSSH2_OPTS += -DBUILD_TESTING=OFF
endif

$(SRCCACHE)/$(LIBSSH2_SRC_DIR)/libssh2-encryptedpem.patch-applied: $(SRCCACHE)/$(LIBSSH2_SRC_DIR)/source-extracted
cd $(SRCCACHE)/$(LIBSSH2_SRC_DIR) && patch -p1 -f < $(SRCDIR)/patches/libssh2-encryptedpem.patch
echo 1 > $@

# Patch submitted upstream: https://github.com/libssh2/libssh2/pull/148
# Remove the patch here once we're using a version of libssh2 that includes the upstream patch
$(SRCCACHE)/$(LIBSSH2_SRC_DIR)/libssh2-netinet-in.patch-applied: $(SRCCACHE)/$(LIBSSH2_SRC_DIR)/libssh2-encryptedpem.patch-applied
cd $(SRCCACHE)/$(LIBSSH2_SRC_DIR) && patch -p0 -f < $(SRCDIR)/patches/libssh2-netinet-in.patch
echo 1 > $@

$(BUILDDIR)/$(LIBSSH2_SRC_DIR)/build-configured: $(SRCCACHE)/$(LIBSSH2_SRC_DIR)/source-extracted $(SRCCACHE)/$(LIBSSH2_SRC_DIR)/libssh2-netinet-in.patch-applied
$(BUILDDIR)/$(LIBSSH2_SRC_DIR)/build-configured: $(SRCCACHE)/$(LIBSSH2_SRC_DIR)/source-extracted
mkdir -p $(dir $@)
cd $(dir $@) && \
$(CMAKE) $(dir $<) $(LIBSSH2_OPTS)
Expand Down Expand Up @@ -74,7 +64,7 @@ check-libssh2: $(BUILDDIR)/$(LIBSSH2_SRC_DIR)/build-checked

else # USE_BINARYBUILDER_LIBSSH2

LIBSSH2_BB_URL_BASE := https://github.com/JuliaPackaging/Yggdrasil/releases/download/LibSSH2-v$(LIBSSH2_VER)-$(LIBSSH2_BB_REL)
LIBSSH2_BB_URL_BASE := https://github.com/JuliaPackaging/Yggdrasil/releases/download/LibSSH2-v$(LIBSSH2_VER)+$(LIBSSH2_BB_REL)
LIBSSH2_BB_NAME := LibSSH2.v$(LIBSSH2_VER)

$(eval $(call bb-install,libssh2,LIBSSH2,false))
Expand Down
4 changes: 2 additions & 2 deletions deps/libssh2.version
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
LIBSSH2_BRANCH=libssh2-1.8.2
LIBSSH2_SHA1=02ecf17a6d5f9837699e8fb3aad0c804caa67eeb
LIBSSH2_BRANCH=libssh2-1.9.0
LIBSSH2_SHA1=42d37aa63129a1b2644bf6495198923534322d64
Loading

0 comments on commit 8c51a52

Please sign in to comment.