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

Update to version 1.4.0, this allows to drop some patches, including

Browse Source 
a couple from Gentoo which are no longer fetchable.

PR:	251010
This commit is contained in:
Alexey Dokuchaev 2020-11-11 04:49:20 +00:00
parent 3e9c72847b
commit a22af55638
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=554869
4 changed files with 5 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
security/rhash/Makefile
View File

@ -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

10
security/rhash/distinfo
View File

@ -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

14
security/rhash/files/patch-Makefile
View File

@ -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 | \

10
security/rhash/files/patch-configure
View File

@ -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)