Tue Jul 18 06:13:51 2023 UTC ()
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


(adam)
diff -r1.20 -r1.21 pkgsrc/misc/rhash/Makefile
diff -r1.3 -r1.4 pkgsrc/misc/rhash/PLIST
diff -r1.22 -r1.23 pkgsrc/misc/rhash/distinfo
diff -r1.3 -r1.4 pkgsrc/misc/rhash/patches/patch-configure
diff -r1.2 -r1.3 pkgsrc/misc/rhash/patches/patch-librhash_Makefile
cvs diff -r1.20 -r1.21 pkgsrc/misc/rhash/Makefile (expand / switch to unified diff)

--- pkgsrc/misc/rhash/Makefile 2022/06/15 08:54:58 1.20
+++ pkgsrc/misc/rhash/Makefile 2023/07/18 06:13:51 1.21
@@ -1,35 +1,37 @@ @@ -1,35 +1,37 @@
1# $NetBSD: Makefile,v 1.20 2022/06/15 08:54:58 adam Exp $ 1# $NetBSD: Makefile,v 1.21 2023/07/18 06:13:51 adam Exp $
2 2
3DISTNAME= rhash-1.4.3 3DISTNAME= rhash-1.4.4
4CATEGORIES= misc 4CATEGORIES= misc
5MASTER_SITES= ${MASTER_SITE_GITHUB:=rhash/} 5MASTER_SITES= ${MASTER_SITE_GITHUB:=rhash/}
6GITHUB_PROJECT= RHash 6GITHUB_PROJECT= RHash
7GITHUB_TAG= v${PKGVERSION_NOREV} 7GITHUB_TAG= v${PKGVERSION_NOREV}
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://github.com/rhash/RHash 10HOMEPAGE= https://github.com/rhash/RHash
11COMMENT= Calculate/check CRC32, MD5, SHA1, GOST, TTH, BTIH or other hash sums 11COMMENT= Calculate/check CRC32, MD5, SHA1, GOST, TTH, BTIH or other hash sums
12LICENSE= mit 12LICENSE= mit
13 13
14WRKSRC= ${WRKDIR}/${DISTNAME:S/rh/RH/} 14WRKSRC= ${WRKDIR}/${DISTNAME:S/rh/RH/}
15HAS_CONFIGURE= yes 15HAS_CONFIGURE= yes
16USE_GCC_RUNTIME= yes 16USE_GCC_RUNTIME= yes
 17USE_TOOLS+= gmake
 18CONFIGURE_ARGS+= --disable-gettext
17CONFIGURE_ARGS+= --disable-symlinks 19CONFIGURE_ARGS+= --disable-symlinks
18CONFIGURE_ARGS+= --enable-lib-shared 20CONFIGURE_ARGS+= --enable-lib-shared
19CONFIGURE_ARGS+= --enable-lib-static 21CONFIGURE_ARGS+= --enable-lib-static
20CONFIGURE_ARGS+= --enable-openssl 22CONFIGURE_ARGS+= --enable-openssl
21CONFIGURE_ARGS+= --extra-cflags=-I${PREFIX}/include\ ${CFLAGS:Q} 23CONFIGURE_ARGS+= --extra-cflags=-I${PREFIX}/include\ ${CFLAGS:Q}
22CONFIGURE_ARGS+= --extra-ldflags=-L${PREFIX}/lib\ -Wl,-R${PREFIX}/lib\ ${LDFLAGS:Q} 24CONFIGURE_ARGS+= --extra-ldflags=-L${PREFIX}/lib\ ${COMPILER_RPATH_FLAG}${PREFIX}/lib\ ${LDFLAGS:Q}
23CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR} 25CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR}
24CONFIGURE_ARGS+= --prefix=${PREFIX} 26CONFIGURE_ARGS+= --prefix=${PREFIX}
25CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 27CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
26INSTALL_TARGET= install install-pkg-config install-lib-so-link 28INSTALL_TARGET= install install-pkg-config install-lib-so-link
27INSTALLATION_DIRS= share/examples/rhash 29INSTALLATION_DIRS= share/examples/rhash
28TEST_TARGET= test 30TEST_TARGET= test
29 31
30PKGCONFIG_OVERRIDE= dist/librhash.pc 32PKGCONFIG_OVERRIDE= dist/librhash.pc
31PKGCONFIG_OVERRIDE_STAGE= post-configure 33PKGCONFIG_OVERRIDE_STAGE= post-configure
32 34
33CONF_FILES+= ${PREFIX}/share/examples/rhash/rhashrc ${PKG_SYSCONFDIR}/rhashrc 35CONF_FILES+= ${PREFIX}/share/examples/rhash/rhashrc ${PKG_SYSCONFDIR}/rhashrc
34 36
35post-install: 37post-install:
cvs diff -r1.3 -r1.4 pkgsrc/misc/rhash/PLIST (expand / switch to unified diff)

