CVS commit: pkgsrc/misc/rhash

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/misc/rhash
From: "Adam Ciarcinski" <adam%netbsd.org@localhost>
Date: Mon, 14 Oct 2024 13:04:00 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon Oct 14 13:04:00 UTC 2024

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

Log Message:
rhash: updated to 1.4.5

Version 1.4.5
* Support --one-hash formatting option
* Bugfix: Show correct config directory in the manpage
* Bugfix: Updating must continue after a file access error
* Bugfix: Show correct size and time for Windows symlinks
* Bugfix: Fix building with glibc < 2.15
* Bugfix: Fix building on Solaris
* Bugfix: Enable large file support on 32-bit targets
* Bugfix: Fix building on Unix
* Bugfix: Fix dynamic library symlink on macOS
* Bugfix: Fix runtime error on WinXP
* Bugfix: Fix dynamic library symlink on *BSD


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 pkgsrc/misc/rhash/Makefile \
    pkgsrc/misc/rhash/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/misc/rhash/patches/patch-configure \
    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.24 pkgsrc/misc/rhash/Makefile:1.25
--- pkgsrc/misc/rhash/Makefile:1.24     Wed May 15 14:06:39 2024
+++ pkgsrc/misc/rhash/Makefile  Mon Oct 14 13:04:00 2024
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.24 2024/05/15 14:06:39 nia Exp $
+# $NetBSD: Makefile,v 1.25 2024/10/14 13:04:00 adam Exp $
 
-DISTNAME=      rhash-1.4.4
-PKGREVISION=   2
+DISTNAME=      rhash-1.4.5
 CATEGORIES=    misc
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=rhash/}
 GITHUB_PROJECT=        RHash
Index: pkgsrc/misc/rhash/distinfo
diff -u pkgsrc/misc/rhash/distinfo:1.24 pkgsrc/misc/rhash/distinfo:1.25
--- pkgsrc/misc/rhash/distinfo:1.24     Tue May 14 14:37:47 2024
+++ pkgsrc/misc/rhash/distinfo  Mon Oct 14 13:04:00 2024
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.24 2024/05/14 14:37:47 nia Exp $
+$NetBSD: distinfo,v 1.25 2024/10/14 13:04:00 adam Exp $
 
-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
+BLAKE2s (rhash-1.4.5.tar.gz) = 3a9ec276de596097b4861eecbbbfa9e8e5addbb1db6ca98eeb502d4f77f19de4
+SHA512 (rhash-1.4.5.tar.gz) = 49bd6aa2497efc4871ae31eaca51d2dc78ceb7126311557d5280b14fafe9355eaecad37f0f78f865e4e1dd1aeb506d3301989cd2f9fff7b0091c81978e8c2f2e
+Size (rhash-1.4.5.tar.gz) = 444526 bytes
 SHA1 (patch-Makefile) = 55d3e148db36ab4bcff9fd23add3e32b51a3854c
-SHA1 (patch-configure) = 47136a8817c439b6f3ac4adf6c7a072bb88a7455
-SHA1 (patch-librhash_Makefile) = 763d6416c8ebe32a80a43520e28b869abb7a88e3
+SHA1 (patch-configure) = 7ed3477a93aa321847dc3d84e6493f14be9509a3
+SHA1 (patch-librhash_Makefile) = 7d73616ed7f14e1d41fac2c5c788f6eed8a91b4d

Index: pkgsrc/misc/rhash/patches/patch-configure
diff -u pkgsrc/misc/rhash/patches/patch-configure:1.4 pkgsrc/misc/rhash/patches/patch-configure:1.5
--- pkgsrc/misc/rhash/patches/patch-configure:1.4       Tue Jul 18 06:13:51 2023
+++ pkgsrc/misc/rhash/patches/patch-configure   Mon Oct 14 13:04:00 2024
@@ -1,15 +1,13 @@
-$NetBSD: patch-configure,v 1.4 2023/07/18 06:13:51 adam Exp $
+$NetBSD: patch-configure,v 1.5 2024/10/14 13:04:00 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     2023-07-14 13:06:29.000000000 +0000
+--- configure.orig     2024-10-13 23:43:50.000000000 +0000
 +++ configure
