rugged 1.0.1 → 1.1.0

data/vendor/libgit2/src/transaction.c

@@ -76,7 +76,8 @@ int git_transaction_new(git_transaction **out, git_repository *repo)
 
 	assert(out && repo);
 
-	git_pool_init(&pool, 1);
+	if ((error = git_pool_init(&pool, 1)) < 0)
+		goto on_error;
 
 	tx = git_pool_mallocz(&pool, sizeof(git_transaction));
 	if (!tx) {

data/vendor/libgit2/src/transports/credential.c

@@ -391,6 +391,7 @@ void git_credential_free(git_credential *cred)
 
 /* Deprecated credential functions */
 
+#ifndef GIT_DEPRECATE_HARD
 int git_cred_has_username(git_credential *cred)
 {
 	return git_credential_has_username(cred);
@@ -474,3 +475,4 @@ void git_cred_free(git_credential *cred)
 {
 	git_credential_free(cred);
 }
+#endif

data/vendor/libgit2/src/transports/credential_helpers.c

@@ -54,6 +54,7 @@ int git_credential_userpass(
 
 /* Deprecated credential functions */
 
+#ifndef GIT_DEPRECATE_HARD
 int git_cred_userpass(
 	git_credential **out,
 	const char *url,
@@ -64,3 +65,4 @@ int git_cred_userpass(
 	return git_credential_userpass(out, url, user_from_url,
 		allowed_types, payload);
 }
+#endif

data/vendor/libgit2/src/transports/httpclient.c

@@ -445,7 +445,7 @@ GIT_INLINE(int) client_write_request(git_http_client *client)
 				      0);
 }
 
-const char *name_for_method(git_http_method method)
+static const char *name_for_method(git_http_method method)
 {
 	switch (method) {
 	case GIT_HTTP_METHOD_GET:
@@ -1120,11 +1120,6 @@ GIT_INLINE(int) client_read_and_parse(git_http_client *client)
 		return -1;
 	}
 
-	if (parser->upgrade) {
-		git_error_set(GIT_ERROR_HTTP, "server requested upgrade");
-		return -1;
-	}
-
 	if (ctx->parse_status == PARSE_STATUS_ERROR) {
 		client->connected = 0;
 		return ctx->error ? ctx->error : -1;
@@ -1374,8 +1369,11 @@ int git_http_client_read_response(
 
 	git_http_response_dispose(response);
 
-	git_vector_free_deep(&client->server.auth_challenges);
-	git_vector_free_deep(&client->proxy.auth_challenges);
+	if (client->current_server == PROXY) {
+		git_vector_free_deep(&client->proxy.auth_challenges);
+	} else if(client->current_server == SERVER) {
+		git_vector_free_deep(&client->server.auth_challenges);
+	}
 
 	client->state = READING_RESPONSE;
 	client->keepalive = 0;

data/vendor/libgit2/src/transports/local.c

@@ -185,12 +185,12 @@ static int store_refs(transport_local *t)
 	}
 
 	t->have_refs = 1;
-	git_strarray_free(&ref_names);
+	git_strarray_dispose(&ref_names);
 	return 0;
 
 on_error:
 	git_vector_free(&t->refs);
-	git_strarray_free(&ref_names);
+	git_strarray_dispose(&ref_names);
 	return -1;
 }
 

data/vendor/libgit2/src/transports/smart.c

@@ -132,7 +132,7 @@ static int git_smart__set_custom_headers(
 	size_t i;
 
 	if (t->custom_headers.count)
-		git_strarray_free(&t->custom_headers);
+		git_strarray_dispose(&t->custom_headers);
 
 	if (!custom_headers)
 		return 0;
@@ -465,7 +465,7 @@ static void git_smart__free(git_transport *transport)
 	git_vector_free(refs);
 	git__free((char *)t->proxy.url);
 
-	git_strarray_free(&t->custom_headers);
+	git_strarray_dispose(&t->custom_headers);
 
 	git__free(t);
 }

data/vendor/libgit2/src/transports/winhttp.c

@@ -41,14 +41,18 @@
 #define WINHTTP_IGNORE_REQUEST_TOTAL_LENGTH 0
 #endif
 
-#ifndef WINHTTP_FLAG_SECURE_PROTOCOL_TLS_1_1
+#ifndef WINHTTP_FLAG_SECURE_PROTOCOL_TLS1_1
 # define WINHTTP_FLAG_SECURE_PROTOCOL_TLS1_1 0x00000200
 #endif
 
-#ifndef WINHTTP_FLAG_SECURE_PROTOCOL_TLS_1_2
+#ifndef WINHTTP_FLAG_SECURE_PROTOCOL_TLS1_2
 # define WINHTTP_FLAG_SECURE_PROTOCOL_TLS1_2 0x00000800
 #endif
 
+#ifndef WINHTTP_FLAG_SECURE_PROTOCOL_TLS1_3
+# define WINHTTP_FLAG_SECURE_PROTOCOL_TLS1_3 0x00002000
+#endif
+
 #ifndef HTTP_STATUS_PERMANENT_REDIRECT
 # define HTTP_STATUS_PERMANENT_REDIRECT 308
 #endif
@@ -743,7 +747,8 @@ static int winhttp_connect(
 	DWORD protocols =
 		WINHTTP_FLAG_SECURE_PROTOCOL_TLS1 |
 		WINHTTP_FLAG_SECURE_PROTOCOL_TLS1_1 |
-		WINHTTP_FLAG_SECURE_PROTOCOL_TLS1_2;
+		WINHTTP_FLAG_SECURE_PROTOCOL_TLS1_2 |
+		WINHTTP_FLAG_SECURE_PROTOCOL_TLS1_3;
 
 	t->session = NULL;
 	t->connection = NULL;
@@ -788,14 +793,20 @@ static int winhttp_connect(
 	}
 
 	/*
-	 * Do a best-effort attempt to enable TLS 1.2 but allow this to
-	 * fail; if TLS 1.2 support is not available for some reason,
+	 * Do a best-effort attempt to enable TLS 1.3 and 1.2 but allow this to
+	 * fail; if TLS 1.2 or 1.3 support is not available for some reason,
 	 * ignore the failure (it will keep the default protocols).
 	 */
-	WinHttpSetOption(t->session,
+	if (WinHttpSetOption(t->session,
 		WINHTTP_OPTION_SECURE_PROTOCOLS,
 		&protocols,
-		sizeof(protocols));
+		sizeof(protocols)) == FALSE) {
+		protocols &= ~WINHTTP_FLAG_SECURE_PROTOCOL_TLS1_3;
+		WinHttpSetOption(t->session,
+			WINHTTP_OPTION_SECURE_PROTOCOLS,
+			&protocols,
+			sizeof(protocols));
+	}
 
 	if (!WinHttpSetTimeouts(t->session, default_timeout, default_connect_timeout, default_timeout, default_timeout)) {
 		git_error_set(GIT_ERROR_OS, "failed to set timeouts for WinHTTP");

data/vendor/libgit2/src/unix/posix.h

@@ -62,11 +62,23 @@ GIT_INLINE(int) p_fsync(int fd)
 #define p_snprintf snprintf
 #define p_mkstemp(p) mkstemp(p)
 #define p_chdir(p) chdir(p)
-#define p_chmod(p,m) chmod(p, m)
 #define p_rmdir(p) rmdir(p)
 #define p_access(p,m) access(p,m)
 #define p_ftruncate(fd, sz) ftruncate(fd, sz)
 
+/*
+ * Pre-Android 5 did not implement a virtual filesystem atop FAT
+ * partitions for Unix permissions, which causes chmod to fail. However,
+ * Unix permissions have no effect on Android anyway as file permissions
+ * are not actually managed this way, so treating it as a no-op across
+ * all Android is safe.
+ */
+#ifdef __ANDROID__
+# define p_chmod(p,m) 0
+#else
+# define p_chmod(p,m) chmod(p, m)
+#endif
+
 /* see win32/posix.h for explanation about why this exists */
 #define p_lstat_posixly(p,b) lstat(p,b)
 

data/vendor/libgit2/src/util.c

@@ -22,52 +22,6 @@
 # include <Shlwapi.h>
 #endif
 
-void git_strarray_free(git_strarray *array)
-{
-	size_t i;
-
-	if (array == NULL)
-		return;
-
-	for (i = 0; i < array->count; ++i)
-		git__free(array->strings[i]);
-
-	git__free(array->strings);
-
-	memset(array, 0, sizeof(*array));
-}
-
-int git_strarray_copy(git_strarray *tgt, const git_strarray *src)
-{
-	size_t i;
-
-	assert(tgt && src);
-
-	memset(tgt, 0, sizeof(*tgt));
-
-	if (!src->count)
-		return 0;
-
-	tgt->strings = git__calloc(src->count, sizeof(char *));
-	GIT_ERROR_CHECK_ALLOC(tgt->strings);
-
-	for (i = 0; i < src->count; ++i) {
-		if (!src->strings[i])
-			continue;
-
-		tgt->strings[tgt->count] = git__strdup(src->strings[i]);
-		if (!tgt->strings[tgt->count]) {
-			git_strarray_free(tgt);
-			memset(tgt, 0, sizeof(*tgt));
-			return -1;
-		}
-
-		tgt->count++;
-	}
-
-	return 0;
-}
-
 int git__strntol64(int64_t *result, const char *nptr, size_t nptr_len, const char **endptr, int base)
 {
 	const char *p;
@@ -424,35 +378,48 @@ void git__hexdump(const char *buffer, size_t len)
 	last_line = (len % LINE_WIDTH);
 
 	for (i = 0; i < line_count; ++i) {
+		printf("%08" PRIxZ "  ", (i * LINE_WIDTH));
+
 		line = buffer + (i * LINE_WIDTH);
-		for (j = 0; j < LINE_WIDTH; ++j, ++line)
-			printf("%02X ", (unsigned char)*line & 0xFF);
+		for (j = 0; j < LINE_WIDTH; ++j, ++line) {
+			printf("%02x ", (unsigned char)*line & 0xFF);
+
+			if (j == (LINE_WIDTH / 2))
+				printf(" ");
+		}
 
-		printf("| ");
+		printf(" |");
 
 		line = buffer + (i * LINE_WIDTH);
 		for (j = 0; j < LINE_WIDTH; ++j, ++line)
 			printf("%c", (*line >= 32 && *line <= 126) ? *line : '.');
 
-		printf("\n");
+		printf("|\n");
 	}
 
 	if (last_line > 0) {
+		printf("%08" PRIxZ "  ", (line_count * LINE_WIDTH));
 
 		line = buffer + (line_count * LINE_WIDTH);
-		for (j = 0; j < last_line; ++j, ++line)
-			printf("%02X ", (unsigned char)*line & 0xFF);
+		for (j = 0; j < last_line; ++j, ++line) {
+			printf("%02x ", (unsigned char)*line & 0xFF);
+
+			if (j == (LINE_WIDTH / 2))
+				printf(" ");
+		}
 
+		if (j < (LINE_WIDTH / 2))
+			printf(" ");
 		for (j = 0; j < (LINE_WIDTH - last_line); ++j)
-			printf("	");
+			printf("   ");
 
-		printf("| ");
+		printf(" |");
 
 		line = buffer + (line_count * LINE_WIDTH);
 		for (j = 0; j < last_line; ++j, ++line)
 			printf("%c", (*line >= 32 && *line <= 126) ? *line : '.');
 
-		printf("\n");
+		printf("|\n");
 	}
 
 	printf("\n");
@@ -810,7 +777,7 @@ static const int8_t utf8proc_utf8class[256] = {
 	4, 4, 4, 4, 4, 4, 4, 4, 0, 0, 0, 0, 0, 0, 0, 0
 };
 
-int git__utf8_charlen(const uint8_t *str, size_t str_len)
+static int util_utf8_charlen(const uint8_t *str, size_t str_len)
 {
 	size_t length, i;
 
@@ -835,7 +802,7 @@ int git__utf8_iterate(const uint8_t *str, int str_len, int32_t *dst)
 	int32_t uc = -1;
 
 	*dst = -1;
-	length = git__utf8_charlen(str, str_len);
+	length = util_utf8_charlen(str, str_len);
 	if (length < 0)
 		return -1;
 
@@ -872,7 +839,7 @@ size_t git__utf8_valid_buf_length(const uint8_t *str, size_t str_len)
 	size_t offset = 0;
 
 	while (offset < str_len) {
-		int length = git__utf8_charlen(str + offset, str_len - offset);
+		int length = util_utf8_charlen(str + offset, str_len - offset);
 
 		if (length < 0)
 			break;

data/vendor/libgit2/src/util.h

@@ -186,10 +186,10 @@ typedef void (*git_refcount_freeptr)(void *r);
 }
 
 #define GIT_REFCOUNT_OWN(r, o) { \
-	(r)->rc.owner = o; \
+	(void)git__swap((r)->rc.owner, o); \
 }
 
-#define GIT_REFCOUNT_OWNER(r) ((r)->rc.owner)
+#define GIT_REFCOUNT_OWNER(r) git__load((r)->rc.owner)
 
 #define GIT_REFCOUNT_VAL(r) git_atomic_get((r)->rc.refcount)
 

data/vendor/libgit2/src/win32/git2.rc

@@ -2,14 +2,29 @@
 #include "../../include/git2/version.h"
 
 #ifndef LIBGIT2_FILENAME
-# define LIBGIT2_FILENAME "git2"
+# ifdef __GNUC__
+#  define LIBGIT2_FILENAME git2
+# else
+#  define LIBGIT2_FILENAME "git2"
+# endif
 #endif
 
 #ifndef LIBGIT2_COMMENTS
 # define LIBGIT2_COMMENTS "For more information visit http://libgit2.github.com/"
 #endif
 
+#ifdef __GNUC__
+# define _STR(x) #x
+# define STR(x) _STR(x)
+#else
+# define STR(x) x
+#endif
+
+#ifdef __GNUC__
+VS_VERSION_INFO		VERSIONINFO
+#else
 VS_VERSION_INFO		VERSIONINFO	MOVEABLE IMPURE LOADONCALL DISCARDABLE
+#endif
   FILEVERSION		LIBGIT2_VER_MAJOR,LIBGIT2_VER_MINOR,LIBGIT2_VER_REVISION,LIBGIT2_VER_PATCH
   PRODUCTVERSION	LIBGIT2_VER_MAJOR,LIBGIT2_VER_MINOR,LIBGIT2_VER_REVISION,LIBGIT2_VER_PATCH
   FILEFLAGSMASK		VS_FFI_FILEFLAGSMASK
@@ -29,9 +44,9 @@ BEGIN
     BEGIN
       VALUE "FileDescription",	"libgit2 - the Git linkable library\0"
       VALUE "FileVersion",	LIBGIT2_VERSION "\0"
-      VALUE "InternalName",	LIBGIT2_FILENAME ".dll\0"
+      VALUE "InternalName",	STR(LIBGIT2_FILENAME) ".dll\0"
       VALUE "LegalCopyright",	"Copyright (C) the libgit2 contributors. All rights reserved.\0"
-      VALUE "OriginalFilename",	LIBGIT2_FILENAME ".dll\0"
+      VALUE "OriginalFilename",	STR(LIBGIT2_FILENAME) ".dll\0"
       VALUE "ProductName",	"libgit2\0"
       VALUE "ProductVersion",	LIBGIT2_VERSION "\0"
       VALUE "Comments",		LIBGIT2_COMMENTS "\0"

data/vendor/libgit2/src/win32/path_w32.c

@@ -151,7 +151,7 @@ int git_win32_path_canonicalize(git_win32_path path)
 	return (int)(to - path);
 }
 
-int git_win32_path__cwd(wchar_t *out, size_t len)
+static int win32_path_cwd(wchar_t *out, size_t len)
 {
 	int cwd_len;
 
@@ -241,7 +241,7 @@ int git_win32_path_from_utf8(git_win32_path out, const char *src)
 	else {
 		int cwd_len;
 
-		if ((cwd_len = git_win32_path__cwd(dest, MAX_PATH)) < 0)
+		if ((cwd_len = win32_path_cwd(dest, MAX_PATH)) < 0)
 			goto on_error;
 
 		dest[cwd_len++] = L'\\';

data/vendor/libgit2/src/worktree.c

@@ -271,11 +271,13 @@ int git_worktree_add_options_init(git_worktree_add_options *opts,
 	return 0;
 }
 
+#ifndef GIT_DEPRECATE_HARD
 int git_worktree_add_init_options(git_worktree_add_options *opts,
 	unsigned int version)
 {
 	return git_worktree_add_options_init(opts, version);
 }
+#endif
 
 int git_worktree_add(git_worktree **out, git_repository *repo,
 	const char *name, const char *worktree,
@@ -506,11 +508,13 @@ int git_worktree_prune_options_init(
 	return 0;
 }
 
+#ifndef GIT_DEPRECATE_HARD
 int git_worktree_prune_init_options(git_worktree_prune_options *opts,
 	unsigned int version)
 {
 	return git_worktree_prune_options_init(opts, version);
 }
+#endif
 
 int git_worktree_is_prunable(git_worktree *wt,
 	git_worktree_prune_options *opts)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rugged
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Scott Chacon
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-24 00:00:00.000000000 Z
+date: 2020-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -123,27 +123,25 @@ files:
 - vendor/libgit2/AUTHORS
 - vendor/libgit2/CMakeLists.txt
 - vendor/libgit2/COPYING
-- vendor/libgit2/cmake/Modules/AddCFlagIfSupported.cmake
-- vendor/libgit2/cmake/Modules/CheckPrototypeDefinition.c.in
-- vendor/libgit2/cmake/Modules/CheckPrototypeDefinition.cmake
-- vendor/libgit2/cmake/Modules/EnableWarnings.cmake
-- vendor/libgit2/cmake/Modules/FindCoreFoundation.cmake
-- vendor/libgit2/cmake/Modules/FindGSSAPI.cmake
-- vendor/libgit2/cmake/Modules/FindGSSFramework.cmake
-- vendor/libgit2/cmake/Modules/FindHTTP_Parser.cmake
-- vendor/libgit2/cmake/Modules/FindIconv.cmake
-- vendor/libgit2/cmake/Modules/FindPCRE.cmake
-- vendor/libgit2/cmake/Modules/FindPCRE2.cmake
-- vendor/libgit2/cmake/Modules/FindPkgLibraries.cmake
-- vendor/libgit2/cmake/Modules/FindSecurity.cmake
-- vendor/libgit2/cmake/Modules/FindStatNsec.cmake
-- vendor/libgit2/cmake/Modules/FindmbedTLS.cmake
-- vendor/libgit2/cmake/Modules/IdeSplitSources.cmake
-- vendor/libgit2/cmake/Modules/PkgBuildConfig.cmake
-- vendor/libgit2/cmake/Modules/SanitizeBool.cmake
-- vendor/libgit2/cmake/Modules/SelectGSSAPI.cmake
-- vendor/libgit2/cmake/Modules/SelectHTTPSBackend.cmake
-- vendor/libgit2/cmake/Modules/SelectHashes.cmake
+- vendor/libgit2/cmake/AddCFlagIfSupported.cmake
+- vendor/libgit2/cmake/EnableWarnings.cmake
+- vendor/libgit2/cmake/FindCoreFoundation.cmake
+- vendor/libgit2/cmake/FindGSSAPI.cmake
+- vendor/libgit2/cmake/FindGSSFramework.cmake
+- vendor/libgit2/cmake/FindHTTP_Parser.cmake
+- vendor/libgit2/cmake/FindIconv.cmake
+- vendor/libgit2/cmake/FindPCRE.cmake
+- vendor/libgit2/cmake/FindPCRE2.cmake
+- vendor/libgit2/cmake/FindPkgLibraries.cmake
+- vendor/libgit2/cmake/FindSecurity.cmake
+- vendor/libgit2/cmake/FindStatNsec.cmake
+- vendor/libgit2/cmake/FindmbedTLS.cmake
+- vendor/libgit2/cmake/IdeSplitSources.cmake
+- vendor/libgit2/cmake/PkgBuildConfig.cmake
+- vendor/libgit2/cmake/SanitizeBool.cmake
+- vendor/libgit2/cmake/SelectGSSAPI.cmake
+- vendor/libgit2/cmake/SelectHTTPSBackend.cmake
+- vendor/libgit2/cmake/SelectHashes.cmake
 - vendor/libgit2/deps/http-parser/CMakeLists.txt
 - vendor/libgit2/deps/http-parser/COPYING
 - vendor/libgit2/deps/http-parser/http_parser.c
@@ -168,6 +166,7 @@ files:
 - vendor/libgit2/deps/ntlmclient/util.h
 - vendor/libgit2/deps/pcre/CMakeLists.txt
 - vendor/libgit2/deps/pcre/COPYING
+- vendor/libgit2/deps/pcre/LICENCE
 - vendor/libgit2/deps/pcre/cmake/COPYING-CMAKE-SCRIPTS
 - vendor/libgit2/deps/pcre/cmake/FindEditline.cmake
 - vendor/libgit2/deps/pcre/cmake/FindPackageHandleStandardArgs.cmake
@@ -328,6 +327,7 @@ files:
 - vendor/libgit2/src/apply.c
 - vendor/libgit2/src/apply.h
 - vendor/libgit2/src/array.h
+- vendor/libgit2/src/assert_safe.h
 - vendor/libgit2/src/attr.c
 - vendor/libgit2/src/attr.h
 - vendor/libgit2/src/attr_file.c
@@ -451,6 +451,8 @@ files:
 - vendor/libgit2/src/merge_file.c
 - vendor/libgit2/src/message.c
 - vendor/libgit2/src/message.h
+- vendor/libgit2/src/midx.c
+- vendor/libgit2/src/midx.h
 - vendor/libgit2/src/mwindow.c
 - vendor/libgit2/src/mwindow.h
 - vendor/libgit2/src/net.c
@@ -507,7 +509,6 @@ files:
 - vendor/libgit2/src/refdb.c
 - vendor/libgit2/src/refdb.h
 - vendor/libgit2/src/refdb_fs.c
-- vendor/libgit2/src/refdb_fs.h
 - vendor/libgit2/src/reflog.c
 - vendor/libgit2/src/reflog.h
 - vendor/libgit2/src/refs.c
@@ -534,6 +535,7 @@ files:
 - vendor/libgit2/src/stash.c
 - vendor/libgit2/src/status.c
 - vendor/libgit2/src/status.h
+- vendor/libgit2/src/strarray.c
 - vendor/libgit2/src/stream.h
 - vendor/libgit2/src/streams/mbedtls.c
 - vendor/libgit2/src/streams/mbedtls.h
@@ -674,7 +676,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Rugged is a Ruby binding to the libgit2 linkable library