Windows: update to libssh 0.10.5

Author: jeroen

NEWS

@@ -1,4 +1,5 @@
 0.8.3
+  - Windows: update to libssh 0.10.5
   - scp_upload() now copies the file mode permissions similar to scp -p
 
 0.8.2

src/Makevars.ucrt

@@ -1,11 +1,12 @@
-VERSION = 0.9.5
-RWINLIB = ../windows/libssh-${VERSION}
+VERSION = 0.10.5
+RWINLIB = ../windows/libssh-$(VERSION)
+TARGET = lib$(subst gcc,,$(COMPILED_BY))$(R_ARCH)
 
-PKG_CPPFLAGS = -DLIBSSH_STATIC \
-	-I${RWINLIB}/include
+PKG_CPPFLAGS = -I$(RWINLIB)/include -DLIBSSH_STATIC
 
 PKG_LIBS = \
-	-L${RWINLIB}/lib${R_ARCH}${CRT} \
+	-L$(RWINLIB)/$(TARGET) \
+	-L$(RWINLIB)/lib$(R_ARCH) \
 	-lssh -lcrypto -lz -lws2_32 -lgdi32 -lcrypt32
 
 all: clean winlibs

src/Makevars.win

@@ -29,17 +29,17 @@ SEXP R_ssh_write_file_writer(SEXP ptr, SEXP buf, SEXP close){
   } else if(Rf_length(buf)) {
     fflush(fp);
   }
-  return ScalarInteger(len);
+  return Rf_ScalarInteger(len);
 }
 
 SEXP R_ssh_new_file_writer(SEXP path){
   SEXP ptr = PROTECT(R_MakeExternalPtr(NULL, path, R_NilValue));
   R_RegisterCFinalizerEx(ptr, fin_file_writer, TRUE);
-  setAttrib(ptr, R_ClassSymbol, mkString("file_writer"));
+  Rf_setAttrib(ptr, R_ClassSymbol, Rf_mkString("file_writer"));
   UNPROTECT(1);
   return ptr;
 }
 
 SEXP R_ssh_total_writers(void){
-  return(ScalarInteger(total_open_writers));
+  return(Rf_ScalarInteger(total_open_writers));
 }

src/writer.c

@@ -1,8 +1,5 @@
-# We need https
-if(getRversion() < "3.3.0") setInternet2()
+# Download libssh + dependencies
 VERSION <- commandArgs(TRUE)
-
-# Downloads libssh2 + dependencies
 if(!file.exists(sprintf("../windows/libssh-%s/include/libssh/libssh.h", VERSION))){
   download.file(sprintf("https://github.com/rwinlib/libssh/archive/v%s.zip", VERSION), "lib.zip", quiet = TRUE)
   dir.create("../windows", showWarnings = FALSE)