8000 Bump libssh2 to 1.6.0 by maxkorp · Pull Request #830 · nodegit/nodegit · GitHub
[go: up one dir, main page]
Skip to content

Bump libssh2 to 1.6.0 #830

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
maxkorp wants to merge 4 commits into from
Closed

Bump libssh2 to 1.6.0 #830

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dd05e5d
bump libssh2 to 1.6.0
maxkorp Dec 12, 2015
c44b379
remove fastfinish on appveyor to see if it's a node version thing
maxkorp Dec 12, 2015
0fde66b
add file to gyp
maxkorp Dec 15, 2015
7cb1884
Add `LIBSSH2_WINCNG` flag and move win specific stuff into `win` gyp …
Feb 19, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,6 @@ environment:
- nodejs_version: "4.1"
- nodejs_version: "5.0"

matrix:
fast_finish: true

# Get the latest stable version of Node 0.STABLE.latest
install:
- ps: Install-Product node $env:nodejs_version $env:platform
Expand Down
13 changes: 11 additions & 2 deletions vendor/libgit2.gyp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,7 @@
"libssh2/src/misc.c",
"libssh2/src/pem.c",
"libssh2/src/session.c",
"libssh2/src/userauth.c",
"libssh2/src/userauth.c"
],
"include_dirs": [
".",
Expand All @@ -486,6 +486,9 @@
"libssh2/win32",
"libssh2/include"
],
"defines": [
"LIBSSH2_WINCNG"
],
"defines!": [
"HAVE_POLL"
],
Expand All @@ -495,7 +498,13 @@
"libssh2/win32",
"libssh2/include"
]
}
},
"sources": [
"libssh2/src/libss2_priv.h",
"libssh2/src/crypto.h",
"libssh2/src/wincng.c",
"libssh2/src/wincng.h"
]
}],
]
}
Expand Down
Empty file removed vendor/libssh2/1.4.3
View file
Open in desktop
Empty file.
2 changes: 1 addition & 1 deletion vendor/libssh2/COPYING
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Copyright (c) 2005,2006 Mikhail Gusarov <dottedmag@dottedmag.net>
* Copyright (c) 2006-2007 The Written Word, Inc.
* Copyright (c) 2007 Eli Fant <elifantu@mail.ru>
* Copyright (c) 2009 Daniel Stenberg
* Copyright (c) 2009-2014 Daniel Stenberg
* Copyright (C) 2008, 2009 Simon Josefsson
* All rights reserved.
*
Expand Down
2 changes: 2 additions & 0 deletions vendor/libssh2/Makefile.OpenSSL.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
CRYPTO_CSOURCES = openssl.c
CRYPTO_HHEADERS = openssl.h
2 changes: 2 additions & 0 deletions vendor/libssh2/Makefile.WinCNG.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
CRYPTO_CSOURCES = wincng.c
CRYPTO_HHEADERS = wincng.h
7 changes: 5 additions & 2 deletions vendor/libssh2/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ win32/libssh2_config.h win32/config.mk win32/rules.mk \
win32/Makefile.Watcom win32/libssh2.dsw win32/tests.dsp $(DSP) \
win32/msvcproj.head win32/msvcproj.foot win32/libssh2.rc

EXTRA_DIST = $(WIN32FILES) buildconf $(NETWAREFILES) get_ver.awk HACKING \
maketgz NMakefile TODO RELEASE-NOTES libssh2.pc.in $(VMSFILES) config.rpath
EXTRA_DIST = $(WIN32FILES) buildconf $(NETWAREFILES) get_ver.awk \
maketgz NMakefile RELEASE-NOTES libssh2.pc.in $(VMSFILES) config.rpath

ACLOCAL_AMFLAGS = -I m4

Expand Down Expand Up @@ -75,6 +75,9 @@ gen-coverage:
coverage: init-coverage build-coverage gen-coverage

# DSP/VCPROJ generation adapted from libcurl
# only OpenSSL and WinCNG are supported with this build system
CRYPTO_CSOURCES = openssl.c wincng.c
CRYPTO_HHEADERS = openssl.h wincng.h
# Makefile.inc provides the CSOURCES and HHEADERS defines
include Makefile.inc

Expand Down
Loading
0