diff --git a/security/rhash/Makefile b/security/rhash/Makefile index 086da8637f3e..0ee04111f25a 100644 --- a/security/rhash/Makefile +++ b/security/rhash/Makefile @@ -1,51 +1,51 @@ # Created by: Alexey Dokuchaev PORTNAME= rhash -PORTVERSION= 1.4.1 +PORTVERSION= 1.4.2 CATEGORIES= security MASTER_SITES= SF DISTNAME= ${PORTNAME}-${PORTVERSION}-src PATCH_SITES= https://gitweb.gentoo.org/repo/gentoo.git/plain/app-crypt/rhash/files/:gentoo \ https://raw.githubusercontent.com/gentoo/gentoo/master/app-crypt/rhash/files/:gentoo \ https://sourceforge.net/p/rhash/patches/_discuss/thread/271b85e9/0ac7/attachment/:sf PATCHFILES= \ rhash-1.3.2.patch:-p1:sf MAINTAINER= danfe@FreeBSD.org COMMENT= Utility and library for computing and checking of file hashes LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING HAS_CONFIGURE= yes CONFIGURE_ARGS= --prefix="${PREFIX}" --mandir="${PREFIX}/man" \ --pkgconfigdir="${PREFIX}/libdata/pkgconfig" \ --enable-lib-static --enable-openssl-runtime \ --extra-cflags="${CFLAGS}" --extra-ldflags="${LDFLAGS}" INSTALL_TARGET= install install-lib-so-link install-pkg-config USE_LDCONFIG= yes WRKSRC= ${WRKDIR}/RHash-${PORTVERSION} PORTDOCS= ChangeLog README.md OPTIONS_DEFINE= DOCS NLS OPTIONS_SUB= yes NLS_USES= gettext localbase:ldflags NLS_CONFIGURE_ON= --enable-gettext NLS_INSTALL_TARGET= install-gmo post-patch: @${REINPLACE_CMD} -e '/BYTE_ORDER/s,__,_,g' \ ${WRKSRC}/librhash/byte_order.h post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} do-test: cd ${WRKSRC}/tests && ${SH} test_rhash.sh --full --shared .include diff --git a/security/rhash/distinfo b/security/rhash/distinfo index fa8fa4ea462d..f93ba59d584a 100644 --- a/security/rhash/distinfo +++ b/security/rhash/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1610013545 -SHA256 (rhash-1.4.1-src.tar.gz) = 430c812733e69b78f07ce30a05db69563450e41e217ae618507a4ce2e144a297 -SIZE (rhash-1.4.1-src.tar.gz) = 413274 +TIMESTAMP = 1626297459 +SHA256 (rhash-1.4.2-src.tar.gz) = 600d00f5f91ef04194d50903d3c79412099328c42f28ff43a0bdb777b00bec62 +SIZE (rhash-1.4.2-src.tar.gz) = 416853 SHA256 (rhash-1.3.2.patch) = 9aeeb0d89f0203429a6f5433e7dd5fd4b621b34bc42fb6d5d32ede6279c990b0 SIZE (rhash-1.3.2.patch) = 9021 diff --git a/security/rhash/files/patch-configure b/security/rhash/files/patch-configure new file mode 100644 index 000000000000..3d90c2a96f68 --- /dev/null +++ b/security/rhash/files/patch-configure @@ -0,0 +1,27 @@ +--- configure.orig 2021-07-14 20:55:34 UTC ++++ configure +@@ -513,14 +513,9 @@ else + CC_TMP="$CC" + test -n "$OPT_CC" && OTHER_CC= || OTHER_CC="gcc cc" + for CC in "$CC_TMP" $OTHER_CC; do +- cc_name_tmp= + if run_cmd "$CC -v"; then + cc_name_tmp=$($CC -v 2>&1 | tail -n 1 | cut -d ' ' -f 1) +- 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 ++ if test "$cc_name_tmp" = "gcc"; then + cc_name=$cc_name_tmp + start_check "$CC version" + cc_vendor=gnu +@@ -544,7 +539,7 @@ else + finish_check "$cc_name $cc_version" + break + fi +- if echo "$cc_name_tmp" | grep -q "clang"; then ++ if $CC -v 2>&1 | grep -q "clang"; then + start_check "$CC version" + cc_vendor=clang + cc_version=$($CC -dumpversion 2>&1)