upgpkg(main/rhash): to 1.4.3

* delete upstreamd patch `librhash-util.h.patch`
* define `SYSCONFDIR` as cflag instead of patch (parse_cmdline.c.patch)

Signed-off-by: Aditya Alok <dev.aditya.alok@gmail.com>
This commit is contained in:
Aditya Alok 2022-06-29 21:10:59 +05:30
parent 9613b79884
commit fbdf4f0f23
No known key found for this signature in database
GPG Key ID: 345AE134142077D8
3 changed files with 3 additions and 27 deletions

View File

@ -2,10 +2,9 @@ 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.2
TERMUX_PKG_REVISION=2
TERMUX_PKG_VERSION=1.4.3
TERMUX_PKG_SRCURL=https://github.com/rhash/RHash/archive/v$TERMUX_PKG_VERSION.tar.gz
TERMUX_PKG_SHA256=600d00f5f91ef04194d50903d3c79412099328c42f28ff43a0bdb777b00bec62
TERMUX_PKG_SHA256=1e40fa66966306920f043866cbe8612f4b939b033ba5e2708c3f41be257c8a3e
TERMUX_PKG_AUTO_UPDATE=true
TERMUX_PKG_DEPENDS="openssl"
TERMUX_PKG_CONFLICTS="librhash, rhash-dev"
@ -13,6 +12,7 @@ TERMUX_PKG_REPLACES="librhash, rhash-dev"
TERMUX_PKG_BUILD_IN_SRC=true
termux_step_configure() {
CFLAGS="-DOPENSSL_RUNTIME -DSYSCONFDIR=\"${TERMUX_PREFIX}/etc\" $CPPFLAGS $CFLAGS"
./configure \
--prefix=$TERMUX_PREFIX \
--disable-static \
@ -22,7 +22,6 @@ termux_step_configure() {
}
termux_step_make() {
CFLAGS="-DOPENSSL_RUNTIME $CPPFLAGS $CFLAGS"
make -j $TERMUX_MAKE_PROCESSES \
ADDCFLAGS="$CFLAGS" \
ADDLDFLAGS="$LDFLAGS"

View File

@ -1,11 +0,0 @@
--- src/librhash/util.h.orig 2020-08-21 15:57:08.729857674 +0000
+++ src/librhash/util.h 2020-08-21 15:55:12.005382002 +0000
@@ -39,7 +39,7 @@
# define rhash_aligned_alloc(alignment, size) _aligned_malloc((size), (alignment))
# define rhash_aligned_free(ptr) _aligned_free(ptr)
-#elif (__STDC_VERSION__ >= 201112L || defined(_ISOC11_SOURCE)) && !defined(__APPLE__)
+#elif (__STDC_VERSION__ >= 201112L || defined(_ISOC11_SOURCE)) && !defined(__APPLE__) && !defined(__ANDROID__)
# define HAS_STDC_ALIGNED_ALLOC
# include <stdlib.h>

View File

@ -1,12 +0,0 @@
diff -uNr RHash-1.3.8/parse_cmdline.c RHash-1.3.8.mod/parse_cmdline.c
--- RHash-1.3.8/parse_cmdline.c 2019-02-04 06:05:28.000000000 +0200
+++ RHash-1.3.8.mod/parse_cmdline.c 2019-03-01 20:33:22.425704712 +0200
@@ -547,7 +547,7 @@
static const char* find_conf_file(void)
{
#ifndef SYSCONFDIR
-# define SYSCONFDIR "/etc"
+# define SYSCONFDIR "@TERMUX_PREFIX@/etc"
#endif
#define CONFIG_FILENAME "rhashrc"