CVS commit: pkgsrc/misc/rhash

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

Module Name:    pkgsrc
Committed By:   adam
Date:           Tue Jul 18 06:13:51 UTC 2023

Modified Files:
        pkgsrc/misc/rhash: Makefile PLIST distinfo
        pkgsrc/misc/rhash/patches: patch-configure patch-librhash_Makefile

Log Message:
rhash: updated to 1.4.4

RHash v1.4.4

New option --unverified to print unverified files
New option --missing to print missing files
New printf-format directive '%d' to print file directory
Print the algorithms being calculated on -vv
Renamed --maxdepth option to --max-depth
Support leading and trailing spaces in a file names
Support escaping of special characters in file paths
Change the simple file format to fit the sfv format
LibRHash: Remove obsolete rhash_timer functions (API breaking change)
Bugfix: Fix slash usage with wilcards on Windows


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 pkgsrc/misc/rhash/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/misc/rhash/PLIST
cvs rdiff -u -r1.22 -r1.23 pkgsrc/misc/rhash/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/misc/rhash/patches/patch-configure
cvs rdiff -u -r1.2 -r1.3 pkgsrc/misc/rhash/patches/patch-librhash_Makefile

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.20 pkgsrc/misc/rhash/Makefile:1.21
--- pkgsrc/misc/rhash/Makefile:1.20     Wed Jun 15 08:54:58 2022
+++ pkgsrc/misc/rhash/Makefile  Tue Jul 18 06:13:51 2023
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.20 2022/06/15 08:54:58 adam Exp $
+# $NetBSD: Makefile,v 1.21 2023/07/18 06:13:51 adam Exp $
 
-DISTNAME=      rhash-1.4.3
+DISTNAME=      rhash-1.4.4
 CATEGORIES=    misc
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=rhash/}
 GITHUB_PROJECT=        RHash
@@ -14,12 +14,14 @@ LICENSE=    mit
 WRKSRC=                        ${WRKDIR}/${DISTNAME:S/rh/RH/}
 HAS_CONFIGURE=         yes
 USE_GCC_RUNTIME=       yes
+USE_TOOLS+=            gmake
+CONFIGURE_ARGS+=       --disable-gettext
 CONFIGURE_ARGS+=       --disable-symlinks
 CONFIGURE_ARGS+=       --enable-lib-shared
 CONFIGURE_ARGS+=       --enable-lib-static
 CONFIGURE_ARGS+=       --enable-openssl
 CONFIGURE_ARGS+=       --extra-cflags=-I${PREFIX}/include\ ${CFLAGS:Q}
-CONFIGURE_ARGS+=       --extra-ldflags=-L${PREFIX}/lib\ -Wl,-R${PREFIX}/lib\ ${LDFLAGS:Q}
+CONFIGURE_ARGS+=       --extra-ldflags=-L${PREFIX}/lib\ ${COMPILER_RPATH_FLAG}${PREFIX}/lib\ ${LDFLAGS:Q}
 CONFIGURE_ARGS+=       --mandir=${PREFIX}/${PKGMANDIR}
 CONFIGURE_ARGS+=       --prefix=${PREFIX}
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}

Index: pkgsrc/misc/rhash/PLIST
diff -u pkgsrc/misc/rhash/PLIST:1.3 pkgsrc/misc/rhash/PLIST:1.4
--- pkgsrc/misc/rhash/PLIST:1.3 Sun Oct  3 17:34:11 2021
+++ pkgsrc/misc/rhash/PLIST     Tue Jul 18 06:13:51 2023
@@ -1,10 +1,11 @@
-@comment $NetBSD: PLIST,v 1.3 2021/10/03 17:34:11 nros Exp $
+@comment $NetBSD: PLIST,v 1.4 2023/07/18 06:13:51 adam Exp $
 bin/rhash
 include/rhash.h
 include/rhash_torrent.h
 lib/librhash.a
 lib/librhash.so
-lib/librhash.so.0
+lib/librhash.so.${PKGVERSION}
+lib/librhash.so.1
 lib/pkgconfig/librhash.pc
 man/man1/rhash.1
 share/examples/rhash/rhashrc

Index: pkgsrc/misc/rhash/distinfo
diff -u pkgsrc/misc/rhash/distinfo:1.22 pkgsrc/misc/rhash/distinfo:1.23
--- pkgsrc/misc/rhash/distinfo:1.22     Mon Jun 27 01:19:39 2022
+++ pkgsrc/misc/rhash/distinfo  Tue Jul 18 06:13:51 2023
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.22 2022/06/27 01:19:39 gutteridge Exp $
+$NetBSD: distinfo,v 1.23 2023/07/18 06:13:51 adam Exp $
 
