From 40539564753cf8c1917bb4d358311fe3fbbb3dc2 Mon Sep 17 00:00:00 2001 From: fbrosson Date: Wed, 30 May 2018 01:15:26 +0000 Subject: [PATCH] git: bump to 2.17.1. --- dev-vcs/git/{git-2.17.0.recipe => git-2.17.1.recipe} | 6 +++--- .../patches/{git-2.17.0.patchset => git-2.17.1.patchset} | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) rename dev-vcs/git/{git-2.17.0.recipe => git-2.17.1.recipe} (95%) rename dev-vcs/git/patches/{git-2.17.0.patchset => git-2.17.1.patchset} (98%) diff --git a/dev-vcs/git/git-2.17.0.recipe b/dev-vcs/git/git-2.17.1.recipe similarity index 95% rename from dev-vcs/git/git-2.17.0.recipe rename to dev-vcs/git/git-2.17.1.recipe index dfbf81ab4..9ecb6f6d2 100644 --- a/dev-vcs/git/git-2.17.0.recipe +++ b/dev-vcs/git/git-2.17.1.recipe @@ -13,13 +13,13 @@ LICENSE="GNU GPL v2" REVISION="1" SOURCE_URI="https://www.kernel.org/pub/software/scm/git/git-$portVersion.tar.xz" -CHECKSUM_SHA256="e916e5e95e81dbeafa7aac5d719c01108b5c814eb90b746695afa1afedf955c7" +CHECKSUM_SHA256="79136e7aa83abae4d8a25c8111f113d3c5a63aeb5fd93cc72c26d49c6d5ba65e" SOURCE_URI_2="https://www.kernel.org/pub/software/scm/git/git-manpages-$portVersion.tar.xz" -CHECKSUM_SHA256_2="4bdab1aed88ad7a12a766de8e03047eba5afbba9874c7effa5059e5481943727" +CHECKSUM_SHA256_2="83d54786ea634488458486f262cb5157629a898f9d45f5d86b302aac79ceef54" SOURCE_URI_3="https://www.kernel.org/pub/software/scm/git/git-htmldocs-$portVersion.tar.xz" -CHECKSUM_SHA256_3="66d055e15c2f0034379b4a8c5280762a5dff5b4fc99daefa43404dab2f8fc308" +CHECKSUM_SHA256_3="945b1c8c8761e7c17ca39ce0fc5af94d2b238da37f8d2b1823c65302cfa4d275" PATCHES="git-$portVersion.patchset" diff --git a/dev-vcs/git/patches/git-2.17.0.patchset b/dev-vcs/git/patches/git-2.17.1.patchset similarity index 98% rename from dev-vcs/git/patches/git-2.17.0.patchset rename to dev-vcs/git/patches/git-2.17.1.patchset index d62133ecd..5d7123de7 100644 --- a/dev-vcs/git/patches/git-2.17.0.patchset +++ b/dev-vcs/git/patches/git-2.17.1.patchset @@ -31,7 +31,7 @@ Subject: On Haiku use the user settings directory instead of HOME diff --git a/path.c b/path.c -index da8b655..ec3d6c2 100644 +index 4c4a751..9129188 100644 --- a/path.c +++ b/path.c @@ -11,6 +11,11 @@ @@ -46,7 +46,7 @@ index da8b655..ec3d6c2 100644 static int get_st_mode_bits(const char *path, int *mode) { struct stat st; -@@ -1331,10 +1336,19 @@ char *xdg_config_home(const char *filename) +@@ -1415,10 +1420,19 @@ char *xdg_config_home(const char *filename) { const char *home, *config_home;