Upgrade Travis-CI to latest GCC and SSH

tbranyen · tbranyen · commit 61d738209fd9 · 2014-10-23T10:47:34.000-04:00
Runs the SSH agent correctly with a random key.
diff --git a/.travis.yml b/.travis.yml
@@ -1,3 +1,17 @@
+# Install GCC 4.8 for C++11 support.
+before_install:
+  - "sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test"
+  - "sudo apt-get -qq update"
+  - "sudo apt-get -qq install g++-4.8"
+  - "export CXX='g++-4.8'"
+# This is a random private key used purely for testing.
+before_script:
+ - echo -e "Host *\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config
+ - echo -e "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDkTcgXnHuqR0gbwegnr9Zxz4hTkjjV/SpgJNPJz7mo/HKNbx0rqjj1P0yGR053R9GSFFim2ut4NK9DPPUkQdyucw+DoLkYRHJmlJ4BNa9NTCD0sl+eSXO2969kZojCYSOgbmkCJx8mdgTwhzdgE/jhBrsY0hPE6pRTlU+H68/zeNdJUAIJf0LLXOm3hpTKLA19VICltl/j9VvBJpgRHdBylXEyL8HokYpjkQQk1ZXj3m7Nlo8yDdg4VcljOJWC+Xh8kxRMfK5x/VRVsYKCQXN5QlzKeqf7USRDUS/7mFoPUBW+d4kwKtGxRsWuIL2yeqzifZUTOgsh9+ZWAWxWffQZ your_email@example.com" > ~/.ssh/id_rsa.pub
+ - echo -e "-----BEGIN RSA PRIVATE KEY-----\nMIIEpAIBAAKCAQEA5E3IF5x7qkdIG8HoJ6/Wcc+IU5I41f0qYCTTyc+5qPxyjW8d\nK6o49T9MhkdOd0fRkhRYptrreDSvQzz1JEHcrnMPg6C5GERyZpSeATWvTUwg9LJf\nnklztvevZGaIwmEjoG5pAicfJnYE8Ic3YBP44Qa7GNITxOqUU5VPh+vP83jXSVAC\nCX9Cy1zpt4aUyiwNfVSApbZf4/VbwSaYER3QcpVxMi/B6JGKY5EEJNWV495uzZaP\nMg3YOFXJYziVgvl4fJMUTHyucf1UVbGCgkFzeUJcynqn+1EkQ1Ev+5haD1AVvneJ\nMCrRsUbFriC9snqs4n2VEzoLIffmVgFsVn30GQIDAQABAoIBAQDPQm2sQbti0mN8\nD4Uawl8D40v30n8WhUa7EbPTOmlqKAQ2sfDhex9KRbTLEmEBmImA/Eee8o9iCTIy\n8Fv8Fm6pUHt9G6Pti/XvemwW3Q3QNpSUkHqN0FDkgecQVqVBEb6uHo3mDm4RFINX\neOmkp30BjIK9/blEw1D0sFALLOEUPaDdPMwiXtFgqfrFSgpDET3TvQIwZ2LxxTm0\ncNmP3sCSlZHJNkZI4hBEWaaXR+V5/+C1qblDCo5blAWTcX3UzqrwUUJgFi6VnBuh\n7S9Q6+CEIU+4JRyWQNmY8YgZFaAp6IOr/kyfPxTP1+UEVVgcLn3WDYwfG9og0tmz\nfzlruAgBAoGBAPfz73Pey86tNZEanhJhbX8gVjzy2hvyhT0paHg0q/H6c1VWOtUH\nOwZ3Ns2xAZqJhlDqCHnQYSCZDly042U/theP4N8zo1APb4Yg4qdmXF9QE1+2M03r\nkS6138gU/CSCLf8pCYa6pA/GmsaXxloeJGLvT4fzOZRsVav80/92XHRhAoGBAOu2\nmKh4Gr1EjgN9QNbk9cQTSFDtlBEqO/0pTepvL73UvNp/BAn4iYZFU4WnklFVBSWc\nL84Sc732xU12TAbTTUsa6E7W29pS8u7zVTxlIdQIIU5pzDyU1pNNk2kpxzte5p3Y\nPDtniPFsoYLWoH0LpsKL93t2pLAj+IOkE6f3XBq5AoGAIKaYo5N1FxQr952frx/x\nQUpK0N/R5Ng8v18SiLG26rhmM5iVSrQXC7TrHI7wfR8a9tC6qP/NqnM9NuwC/bQ0\nEEo7/GhaWxKNRwZRkmWiSFLNGk9t1hbtGU+N1lUdFtmloPIQdRNiw0kN3JTj474Q\nYI7O1EItFORnK6yxZfR6HEECgYEA1CT7MGUoa8APsMRCXyaiq15Pb8bjxK8mXquW\nHLEFXuzhLCW1FORDoj0y9s/iuKC0iS0ROX8R/J7k5NrbgikbH8WP36UxKkYNr1IC\nHOFImPTYRSKjVsL+fIUNb1DSp3S6SsYbL7v3XJJQqtlQiDq8U8x1aQFXJ9C4EoLR\nzhKrKsECgYBtU/TSF/TATZY5XtrN9O+HX1Fbz70Ci8XgvioheVI2fezOcXPRzDcC\nOYPaCMNKA5E8gHdg4s0TN7uDvKTJ+KhSg2V7gZ39A28dHrJaRX7Nz4k6t2uEBjX9\na1JidpAIbJ+3w7+hj6L299tVZvS+Y/6Dz/uuEQGXfJg/l/5CCvQPsA==\n-----END RSA PRIVATE KEY-----" > ~/.ssh/id_rsa
+ - chmod 600 ~/.ssh/id_rsa*
+ - eval `ssh-agent -s`
+ - ssh-add ~/.ssh/id_rsa
 language: node_js
 node_js:
   - "0.10"
