Skip to content

Commit 0c239ed

Browse files
committed
Drop libssh2 patches
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`.
1 parent 30a73de commit 0c239ed

File tree

3 files changed

+0
-72
lines changed

3 files changed

+0
-72
lines changed

deps/libssh2.mk

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -30,22 +30,6 @@ endif
3030

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

33-
# Apply patch to fix v1.10.0 CVE (https://github.com/libssh2/libssh2/issues/649), drop with v1.11
34-
$(LIBSSH2_SRC_PATH)/libssh2-userauth-check.patch-applied: $(LIBSSH2_SRC_PATH)/source-extracted
35-
cd $(LIBSSH2_SRC_PATH) && \
36-
patch -p1 -f < $(SRCDIR)/patches/libssh2-userauth-check.patch
37-
echo 1 > $@
38-
39-
# issue: https://github.com/JuliaLang/julia/issues/45645#issuecomment-1153214379
40-
# fix pr: https://github.com/libssh2/libssh2/pull/711
41-
$(LIBSSH2_SRC_PATH)/libssh2-fix-import-lib-name.patch-applied: $(LIBSSH2_SRC_PATH)/libssh2-userauth-check.patch-applied
42-
cd $(LIBSSH2_SRC_PATH) && \
43-
patch -p1 -f < $(SRCDIR)/patches/libssh2-fix-import-lib-name.patch
44-
echo 1 > $@
45-
46-
$(BUILDDIR)/$(LIBSSH2_SRC_DIR)/build-configured: \
47-
$(LIBSSH2_SRC_PATH)/libssh2-fix-import-lib-name.patch-applied
48-
4933
$(BUILDDIR)/$(LIBSSH2_SRC_DIR)/build-configured: $(LIBSSH2_SRC_PATH)/source-extracted
5034
mkdir -p $(dir $@)
5135
cd $(dir $@) && \

deps/patches/libssh2-fix-import-lib-name.patch

Lines changed: 0 additions & 26 deletions
This file was deleted.

deps/patches/libssh2-userauth-check.patch

Lines changed: 0 additions & 30 deletions
This file was deleted.

0 commit comments

Comments
 (0)