CVS commit: pkgsrc/devel/git-base

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Jun  8 09:08:51 UTC 2017

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

Log Message:
Fix endianness issue using upstream commit
https://github.com/git/git/commit/6b851e536b05e0c8c61f77b9e4c3e7cedea39ff8

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 pkgsrc/devel/git-base/Makefile
cvs rdiff -u -r1.64 -r1.65 pkgsrc/devel/git-base/distinfo
cvs rdiff -u -r0 -r1.4 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.39 pkgsrc/devel/git-base/Makefile:1.40
--- pkgsrc/devel/git-base/Makefile:1.39 Mon Jun  5 10:11:39 2017
+++ pkgsrc/devel/git-base/Makefile      Thu Jun  8 09:08:51 2017
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.39 2017/06/05 10:11:39 adam Exp $
+# $NetBSD: Makefile,v 1.40 2017/06/08 09:08:51 wiz Exp $
 
 .include "../../devel/git/Makefile.common"
 
 PKGNAME=       git-base-${GIT_VERSION}
+PKGREVISION=   1
 COMMENT=       GIT Tree History Storage Tool (base package)
 
 CONFLICTS+=            scmgit-base-[0-9]*

Index: pkgsrc/devel/git-base/distinfo
diff -u pkgsrc/devel/git-base/distinfo:1.64 pkgsrc/devel/git-base/distinfo:1.65
--- pkgsrc/devel/git-base/distinfo:1.64 Mon Jun  5 10:11:39 2017
+++ pkgsrc/devel/git-base/distinfo      Thu Jun  8 09:08:51 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.64 2017/06/05 10:11:39 adam Exp $
+$NetBSD: distinfo,v 1.65 2017/06/08 09:08:51 wiz Exp $
 
 SHA1 (git-2.13.1.tar.xz) = 2e55f6cc053aa3c19418ac3b8afea6fdd1f970c8
 RMD160 (git-2.13.1.tar.xz) = 34b7124a0773035aa32b51092f9f1aed7662966f
@@ -12,4 +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) = 600215fa46f3bfcad80bde622a5d25924df1755a
 SHA1 (patch-wrapper.c) = 1fb629ec301d0431cb5bebd716b1c3a7ae45577f

Added files:

Index: pkgsrc/devel/git-base/patches/patch-sha1dc_sha1.c
diff -u /dev/null pkgsrc/devel/git-base/patches/patch-sha1dc_sha1.c:1.4
--- /dev/null   Thu Jun  8 09:08:52 2017
+++ pkgsrc/devel/git-base/patches/patch-sha1dc_sha1.c   Thu Jun  8 09:08:51 2017
@@ -0,0 +1,47 @@
+$NetBSD: patch-sha1dc_sha1.c,v 1.4 2017/06/08 09:08:51 wiz Exp $
+
+Fix endianness issue using upstream commit
+https://github.com/git/git/commit/6b851e536b05e0c8c61f77b9e4c3e7cedea39ff8
+
+--- sha1dc/sha1.c.orig 2017-06-05 01:08:11.000000000 +0000
++++ sha1dc/sha1.c
+@@ -35,15 +35,33 @@
+ #ifdef SHA1DC_BIGENDIAN
+ #undef SHA1DC_BIGENDIAN
+ #endif
+-#if (!defined SHA1DC_FORCE_LITTLEENDIAN) && \
+-    ((defined(__BYTE_ORDER) && (__BYTE_ORDER == __BIG_ENDIAN)) || \
+-    (defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __BIG_ENDIAN__)) || \
+-    defined(_BIG_ENDIAN) || defined(__BIG_ENDIAN__) || defined(__ARMEB__) || defined(__THUMBEB__) ||  defined(__AARCH64EB__) || \
+-    defined(_MIPSEB) || defined(__MIPSEB) || defined(__MIPSEB__) || defined(SHA1DC_FORCE_BIGENDIAN))
+ 
++#if (defined(_BYTE_ORDER) || defined(__BYTE_ORDER) || defined(__BYTE_ORDER__))
++
++#if ((defined(_BYTE_ORDER) && (_BYTE_ORDER == _BIG_ENDIAN)) || \
++     (defined(__BYTE_ORDER) && (__BYTE_ORDER == __BIG_ENDIAN)) || \
++     (defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __BIG_ENDIAN__)) )
+ #define SHA1DC_BIGENDIAN
++#endif
++
++#else
++
++#if (defined(_BIG_ENDIAN) || defined(__BIG_ENDIAN) || defined(__BIG_ENDIAN__) || \
++     defined(__ARMEB__) || defined(__THUMBEB__) || defined(__AARCH64EB__) || \
++     defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || \
++     defined(__sparc))
++#define SHA1DC_BIGENDIAN
++#endif
+ 
+-#endif /*ENDIANNESS SELECTION*/
++#endif
++
++#if (defined(SHA1DC_FORCE_LITTLEENDIAN) && defined(SHA1DC_BIGENDIAN))
++#undef SHA1DC_BIGENDIAN
++#endif
++#if (defined(SHA1DC_FORCE_BIGENDIAN) && !defined(SHA1DC_BIGENDIAN))
++#define SHA1DC_BIGENDIAN
++#endif
++/*ENDIANNESS SELECTION*/
+ 
+ #if (defined SHA1DC_FORCE_UNALIGNED_ACCESS || \
+      defined(__amd64__) || defined(__amd64) || defined(__x86_64__) || defined(__x86_64) || \