cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to rhash-1.4.2

Browse Source 
Changelog: https://github.com/rhash/RHash/blob/v1.4.2/ChangeLog

OK rsadowski@
This commit is contained in:
bket 2021-12-11 11:50:55 +00:00
parent 25cabaa9c9
commit ca25809794
3 changed files with 76 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
security/rhash/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.9 2021/03/06 19:31:56 bket Exp $
# $OpenBSD: Makefile,v 1.10 2021/12/11 11:50:55 bket Exp $
COMMENT = utility and library for computing hash sums
DISTNAME = rhash-1.4.1-src
DISTNAME = rhash-1.4.2-src
PKGNAME = ${DISTNAME:S/-src$//}
SHARED_LIBS = rhash 0.0

4
security/rhash/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (rhash-1.4.1-src.tar.gz) = QwyBJzPmm3jwfOMKBdtpVjRQ5B4heuYYUHpM4uFEopc=
SIZE (rhash-1.4.1-src.tar.gz) = 413274
SHA256 (rhash-1.4.2-src.tar.gz) = YA0A9fke8EGU1QkD08eUEgmTKMQvKP9DoL23d7AL7GI=
SIZE (rhash-1.4.2-src.tar.gz) = 416853

74
security/rhash/patches/patch-configure
View File

@ -1,9 +1,79 @@
$OpenBSD: patch-configure,v 1.3 2020/07/29 13:33:22 bket Exp $
$OpenBSD: patch-configure,v 1.4 2021/12/11 11:50:55 bket Exp $
Fix clang detection. Taken from
https://github.com/rhash/RHash/commit/4dc506066cf1727b021e6352535a8bb315c3f8dc
Index: configure
--- configure.orig
+++ configure
@@ -599,7 +599,7 @@ log_finish
@@ -519,38 +519,36 @@ else
elif run_cmd "$CC --version"; then
cc_name_tmp=$($CC --version 2>&1 | head -n 1 | cut -d ' ' -f 1)
fi
- if test -n "${cc_name_tmp}"; then
- if echo "$cc_name_tmp" | grep -q "gcc"; then
- cc_name=$cc_name_tmp
- start_check "$CC version"
- cc_vendor=gnu
- cc_version=$($CC -dumpversion 2>&1)
- if ! echo $cc_version | grep -q '^[0-9][0-9]*\.[0-9]'; then
- cc_v2=$($CC -dumpfullversion -dumpversion 2>/dev/null)
- if echo $cc_v2 | grep -q '^[0-9][0-9]*\.[0-9]'; then
- cc_version=$cc_v2
- fi
+ if echo "$cc_name_tmp" | grep -q "gcc"; then
+ cc_name=$cc_name_tmp
+ start_check "$CC version"
+ cc_vendor=gnu
+ cc_version=$($CC -dumpversion 2>&1)
+ if ! echo $cc_version | grep -q '^[0-9][0-9]*\.[0-9]'; then
+ cc_v2=$($CC -dumpfullversion -dumpversion 2>/dev/null)
+ if echo $cc_v2 | grep -q '^[0-9][0-9]*\.[0-9]'; then
+ cc_version=$cc_v2
fi
- case $cc_version in
- 2.96*)
- cc_fail=yes
- ;;
- *)
- _cc_major=$(echo $cc_version | cut -d '.' -f 1)
- _cc_minor=$(echo $cc_version | cut -d '.' -f 2)
- _cc_mini=$(echo $cc_version | cut -d '.' -f 3)
- ;;
- esac
- finish_check "$cc_name $cc_version"
- break
fi
- if echo "$cc_name_tmp" | grep -q "clang"; then
- start_check "$CC version"
- cc_vendor=clang
- cc_version=$($CC -dumpversion 2>&1)
- finish_check "clang $cc_version"
- break
- fi
+ case $cc_version in
+ 2.96*)
+ cc_fail=yes
+ ;;
+ *)
+ _cc_major=$(echo $cc_version | cut -d '.' -f 1)
+ _cc_minor=$(echo $cc_version | cut -d '.' -f 2)
+ _cc_mini=$(echo $cc_version | cut -d '.' -f 3)
+ ;;
+ esac
+ finish_check "$cc_name $cc_version"
+ break
+ elif $CC --version 2>&1 | grep -q "clang"; then
+ start_check "$CC version"
+ cc_vendor=clang
+ cc_version=$($CC -dumpversion 2>&1)
+ finish_check "clang $cc_version"
+ break
+ else
cc_name_tmp=$($CC -V 2>&1 | head -n 1 | cut -d ' ' -f 2,3)
if test "$cc_name_tmp" = "Sun C"; then
start_check "$CC version"
@@ -604,7 +602,7 @@ log_finish
# detect proper shared library name
SHARED_PREFIX="lib"
STATIC_PREFIX="lib"