From 98fb76be1bfe61d76cd5a68076b9bac00c855abd Mon Sep 17 00:00:00 2001
From: YAKSH BARIYA <yakshbari4@gmail.com>
Date: Sun, 25 Jul 2021 21:22:51 +0530
Subject: [PATCH] rhash: update to 1.4.2 (#7189)

---
 packages/cmake/build.sh        |  1 +
 packages/rhash/build.sh        | 14 +++++++++++---
 packages/rhash/configure.patch | 18 +++++++++++++-----
 3 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/packages/cmake/build.sh b/packages/cmake/build.sh
index 10b92c26d..7c94a46e6 100644
--- a/packages/cmake/build.sh
+++ b/packages/cmake/build.sh
@@ -4,6 +4,7 @@ TERMUX_PKG_LICENSE="BSD 3-Clause"
 TERMUX_PKG_MAINTAINER="@termux"
 # When updating version here, please update termux_setup_cmake.sh as well.
 TERMUX_PKG_VERSION=3.21.0
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://www.cmake.org/files/v${TERMUX_PKG_VERSION:0:4}/cmake-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=4a42d56449a51f4d3809ab4d3b61fd4a96a469e56266e896ce1009b5768bd2ab
 TERMUX_PKG_DEPENDS="libarchive, libc++, libcurl, libexpat, jsoncpp, libuv, rhash, make, clang, zlib"
diff --git a/packages/rhash/build.sh b/packages/rhash/build.sh
index 369fbefcc..734746449 100644
--- a/packages/rhash/build.sh
+++ b/packages/rhash/build.sh
@@ -2,14 +2,22 @@ TERMUX_PKG_HOMEPAGE=https://github.com/rhash/RHash
 TERMUX_PKG_DESCRIPTION="Console utility for calculation and verification of magnet links and a wide range of hash sums"
 TERMUX_PKG_LICENSE="MIT"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=1.4.1
+TERMUX_PKG_VERSION=1.4.2
 TERMUX_PKG_SRCURL=https://github.com/rhash/RHash/archive/v$TERMUX_PKG_VERSION.tar.gz
-TERMUX_PKG_SHA256=430c812733e69b78f07ce30a05db69563450e41e217ae618507a4ce2e144a297
+TERMUX_PKG_SHA256=600d00f5f91ef04194d50903d3c79412099328c42f28ff43a0bdb777b00bec62
 TERMUX_PKG_DEPENDS="openssl"
 TERMUX_PKG_CONFLICTS="librhash, rhash-dev"
 TERMUX_PKG_REPLACES="librhash, rhash-dev"
 TERMUX_PKG_BUILD_IN_SRC=true
-TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-static --enable-lib-static --enable-lib-shared"
+
+termux_step_configure() {
+	./configure \
+		--prefix=$TERMUX_PREFIX \
+		--disable-static \
+		--enable-lib-static \
+		--enable-lib-shared \
+		--cc=$CC
+}
 
 termux_step_make() {
 	CFLAGS="-DOPENSSL_RUNTIME $CPPFLAGS $CFLAGS"
diff --git a/packages/rhash/configure.patch b/packages/rhash/configure.patch
index d66511fe8..f79896096 100644
--- a/packages/rhash/configure.patch
+++ b/packages/rhash/configure.patch
@@ -1,8 +1,7 @@
-diff -u -r ../RHash-1.3.6/configure ./configure
---- ../RHash-1.3.6/configure	2018-03-14 02:42:17.000000000 +0100
-+++ ./configure	2018-04-22 21:56:37.741263688 +0200
-@@ -193,8 +193,7 @@
-     BUILD_EXTRA_LDFLAGS=$(get_opt_value $OPT)
+--- ./configure	2021-07-15 02:25:34.000000000 +0530
++++ ./configure.mod	2021-07-25 17:40:51.831883002 +0530
+@@ -227,8 +227,7 @@
+     BUILD_EXTRA_LDFLAGS="$BUILD_EXTRA_LDFLAGS $(get_opt_value $OPT)"
      ;;
    *)
 -      echo "unknown option $OPT"
@@ -11,3 +10,12 @@ diff -u -r ../RHash-1.3.6/configure ./configure
        ;;
    esac
    shift
+@@ -487,7 +486,7 @@
+ 
+ # Checking CC version...
+ # Intel C++ Compilers (no autoselect, use CC=/some/binary ./configure)
+-cc_vendor=
++cc_vendor=clang
+ if test "$(basename $CC)" = "icc" || test "$(basename $CC)" = "ecc"; then
+   start_check "$CC version"
+   cc_vendor=intel