--- pkgsrc/misc/rhash/PLIST 2021/10/03 17:34:11 1.3
+++ pkgsrc/misc/rhash/PLIST 2023/07/18 06:13:51 1.4
@@ -1,10 +1,11 @@ @@ -1,10 +1,11 @@
1@comment $NetBSD: PLIST,v 1.3 2021/10/03 17:34:11 nros Exp $ 1@comment $NetBSD: PLIST,v 1.4 2023/07/18 06:13:51 adam Exp $
2bin/rhash 2bin/rhash
3include/rhash.h 3include/rhash.h
4include/rhash_torrent.h 4include/rhash_torrent.h
5lib/librhash.a 5lib/librhash.a
6lib/librhash.so 6lib/librhash.so
7lib/librhash.so.0 7lib/librhash.so.${PKGVERSION}
 8lib/librhash.so.1
8lib/pkgconfig/librhash.pc 9lib/pkgconfig/librhash.pc
9man/man1/rhash.1 10man/man1/rhash.1
10share/examples/rhash/rhashrc 11share/examples/rhash/rhashrc
cvs diff -r1.22 -r1.23 pkgsrc/misc/rhash/distinfo (expand / switch to unified diff)

--- pkgsrc/misc/rhash/distinfo 2022/06/27 01:19:39 1.22
+++ pkgsrc/misc/rhash/distinfo 2023/07/18 06:13:51 1.23
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.22 2022/06/27 01:19:39 gutteridge Exp $ 1$NetBSD: distinfo,v 1.23 2023/07/18 06:13:51 adam Exp $
2 2
3BLAKE2s (rhash-1.4.3.tar.gz) = fd47c6f7997416d295fa92fa0611dc956596ff91f1199049baf3b6bd2d88a427 3BLAKE2s (rhash-1.4.4.tar.gz) = 7812d695fef6e198eb1eccc7440fa63936ec3c2ba559467e7102a7f4adcf35d2
4SHA512 (rhash-1.4.3.tar.gz) = d87ffcde28d8f25cf775c279fed457e52d24523ed9b695629dae694b3c22372247d18f6032f8ce13a0b70fa2953be408982e46659daaa7c4ab227ae89eaed9c7 4SHA512 (rhash-1.4.4.tar.gz) = 00a7e5e058b53ce20ae79509815452ed9cb699d1322b678220b72c61dea3ea2f8fa131acfade8bb6d9f6af913f0c3c472330841181b22314b8755166310c946f
5Size (rhash-1.4.3.tar.gz) = 429290 bytes 5Size (rhash-1.4.4.tar.gz) = 435691 bytes
6SHA1 (patch-configure) = aba3e782bd317504fcb35a4d59b4146ccb944171 6SHA1 (patch-configure) = 47136a8817c439b6f3ac4adf6c7a072bb88a7455
7SHA1 (patch-librhash_Makefile) = f5a3ccdd8c0467b11f2dda553310bf5a9c8ade0c 7SHA1 (patch-librhash_Makefile) = 9b4b44c2e729d7866fcab82d93a7ac83be14cc28
cvs diff -r1.3 -r1.4 pkgsrc/misc/rhash/patches/patch-configure (expand / switch to unified diff)

