Skip to content

Commit

Permalink
Windows: update to libssh 0.11.0
Browse files Browse the repository at this point in the history
Fixes #69
  • Loading branch information
jeroen committed Aug 23, 2024
1 parent 043ca7d commit d69ddd9
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 5 deletions.
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: ssh
Type: Package
Title: Secure Shell (SSH) Client for R
Version: 0.9.2
Version: 0.9.3
Authors@R: person("Jeroen", "Ooms", role = c("aut", "cre"),
email = "[email protected]", comment = c(ORCID = "0000-0002-4035-0289"))
Description: Connect to a remote server over SSH to transfer files via SCP,
Expand Down
3 changes: 3 additions & 0 deletions NEWS
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
0.9.3
- Windows: update to libssh 0.11.0

0.9.2
- Fix protect warning from rchk

Expand Down
2 changes: 1 addition & 1 deletion src/Makevars.win
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ PKG_CPPFLAGS = -I$(RWINLIB)/include -DLIBSSH_STATIC
PKG_LIBS = \
-L$(RWINLIB)/$(OLDLIBDIR) \
-L$(RWINLIB)/lib \
-lssh -lcrypto -lz -lpthread -lws2_32 -lgdi32 -lcrypt32
-lssh -lcrypto -lz -lpthread -lws2_32 -lgdi32 -lcrypt32 -liphlpapi

all: clean winlibs

Expand Down
6 changes: 3 additions & 3 deletions tools/winlibs.R
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
if(!file.exists("../windows/protobuf/include/libssh/libssh.h")){
unlink("../windows", recursive = TRUE)
url <- if(grepl("aarch", R.version$platform)){
"https://github.com/r-windows/bundles/releases/download/libssh-0.10.5/libssh-0.10.5-clang-aarch64.tar.xz"
"https://github.com/r-windows/bundles/releases/download/libssh-0.11.0/libssh-0.11.0-clang-aarch64.tar.xz"
} else if(grepl("clang", Sys.getenv('R_COMPILED_BY'))){
"https://github.com/r-windows/bundles/releases/download/libssh-0.10.5/libssh-0.10.5-clang-x86_64.tar.xz"
"https://github.com/r-windows/bundles/releases/download/libssh-0.11.0/libssh-0.11.0-clang-x86_64.tar.xz"
} else if(getRversion() >= "4.2") {
"https://github.com/r-windows/bundles/releases/download/libssh-0.10.5/libssh-0.10.5-ucrt-x86_64.tar.xz"
"https://github.com/r-windows/bundles/releases/download/libssh-0.11.0/libssh-0.11.0-ucrt-x86_64.tar.xz"
} else {
"https://github.com/rwinlib/libssh/archive/v0.10.5.tar.gz"
}
Expand Down

0 comments on commit d69ddd9

Please sign in to comment.