[pkgsrc/trunk]: pkgsrc/devel/git-base Fix build under NetBSD. Do not conflict...

[ryoon <ryoon%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1b11fca13167
branches:  trunk
changeset: 343667:1b11fca13167
user:      ryoon <ryoon%pkgsrc.org@localhost>
date:      Fri Nov 08 12:52:30 2019 +0000

description:
Fix build under NetBSD. Do not conflict with hmac(3).

diffstat:

 devel/git-base/distinfo                             |   3 +-
 devel/git-base/patches/patch-builtin_receive-pack.c |  24 +++++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletions(-)

diffs (45 lines):

diff -r b774792d000d -r 1b11fca13167 devel/git-base/distinfo
--- a/devel/git-base/distinfo   Fri Nov 08 12:25:33 2019 +0000
+++ b/devel/git-base/distinfo   Fri Nov 08 12:52:30 2019 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.91 2019/11/08 12:24:31 adam Exp $
+$NetBSD: distinfo,v 1.92 2019/11/08 12:52:30 ryoon Exp $
 
 SHA1 (git-2.24.0.tar.xz) = 851537fc03f5a99419ef20e9b836de965c7928bd
 RMD160 (git-2.24.0.tar.xz) = 28b19ca928fcf8182f27031b3e2ec3e08a2b0584
@@ -6,6 +6,7 @@
 Size (git-2.24.0.tar.xz) = 5766056 bytes
 SHA1 (patch-Documentation_Makefile) = 06460f220b4703a1ff98809006ec1aed5017bb23
 SHA1 (patch-Makefile) = 73741b9d9a1b32bb47db48a7c546c4ff10fb41d6
+SHA1 (patch-builtin_receive-pack.c) = 271df08d874a11b41f33aade64352040bc028fa2
 SHA1 (patch-config.mak.uname) = 5316873147acf5b6ef29e426946280bb6441c886
 SHA1 (patch-git-gui_Makefile) = d00f4da74a437f3a58f0926f2407c974a8efc2c7
 SHA1 (patch-gitk-git_Makefile) = e5d2112d158fe493a89b244a10d2e4b998a23d98
diff -r b774792d000d -r 1b11fca13167 devel/git-base/patches/patch-builtin_receive-pack.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/git-base/patches/patch-builtin_receive-pack.c       Fri Nov 08 12:52:30 2019 +0000
@@ -0,0 +1,24 @@
+$NetBSD: patch-builtin_receive-pack.c,v 1.1 2019/11/08 12:52:30 ryoon Exp $
+
+* Do not conflict hmac(3) of NetBSD
+
+--- builtin/receive-pack.c.orig        2019-11-04 05:07:07.000000000 +0000
++++ builtin/receive-pack.c
+@@ -417,7 +417,7 @@ static int copy_to_sideband(int in, int 
+       return 0;
+ }
+ 
+-static void hmac(unsigned char *out,
++static void git_hmac(unsigned char *out,
+                     const char *key_in, size_t key_len,
+                     const char *text, size_t text_len)
+ {
+@@ -462,7 +462,7 @@ static char *prepare_push_cert_nonce(con
+       unsigned char hash[GIT_MAX_RAWSZ];
+ 
+       strbuf_addf(&buf, "%s:%"PRItime, path, stamp);
+-      hmac(hash, buf.buf, buf.len, cert_nonce_seed, strlen(cert_nonce_seed));
++      git_hmac(hash, buf.buf, buf.len, cert_nonce_seed, strlen(cert_nonce_seed));
+       strbuf_release(&buf);
+ 
+       /* RFC 2104 5. HMAC-SHA1-80 */