From 10b2bb8dffa8f6d8b2ebc8d5e2a04aaeb118acaa Mon Sep 17 00:00:00 2001
From: fbrosson <fbrosson@users.noreply.github.com>
Date: Fri, 3 Feb 2017 06:45:33 +0000
Subject: [PATCH] git: bump to 2.11.1.

---
 dev-vcs/git/{git-2.11.0.recipe => git-2.11.1.recipe}   | 10 +++++-----
 .../{git-2.11.0.patchset => git-2.11.1.patchset}       | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)
 rename dev-vcs/git/{git-2.11.0.recipe => git-2.11.1.recipe} (94%)
 rename dev-vcs/git/patches/{git-2.11.0.patchset => git-2.11.1.patchset} (92%)

diff --git a/dev-vcs/git/git-2.11.0.recipe b/dev-vcs/git/git-2.11.1.recipe
similarity index 94%
rename from dev-vcs/git/git-2.11.0.recipe
rename to dev-vcs/git/git-2.11.1.recipe
index 540ae0680..2b016f532 100644
--- a/dev-vcs/git/git-2.11.0.recipe
+++ b/dev-vcs/git/git-2.11.1.recipe
@@ -8,22 +8,22 @@ It outclasses SCM tools like Subversion, CVS, Perforce, and ClearCase with \
 features like cheap local branching, convenient staging areas, and multiple \
 workflows."
 HOMEPAGE="https://git-scm.com/"
-COPYRIGHT="2005-2016 Git Authors (see git web site for list)"
+COPYRIGHT="2005-2017 Git Authors (see git web site for list)"
 LICENSE="GNU GPL v2"
 REVISION="1"
 
 SOURCE_URI="https://www.kernel.org/pub/software/scm/git/git-$portVersion.tar.xz"
-CHECKSUM_SHA256="7e7e8d69d494892373b87007674be5820a4bc1ef596a0117d03ea3169119fd0b"
+CHECKSUM_SHA256="c0a779cae325d48a1d5ba08b6ee1febcc31d0657a6da01fd1dec1c6e10976415"
 
 SOURCE_URI_2="https://www.kernel.org/pub/software/scm/git/git-manpages-$portVersion.tar.xz"
-CHECKSUM_SHA256_2="b3d3e78829c0b69b727aaca407ecfe239a46db3f354f16189f7a7c10af9528d8"
+CHECKSUM_SHA256_2="69486ed339ee0591001ae83d43c888aa26351b9680b6ceb59e06b593051bca31"
 
 SOURCE_URI_3="https://www.kernel.org/pub/software/scm/git/git-htmldocs-$portVersion.tar.xz"
-CHECKSUM_SHA256_3="3975399f1be3d959edf0fded03eab8fbf94787bfd0318b7644c77cf61e4a7b48"
+CHECKSUM_SHA256_3="1a5f1e4a5eadad89b0783efa08bb1f7e3802d4a4d0a135bf5f61fd672ea3846e"
 
 PATCHES="git-$portVersion.patchset"
 
-ARCHITECTURES="?x86_gcc2 x86 x86_64"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
 
 PROVIDES="
 	git = $portVersion compat >= 2.2
diff --git a/dev-vcs/git/patches/git-2.11.0.patchset b/dev-vcs/git/patches/git-2.11.1.patchset
similarity index 92%
rename from dev-vcs/git/patches/git-2.11.0.patchset
rename to dev-vcs/git/patches/git-2.11.1.patchset
index bebd7951a..ad92080e5 100644
--- a/dev-vcs/git/patches/git-2.11.0.patchset
+++ b/dev-vcs/git/patches/git-2.11.1.patchset
@@ -30,7 +30,7 @@ Subject: On Haiku use the user settings directory instead of HOME
 
 
 diff --git a/path.c b/path.c
-index 52d889c..fc5a2ff 100644
+index efcedaf..e96d512 100644
 --- a/path.c
 +++ b/path.c
 @@ -8,6 +8,11 @@
@@ -45,7 +45,7 @@ index 52d889c..fc5a2ff 100644
  static int get_st_mode_bits(const char *path, int *mode)
  {
  	struct stat st;
-@@ -1256,10 +1261,18 @@ char *xdg_config_home(const char *filename)
+@@ -1261,10 +1266,18 @@ char *xdg_config_home(const char *filename)
  {
  	const char *home, *config_home;
  
@@ -75,10 +75,10 @@ Subject: Ensure config-directory exists before using it.
 
 
 diff --git a/config.c b/config.c
-index 83fdecb..6c9fca1 100644
+index 617b2e3..9debb9d 100644
 --- a/config.c
 +++ b/config.c
-@@ -2083,6 +2083,7 @@ int git_config_set_multivar_in_file_gently(const char *config_filename,
+@@ -2105,6 +2105,7 @@ int git_config_set_multivar_in_file_gently(const char *config_filename,
  	int ret;
  	struct lock_file *lock = NULL;
  	char *filename_buf = NULL;
@@ -86,7 +86,7 @@ index 83fdecb..6c9fca1 100644
  	char *contents = NULL;
  	size_t contents_sz;
  
-@@ -2096,6 +2097,12 @@ int git_config_set_multivar_in_file_gently(const char *config_filename,
+@@ -2118,6 +2119,12 @@ int git_config_set_multivar_in_file_gently(const char *config_filename,
  	if (!config_filename)
  		config_filename = filename_buf = git_pathdup("config");