[gentoo-commits] repo/gentoo:master commit in: app-crypt/rhash/, app-crypt/rhash/files/

[James Le Cuirot]

commit:     b29a8eee6d90f689232342e632c2418421217649
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Thu Jan  2 20:38:38 2020 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Thu Jan  2 20:38:38 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b29a8eee

app-crypt/rhash: Apply upstream patch to fix 1.3.9 -rc segfault

Bug: https://github.com/rhash/RHash/issues/104
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 .../rhash/files/rhash-1.3.9-rc-segfault.patch      | 25 ++++++++++++++++++++++
 .../{rhash-1.3.9.ebuild => rhash-1.3.9-r1.ebuild}  |  3 ++-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/app-crypt/rhash/files/rhash-1.3.9-rc-segfault.patch b/app-crypt/rhash/files/rhash-1.3.9-rc-segfault.patch
new file mode 100644
index 00000000000..90a1efecbb1
--- /dev/null
+++ b/app-crypt/rhash/files/rhash-1.3.9-rc-segfault.patch
@@ -0,0 +1,25 @@
+From 198e62063ed817357204284a15f95ffc7230044c Mon Sep 17 00:00:00 2001
+From: Aleksey <rhash.admin@×××××.com>
+Date: Thu, 2 Jan 2020 21:16:51 +0300
+Subject: [PATCH] fix segfault on rhash -rc
+
+---
+ file.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/file.c b/file.c
+index 6f593f9..0d18f45 100644
+--- a/file.c
++++ b/file.c
+@@ -361,8 +361,9 @@ int file_init_by_print_path(file_t* file, file_t* prepend_dir, const char* print
+ 		const char* path = make_path(prepend_dir->real_path, print_path, 0);
+ 		file_init(file, path, init_flags & ~FileInitReusePath);
+ 	}
+-	if (!prepend_dir || IS_DOT_STR(prepend_dir->print_path) ||
+-			(!prepend_dir->print_path && opt.path_separator != ALIEN_PATH_SEPARATOR)) {
++	if (!prepend_dir || (prepend_dir->print_path ?
++			IS_DOT_STR(prepend_dir->print_path) :
++			opt.path_separator != ALIEN_PATH_SEPARATOR)) {
+ 		if ((init_flags & FileInitReusePath) != 0) {
+ 			file->print_path = print_path;
+ 			file->mode |= FileDontFreePrintPath;

diff --git a/app-crypt/rhash/rhash-1.3.9.ebuild b/app-crypt/rhash/rhash-1.3.9-r1.ebuild
similarity index 95%
rename from app-crypt/rhash/rhash-1.3.9.ebuild
rename to app-crypt/rhash/rhash-1.3.9-r1.ebuild
index 2d4c3303cd5..e203d68814e 100644
--- a/app-crypt/rhash/rhash-1.3.9.ebuild
+++ b/app-crypt/rhash/rhash-1.3.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -32,6 +32,7 @@ S="${WORKDIR}/RHash-${PV}"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-nls.patch
+	"${FILESDIR}"/${P}-rc-segfault.patch
 )
 
 src_prepare() {