CVS commit: pkgsrc/misc/rhash

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Tue Aug 15 08:37:47 UTC 2017

Modified Files:
        pkgsrc/misc/rhash: Makefile distinfo
        pkgsrc/misc/rhash/patches: patch-librhash_byte__order.h

Log Message:
Version 1.3.5:
* look for locales directory at PROGRAM_DIRECTORY\locale on Windows
* look for config at PROGRAM_DIRECTORY\rhashrc on Windows
* support LibRhash bindings to PHP7
* Bugfix: illegal instruction error on macOS
* improve utf-8 support on Windows
* Bugfix: fix access to long paths on Windows
* add ca, fr, ro translations
* full Spanish translation
* correct build/install command for freebsd
* compilation fixes for aarch64 and musl
* improve support of clang on macOS


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/misc/rhash/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/misc/rhash/distinfo
cvs rdiff -u -r1.4 -r1.5 \
    pkgsrc/misc/rhash/patches/patch-librhash_byte__order.h

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

Modified files:

Index: pkgsrc/misc/rhash/Makefile
diff -u pkgsrc/misc/rhash/Makefile:1.4 pkgsrc/misc/rhash/Makefile:1.5
--- pkgsrc/misc/rhash/Makefile:1.4      Mon Nov 14 14:10:04 2016
+++ pkgsrc/misc/rhash/Makefile  Tue Aug 15 08:37:47 2017
@@ -1,17 +1,17 @@
-# $NetBSD: Makefile,v 1.4 2016/11/14 14:10:04 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2017/08/15 08:37:47 adam Exp $
 
-DISTNAME=      rhash-1.3.4
+DISTNAME=      rhash-1.3.5
 CATEGORIES=    security
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=rhash/}
 GITHUB_PROJECT=        RHash
-GITHUB_TAG=     v${PKGVERSION_NOREV}
+GITHUB_TAG=    v${PKGVERSION_NOREV}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://github.com/rhash/RHash
 COMMENT=       Calculate/check CRC32, MD5, SHA1, GOST, TTH, BTIH or other hash sums
 LICENSE=       mit
 
-WRKSRC=                 ${WRKDIR}/${DISTNAME:S/rh/RH/}
+WRKSRC=                        ${WRKDIR}/${DISTNAME:S/rh/RH/}
 INSTALLATION_DIRS=     bin include lib ${PKGMANDIR}/man1 share/examples/rhash
 
 CONF_FILES+=           ${PREFIX}/share/examples/rhash/rhashrc ${PKG_SYSCONFDIR}/rhashrc

Index: pkgsrc/misc/rhash/distinfo
diff -u pkgsrc/misc/rhash/distinfo:1.7 pkgsrc/misc/rhash/distinfo:1.8
--- pkgsrc/misc/rhash/distinfo:1.7      Thu Jul  6 13:04:28 2017
+++ pkgsrc/misc/rhash/distinfo  Tue Aug 15 08:37:47 2017
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.7 2017/07/06 13:04:28 wiz Exp $
+$NetBSD: distinfo,v 1.8 2017/08/15 08:37:47 adam Exp $
 
-SHA1 (rhash-1.3.4.tar.gz) = fc4610084b8b5a8d20ef0b788381709921ada8bb
-RMD160 (rhash-1.3.4.tar.gz) = 00225455818941f6e59b398854f128687465448b
-SHA512 (rhash-1.3.4.tar.gz) = 1d6af41f98588005ad2dcabdf479a30f7e4e6b59d56b322702827470e6eaa9a6905e9c1424f778b90488f04e719aa3b2985b92820b7da40ae30f2968339990c0
-Size (rhash-1.3.4.tar.gz) = 309181 bytes
+SHA1 (rhash-1.3.5.tar.gz) = 990c9a0135afe48dee4ce1dbf83578e44735f302
+RMD160 (rhash-1.3.5.tar.gz) = 38f840f8745d3183228d6ca0a9be3036f67f4768
+SHA512 (rhash-1.3.5.tar.gz) = e8450aab0c16bfb975bf4aeee218740fb4d86d5514e426b70c3edb84e4d63865cd4051939aa95c24a87a78baaedc49e40bb509b2610e89ca3745930808b3ef6c
+Size (rhash-1.3.5.tar.gz) = 316867 bytes
 SHA1 (patch-Makefile) = 04a890dcfae086b2984f294833eca300ce6b8128
-SHA1 (patch-librhash_byte__order.h) = 04b5b1f75ec2e20e301f9cf1a055df1b260a8912
+SHA1 (patch-librhash_byte__order.h) = 92360ac37b4c6e56f6bdbb371ecc0a21a6ea71bd

Index: pkgsrc/misc/rhash/patches/patch-librhash_byte__order.h
diff -u pkgsrc/misc/rhash/patches/patch-librhash_byte__order.h:1.4 pkgsrc/misc/rhash/patches/patch-librhash_byte__order.h:1.5
--- pkgsrc/misc/rhash/patches/patch-librhash_byte__order.h:1.4  Thu Apr 13 09:40:37 2017
+++ pkgsrc/misc/rhash/patches/patch-librhash_byte__order.h      Tue Aug 15 08:37:47 2017
@@ -1,9 +1,8 @@
-$NetBSD: patch-librhash_byte__order.h,v 1.4 2017/04/13 09:40:37 jperkin Exp $
+$NetBSD: patch-librhash_byte__order.h,v 1.5 2017/08/15 08:37:47 adam Exp $
 
