Merge pull request #3692 from lazka/rhash-1.4.3

rhash: Update to 1.4.3

rhash/1.4.0_rhash-CYGWIN.patch

@@ -1,5 +1,5 @@
---- origsrc/RHash-1.3.9/common_func.c	2019-12-14 17:52:11.000000000 +0100
-+++ common_func.c	2019-12-19 16:17:43.866849500 +0100
+--- orig/rhash-1.4.3/common_func.c	2022-06-14 22:25:13.000000000 +0200
++++ common_func.c	2023-03-24 16:30:19.880219800 +0100
 @@ -11,8 +11,9 @@
  #include <stdlib.h>
  #include <string.h>
@@ -11,34 +11,25 @@
  # include <windows.h>
  #endif
  
-@@ -241,7 +242,7 @@ const char* get_bt_program_name(void)
-  */
- static double rsh_fsec(timedelta_t* timer)
- {
--#if defined( _WIN32) || defined(__CYGWIN__)
-+#if defined( _WIN32)
- 	LARGE_INTEGER freq;
- 	QueryPerformanceFrequency(&freq);
- 	return (double)*timer / freq.QuadPart;
-@@ -250,7 +251,7 @@ static double rsh_fsec(timedelta_t* time
- #endif
- }
+@@ -231,7 +232,7 @@
+  * Timer functions
+  *=========================================================================*/
  
 -#if defined( _WIN32) || defined(__CYGWIN__)
 +#if defined( _WIN32)
  #define get_timedelta(delta) QueryPerformanceCounter((LARGE_INTEGER*)delta)
  #else
  #define get_timedelta(delta) gettimeofday(delta, NULL)
-@@ -265,7 +266,7 @@ double rsh_timer_stop(timedelta_t* timer
+@@ -245,7 +246,7 @@
+ uint64_t rsh_timer_stop(timedelta_t* timer)
  {
  	timedelta_t end;
- 	get_timedelta(&end);
 -#if defined( _WIN32) || defined(__CYGWIN__)
 +#if defined( _WIN32)
+ 	LARGE_INTEGER frequency;
+ 	get_timedelta(&end);
  	*timer = end - *timer;
- #else
- 	timer->tv_sec  = end.tv_sec  - timer->tv_sec - (end.tv_usec >= timer->tv_usec ? 0 : 1);
-@@ -276,7 +277,7 @@ double rsh_timer_stop(timedelta_t* timer
+@@ -261,7 +262,7 @@
  
  unsigned rhash_get_ticks(void)
  {
@@ -80,8 +71,8 @@
  # include <share.h> /* for _SH_DENYWR */
 --- origsrc/RHash-1.3.9/librhash/plug_openssl.c	2019-12-14 17:52:11.000000000 +0100
 +++ librhash/plug_openssl.c	2019-12-19 16:34:19.467508100 +0100
-@@ -39,7 +39,7 @@
- #include "plug_openssl.h"
+@@ -57,7 +57,7 @@
+ #endif
  
  #if defined(OPENSSL_RUNTIME)
 -#  if defined(_WIN32) || defined(__CYGWIN__)
@@ -89,7 +80,7 @@
  #    include <windows.h>
  #  else
  #    include <dlfcn.h>
-@@ -138,7 +138,7 @@ rhash_hash_info rhash_openssl_hash_info[
+@@ -176,7 +176,7 @@
  
  #ifdef OPENSSL_RUNTIME
  
@@ -98,15 +89,15 @@
  # define GET_DLSYM(name) (void(*)(void))GetProcAddress(handle, name)
  #else  /* _WIN32 */
  # define GET_DLSYM(name) dlsym(handle, name)
-@@ -157,7 +157,7 @@ rhash_hash_info rhash_openssl_hash_info[
+@@ -195,7 +195,7 @@
   */
  static int load_openssl_runtime(void)
  {
 -#if defined(_WIN32) || defined(__CYGWIN__)
 +#if defined(_WIN32)
- 	HMODULE handle;
- 	/* suppress the error popup dialogs */
- 	UINT oldErrorMode = SetErrorMode(SEM_FAILCRITICALERRORS);
+ 	HMODULE handle = 0;
+ 	size_t i;
+ 
 --- origsrc/RHash-1.3.9/librhash/rhash.c	2019-12-14 17:52:11.000000000 +0100
 +++ librhash/rhash.c	2019-12-19 16:48:42.605848200 +0100
 @@ -15,7 +15,7 @@

rhash/PKGBUILD

@@ -2,7 +2,7 @@
 
 pkgbase=rhash
 pkgname=("lib${pkgbase}" "lib${pkgbase}-devel" "${pkgbase}")
-pkgver=1.4.2
+pkgver=1.4.3
 pkgrel=1
 pkgdesc='Utility for verifying hash sums of files'
 url='https://sourceforge.net/projects/rhash/'
@@ -13,9 +13,9 @@ source=(${pkgbase}-${pkgver}.tar.gz::https://github.com/rhash/RHash/archive/v${p
         1.4.0_rhash-CYGWIN.patch
         002-no-dynamicbase.patch)
 makedepends=('openssl-devel' 'autotools' 'gcc')
-sha256sums=('600d00f5f91ef04194d50903d3c79412099328c42f28ff43a0bdb777b00bec62'
+sha256sums=('1e40fa66966306920f043866cbe8612f4b939b033ba5e2708c3f41be257c8a3e'
             'SKIP'
-            '08f647635f5c2519ba2f9b64165690eb31a49bdd43a0986b0a5cf3970d1b9de5'
+            'f34bfa8dd8fe5d81c7b2c74cfd805ed5ed7dfd538b1906656b645c1f5d09a428'
             '44cda291787236afc04b0578e20ad40363ea0e26b7b5ca971a6aae8c494ece8a')
 # https://sourceforge.net/p/rhash/wiki/PublicKey/
 validpgpkeys=('2875F6B1C2D27A4F0C8AF60B2A714497E37363AE')