-@@ -646,8 +646,6 @@ else
+@@ -647,8 +647,6 @@ else
      fi
    done
  fi # icc
@@ -18,24 +16,7 @@ with lang/gcc7 and older Solaris release
  
  log_start "compiler working with default options"
  if ! cc_check_cflag; then
-@@ -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
+@@ -758,6 +756,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.4 pkgsrc/misc/rhash/patches/patch-librhash_Makefile:1.5
--- pkgsrc/misc/rhash/patches/patch-librhash_Makefile:1.4       Tue May 14 14:37:48 2024
+++ pkgsrc/misc/rhash/patches/patch-librhash_Makefile   Mon Oct 14 13:04:00 2024
@@ -1,8 +1,8 @@
-$NetBSD: patch-librhash_Makefile,v 1.4 2024/05/14 14:37:48 nia Exp $
+$NetBSD: patch-librhash_Makefile,v 1.5 2024/10/14 13:04:00 adam Exp $
 
 libtoolize.
 
---- librhash/Makefile.orig     2023-07-14 13:06:29.000000000 +0000
+--- librhash/Makefile.orig     2024-10-13 23:43:50.000000000 +0000
 +++ librhash/Makefile
 @@ -4,7 +4,7 @@ include config.mak
  
@@ -18,30 +18,27 @@ libtoolize.
  install-lib-shared: $(LIBRHASH_SHARED) $(EXTRA_INSTALL_LIBSHARED)
        $(INSTALL) -d $(SO_DIR)
 -      $(INSTALL_SHARED) $(LIBRHASH_SHARED) $(SO_DIR)/
--      test "x$(LIBRHASH_SO_MAJ)" != "x$(LIBRHASH_SHARED)" && \
+-      test "x$(LIBRHASH_SO_MAJ)" = "x$(LIBRHASH_SHARED)" || ( \
 -        rm -f $(LIBDIR)/$(LIBRHASH_SO_MAJ) && \
--        ln -s $(LIBRHASH_SHARED) $(LIBDIR)/$(LIBRHASH_SO_MAJ)
+-        ln -s $(LIBRHASH_SHARED) $(LIBDIR)/$(LIBRHASH_SO_MAJ) )
 +      $(LIBTOOL) --mode=install --tag=CC $(INSTALL_SHARED) $(LIBRHASH_SHARED) $(SO_DIR)/
  
  install-implib:
        $(INSTALL) -d $(LIBDIR)
-@@ -59,115 +56,10 @@ install-lib-headers:
- uninstall-lib-headers:
-       for f in $(LIB_HEADERS); do rm -f "$(INCDIR)/$$f"; done
- 
--# not using GNU make extensions for compatibility with Unix/*BSD make
--#%.o: %.c
--#     $(CC) -c $(CFLAGS) $< -o $@
--
+@@ -63,111 +60,10 @@ uninstall-lib-headers:
+ #%.o: %.c
+ #     $(CC) -c $(CFLAGS) $< -o $@
+ 
 -# NOTE: dependences were generated by 'gcc -MM -DUSE_OPENSSL *.c'
 -# we are using plain old makefile style to support BSD make
--aich.o: aich.c byte_order.h ustd.h algorithms.h rhash.h aich.h sha1.h
+-aich.o: aich.c aich.h algorithms.h rhash.h byte_order.h ustd.h sha1.h \
+- util.h
 -      $(CC) -c $(CFLAGS) $< -o $@
 -
--algorithms.o: algorithms.c byte_order.h ustd.h rhash.h algorithms.h \
-- aich.h sha1.h crc32.h ed2k.h md4.h edonr.h gost12.h gost94.h has160.h \
-- md5.h ripemd-160.h snefru.h sha256.h sha512.h sha3.h tiger.h torrent.h \
-- tth.h whirlpool.h
+-algorithms.o: algorithms.c algorithms.h rhash.h byte_order.h ustd.h \
+- aich.h sha1.h blake2b.h blake2s.h crc32.h ed2k.h md4.h edonr.h gost12.h \
+- gost94.h has160.h md5.h ripemd-160.h snefru.h sha256.h sha512.h sha3.h \
+- tiger.h torrent.h tth.h whirlpool.h
 -      $(CC) -c $(CFLAGS) $< -o $@
 -
 -blake2b.o: blake2b.c blake2b.h ustd.h byte_order.h
