mirror of
https://github.com/yann64/haikuports.git
synced 2026-03-19 01:46:00 +01:00
rhash, bump to version 1.4.6 (#13665)
This commit is contained in:
Schrijvers Luc
GitHub
@@ -1,22 +0,0 @@
|
||||
From 2db8b9e337e073f52c762f12373632044fefe340 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
|
||||
Date: Sat, 31 Oct 2020 12:41:12 +0100
|
||||
Subject: Haiku have no alligned_alloc
|
||||
|
||||
|
||||
diff --git a/librhash/util.h b/librhash/util.h
|
||||
index 6accc7b..0a4db35 100644
|
||||
--- a/librhash/util.h
|
||||
+++ b/librhash/util.h
|
||||
@@ -39,7 +39,7 @@ extern "C" {
|
||||
# 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(__HAIKU__)
|
||||
|
||||
# define HAS_STDC_ALIGNED_ALLOC
|
||||
# include <stdlib.h>
|
||||
--
|
||||
2.28.0
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
From 183d6f4d38564039f3fcef33957df6e05b07889b Mon Sep 17 00:00:00 2001
|
||||
From 86c15da17769f0181c7f7562fd67c18233193cec Mon Sep 17 00:00:00 2001
|
||||
From: Jerome Duval <jerome.duval@gmail.com>
|
||||
Date: Fri, 9 Feb 2024 13:34:00 +0100
|
||||
Subject: Haiku patch
|
||||
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index dae76d5..3eb5bac 100755
|
||||
index 37393d6..b7a36c4 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -514,6 +514,7 @@ else
|
||||
@@ -521,6 +521,7 @@ else
|
||||
linux|uclinux) TARGET_OS=Linux ;;
|
||||
freebsd*) TARGET_OS=FreeBSD ;;
|
||||
gnu/kfreebsd) TARGET_OS=FreeBSD ;;
|
||||
@@ -16,7 +16,7 @@ index dae76d5..3eb5bac 100755
|
||||
netbsd) TARGET_OS=NetBSD ;;
|
||||
bsd/os) TARGET_OS=BSD/OS ;;
|
||||
openbsd) TARGET_OS=OpenBSD ;;
|
||||
@@ -553,6 +554,7 @@ darwin() { test "$OS_LC" = "darwin"; }
|
||||
@@ -561,6 +562,7 @@ darwin() { test "$OS_LC" = "darwin"; }
|
||||
dragonfly() { test "$OS_LC" = "dragonfly"; }
|
||||
freebsd() { test "$OS_LC" = "freebsd" || test "$OS_LC" = "gnu/kfreebsd"; }
|
||||
gnu() { test "$OS_LC" = "gnu"; }
|
||||
@@ -24,8 +24,8 @@ index dae76d5..3eb5bac 100755
|
||||
hpux() { test "$OS_LC" = "hp-ux"; }
|
||||
irix() { test "$OS_LC" = "irix"; }
|
||||
linux() { test "$OS_LC" = "linux"; }
|
||||
@@ -716,6 +718,9 @@ elif darwin; then
|
||||
elif linux; then
|
||||
@@ -728,6 +730,9 @@ elif darwin; then
|
||||
elif linux || bsd || gnu; then
|
||||
# use the full library version for the library file extension
|
||||
SHARED_EXT=".so.${RHASH_VERSION}"
|
||||
+elif haiku; then
|
||||
@@ -34,6 +34,13 @@ index dae76d5..3eb5bac 100755
|
||||
fi
|
||||
|
||||
#####################################################################
|
||||
@@ -1058,4 +1063,4 @@ if test -f "${MAN_PATH}.in"; then
|
||||
SED_SYSCONFDIR=$(echo $INSTALL_SYSCONFDIR | sed -e 's/\([|\\&]\)/\\\1/g')
|
||||
echo "Writing ${MAN_PATH}"
|
||||
sed -e "s|@SYSCONFDIR@|$SED_SYSCONFDIR|" ${MAN_PATH}.in > ${MAN_PATH}
|
||||
-fi
|
||||
\ No newline at end of file
|
||||
+fi
|
||||
--
|
||||
2.42.1
|
||||
2.52.0
|
||||
|
||||
@@ -2,16 +2,15 @@ SUMMARY="Utility for verifying hash sums of files"
|
||||
DESCRIPTION="RHash (Recursive Hasher) is a console utility for computing and \
|
||||
verifying hash sums of files. It supports CRC32, MD4, MD5, SHA1, SHA256, \
|
||||
SHA512, Tiger, DC++ TTH, BitTorrent BTIH, ED2K, AICH, GOST R 34.11-94, \
|
||||
RIPEMD-160, HAS-160, EDON-R 256/512, Whirlpool and Snefru-128/256 algorithms. \
|
||||
RIPEMD-160, HAS-160, EDON-R 256/512, Whirlpool and Snefru-128/256 algorithms.
|
||||
Hash sums are used to ensure and verify integrity of large volumes of data for \
|
||||
a long-term storing or transferring.
|
||||
"
|
||||
a long-term storing or transferring."
|
||||
HOMEPAGE="https://github.com/rhash/RHash"
|
||||
COPYRIGHT="2005-2020 Aleksey Kravchenko"
|
||||
COPYRIGHT="2005 Aleksey Kravchenko"
|
||||
LICENSE="MIT"
|
||||
REVISION="3"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://github.com/rhash/RHash/archive/v$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="8e7d1a8ccac0143c8fe9b68ebac67d485df119ea17a613f4038cda52f84ef52a"
|
||||
CHECKSUM_SHA256="9f6019cfeeae8ace7067ad22da4e4f857bb2cfa6c2deaa2258f55b2227ec937a"
|
||||
SOURCE_DIR="RHash-$portVersion"
|
||||
PATCHES="rhash-$portVersion.patchset"
|
||||
|
||||
@@ -25,24 +24,18 @@ if [ "$targetArchitecture" = x86_gcc2 ]; then
|
||||
commandBinDir=$prefix/bin
|
||||
fi
|
||||
|
||||
if [ -z "$commandSuffix" ]; then
|
||||
libVersion="$portVersion"
|
||||
libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
|
||||
|
||||
GLOBAL_WRITABLE_FILES="
|
||||
settings/rhashrc keep-old
|
||||
"
|
||||
USER_SETTINGS_FILES="
|
||||
settings/rhashrc
|
||||
"
|
||||
fi
|
||||
|
||||
PROVIDES="
|
||||
rhash$secondaryArchSuffix = $portVersion
|
||||
lib:librhash$secondaryArchSuffix = 1 compat >=1
|
||||
"
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
"
|
||||
|
||||
RHASH_BIN="
|
||||
cmd:ed2k_link$commandSuffix = $portVersion
|
||||
cmd:edonr256_hash$commandSuffix = $portVersion
|
||||
cmd:edonr512_hash$commandSuffix = $portVersion
|
||||
@@ -56,25 +49,15 @@ RHASH_BIN="
|
||||
cmd:tiger_hash$commandSuffix = $portVersion
|
||||
cmd:tth_hash$commandSuffix = $portVersion
|
||||
cmd:whirlpool_hash$commandSuffix = $portVersion
|
||||
lib:librhash$secondaryArchSuffix = $libVersionCompat
|
||||
"
|
||||
if [ -z "$commandSuffix" ]; then
|
||||
PROVIDES="$PROVIDES
|
||||
$RHASH_BIN
|
||||
"
|
||||
else
|
||||
PROVIDES_bin="
|
||||
rhash_bin = $portVersion
|
||||
$RHASH_BIN
|
||||
"
|
||||
REQUIRES_bin="
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
rhash$secondaryArchSuffix == $portVersion base
|
||||
"
|
||||
fi
|
||||
|
||||
PROVIDES_devel="
|
||||
rhash${secondaryArchSuffix}_devel = $portVersion
|
||||
devel:librhash$secondaryArchSuffix = 1 compat >=1
|
||||
devel:librhash$secondaryArchSuffix = $libVersionCompat
|
||||
"
|
||||
REQUIRES_devel="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
@@ -110,13 +93,6 @@ INSTALL()
|
||||
|
||||
packageEntries devel \
|
||||
"$developDir"
|
||||
|
||||
if [ -n "$commandSuffix" ]; then
|
||||
packageEntries bin \
|
||||
"$commandBinDir" \
|
||||
"$manDir"
|
||||
rm "$settingsDir"/rhashrc
|
||||
fi
|
||||
}
|
||||
|
||||
TEST()
|
||||
@@ -1,54 +0,0 @@
|
||||
SUMMARY="Utility for verifying hash sums of files"
|
||||
DESCRIPTION="RHash (Recursive Hasher) is a console utility for computing and \
|
||||
verifying hash sums of files. It supports CRC32, MD4, MD5, SHA1, SHA256, \
|
||||
SHA512, Tiger, DC++ TTH, BitTorrent BTIH, ED2K, AICH, GOST R 34.11-94, \
|
||||
RIPEMD-160, HAS-160, EDON-R 256/512, Whirlpool and Snefru-128/256 algorithms. \
|
||||
Hash sums are used to ensure and verify integrity of large volumes of data for\
|
||||
a long-term storing or transferring.
|
||||
"
|
||||
HOMEPAGE="https://github.com/rhash/RHash"
|
||||
COPYRIGHT="2005-2020 Aleksey Kravchenko"
|
||||
LICENSE="MIT"
|
||||
REVISION="2"
|
||||
SOURCE_URI="https://github.com/rhash/RHash/archive/v$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="600d00f5f91ef04194d50903d3c79412099328c42f28ff43a0bdb777b00bec62"
|
||||
SOURCE_DIR="RHash-$portVersion"
|
||||
PATCHES="rhash-$portVersion.patchset"
|
||||
|
||||
ARCHITECTURES="all !x86_gcc2"
|
||||
SECONDARY_ARCHITECTURES="x86"
|
||||
|
||||
PROVIDES="
|
||||
rhash0$secondaryArchSuffix = $portVersion
|
||||
lib:librhash$secondaryArchSuffix = 0 compat >=0
|
||||
"
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
"
|
||||
|
||||
BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
cmd:gcc$secondaryArchSuffix
|
||||
cmd:ld$secondaryArchSuffix
|
||||
cmd:make
|
||||
cmd:sed
|
||||
"
|
||||
|
||||
BUILD()
|
||||
{
|
||||
./configure --prefix="$prefix" \
|
||||
--libdir="$libDir" --localedir="$dataDir"/locale --mandir="$manDir" \
|
||||
--sysconfdir="$sysconfDir"
|
||||
make $jobArgs
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
make install
|
||||
make -C librhash install-so-link
|
||||
|
||||
rm -rf $manDir $prefix/bin
|
||||
rm "$settingsDir"/rhashrc
|
||||
}
|
||||
Reference in New Issue
Block a user