diff --git a/DESCRIPTION b/DESCRIPTION index ad35f04..a2b2d49 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -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 = "jeroen@berkeley.edu", comment = c(ORCID = "0000-0002-4035-0289")) Description: Connect to a remote server over SSH to transfer files via SCP, diff --git a/NEWS b/NEWS index 0160708..d496aee 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,6 @@ +0.9.3 + - Windows: update to libssh 0.11.0 + 0.9.2 - Fix protect warning from rchk diff --git a/src/Makevars.win b/src/Makevars.win index 55c9561..0591c23 100644 --- a/src/Makevars.win +++ b/src/Makevars.win @@ -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 diff --git a/tools/winlibs.R b/tools/winlibs.R index 5429937..cc2b5d8 100644 --- a/tools/winlibs.R +++ b/tools/winlibs.R @@ -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" }