Skip to content

Commit

Permalink
Drop libssh2 patches
Browse files Browse the repository at this point in the history
We're now using libssh2 v1.11.0 which includes the two patches we were
carrying. The patches need to be dropped in order to build with
`USE_BINARYBUILDER=0`.
  • Loading branch information
ararslan committed Aug 17, 2023
1 parent 30a73de commit 0c239ed
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 72 deletions.
16 changes: 0 additions & 16 deletions deps/libssh2.mk
Original file line number Diff line number Diff line change
Expand Up @@ -30,22 +30,6 @@ endif

LIBSSH2_SRC_PATH := $(SRCCACHE)/$(LIBSSH2_SRC_DIR)

# Apply patch to fix v1.10.0 CVE (https://github.com/libssh2/libssh2/issues/649), drop with v1.11
$(LIBSSH2_SRC_PATH)/libssh2-userauth-check.patch-applied: $(LIBSSH2_SRC_PATH)/source-extracted
cd $(LIBSSH2_SRC_PATH) && \
patch -p1 -f < $(SRCDIR)/patches/libssh2-userauth-check.patch
echo 1 > $@

# issue: https://github.com/JuliaLang/julia/issues/45645#issuecomment-1153214379
# fix pr: https://github.com/libssh2/libssh2/pull/711
$(LIBSSH2_SRC_PATH)/libssh2-fix-import-lib-name.patch-applied: $(LIBSSH2_SRC_PATH)/libssh2-userauth-check.patch-applied
cd $(LIBSSH2_SRC_PATH) && \
patch -p1 -f < $(SRCDIR)/patches/libssh2-fix-import-lib-name.patch
echo 1 > $@

$(BUILDDIR)/$(LIBSSH2_SRC_DIR)/build-configured: \
$(LIBSSH2_SRC_PATH)/libssh2-fix-import-lib-name.patch-applied

$(BUILDDIR)/$(LIBSSH2_SRC_DIR)/build-configured: $(LIBSSH2_SRC_PATH)/source-extracted
mkdir -p $(dir $@)
cd $(dir $@) && \
Expand Down
26 changes: 0 additions & 26 deletions deps/patches/libssh2-fix-import-lib-name.patch

This file was deleted.

30 changes: 0 additions & 30 deletions deps/patches/libssh2-userauth-check.patch

This file was deleted.

0 comments on commit 0c239ed

Please sign in to comment.