@@ -71,7 +68,7 @@ libtoolize.
 -has160.o: has160.c byte_order.h ustd.h has160.h
 -      $(CC) -c $(CFLAGS) $< -o $@
 -
--hex.o: hex.c hex.h ustd.h
+-hex.o: hex.c hex.h ustd.h util.h
 -      $(CC) -c $(CFLAGS) $< -o $@
 -
 -md4.o: md4.c byte_order.h ustd.h md4.h
@@ -80,16 +77,15 @@ libtoolize.
 -md5.o: md5.c byte_order.h ustd.h md5.h
 -      $(CC) -c $(CFLAGS) $< -o $@
 -
--plug_openssl.o: plug_openssl.c algorithms.h rhash.h byte_order.h ustd.h \
-- plug_openssl.h
+-plug_openssl.o: plug_openssl.c
 -      $(CC) -c $(CFLAGS) $< -o $@
 -
--rhash.o: rhash.c byte_order.h ustd.h algorithms.h rhash.h torrent.h \
-- sha1.h plug_openssl.h util.h hex.h
+-rhash.o: rhash.c rhash.h algorithms.h byte_order.h ustd.h hex.h \
+- plug_openssl.h torrent.h sha1.h util.h
 -      $(CC) -c $(CFLAGS) $(VERSION_CFLAGS) $< -o $@
 -
--rhash_torrent.o: rhash_torrent.c algorithms.h rhash.h byte_order.h ustd.h \
-- torrent.h sha1.h rhash_torrent.h
+-rhash_torrent.o: rhash_torrent.c rhash_torrent.h algorithms.h rhash.h \
+- byte_order.h ustd.h torrent.h sha1.h
 -      $(CC) -c $(CFLAGS) $< -o $@
 -
 -ripemd-160.o: ripemd-160.c byte_order.h ustd.h ripemd-160.h
@@ -114,7 +110,7 @@ libtoolize.
 - rhash.h test_lib.h util.h
 -      $(CC) -c $(CFLAGS) $< -o $@
 -
--test_utils.o: test_utils.c byte_order.h ustd.h rhash.h test_utils.h
+-test_utils.o: test_utils.c test_utils.h byte_order.h ustd.h rhash.h
 -      $(CC) -c $(CFLAGS) $< -o $@
 -
 -tiger.o: tiger.c byte_order.h ustd.h tiger.h
@@ -123,11 +119,11 @@ libtoolize.
 -tiger_sbox.o: tiger_sbox.c byte_order.h ustd.h
 -      $(CC) -c $(CFLAGS) $< -o $@
 -
--torrent.o: torrent.c byte_order.h ustd.h algorithms.h rhash.h hex.h \
-- torrent.h sha1.h
+-torrent.o: torrent.c torrent.h algorithms.h rhash.h byte_order.h ustd.h \
+- sha1.h hex.h util.h
 -      $(CC) -c $(CFLAGS) $< -o $@
 -
--tth.o: tth.c byte_order.h ustd.h tth.h tiger.h
+-tth.o: tth.c tth.h ustd.h tiger.h byte_order.h
 -      $(CC) -c $(CFLAGS) $< -o $@
 -
 -util.o: util.c util.h
@@ -144,7 +140,7 @@ libtoolize.
  
  # build shared library
  $(EXPORTS_FILE): $(LIB_HEADERS)
-@@ -181,8 +73,8 @@ $(LIBRHASH_SOLINK):
+@@ -181,8 +77,8 @@ $(LIBRHASH_SOLINK):
        rm -f $(LIBRHASH_SOLINK)
        ln -s $(LIBRHASH_SO_MAJ) $(LIBRHASH_SOLINK)

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/devel/py-vulture
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/devel/py-vulture
Indexes:

Home | Main Index | Thread Index | Old Index