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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B254D158094 for ; Fri, 23 Sep 2022 08:23:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0B3C7E0B01; Fri, 23 Sep 2022 08:23:10 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E33DDE0B01 for ; Fri, 23 Sep 2022 08:23:09 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E01F23411F0 for ; Fri, 23 Sep 2022 08:23:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 267225D4 for ; Fri, 23 Sep 2022 08:23:07 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1663921380.a9720529caa34a39ed0bdf1e759068fad943011b.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/busybox/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/busybox/busybox-1.34.1-r1.ebuild sys-apps/busybox/busybox-1.34.1.ebuild sys-apps/busybox/busybox-1.35.0-r1.ebuild sys-apps/busybox/busybox-1.35.0.ebuild sys-apps/busybox/busybox-9999.ebuild X-VCS-Directories: sys-apps/busybox/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: a9720529caa34a39ed0bdf1e759068fad943011b X-VCS-Branch: master Date: Fri, 23 Sep 2022 08:23:07 +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: 48995db2-8df2-451a-8589-a73a7fcd1ee9 X-Archives-Hash: dbe5a28293645366196d7aa7c28249f9 commit: a9720529caa34a39ed0bdf1e759068fad943011b Author: Sam James gentoo org> AuthorDate: Fri Sep 23 08:22:00 2022 +0000 Commit: Sam James gentoo org> CommitDate: Fri Sep 23 08:23:00 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9720529 sys-apps/busybox: adjust non-static deps for libcrypt/libc It's a bit of a weird one in that we don't end up doing this for every single package when it's non-static, but the libcrypt dep was wrong anyway for -static, and busybox is a special case anyway in that someone is quite likely to want to build a tiny system with only busybox and possibly a custom built application within. Closes: https://bugs.gentoo.org/872497 Signed-off-by: Sam James gentoo.org> sys-apps/busybox/busybox-1.34.1-r1.ebuild | 7 +++++-- sys-apps/busybox/busybox-1.34.1.ebuild | 7 +++++-- sys-apps/busybox/busybox-1.35.0-r1.ebuild | 7 +++++-- sys-apps/busybox/busybox-1.35.0.ebuild | 7 +++++-- sys-apps/busybox/busybox-9999.ebuild | 7 +++++-- 5 files changed, 25 insertions(+), 10 deletions(-) diff --git a/sys-apps/busybox/busybox-1.34.1-r1.ebuild b/sys-apps/busybox/busybox-1.34.1-r1.ebuild index 8fb10aebdff0..1c76b4ce84f7 100644 --- a/sys-apps/busybox/busybox-1.34.1-r1.ebuild +++ b/sys-apps/busybox/busybox-1.34.1-r1.ebuild @@ -27,8 +27,11 @@ RESTRICT="test" # TODO: Could make pkgconfig conditional on selinux? bug #782829 RDEPEND=" - virtual/libcrypt:= - !static? ( selinux? ( sys-libs/libselinux ) ) + !static? ( + virtual/libc + virtual/libcrypt:= + selinux? ( sys-libs/libselinux ) + ) pam? ( sys-libs/pam ) " DEPEND="${RDEPEND} diff --git a/sys-apps/busybox/busybox-1.34.1.ebuild b/sys-apps/busybox/busybox-1.34.1.ebuild index 502b590fd4ae..a983429625d9 100644 --- a/sys-apps/busybox/busybox-1.34.1.ebuild +++ b/sys-apps/busybox/busybox-1.34.1.ebuild @@ -27,8 +27,11 @@ RESTRICT="test" # TODO: Could make pkgconfig conditional on selinux? bug #782829 RDEPEND=" - virtual/libcrypt:= - !static? ( selinux? ( sys-libs/libselinux ) ) + !static? ( + virtual/libc + virtual/libcrypt:= + selinux? ( sys-libs/libselinux ) + ) pam? ( sys-libs/pam ) " DEPEND="${RDEPEND} diff --git a/sys-apps/busybox/busybox-1.35.0-r1.ebuild b/sys-apps/busybox/busybox-1.35.0-r1.ebuild index 76d06dcb9b29..d08c6a826b69 100644 --- a/sys-apps/busybox/busybox-1.35.0-r1.ebuild +++ b/sys-apps/busybox/busybox-1.35.0-r1.ebuild @@ -28,8 +28,11 @@ RESTRICT="test" # TODO: Could make pkgconfig conditional on selinux? bug #782829 RDEPEND=" - virtual/libcrypt:= - !static? ( selinux? ( sys-libs/libselinux ) ) + !static? ( + virtual/libc + virtual/libcrypt:= + selinux? ( sys-libs/libselinux ) + ) pam? ( sys-libs/pam ) " DEPEND="${RDEPEND} diff --git a/sys-apps/busybox/busybox-1.35.0.ebuild b/sys-apps/busybox/busybox-1.35.0.ebuild index 24f99089f847..223e6ce2486d 100644 --- a/sys-apps/busybox/busybox-1.35.0.ebuild +++ b/sys-apps/busybox/busybox-1.35.0.ebuild @@ -28,8 +28,11 @@ RESTRICT="test" # TODO: Could make pkgconfig conditional on selinux? bug #782829 RDEPEND=" - virtual/libcrypt:= - !static? ( selinux? ( sys-libs/libselinux ) ) + !static? ( + virtual/libc + virtual/libcrypt:= + selinux? ( sys-libs/libselinux ) + ) pam? ( sys-libs/pam ) " DEPEND="${RDEPEND} diff --git a/sys-apps/busybox/busybox-9999.ebuild b/sys-apps/busybox/busybox-9999.ebuild index 5e059850212f..6450127bf54b 100644 --- a/sys-apps/busybox/busybox-9999.ebuild +++ b/sys-apps/busybox/busybox-9999.ebuild @@ -27,8 +27,11 @@ RESTRICT="test" # TODO: Could make pkgconfig conditional on selinux? bug #782829 RDEPEND=" - virtual/libcrypt:= - !static? ( selinux? ( sys-libs/libselinux ) ) + !static? ( + virtual/libc + virtual/libcrypt:= + selinux? ( sys-libs/libselinux ) + ) pam? ( sys-libs/pam ) " DEPEND="${RDEPEND}