-Use bswap builtins for clang. Prefer builtin over inline assembler.
 Recognize BSDish endian macros.
 
---- librhash/byte_order.h.orig 2016-11-06 20:12:16.000000000 +0000
+--- librhash/byte_order.h.orig 2017-08-14 00:56:22.000000000 +0000
 +++ librhash/byte_order.h
 @@ -10,6 +10,8 @@
  
@@ -14,52 +13,19 @@ Recognize BSDish endian macros.
  #endif
  
  #ifdef __cplusplus
-@@ -37,7 +39,8 @@ extern "C" {
- 
+@@ -38,6 +40,7 @@ extern "C" {
  /* detect CPU endianness */
  #if (defined(__BYTE_ORDER) && defined(__LITTLE_ENDIAN) && \
--              __BYTE_ORDER == __LITTLE_ENDIAN) || \
-+              __BYTE_ORDER == __LITTLE_ENDIAN) || (defined(_BYTE_ORDER) && defined(_LITTLE_ENDIAN) && \
-+              _BYTE_ORDER == _LITTLE_ENDIAN + 0) || \
+               __BYTE_ORDER == __LITTLE_ENDIAN) || \
++      (defined(_BYTE_ORDER) && defined(_LITTLE_ENDIAN) && _BYTE_ORDER == _LITTLE_ENDIAN + 0) || \
+       (defined(__BYTE_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__) && \
+               __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__) || \
        defined(CPU_IA32) || defined(CPU_X64) || \
-       defined(__ia64) || defined(__ia64__) || defined(__alpha__) || defined(_M_ALPHA) || \
-       defined(vax) || defined(MIPSEL) || defined(_ARM_) || defined(__arm__)
-@@ -45,7 +48,8 @@ extern "C" {
- # define IS_BIG_ENDIAN 0
+@@ -48,6 +51,7 @@ extern "C" {
  # define IS_LITTLE_ENDIAN 1
  #elif (defined(__BYTE_ORDER) && defined(__BIG_ENDIAN) && \
--              __BYTE_ORDER == __BIG_ENDIAN) || \
-+              __BYTE_ORDER == __BIG_ENDIAN) || (defined(_BYTE_ORDER) && defined(_BIG_ENDIAN) && \
-+              _BYTE_ORDER == _BIG_ENDIAN + 0) || \
+               __BYTE_ORDER == __BIG_ENDIAN) || \
++      (defined(_BYTE_ORDER) && defined(_BIG_ENDIAN) && _BYTE_ORDER == _BIG_ENDIAN + 0) || \
+       (defined(__BYTE_ORDER__) && defined(__ORDER_BIG_ENDIAN__) && \
+               __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__) || \
        defined(__sparc) || defined(__sparc__) || defined(sparc) || \
-       defined(_ARCH_PPC) || defined(_ARCH_PPC64) || defined(_POWER) || \
-       defined(__POWERPC__) || defined(POWERPC) || defined(__powerpc) || \
-@@ -90,15 +94,15 @@ void rhash_swap_copy_u64_to_str(void* to
- void rhash_u32_mem_swap(unsigned *p, int length_in_u32);
- 
- /* define bswap_32 */
--#if defined(__GNUC__) && defined(CPU_IA32) && !defined(__i386__)
-+#if defined(__GNUC__) && (__GNUC__ >= 4) && ((__GNUC__ > 4 || __GNUC_MINOR__ >= 3) || defined(__clang__))
-+/* for GCC >= 4.3 */
-+# define bswap_32(x) __builtin_bswap32(x)
-+#elif defined(__GNUC__) && defined(CPU_IA32) && !defined(__i386__)
- /* for intel x86 CPU */
- static inline uint32_t bswap_32(uint32_t x) {
-       __asm("bswap\t%0" : "=r" (x) : "0" (x));
-       return x;
- }
--#elif defined(__GNUC__)  && (__GNUC__ >= 4) && (__GNUC__ > 4 || __GNUC_MINOR__ >= 3)
--/* for GCC >= 4.3 */
--# define bswap_32(x) __builtin_bswap32(x)
- #elif (_MSC_VER > 1300) && (defined(CPU_IA32) || defined(CPU_X64)) /* MS VC */
- # define bswap_32(x) _byteswap_ulong((unsigned long)x)
- #elif !defined(__STRICT_ANSI__)
-@@ -112,7 +116,7 @@ static inline uint32_t bswap_32(uint32_t
-       (((x) & 0x0000ff00) <<  8) | (((x) & 0x000000ff) << 24))
- #endif /* bswap_32 */
- 
--#if defined(__GNUC__) && (__GNUC__ >= 4) && (__GNUC__ > 4 || __GNUC_MINOR__ >= 3)
-+#if defined(__GNUC__) && (__GNUC__ >= 4) && ((__GNUC__ > 4 || __GNUC_MINOR__ >= 3) || defined(__clang__))
- # define bswap_64(x) __builtin_bswap64(x)
- #elif (_MSC_VER > 1300) && (defined(CPU_IA32) || defined(CPU_X64)) /* MS VC */
- # define bswap_64(x) _byteswap_uint64((__int64)x)