--- pkgsrc/misc/rhash/patches/patch-configure 2022/06/27 01:19:40 1.3
+++ pkgsrc/misc/rhash/patches/patch-configure 2023/07/18 06:13:51 1.4
@@ -1,32 +1,51 @@ @@ -1,32 +1,51 @@
1$NetBSD: patch-configure,v 1.3 2022/06/27 01:19:40 gutteridge Exp $ 1$NetBSD: patch-configure,v 1.4 2023/07/18 06:13:51 adam Exp $
2 2
3Skip compiler detection magic. 3Skip compiler detection magic.
4 4
 5Fix build https://github.com/rhash/RHash/issues/238
 6
5Avoid choosing aligned_alloc() when it's not present, such as CentOS 6 7Avoid choosing aligned_alloc() when it's not present, such as CentOS 6
6with lang/gcc7 and older Solaris releases. 8with lang/gcc7 and older Solaris releases.
7 9
8--- configure.orig 2021-07-14 20:55:34.000000000 +0000 10--- configure.orig 2023-07-14 13:06:29.000000000 +0000
9+++ configure 11+++ configure
10@@ -563,8 +563,6 @@ else 12@@ -646,8 +646,6 @@ else
11 fi 13 fi
12 done 14 done
13 fi # icc 15 fi # icc
14-test -z "$cc_vendor" && die "compiler not found" 16-test -z "$cc_vendor" && die "compiler not found"
15-test "$cc_fail" = "yes" && die "unsupported compiler version" 17-test "$cc_fail" = "yes" && die "unsupported compiler version"
16  18
17 log_start "compiler working with default options" 19 log_start "compiler working with default options"
18 if ! cc_check_cflag; then 20 if ! cc_check_cflag; then
19@@ -660,6 +658,16 @@ elif test "$OPT_OPENSSL" = "auto" || tes 21@@ -690,7 +688,6 @@ log_finish
 22 SHARED_PREFIX="lib"
 23 STATIC_PREFIX="lib"
 24 STATIC_EXT=".a"
 25-SHARED_EXT=".so.${RHASH_VERSION_MAJOR}"
 26 SO_MAJ_EXT=".so.${RHASH_VERSION_MAJOR}"
 27 SOLINK_EXT=".so"
 28 EXEC_EXT=
 29@@ -713,7 +710,7 @@ if win32; then
 30 elif darwin; then
 31 SHARED_EXT=".${RHASH_VERSION_MAJOR}.dylib"
 32 SOLINK_EXT=".dylib"
 33-elif linux; then
 34+else
 35 # use the full library version for the library file extension
 36 SHARED_EXT=".so.${RHASH_VERSION}"
 37 fi
 38@@ -755,6 +752,16 @@ elif test "$OPT_OPENSSL" = "auto" || tes
20 finish_check "$ALLOW_RUNTIME_LINKING" 39 finish_check "$ALLOW_RUNTIME_LINKING"
21 fi 40 fi
22  41
23+start_check "libc provides aligned_alloc" 42+start_check "libc provides aligned_alloc"
24+HAS_STDC_ALIGNED_ALLOC=no 43+HAS_STDC_ALIGNED_ALLOC=no
25+if cc_check_statement "stdlib.h" 'aligned_alloc(256, 1024);' "-Werror -Wno-unused-result"; then 44+if cc_check_statement "stdlib.h" 'aligned_alloc(256, 1024);' "-Werror -Wno-unused-result"; then
26+ HAS_STDC_ALIGNED_ALLOC=yes 45+ HAS_STDC_ALIGNED_ALLOC=yes
27+fi 46+fi
28+if test "$HAS_STDC_ALIGNED_ALLOC" = "no"; then 47+if test "$HAS_STDC_ALIGNED_ALLOC" = "no"; then
29+ BUILD_EXTRA_CFLAGS=$(join_params $BUILD_EXTRA_CFLAGS -DNO_STDC_ALIGNED_ALLOC) 48+ BUILD_EXTRA_CFLAGS=$(join_params $BUILD_EXTRA_CFLAGS -DNO_STDC_ALIGNED_ALLOC)
30+fi 49+fi
31+finish_check "$HAS_STDC_ALIGNED_ALLOC" 50+finish_check "$HAS_STDC_ALIGNED_ALLOC"
32+ 51+
cvs diff -r1.2 -r1.3 pkgsrc/misc/rhash/patches/patch-librhash_Makefile (expand / switch to unified diff)

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