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

Update to rhash-1.4.3 

Changes: https://rhash.sourceforge.net/changelog.php

Bump minor of shared lib because of some additions.
This commit is contained in:
bket 2022-10-18 19:39:16 +00:00
parent 3b5db58349
commit 92607deb19
4 changed files with 10 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
security/rhash/Makefile
View File

@ -1,9 +1,9 @@
COMMENT = utility and library for computing hash sums
DISTNAME = rhash-1.4.2-src
DISTNAME = rhash-1.4.3-src
PKGNAME = ${DISTNAME:S/-src$//}
SHARED_LIBS = rhash 0.0
SHARED_LIBS = rhash 0.1
CATEGORIES = security
@ -32,16 +32,16 @@ DEBUG_PACKAGES = ${BUILD_PACKAGES}
WRKDIST = ${WRKDIR}/${PKGNAME:S/^rhash/RHash/}
post-extract:
sed -i 's,grep,ggrep,g' ${WRKSRC}/tests/test_rhash.sh
pre-configure:
${SUBST_CMD} ${WRKSRC}/common_func.h \
${WRKSRC}/configure
pre-test:
sed -i 's,grep,ggrep,g' ${WRKSRC}/tests/test_rhash.sh
do-test:
cd ${WRKSRC}/tests && env \
LD_PRELOAD=${WRKBUILD}/librhash/librhash.so.${LIBrhash_VERSION} \
./test_rhash.sh --full
./test_rhash.sh --full ../rhash
.include <bsd.port.mk>

4
security/rhash/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (rhash-1.4.2-src.tar.gz) = YA0A9fke8EGU1QkD08eUEgmTKMQvKP9DoL23d7AL7GI=
SIZE (rhash-1.4.2-src.tar.gz) = 416853
SHA256 (rhash-1.4.3-src.tar.gz) = HkD6ZpZjBpIPBDhmy+hhL0uTmwM7peJwjD9BviV8ij4=
SIZE (rhash-1.4.3-src.tar.gz) = 429290

2
security/rhash/patches/patch-Makefile
View File

@ -1,7 +1,7 @@
Index: Makefile
--- Makefile.orig
+++ Makefile
@@ -79,8 +79,8 @@ install-man:
@@ -80,8 +80,8 @@ install-man:
$(INSTALL_DATA) dist/rhash.1 $(MANDIR)/man1/rhash.1
install-conf:

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

@ -1,77 +1,7 @@
Fix clang detection. Taken from
https://github.com/rhash/RHash/commit/4dc506066cf1727b021e6352535a8bb315c3f8dc
Index: configure
--- configure.orig
+++ configure
@@ -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
@@ -603,7 +603,7 @@ log_finish
# detect proper shared library name
SHARED_PREFIX="lib"
STATIC_PREFIX="lib"