| 1 |
commit: 8d1afa41f9a96061d46e32e9035d7e839086d962 |
| 2 |
Author: William Hubbs <williamh <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jun 7 23:39:41 2022 +0000 |
| 4 |
Commit: William Hubbs <williamh <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jun 7 23:40:01 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d1afa41 |
| 7 |
|
| 8 |
sys-apps/openrc: sync live |
| 9 |
|
| 10 |
Signed-off-by: William Hubbs <williamh <AT> gentoo.org> |
| 11 |
|
| 12 |
sys-apps/openrc/openrc-9999.ebuild | 34 +++++++++++++++++++++++----------- |
| 13 |
1 file changed, 23 insertions(+), 11 deletions(-) |
| 14 |
|
| 15 |
diff --git a/sys-apps/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild |
| 16 |
index 4c8638a6543e..0be02cfdbdbb 100644 |
| 17 |
--- a/sys-apps/openrc/openrc-9999.ebuild |
| 18 |
+++ b/sys-apps/openrc/openrc-9999.ebuild |
| 19 |
@@ -1,9 +1,9 @@ |
| 20 |
-# Copyright 1999-2021 Gentoo Authors |
| 21 |
+# Copyright 1999-2022 Gentoo Authors |
| 22 |
# Distributed under the terms of the GNU General Public License v2 |
| 23 |
|
| 24 |
-EAPI=7 |
| 25 |
+EAPI=8 |
| 26 |
|
| 27 |
-inherit flag-o-matic meson pam toolchain-funcs |
| 28 |
+inherit meson pam |
| 29 |
|
| 30 |
DESCRIPTION="OpenRC manages the services, startup and shutdown of a host" |
| 31 |
HOMEPAGE="https://github.com/openrc/openrc/" |
| 32 |
@@ -13,7 +13,7 @@ if [[ ${PV} =~ ^9{4,}$ ]]; then |
| 33 |
inherit git-r3 |
| 34 |
else |
| 35 |
SRC_URI="https://github.com/OpenRC/openrc/archive/${PV}.tar.gz -> ${P}.tar.gz" |
| 36 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" |
| 37 |
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" |
| 38 |
fi |
| 39 |
|
| 40 |
LICENSE="BSD-2" |
| 41 |
@@ -25,13 +25,10 @@ COMMON_DEPEND=" |
| 42 |
pam? ( sys-libs/pam ) |
| 43 |
audit? ( sys-process/audit ) |
| 44 |
sys-process/psmisc |
| 45 |
- !<sys-process/procps-3.3.9-r2 |
| 46 |
selinux? ( |
| 47 |
sys-apps/policycoreutils |
| 48 |
>=sys-libs/libselinux-2.6 |
| 49 |
- ) |
| 50 |
- !<sys-apps/baselayout-2.1-r1 |
| 51 |
- !<sys-fs/udev-init-scripts-27" |
| 52 |
+ )" |
| 53 |
DEPEND="${COMMON_DEPEND} |
| 54 |
virtual/os-headers |
| 55 |
ncurses? ( virtual/pkgconfig )" |
| 56 |
@@ -49,8 +46,6 @@ RDEPEND="${COMMON_DEPEND} |
| 57 |
>=sec-policy/selinux-base-policy-2.20170204-r4 |
| 58 |
>=sec-policy/selinux-openrc-2.20170204-r4 |
| 59 |
) |
| 60 |
- !<app-shells/gentoo-bashcomp-20180302 |
| 61 |
- !<app-shells/gentoo-zsh-completions-20180228 |
| 62 |
" |
| 63 |
|
| 64 |
PDEPEND="netifrc? ( net-misc/netifrc )" |
| 65 |
@@ -112,7 +107,7 @@ src_install() { |
| 66 |
fi |
| 67 |
|
| 68 |
# install documentation |
| 69 |
- dodoc ChangeLog *.md |
| 70 |
+ dodoc *.md |
| 71 |
} |
| 72 |
|
| 73 |
pkg_preinst() { |
| 74 |
@@ -155,4 +150,21 @@ pkg_postinst() { |
| 75 |
ewarn "without networking." |
| 76 |
ewarn |
| 77 |
fi |
| 78 |
+ |
| 79 |
+ # added for 0.45 to handle seedrng/urandom switching (2022-06-07) |
| 80 |
+ for v in ${REPLACING_VERSIONS}; do |
| 81 |
+ [[ -x $(type rc-update) ]] || continue |
| 82 |
+ if ver_test $v -lt 0.45; then |
| 83 |
+ if rc-update show boot | grep -q urandom; then |
| 84 |
+ rc-update del urandom boot |
| 85 |
+ rc-update add seedrng boot |
| 86 |
+ fi |
| 87 |
+ fi |
| 88 |
+ if ver_test $v -gt 0.45; then |
| 89 |
+ if rc-update show boot | grep -q seedrng; then |
| 90 |
+ rc-update del seedrng boot |
| 91 |
+ rc-update add urandom boot |
| 92 |
+ fi |
| 93 |
+ fi |
| 94 |
+ done |
| 95 |
} |
Archives