From 500d03a8e37f2b42ef52248f4dd20ac8824a6e3a Mon Sep 17 00:00:00 2001 From: fbrosson Date: Sun, 24 Dec 2017 18:52:28 +0000 Subject: [PATCH] git: bump to 2.15.1. --- dev-vcs/git/{git-2.15.0.recipe => git-2.15.1.recipe} | 6 +++--- .../patches/{git-2.15.0.patchset => git-2.15.1.patchset} | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) rename dev-vcs/git/{git-2.15.0.recipe => git-2.15.1.recipe} (95%) rename dev-vcs/git/patches/{git-2.15.0.patchset => git-2.15.1.patchset} (99%) diff --git a/dev-vcs/git/git-2.15.0.recipe b/dev-vcs/git/git-2.15.1.recipe similarity index 95% rename from dev-vcs/git/git-2.15.0.recipe rename to dev-vcs/git/git-2.15.1.recipe index cd8e58836..1d099d21a 100644 --- a/dev-vcs/git/git-2.15.0.recipe +++ b/dev-vcs/git/git-2.15.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="107116489f10b758b51af1c5dbdb9a274917b0fb67dc8eaefcdabc7bc3eb3e6a" +CHECKSUM_SHA256="999c90fd7d45066992cdb87dda35bdff6dfc1d01496118ea718dfb866da4045c" SOURCE_URI_2="https://www.kernel.org/pub/software/scm/git/git-manpages-$portVersion.tar.xz" -CHECKSUM_SHA256_2="22ad09441490f77bca781168fc66fd6576f0175407c5a95c1cdc96dfd3731c77" +CHECKSUM_SHA256_2="6c6bcf7d53aec8a498a1f5af558ae8f83daf892c3565188ee81ce34f6f022656" SOURCE_URI_3="https://www.kernel.org/pub/software/scm/git/git-htmldocs-$portVersion.tar.xz" -CHECKSUM_SHA256_3="79b2029855eeab2a01f38baeeabf6fbd222ea6de02457f0d5b9f2325cf96c514" +CHECKSUM_SHA256_3="0b3ad20f1f98d548f07a19900852e134cfc958d9664af95d04c028cf8d140166" PATCHES="git-$portVersion.patchset" diff --git a/dev-vcs/git/patches/git-2.15.0.patchset b/dev-vcs/git/patches/git-2.15.1.patchset similarity index 99% rename from dev-vcs/git/patches/git-2.15.0.patchset rename to dev-vcs/git/patches/git-2.15.1.patchset index 449b706be..fdadb80b0 100644 --- a/dev-vcs/git/patches/git-2.15.0.patchset +++ b/dev-vcs/git/patches/git-2.15.1.patchset @@ -77,7 +77,7 @@ Subject: Ensure config-directory exists before using it. diff --git a/config.c b/config.c -index adb7d7a..4b1b14e 100644 +index c38401a..329727d 100644 --- a/config.c +++ b/config.c @@ -2453,6 +2453,7 @@ int git_config_set_multivar_in_file_gently(const char *config_filename,