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 7A4EC1382C5 for ; Wed, 26 May 2021 09:07:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5E23AE0D04; Wed, 26 May 2021 09:02:10 +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 35505E0D04 for ; Wed, 26 May 2021 09:02:10 +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 31A33340DBE for ; Wed, 26 May 2021 09:02:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C9870790 for ; Wed, 26 May 2021 09:02: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: <1622019717.8c52e9702c82fa2c3ba5a24ffe2d067ecaa3ff74.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/busybox/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/busybox/Manifest sys-apps/busybox/busybox-1.33.1.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: 8c52e9702c82fa2c3ba5a24ffe2d067ecaa3ff74 X-VCS-Branch: master Date: Wed, 26 May 2021 09:02: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: 4d9f28ac-8bbb-458a-9b7d-09cffaa9c212 X-Archives-Hash: 10df42148c481a901ee02a63071b9608 commit: 8c52e9702c82fa2c3ba5a24ffe2d067ecaa3ff74 Author: Sam James gentoo org> AuthorDate: Wed May 26 08:56:21 2021 +0000 Commit: Sam James gentoo org> CommitDate: Wed May 26 09:01:57 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c52e970 sys-apps/busybox: add 1.33.1 Closes: https://bugs.gentoo.org/701512 Closes: https://bugs.gentoo.org/765580 Signed-off-by: Sam James gentoo.org> sys-apps/busybox/Manifest | 1 + .../{busybox-9999.ebuild => busybox-1.33.1.ebuild} | 17 ++++++++++++----- sys-apps/busybox/busybox-9999.ebuild | 17 ++++++++++++----- 3 files changed, 25 insertions(+), 10 deletions(-) diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest index b15a4a97e0d..b31dc7d8797 100644 --- a/sys-apps/busybox/Manifest +++ b/sys-apps/busybox/Manifest @@ -1,2 +1,3 @@ DIST busybox-1.32.1.tar.bz2 2444679 BLAKE2B b0258345d40628d8c12b4cc5c3efdb318cfb469e029242942cdad22aeec5142963291a746fbac450b43a4a1f2f7e9204442456691fa98f18eeaa58c70d714caf SHA512 3a33e99adaf7cbd51dcbeb31b5361123bf61ac040c0a032656c654ddb69c4074af75fb4335ba63f283067f61a22d7d7cbca8e1ed265c9522982c453ce48ea2fd DIST busybox-1.33.0.tar.bz2 2448841 BLAKE2B bc25c2187cd7e357dd2f75b3eaae33ab9da318bbcec861e0b6b00da8466a86a17a71933035958f70badb9f1f143fa7f11f114c12a52f3680042730471f56cefe SHA512 20f8f5197c5cbc8b244f69d82d6628066296c7306a9736ee1344cb555882854412cf7f264490f9a735251c139b9621004f48e972d06ef2623a3c99278f8e765a +DIST busybox-1.33.1.tar.bz2 2453694 BLAKE2B 2dce3427ab7703c56cbb3bdc0c93c1fe1c6dc24c5b467b6213b8f9cf55223ec63136b3837970e41293cc3d55d320599945d29a69a4ef8b4b3ab9fb5e2a527632 SHA512 d24931432f65e4e79cf54a6c2b91c9cafba817b637d337f456ce8f505434fc06c4345c65cde4fe2a019650a8a089a6f5336bfafb5ef64a4f14659a9d0b3ddb1a diff --git a/sys-apps/busybox/busybox-9999.ebuild b/sys-apps/busybox/busybox-1.33.1.ebuild similarity index 97% copy from sys-apps/busybox/busybox-9999.ebuild copy to sys-apps/busybox/busybox-1.33.1.ebuild index d5269107970..e9062e18e44 100644 --- a/sys-apps/busybox/busybox-9999.ebuild +++ b/sys-apps/busybox/busybox-1.33.1.ebuild @@ -27,10 +27,13 @@ RESTRICT="test" # TODO: Could make pkgconfig conditional on selinux? bug #782829 COMMON_DEPEND="!static? ( selinux? ( sys-libs/libselinux ) ) - pam? ( sys-libs/pam )" + pam? ( sys-libs/pam ) + virtual/libcrypt:=" DEPEND="${COMMON_DEPEND} - virtual/pkgconfig - static? ( selinux? ( sys-libs/libselinux[static-libs(+)] ) ) + static? ( + virtual/libcrypt[static-libs] + selinux? ( sys-libs/libselinux[static-libs(+)] ) + ) >=sys-kernel/linux-headers-2.6.39" BDEPEND="virtual/pkgconfig" RDEPEND="${COMMON_DEPEND} @@ -216,6 +219,9 @@ src_compile() { export SKIP_STRIP=y emake V=1 busybox + + # bug #701512 + emake V=1 doc } src_install() { @@ -287,7 +293,8 @@ src_install() { dodoc AUTHORS README TODO - cd docs + cd docs || die + doman busybox.1 docinto txt dodoc *.txt docinto pod @@ -295,7 +302,7 @@ src_install() { docinto html dodoc *.html - cd ../examples + cd ../examples || die docinto examples dodoc inittab depmod.pl *.conf *.script undeb unrpm } diff --git a/sys-apps/busybox/busybox-9999.ebuild b/sys-apps/busybox/busybox-9999.ebuild index d5269107970..e9062e18e44 100644 --- a/sys-apps/busybox/busybox-9999.ebuild +++ b/sys-apps/busybox/busybox-9999.ebuild @@ -27,10 +27,13 @@ RESTRICT="test" # TODO: Could make pkgconfig conditional on selinux? bug #782829 COMMON_DEPEND="!static? ( selinux? ( sys-libs/libselinux ) ) - pam? ( sys-libs/pam )" + pam? ( sys-libs/pam ) + virtual/libcrypt:=" DEPEND="${COMMON_DEPEND} - virtual/pkgconfig - static? ( selinux? ( sys-libs/libselinux[static-libs(+)] ) ) + static? ( + virtual/libcrypt[static-libs] + selinux? ( sys-libs/libselinux[static-libs(+)] ) + ) >=sys-kernel/linux-headers-2.6.39" BDEPEND="virtual/pkgconfig" RDEPEND="${COMMON_DEPEND} @@ -216,6 +219,9 @@ src_compile() { export SKIP_STRIP=y emake V=1 busybox + + # bug #701512 + emake V=1 doc } src_install() { @@ -287,7 +293,8 @@ src_install() { dodoc AUTHORS README TODO - cd docs + cd docs || die + doman busybox.1 docinto txt dodoc *.txt docinto pod @@ -295,7 +302,7 @@ src_install() { docinto html dodoc *.html - cd ../examples + cd ../examples || die docinto examples dodoc inittab depmod.pl *.conf *.script undeb unrpm }