CVS commit: pkgsrc/devel/git-base

["Noriyuki Soda" <soda%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   soda
Date:           Thu May 25 03:04:05 UTC 2017

Modified Files:
        pkgsrc/devel/git-base: Makefile distinfo
        pkgsrc/devel/git-base/patches: patch-sha1dc_sha1.c

Log Message:
git-base-2.13.0nb1 broke all little endian platforms on *BSD.
(NOTE: _BIG_ENDIAN is always defined even on litte endian platforms)
from nonaka@


To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 pkgsrc/devel/git-base/Makefile
cvs rdiff -u -r1.62 -r1.63 pkgsrc/devel/git-base/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/git-base/patches/patch-sha1dc_sha1.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/git-base/Makefile
diff -u pkgsrc/devel/git-base/Makefile:1.37 pkgsrc/devel/git-base/Makefile:1.38
--- pkgsrc/devel/git-base/Makefile:1.37 Wed May 24 12:59:01 2017
+++ pkgsrc/devel/git-base/Makefile      Thu May 25 03:04:05 2017
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.37 2017/05/24 12:59:01 martin Exp $
+# $NetBSD: Makefile,v 1.38 2017/05/25 03:04:05 soda Exp $
 
 .include "../../devel/git/Makefile.common"
 
-PKGREVISION=   1
+PKGREVISION=   2
 PKGNAME=       git-base-${GIT_VERSION}
 COMMENT=       GIT Tree History Storage Tool (base package)
 

Index: pkgsrc/devel/git-base/distinfo
diff -u pkgsrc/devel/git-base/distinfo:1.62 pkgsrc/devel/git-base/distinfo:1.63
--- pkgsrc/devel/git-base/distinfo:1.62 Wed May 24 12:59:01 2017
+++ pkgsrc/devel/git-base/distinfo      Thu May 25 03:04:05 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.62 2017/05/24 12:59:01 martin Exp $
+$NetBSD: distinfo,v 1.63 2017/05/25 03:04:05 soda Exp $
 
 SHA1 (git-2.13.0.tar.xz) = c18782d17ce7dc3c40d0531d9cab593e8906f60a
 RMD160 (git-2.13.0.tar.xz) = 2bd561eed1b8bece94d5630bcf160e35f9e86c5e
@@ -12,5 +12,5 @@ SHA1 (patch-ag) = 4f0b9a5745203ea7ef369c
 SHA1 (patch-ah) = f22a2160631fb624e9e20616c68ad1a4aa2bebc7
 SHA1 (patch-ai) = 56b63d4790a11f5eb128186ad5efdd1bcf102f2e
 SHA1 (patch-config.mak.uname) = 5316873147acf5b6ef29e426946280bb6441c886
-SHA1 (patch-sha1dc_sha1.c) = 624f679acaecf61b878e05fe721dc23e69dc5fd2
+SHA1 (patch-sha1dc_sha1.c) = 0a649dbf98b3d2f8bf795c7bc52658f83cc4f907
 SHA1 (patch-wrapper.c) = 1fb629ec301d0431cb5bebd716b1c3a7ae45577f

Index: pkgsrc/devel/git-base/patches/patch-sha1dc_sha1.c
diff -u pkgsrc/devel/git-base/patches/patch-sha1dc_sha1.c:1.1 pkgsrc/devel/git-base/patches/patch-sha1dc_sha1.c:1.2
--- pkgsrc/devel/git-base/patches/patch-sha1dc_sha1.c:1.1       Wed May 24 14:41:35 2017
+++ pkgsrc/devel/git-base/patches/patch-sha1dc_sha1.c   Thu May 25 03:04:05 2017
@@ -1,20 +1,19 @@
-$NetBSD: patch-sha1dc_sha1.c,v 1.1 2017/05/24 14:41:35 martin Exp $
+$NetBSD: patch-sha1dc_sha1.c,v 1.2 2017/05/25 03:04:05 soda Exp $
 
 Upstream fix for alignement issues in SHA1DCUpdate,
 see: https://public-inbox.org/git/20170515220939.vkgofpkdtpz7u26v%sigill.intra.peff.net@localhost/T/#u
 
---- sha1dc/sha1.c.orig 2017-05-24 14:22:01.252256885 +0200
-+++ sha1dc/sha1.c      2017-05-24 14:24:53.441321730 +0200
-@@ -20,7 +20,7 @@
+--- sha1dc/sha1.c.orig 2017-05-09 14:47:28.000000000 +0000
++++ sha1dc/sha1.c
+@@ -20,6 +20,7 @@
   */
  #if (defined(__BYTE_ORDER) && (__BYTE_ORDER == __BIG_ENDIAN)) || \
      (defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __BIG_ENDIAN__)) || \
--    defined(__BIG_ENDIAN__) || defined(__ARMEB__) || defined(__THUMBEB__) ||  defined(__AARCH64EB__) || \
-+     defined(_BIG_ENDIAN) || defined(__BIG_ENDIAN__) || defined(__ARMEB__) || defined(__THUMBEB__) ||  defined(__AARCH64EB__) || \
++    (defined(_BYTE_ORDER) && (_BYTE_ORDER == _BIG_ENDIAN)) || \
+     defined(__BIG_ENDIAN__) || defined(__ARMEB__) || defined(__THUMBEB__) ||  defined(__AARCH64EB__) || \
      defined(_MIPSEB) || defined(__MIPSEB) || defined(__MIPSEB__)
  
- #define SHA1DC_BIGENDIAN      1
-@@ -1728,7 +1728,8 @@ void SHA1DCUpdate(SHA1_CTX* ctx, const c
+@@ -1728,7 +1729,8 @@ void SHA1DCUpdate(SHA1_CTX* ctx, const c
        while (len >= 64)
        {
                ctx->total += 64;