Merge pull request #946 from libgit2/cmn/bump-libgit2

vendor: bump libgit2 to 2347eb3263c49723d539ba84959aca3a445de509

Author: carlosmn

ext/rugged/extconf.rb

@@ -116,7 +116,7 @@ def self.run_cmake(timeout, args)
         $LDFLAGS << " " + "-L#{Dir.pwd}/deps/winhttp"
         $LIBS << " -lwinhttp -lcrypt32 -lrpcrt4 -lole32 -lz -lssh2"
       else
-        pcfile = File.join(LIBGIT2_DIR, "build", "libgit2.pc")
+        pcfile = File.join(LIBGIT2_DIR, "build", "git2.pc")
         $LDFLAGS << " " + `pkg-config --libs --static #{pcfile}`.strip
       end
     end

script/travisbuild

@@ -34,6 +34,11 @@ while read algorithm key comment; do
     echo "[localhost]:2222 $algorithm $key" >>"${HOME}/.ssh/known_hosts"
 done <"${SSHD_DIR}/id_rsa.pub"
 
+# Append the github.com keys for the tests that don't override checks. Some
+# older libssh2 versions don't like it unless we have ssh-rsa in here. This also
+# tests that the automatic selection off of known_hosts is working.
+ssh-keyscan -t ssh-rsa github.com >>"${HOME}/.ssh/known_hosts"
+
 # Get the fingerprint for localhost and remove the colons so we can
 # parse it as a hex number. Older versions have a different output
 # format.

test/commit_test.rb

@@ -492,6 +492,7 @@ def setup
     @repo.config['core.abbrev'] = 7
 
     prerelease = Rugged.libgit2_prerelease
+    prerelease = "-#{prerelease}" unless prerelease.empty?
     @version_string = "#{Rugged.libgit2_version.join('.')}#{prerelease unless prerelease.empty?}"
   end