aboutsummaryrefslogtreecommitdiff
path: root/security/rhash
diff options
context:
space:
mode:
authorAlexey Dokuchaev <danfe@FreeBSD.org>2020-11-11 04:49:20 +0000
committerAlexey Dokuchaev <danfe@FreeBSD.org>2020-11-11 04:49:20 +0000
commita22af556389ef7e6dcde10a087e9a5ff95445748 (patch)
tree4a63d8a6a4052b45203fbf54d650902317723ea5 /security/rhash
parent3e9c72847b0dccec10b0df5c75f9a11f3e33d9fe (diff)
downloadports-a22af556389ef7e6dcde10a087e9a5ff95445748.tar.gz
ports-a22af556389ef7e6dcde10a087e9a5ff95445748.zip
Update to version 1.4.0, this allows to drop some patches, including
a couple from Gentoo which are no longer fetchable. PR: 251010
Notes
Notes: svn path=/head/; revision=554869
Diffstat (limited to 'security/rhash')
-rw-r--r--security/rhash/Makefile5
-rw-r--r--security/rhash/distinfo10
-rw-r--r--security/rhash/files/patch-Makefile14
-rw-r--r--security/rhash/files/patch-configure10
4 files changed, 5 insertions, 34 deletions
diff --git a/security/rhash/Makefile b/security/rhash/Makefile
index 0de75e5db885..2d8c7d9ef556 100644
--- a/security/rhash/Makefile
+++ b/security/rhash/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= rhash
-PORTVERSION= 1.3.9
+PORTVERSION= 1.4.0
CATEGORIES= security
MASTER_SITES= SF
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
@@ -10,8 +10,7 @@ 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
diff --git a/security/rhash/distinfo b/security/rhash/distinfo
index 28530237fb48..24bbb8674ee3 100644
--- a/security/rhash/distinfo
+++ b/security/rhash/distinfo
@@ -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
diff --git a/security/rhash/files/patch-Makefile b/security/rhash/files/patch-Makefile
index f9f5f97d6a67..436292b1113e 100644
--- a/security/rhash/files/patch-Makefile
+++ b/security/rhash/files/patch-Makefile
@@ -9,17 +9,3 @@
rm -f rc.tmp
# dependencies should be properly set, otherwise 'make -j<n>' 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 | \
diff --git a/security/rhash/files/patch-configure b/security/rhash/files/patch-configure
deleted file mode 100644
index 45f1f34e4846..000000000000
--- a/security/rhash/files/patch-configure
+++ /dev/null
@@ -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)