From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1297101-garchives=archives.gentoo.org@lists.gentoo.org>
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 7FA51139335
for <garchives@archives.gentoo.org>; Sat, 26 Jun 2021 23:25:10 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 63487E0875;
Sat, 26 Jun 2021 23:25:09 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(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 43C87E0875
for <gentoo-commits@lists.gentoo.org>; Sat, 26 Jun 2021 23:25:09 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(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 5D6BB33BEA3
for <gentoo-commits@lists.gentoo.org>; Sat, 26 Jun 2021 23:25:07 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id ADBBD7AC
for <gentoo-commits@lists.gentoo.org>; Sat, 26 Jun 2021 23:25:05 +0000 (UTC)
From: "Georgy Yakovlev" <gyakovlev@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Georgy Yakovlev" <gyakovlev@gentoo.org>
Message-ID: <1624749835.5bef2da6c6ceef1c7947571a7cea1bf79d94e9f2.gyakovlev@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: metadata/install-qa-check.d/
X-VCS-Repository: repo/gentoo
X-VCS-Files: metadata/install-qa-check.d/60libcrypt-deps
X-VCS-Directories: metadata/install-qa-check.d/
X-VCS-Committer: gyakovlev
X-VCS-Committer-Name: Georgy Yakovlev
X-VCS-Revision: 5bef2da6c6ceef1c7947571a7cea1bf79d94e9f2
X-VCS-Branch: master
Date: Sat, 26 Jun 2021 23:25:05 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 648c5367-4080-4fef-963c-1a9de051fb0c
X-Archives-Hash: adf1a3ae6738eb7ec010bfc5c8234259
commit: 5bef2da6c6ceef1c7947571a7cea1bf79d94e9f2
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 26 23:23:55 2021 +0000
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Sat Jun 26 23:23:55 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bef2da6
metadata/install-qa-check.d: fix some issues with 60libcrypt-deps
Thanks-to: [Arfrever]
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
metadata/install-qa-check.d/60libcrypt-deps | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/metadata/install-qa-check.d/60libcrypt-deps b/metadata/install-qa-check.d/60libcrypt-deps
index a822ed8c467..52220ba9734 100644
--- a/metadata/install-qa-check.d/60libcrypt-deps
+++ b/metadata/install-qa-check.d/60libcrypt-deps
@@ -8,9 +8,16 @@
libcrypt_check() {
if ! type -P scanelf >/dev/null || has binchecks ${PORTAGE_RESTRICT}; then
return
- fi
+ fi
+
+ # skip libcrypt.so providers
+ case "${CATEGORY}/${PN}" in
+ sys-libs/libxcrypt|sys-libs/glibc|sys-libs/musl|sys-libs/uclibc-ng)
+ return
+ ;;
+ esac
- if grep -q virtual/libcrypt <<<${RDEPEND}; then
+ if grep -q "virtual/libcrypt" <<<${RDEPEND}; then
# nothing to do here
return
fi
@@ -18,7 +25,7 @@ libcrypt_check() {
local libcrypt_consumers
# grep outputs newline separated list of files, so it's ok to skip specifying delimiter
IFS= mapfile libcrypt_consumers < <(find "${ED}" -type f -executable \
- -print0 | xargs -0 scanelf -qyRF '%F %n' | grep 'libcrypt.so' 2>/dev/null )
+ -print0 | xargs -0 scanelf -qyRF '%F %n' | grep 'libcrypt\.so' 2>/dev/null )
if [[ -n ${libcrypt_consumers[@]} ]]; then
eqawarn "Binary files linked to libcrypt.so found"
@@ -26,7 +33,7 @@ libcrypt_check() {
eqawarn
eqatag -v virtual-libcrypt.missing "${libcrypt_consumers[@]%% *}"
eqawarn
- eqawarn "Please add virtual/libcrypt dependency"
+ eqawarn "Please add virtual/libcrypt:= dependency"
eqawarn "Gentoo Bug: https://bugs.gentoo.org/699422"
fi