@@ -7,3 +21,4 @@ git:
 branches:
   only:
     - master
+
diff --git a/generate/templates/struct_content.cc b/generate/templates/struct_content.cc
@@ -37,7 +37,7 @@ using namespace std;
 {{ cppClassName }}::~{{ cppClassName }}() {
   // This is going to cause memory leaks. We'll have to solve that later
   // TODO: Clean up memory better
-  if (this->selfFreeing) {
+  if (!this->selfFreeing) {
     free(this->raw);
   }
 
diff --git a/lib/clone.js b/lib/clone.js
@@ -12,12 +12,19 @@ var clone = Clone.clone;
  * @param options
  */
 Clone.clone = function(url, local_path, options) {
-  var remoteCallbacks = options.remoteCallbacks;
-  delete options.remoteCallbacks;
+  var remoteCallbacks;
+
+  if (options) {
+    remoteCallbacks = options.remoteCallbacks;
+    delete options.remoteCallbacks;
+  }
+
   options = normalizeOptions(options, NodeGit.CloneOptions);
 
-  options.remoteCallbacks = normalizeOptions(remoteCallbacks,
-    NodeGit.RemoteCallbacks);
+  if (remoteCallbacks) {
+    options.remoteCallbacks = normalizeOptions(remoteCallbacks,
+      NodeGit.RemoteCallbacks);
+  }
 
   return clone.call(this, url, local_path, options);
 };
diff --git a/test/tests/clone.js b/test/tests/clone.js
@@ -43,7 +43,7 @@ describe("Clone", function() {
     });
   });
 
-  it.only("can clone with ssh", function() {
+  it("can clone with ssh", function() {
     var url = "git@github.com:nodegit/test.git";
     var opts = {
       ignoreCertErrors: 1,
diff --git a/vendor/libgit2.gyp b/vendor/libgit2.gyp
@@ -407,6 +407,9 @@
     {
       "target_name": "libssh2",
       "type": "static_library",
+      "defines": [
+        "NETSNMP_ENABLE_IPV6"
+      ],
       "sources": [
         "libssh2/src/agent.c",
         "libssh2/src/crypt.c",
@@ -438,8 +441,10 @@
       "conditions": [
         ["OS=='win'", {
           "include_dirs": [
+            "libssh2/src",
             "libssh2/win32",
-          ]
+            "libssh2/include",
+          ],
         }],
       ]
     },

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ using namespace std;`
`37`	`37`	`{{ cppClassName }}::~{{ cppClassName }}() {`
`38`	`38`	`// This is going to cause memory leaks. We'll have to solve that later`
`39`	`39`	`// TODO: Clean up memory better`
`40`		`- if (this->selfFreeing) {`
	`40`	`+ if (!this->selfFreeing) {`
`41`	`41`	`free(this->raw);`
`42`	`42`	`}`
`43`	`43`