From c58fc97c6b87388e321e477c6d3720370240de80 Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Fri, 28 Dec 2018 01:05:50 +0100 Subject: [PATCH] rhash: Update from 1.3.6 to 1.3.7 --- packages/rhash/build.sh | 7 +++---- packages/rhash/configure.patch | 22 ---------------------- packages/rhash/librhash-byte_order.h.patch | 9 +++++---- 3 files changed, 8 insertions(+), 30 deletions(-) diff --git a/packages/rhash/build.sh b/packages/rhash/build.sh index 68d1e2d9c..c2d8ff0ff 100644 --- a/packages/rhash/build.sh +++ b/packages/rhash/build.sh @@ -1,8 +1,7 @@ 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_VERSION=1.3.6 -TERMUX_PKG_REVISION=4 -TERMUX_PKG_SHA256=964df972b60569b5cb35ec989ced195ab8ea514fc46a74eab98e86569ffbcf92 +TERMUX_PKG_VERSION=1.3.7 +TERMUX_PKG_SHA256=a2441b7a04ae554ddd3eafcf50365c787b012e35ee6402eb6705d9cd4b8dfa65 TERMUX_PKG_SRCURL=https://github.com/rhash/RHash/archive/v$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_DEPENDS="openssl" TERMUX_PKG_BUILD_IN_SRC=true @@ -19,7 +18,7 @@ termux_step_make () { termux_step_make_install () { make install install-pkg-config - make -C librhash install-headers + make -C librhash install-lib-headers ln -sf $TERMUX_PREFIX/lib/librhash.so.0 $TERMUX_PREFIX/lib/librhash.so } diff --git a/packages/rhash/configure.patch b/packages/rhash/configure.patch index 761742d04..d66511fe8 100644 --- a/packages/rhash/configure.patch +++ b/packages/rhash/configure.patch @@ -11,25 +11,3 @@ diff -u -r ../RHash-1.3.6/configure ./configure ;; esac shift -@@ -897,4 +896,4 @@ - Libs.private: ${OPENSSL_LDFLAGS} - - EOF --fi -\ No newline at end of file -+fi -diff -u -r ../RHash-1.3.6/librhash/byte_order.h ./librhash/byte_order.h ---- ../RHash-1.3.6/librhash/byte_order.h 2018-03-14 02:42:17.000000000 +0100 -+++ ./librhash/byte_order.h 2018-04-22 21:55:52.997763406 +0200 -@@ -14,6 +14,10 @@ - #endif - - -+#ifdef __ANDROID__ -+# include -+#endif -+ - #ifdef __cplusplus - extern "C" { - #endif -Only in ./librhash: byte_order.h.orig diff --git a/packages/rhash/librhash-byte_order.h.patch b/packages/rhash/librhash-byte_order.h.patch index 493ca4530..cd7d59bd8 100644 --- a/packages/rhash/librhash-byte_order.h.patch +++ b/packages/rhash/librhash-byte_order.h.patch @@ -1,9 +1,10 @@ ---- ../RHash-1.3.4/librhash/byte_order.h 2016-11-06 21:12:16.000000000 +0100 -+++ ./librhash/byte_order.h 2017-04-13 15:01:29.364785379 +0200 -@@ -12,6 +12,10 @@ - # include +diff -u -r ../RHash-1.3.6/librhash/byte_order.h ./librhash/byte_order.h +--- ../RHash-1.3.6/librhash/byte_order.h 2018-03-14 02:42:17.000000000 +0100 ++++ ./librhash/byte_order.h 2018-04-22 21:55:52.997763406 +0200 +@@ -14,6 +14,10 @@ #endif + +#ifdef __ANDROID__ +# include +#endif