| 1 |
commit: 8c52e9702c82fa2c3ba5a24ffe2d067ecaa3ff74 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed May 26 08:56:21 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed May 26 09:01:57 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c52e970 |
| 7 |
|
| 8 |
sys-apps/busybox: add 1.33.1 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/701512 |
| 11 |
Closes: https://bugs.gentoo.org/765580 |
| 12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 13 |
|
| 14 |
sys-apps/busybox/Manifest | 1 + |
| 15 |
.../{busybox-9999.ebuild => busybox-1.33.1.ebuild} | 17 ++++++++++++----- |
| 16 |
sys-apps/busybox/busybox-9999.ebuild | 17 ++++++++++++----- |
| 17 |
3 files changed, 25 insertions(+), 10 deletions(-) |
| 18 |
|
| 19 |
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest |
| 20 |
index b15a4a97e0d..b31dc7d8797 100644 |
| 21 |
--- a/sys-apps/busybox/Manifest |
| 22 |
+++ b/sys-apps/busybox/Manifest |
| 23 |
@@ -1,2 +1,3 @@ |
| 24 |
DIST busybox-1.32.1.tar.bz2 2444679 BLAKE2B b0258345d40628d8c12b4cc5c3efdb318cfb469e029242942cdad22aeec5142963291a746fbac450b43a4a1f2f7e9204442456691fa98f18eeaa58c70d714caf SHA512 3a33e99adaf7cbd51dcbeb31b5361123bf61ac040c0a032656c654ddb69c4074af75fb4335ba63f283067f61a22d7d7cbca8e1ed265c9522982c453ce48ea2fd |
| 25 |
DIST busybox-1.33.0.tar.bz2 2448841 BLAKE2B bc25c2187cd7e357dd2f75b3eaae33ab9da318bbcec861e0b6b00da8466a86a17a71933035958f70badb9f1f143fa7f11f114c12a52f3680042730471f56cefe SHA512 20f8f5197c5cbc8b244f69d82d6628066296c7306a9736ee1344cb555882854412cf7f264490f9a735251c139b9621004f48e972d06ef2623a3c99278f8e765a |
| 26 |
+DIST busybox-1.33.1.tar.bz2 2453694 BLAKE2B 2dce3427ab7703c56cbb3bdc0c93c1fe1c6dc24c5b467b6213b8f9cf55223ec63136b3837970e41293cc3d55d320599945d29a69a4ef8b4b3ab9fb5e2a527632 SHA512 d24931432f65e4e79cf54a6c2b91c9cafba817b637d337f456ce8f505434fc06c4345c65cde4fe2a019650a8a089a6f5336bfafb5ef64a4f14659a9d0b3ddb1a |
| 27 |
|
| 28 |
diff --git a/sys-apps/busybox/busybox-9999.ebuild b/sys-apps/busybox/busybox-1.33.1.ebuild |
| 29 |
similarity index 97% |
| 30 |
copy from sys-apps/busybox/busybox-9999.ebuild |
| 31 |
copy to sys-apps/busybox/busybox-1.33.1.ebuild |
| 32 |
index d5269107970..e9062e18e44 100644 |
| 33 |
--- a/sys-apps/busybox/busybox-9999.ebuild |
| 34 |
+++ b/sys-apps/busybox/busybox-1.33.1.ebuild |
| 35 |
@@ -27,10 +27,13 @@ RESTRICT="test" |
| 36 |
|
| 37 |
# TODO: Could make pkgconfig conditional on selinux? bug #782829 |
| 38 |
COMMON_DEPEND="!static? ( selinux? ( sys-libs/libselinux ) ) |
| 39 |
- pam? ( sys-libs/pam )" |
| 40 |
+ pam? ( sys-libs/pam ) |
| 41 |
+ virtual/libcrypt:=" |
| 42 |
DEPEND="${COMMON_DEPEND} |
| 43 |
- virtual/pkgconfig |
| 44 |
- static? ( selinux? ( sys-libs/libselinux[static-libs(+)] ) ) |
| 45 |
+ static? ( |
| 46 |
+ virtual/libcrypt[static-libs] |
| 47 |
+ selinux? ( sys-libs/libselinux[static-libs(+)] ) |
| 48 |
+ ) |
| 49 |
>=sys-kernel/linux-headers-2.6.39" |
| 50 |
BDEPEND="virtual/pkgconfig" |
| 51 |
RDEPEND="${COMMON_DEPEND} |
| 52 |
@@ -216,6 +219,9 @@ src_compile() { |
| 53 |
export SKIP_STRIP=y |
| 54 |
|
| 55 |
emake V=1 busybox |
| 56 |
+ |
| 57 |
+ # bug #701512 |
| 58 |
+ emake V=1 doc |
| 59 |
} |
| 60 |
|
| 61 |
src_install() { |
| 62 |
@@ -287,7 +293,8 @@ src_install() { |
| 63 |
|
| 64 |
dodoc AUTHORS README TODO |
| 65 |
|
| 66 |
- cd docs |
| 67 |
+ cd docs || die |
| 68 |
+ doman busybox.1 |
| 69 |
docinto txt |
| 70 |
dodoc *.txt |
| 71 |
docinto pod |
| 72 |
@@ -295,7 +302,7 @@ src_install() { |
| 73 |
docinto html |
| 74 |
dodoc *.html |
| 75 |
|
| 76 |
- cd ../examples |
| 77 |
+ cd ../examples || die |
| 78 |
docinto examples |
| 79 |
dodoc inittab depmod.pl *.conf *.script undeb unrpm |
| 80 |
} |
| 81 |
|
| 82 |
diff --git a/sys-apps/busybox/busybox-9999.ebuild b/sys-apps/busybox/busybox-9999.ebuild |
| 83 |
index d5269107970..e9062e18e44 100644 |
| 84 |
--- a/sys-apps/busybox/busybox-9999.ebuild |
| 85 |
+++ b/sys-apps/busybox/busybox-9999.ebuild |
| 86 |
@@ -27,10 +27,13 @@ RESTRICT="test" |
| 87 |
|
| 88 |
# TODO: Could make pkgconfig conditional on selinux? bug #782829 |
| 89 |
COMMON_DEPEND="!static? ( selinux? ( sys-libs/libselinux ) ) |
| 90 |
- pam? ( sys-libs/pam )" |
| 91 |
+ pam? ( sys-libs/pam ) |
| 92 |
+ virtual/libcrypt:=" |
| 93 |
DEPEND="${COMMON_DEPEND} |
| 94 |
- virtual/pkgconfig |
| 95 |
- static? ( selinux? ( sys-libs/libselinux[static-libs(+)] ) ) |
| 96 |
+ static? ( |
| 97 |
+ virtual/libcrypt[static-libs] |
| 98 |
+ selinux? ( sys-libs/libselinux[static-libs(+)] ) |
| 99 |
+ ) |
| 100 |
>=sys-kernel/linux-headers-2.6.39" |
| 101 |
BDEPEND="virtual/pkgconfig" |
| 102 |
RDEPEND="${COMMON_DEPEND} |
| 103 |
@@ -216,6 +219,9 @@ src_compile() { |
| 104 |
export SKIP_STRIP=y |
| 105 |
|
| 106 |
emake V=1 busybox |
| 107 |
+ |
| 108 |
+ # bug #701512 |
| 109 |
+ emake V=1 doc |
| 110 |
} |
| 111 |
|
| 112 |
src_install() { |
| 113 |
@@ -287,7 +293,8 @@ src_install() { |
| 114 |
|
| 115 |
dodoc AUTHORS README TODO |
| 116 |
|
| 117 |
- cd docs |
| 118 |
+ cd docs || die |
| 119 |
+ doman busybox.1 |
| 120 |
docinto txt |
| 121 |
dodoc *.txt |
| 122 |
docinto pod |
| 123 |
@@ -295,7 +302,7 @@ src_install() { |
| 124 |
docinto html |
| 125 |
dodoc *.html |
| 126 |
|
| 127 |
- cd ../examples |
| 128 |
+ cd ../examples || die |
| 129 |
docinto examples |
| 130 |
dodoc inittab depmod.pl *.conf *.script undeb unrpm |
| 131 |
} |
Archives