From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DABC0138334 for ; Thu, 2 Jan 2020 20:39:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CBB09E09EF; Thu, 2 Jan 2020 20:39:18 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A5FCBE09EF for ; Thu, 2 Jan 2020 20:39:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 48F8834DE67 for ; Thu, 2 Jan 2020 20:39:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4B0CA7C for ; Thu, 2 Jan 2020 20:39:15 +0000 (UTC) From: "James Le Cuirot" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "James Le Cuirot" Message-ID: <1577997518.b29a8eee6d90f689232342e632c2418421217649.chewi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-crypt/rhash/, app-crypt/rhash/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-crypt/rhash/files/rhash-1.3.9-rc-segfault.patch app-crypt/rhash/rhash-1.3.9-r1.ebuild app-crypt/rhash/rhash-1.3.9.ebuild X-VCS-Directories: app-crypt/rhash/ app-crypt/rhash/files/ X-VCS-Committer: chewi X-VCS-Committer-Name: James Le Cuirot X-VCS-Revision: b29a8eee6d90f689232342e632c2418421217649 X-VCS-Branch: master Date: Thu, 2 Jan 2020 20:39:15 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ea196c0c-55ed-4e33-825a-d9269498d4a4 X-Archives-Hash: 365942e89a737ea36fa3881d50681b10 commit: b29a8eee6d90f689232342e632c2418421217649 Author: James Le Cuirot gentoo org> AuthorDate: Thu Jan 2 20:38:38 2020 +0000 Commit: James Le Cuirot gentoo 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 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 +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() {