Index: head/security/rhash/Makefile =================================================================== --- head/security/rhash/Makefile (revision 554868) +++ head/security/rhash/Makefile (revision 554869) @@ -1,53 +1,52 @@ # Created by: Alexey Dokuchaev # $FreeBSD$ PORTNAME= rhash -PORTVERSION= 1.3.9 +PORTVERSION= 1.4.0 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.9-nls.patch:-p1:gentoo \ - rhash-1.3.9-rc-segfault.patch:-p1:gentoo \ +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 Index: head/security/rhash/distinfo =================================================================== --- head/security/rhash/distinfo (revision 554868) +++ head/security/rhash/distinfo (revision 554869) @@ -1,9 +1,5 @@ -TIMESTAMP = 1576370852 -SHA256 (rhash-1.3.9-src.tar.gz) = 42b1006f998adb189b1f316bf1a60e3171da047a85c4aaded2d0d26c1476c9f6 -SIZE (rhash-1.3.9-src.tar.gz) = 403415 -SHA256 (rhash-1.3.9-nls.patch) = 2e60e6e34d32296f8b6d0851f5f8fe6506836dea8d560d1261424d4bc783dc50 -SIZE (rhash-1.3.9-nls.patch) = 744 -SHA256 (rhash-1.3.9-rc-segfault.patch) = 39e875cde8026fb609e1008d7afc7133474e104c5f823bd7552060d39ae7d891 -SIZE (rhash-1.3.9-rc-segfault.patch) = 9662 +TIMESTAMP = 1594834294 +SHA256 (rhash-1.4.0-src.tar.gz) = 2ea39540f5c580da0e655f7b483c19e0d31506aed4202d88e8459fa7aeeb8861 +SIZE (rhash-1.4.0-src.tar.gz) = 406433 SHA256 (rhash-1.3.2.patch) = 9aeeb0d89f0203429a6f5433e7dd5fd4b621b34bc42fb6d5d32ede6279c990b0 SIZE (rhash-1.3.2.patch) = 9021 Index: head/security/rhash/files/patch-configure =================================================================== --- head/security/rhash/files/patch-configure (revision 554868) +++ head/security/rhash/files/patch-configure (nonexistent) @@ -1,10 +0,0 @@ ---- configure.orig 2019-12-14 16:52:11 UTC -+++ configure -@@ -883,6 +883,7 @@ WARN_CFLAGS = $WARN_CFLAGS - ADDCFLAGS = $BUILD_EXTRA_CFLAGS - ADDLDFLAGS = $BUILD_EXTRA_LDFLAGS - CONFCFLAGS = -DSYSCONFDIR=\\"$INSTALL_SYSCONFDIR\\" -+LOCALECFLAGS = -DLOCALEDIR=\\"$INSTALL_LOCALEDIR\\" - CFLAGS = $RHASH_DEFINES \$(OPTFLAGS) \$(WARN_CFLAGS) \$(ADDCFLAGS) - LDFLAGS = \$(OPTLDFLAGS) \$(ADDLDFLAGS) $GETTEXT_LDFLAGS - BIN_STATIC_LDFLAGS = \$(LDFLAGS) $(join_params $LD_STATIC $OPENSSL_LDFLAGS) Property changes on: head/security/rhash/files/patch-configure ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/rhash/files/patch-Makefile =================================================================== --- head/security/rhash/files/patch-Makefile (revision 554868) +++ head/security/rhash/files/patch-Makefile (revision 554869) @@ -1,25 +1,11 @@ --- Makefile.orig 2019-12-14 16:52:11 UTC +++ Makefile @@ -80,7 +80,7 @@ install-man: install-conf: $(INSTALL) -d $(SYSCONFDIR) - tr -d \\r < dist/rhashrc.sample > rc.tmp && $(INSTALL_DATA) rc.tmp $(SYSCONFDIR)/rhashrc + tr -d \\r < dist/rhashrc.sample > rc.tmp && $(INSTALL_DATA) rc.tmp $(SYSCONFDIR)/rhashrc.sample rm -f rc.tmp # dependencies should be properly set, otherwise 'make -j' can fail -@@ -212,11 +212,11 @@ parse_cmdline.o: parse_cmdline.c parse_cmdline.h commo - rhash_main.o: rhash_main.c rhash_main.h calc_sums.h common_func.h file.h \ - hash_check.h file_mask.h find_file.h hash_print.h hash_update.h \ - parse_cmdline.h output.h win_utils.h librhash/rhash.h -- $(CC) -c $(CFLAGS) $< -o $@ -+ $(CC) -c $(CFLAGS) $(LOCALECFLAGS) $< -o $@ - - win_utils.o: win_utils.c win_utils.h common_func.h file.h parse_cmdline.h \ - rhash_main.h -- $(CC) -c $(CFLAGS) $< -o $@ -+ $(CC) -c $(CFLAGS) $(LOCALECFLAGS) $< -o $@ - - dist/rhash.1.win.html: dist/rhash.1 dist/rhash.1.win.sed - sed -f dist/rhash.1.win.sed dist/rhash.1 | rman -fHTML -roff | \