From 004a5ba46c918aac573c3a57d3cd613a79b8d1a3 Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Sun, 3 Mar 2019 23:42:27 -0800
Subject: git: Update to 2.21.0

---
 pkg/git/.gitignore |  2 +-
 pkg/git/config.h   |  4 +++-
 pkg/git/gen.lua    | 27 ++++++++++++++++++++++++++-
 pkg/git/man.txt    |  2 +-
 pkg/git/rev        |  2 +-
 pkg/git/sha256     |  2 +-
 pkg/git/src        |  2 +-
 pkg/git/url        |  2 +-
 8 files changed, 35 insertions(+), 8 deletions(-)

(limited to 'pkg/git')

diff --git a/pkg/git/.gitignore b/pkg/git/.gitignore
index 4b4e41dd..be1e0aae 100644
--- a/pkg/git/.gitignore
+++ b/pkg/git/.gitignore
@@ -1,3 +1,3 @@
-/git-manpages-2.19.2.tar.xz
+/git-manpages-2.21.0.tar.xz
 /man
 /man.ninja
diff --git a/pkg/git/config.h b/pkg/git/config.h
index 093078bb..0678f49b 100644
--- a/pkg/git/config.h
+++ b/pkg/git/config.h
@@ -11,7 +11,7 @@
 #define GIT_LOCALE_PATH "/share/locale"
 #define GIT_MAN_PATH "share/man"
 #define GIT_USER_AGENT "git/" GIT_VERSION
-#define GIT_VERSION "2.20.1"
+#define GIT_VERSION "2.21.0"
 #define HAVE_ALLOCA_H
 #define HAVE_PATHS_H
 #define HAVE_DEV_TTY
@@ -29,3 +29,5 @@
 #define SHA1DC_INIT_SAFE_HASH_DEFAULT 0
 #define SHA1DC_CUSTOM_INCLUDE_SHA1_C "cache.h"
 #define SHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C "git-compat-util.h"
+
+#define SHA256_BLK
diff --git a/pkg/git/gen.lua b/pkg/git/gen.lua
index 48acebdf..b02b6d85 100644
--- a/pkg/git/gen.lua
+++ b/pkg/git/gen.lua
@@ -223,6 +223,8 @@ lib('libgit.a', [[
 	sha1dc/sha1.c
 	sha1dc/ubc_check.c
 
+	sha256/block/sha256.c
+
 	libxdiff.a
 	$builddir/pkg/zlib/libz.a
 ]])
@@ -420,10 +422,33 @@ x('parse-remote', '644')
 x('rebase--am', '644')
 x('rebase--common', '644')
 x('rebase--preserve-merges', '644')
-x('rebase--merge', '644')
 x('sh-setup', '644')
 x('sh-i18n', '644')
 
+local function x(name)
+	build('sed', '$outdir/git-'..name, '$srcdir/git-'..name..'.perl', {
+		expr={
+			[[-e '1ause lib (split(/:/, $$ENV{GITPERLLIB} || "/share/perl5"));']],
+			'-e s,@@GIT_VERSION@@,2.19.1,g',
+		},
+	})
+	file('libexec/git-core/git-'..name, '755', '$outdir/git-'..name)
+end
+
+-- src/Makefile:/^SCRIPT_PERL.\+=
+x('send-email')
+x('add--interactive')
+
+for name in iterlines('perllibs.txt') do
+	build('sed', '$outdir/perl/'..name, '$srcdir/perl/'..name, {
+		expr={
+			'-e s,@@LOCALEDIR@@,/share/locale,g',
+			'-e s,@@NO_PERL_CPAN_FALLBACKS@@,,g',
+		},
+	})
+	file('share/perl5/'..name, '644', '$outdir/perl/'..name)
+end
+
 for _, name in ipairs{'git-shell', 'git-upload-pack'} do
 	sym('bin/'..name, '../libexec/git-core/'..name)
 end
diff --git a/pkg/git/man.txt b/pkg/git/man.txt
index 8fc6e756..f5cec223 100644
--- a/pkg/git/man.txt
+++ b/pkg/git/man.txt
@@ -1,4 +1,4 @@
-# 2,<xzcat git-manpages-2.20.1.tar.xz | pax -s '/\.\///' '*.[1-9]' | sort
+# 2,<xzcat git-manpages-2.21.0.tar.xz | pax -s '/\.\///' '*.[1-9]' | sort
 man1/git-add.1
 man1/git-am.1
 man1/git-annotate.1
diff --git a/pkg/git/rev b/pkg/git/rev
index 8f92bfdd..7facc899 100644
--- a/pkg/git/rev
+++ b/pkg/git/rev
@@ -1 +1 @@
-35
+36
diff --git a/pkg/git/sha256 b/pkg/git/sha256
index cf9f7df4..5a3c6751 100644
--- a/pkg/git/sha256
+++ b/pkg/git/sha256
@@ -1 +1 @@
-060acce347cfb712d0c7dfe7578c5291fde2d3d807917b2828c8aae3c90876ba  git-manpages-2.20.1.tar.xz
+2f68dc24931c0d05f70167d9ffe6c33ef6b0b6c75b92301ddcda55b9b0f5ec51  git-manpages-2.21.0.tar.xz
diff --git a/pkg/git/src b/pkg/git/src
index 0d0ac382..8104ec99 160000
--- a/pkg/git/src
+++ b/pkg/git/src
@@ -1 +1 @@
-Subproject commit 0d0ac3826a3bbb9247e39e12623bbcfdd722f24c
+Subproject commit 8104ec994ea3849a968b4667d072fedd1e688642
diff --git a/pkg/git/url b/pkg/git/url
index fd11f46c..ad10b79b 100644
--- a/pkg/git/url
+++ b/pkg/git/url
@@ -1 +1 @@
-url = "https://www.kernel.org/pub/software/scm/git/git-manpages-2.20.1.tar.xz"
+url = "https://www.kernel.org/pub/software/scm/git/git-manpages-2.21.0.tar.xz"
-- 
cgit v1.2.3