-BLAKE2s (rhash-1.4.3.tar.gz) = fd47c6f7997416d295fa92fa0611dc956596ff91f1199049baf3b6bd2d88a427
-SHA512 (rhash-1.4.3.tar.gz) = d87ffcde28d8f25cf775c279fed457e52d24523ed9b695629dae694b3c22372247d18f6032f8ce13a0b70fa2953be408982e46659daaa7c4ab227ae89eaed9c7
-Size (rhash-1.4.3.tar.gz) = 429290 bytes
-SHA1 (patch-configure) = aba3e782bd317504fcb35a4d59b4146ccb944171
-SHA1 (patch-librhash_Makefile) = f5a3ccdd8c0467b11f2dda553310bf5a9c8ade0c
+BLAKE2s (rhash-1.4.4.tar.gz) = 7812d695fef6e198eb1eccc7440fa63936ec3c2ba559467e7102a7f4adcf35d2
+SHA512 (rhash-1.4.4.tar.gz) = 00a7e5e058b53ce20ae79509815452ed9cb699d1322b678220b72c61dea3ea2f8fa131acfade8bb6d9f6af913f0c3c472330841181b22314b8755166310c946f
+Size (rhash-1.4.4.tar.gz) = 435691 bytes
+SHA1 (patch-configure) = 47136a8817c439b6f3ac4adf6c7a072bb88a7455
+SHA1 (patch-librhash_Makefile) = 9b4b44c2e729d7866fcab82d93a7ac83be14cc28

Index: pkgsrc/misc/rhash/patches/patch-configure
diff -u pkgsrc/misc/rhash/patches/patch-configure:1.3 pkgsrc/misc/rhash/patches/patch-configure:1.4
--- pkgsrc/misc/rhash/patches/patch-configure:1.3       Mon Jun 27 01:19:40 2022
+++ pkgsrc/misc/rhash/patches/patch-configure   Tue Jul 18 06:13:51 2023
@@ -1,13 +1,15 @@
-$NetBSD: patch-configure,v 1.3 2022/06/27 01:19:40 gutteridge Exp $
+$NetBSD: patch-configure,v 1.4 2023/07/18 06:13:51 adam Exp $
 
 Skip compiler detection magic.
 
+Fix build https://github.com/rhash/RHash/issues/238
+
 Avoid choosing aligned_alloc() when it's not present, such as CentOS 6
 with lang/gcc7 and older Solaris releases.
 
---- configure.orig     2021-07-14 20:55:34.000000000 +0000
+--- configure.orig     2023-07-14 13:06:29.000000000 +0000
 +++ configure
-@@ -563,8 +563,6 @@ else
+@@ -646,8 +646,6 @@ else
      fi
    done
  fi # icc
@@ -16,7 +18,24 @@ with lang/gcc7 and older Solaris release
  
  log_start "compiler working with default options"
  if ! cc_check_cflag; then
-@@ -660,6 +658,16 @@ elif test "$OPT_OPENSSL" = "auto" || tes
+@@ -690,7 +688,6 @@ log_finish
+ SHARED_PREFIX="lib"
+ STATIC_PREFIX="lib"
+ STATIC_EXT=".a"
+-SHARED_EXT=".so.${RHASH_VERSION_MAJOR}"
+ SO_MAJ_EXT=".so.${RHASH_VERSION_MAJOR}"
+ SOLINK_EXT=".so"
+ EXEC_EXT=
+@@ -713,7 +710,7 @@ if win32; then
+ elif darwin; then
+   SHARED_EXT=".${RHASH_VERSION_MAJOR}.dylib"
+   SOLINK_EXT=".dylib"
+-elif linux; then
++else
+   # use the full library version for the library file extension
+   SHARED_EXT=".so.${RHASH_VERSION}"
+ fi
+@@ -755,6 +752,16 @@ elif test "$OPT_OPENSSL" = "auto" || tes
    finish_check "$ALLOW_RUNTIME_LINKING"
  fi
  

Index: pkgsrc/misc/rhash/patches/patch-librhash_Makefile
diff -u pkgsrc/misc/rhash/patches/patch-librhash_Makefile:1.2 pkgsrc/misc/rhash/patches/patch-librhash_Makefile:1.3
--- pkgsrc/misc/rhash/patches/patch-librhash_Makefile:1.2       Wed Jun 15 08:54:58 2022
+++ pkgsrc/misc/rhash/patches/patch-librhash_Makefile   Tue Jul 18 06:13:51 2023
@@ -1,10 +1,10 @@
-$NetBSD: patch-librhash_Makefile,v 1.2 2022/06/15 08:54:58 adam Exp $
+$NetBSD: patch-librhash_Makefile,v 1.3 2023/07/18 06:13:51 adam Exp $
 
 Make ar(1) flags compatible with SunOS 
 
---- librhash/Makefile.orig     2022-06-14 20:25:13.000000000 +0000
+--- librhash/Makefile.orig     2023-07-14 13:06:29.000000000 +0000
 +++ librhash/Makefile
-@@ -181,7 +181,7 @@ $(LIBRHASH_SHARED): $(SOURCES) $(EXPORTS
+@@ -187,7 +187,7 @@ $(LIBRHASH_SHARED): $(SOURCES) $(EXPORTS
  # build static library
  $(LIBRHASH_STATIC): $(OBJECTS)
        rm -f $@
@@ -12,4 +12,4 @@ Make ar(1) flags compatible with SunOS 
 +      $(AR) -crs $@ $(OBJECTS)
  
  # test targets
- $(TEST_SHARED): $(LIBRHASH_SHARED) test_lib.o
+ $(TEST_SHARED): $(LIBRHASH_SHARED) test_lib.o test_utils.o