Gentoo Archives: gentoo-commits

From: William Hubbs <williamh@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/openrc/
Date: Tue, 20 Aug 2019 18:39:52
Message-Id: 1566326302.5c3005eefadcdef6243fac3b482cfbc1b3ab33c7.williamh@gentoo
1 commit: 5c3005eefadcdef6243fac3b482cfbc1b3ab33c7
2 Author: William Hubbs <william.hubbs <AT> sony <DOT> com>
3 AuthorDate: Tue Aug 20 18:35:51 2019 +0000
4 Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
5 CommitDate: Tue Aug 20 18:38:22 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c3005ee
7
8 sys-apps/openrc: 0.42 bump
9
10 Copyright: Sony Interactive Entertainment Inc.
11 Package-Manager: Portage-2.3.69, Repoman-2.3.16
12 Signed-off-by: William Hubbs <williamh <AT> gentoo.org>
13
14 sys-apps/openrc/Manifest | 1 +
15 sys-apps/openrc/openrc-0.42.ebuild | 211 +++++++++++++++++++++++++++++++++++++
16 2 files changed, 212 insertions(+)
17
18 diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
19 index 360aca845d8..c2452410c3d 100644
20 --- a/sys-apps/openrc/Manifest
21 +++ b/sys-apps/openrc/Manifest
22 @@ -1,3 +1,4 @@
23 DIST openrc-0.34.11.tar.gz 228054 BLAKE2B 8d4fdd7de4b3c44df0ccec728b91bd2624582dc2bbdb1fa7892aa61ce0a953a7cf66964f38da888636d895e3c6b776747a4a7fbbdbbbd26029313695f35837fe SHA512 76245d31c6fe9e90e5e2f35ce918b915fc88c231674e0c99dc98b8f3fa120e794900eec9919a0ab029a081b206393246eccb9119a79c90ad6e39325d022928be
24 DIST openrc-0.38.3.tar.gz 238031 BLAKE2B 87d1546e21d581feda4064cd64bf43f762203becdcc4b002bf868f17403bd42770cb1106a8bc383c8d69e19ad66ad2bedaa7090c95206597e8a9b6e2ba481dcc SHA512 6bb42ccdab5fb24b11f5042bf19850f440d3494b6bd1d7b8db31b592f051fcd26feac1c8d9ef515238c53c6f5bf98a8c367a48471c178ae829e05c56bd24cfde
25 DIST openrc-0.41.2.tar.gz 245302 BLAKE2B ab80dc4f3a7c2c464fe64cdfa7fd31363d5a9d25e90d0239325be05561e5802f22c47013fde82650f5ce08cf99f16f5f479d8617c254647b8c40cec9609d0b6b SHA512 ebfa691cae4704bb3023ea0508a712a45b8c20809828729dfa5292e96f3fd1b309813d80d7c286d0c09680bf5378aba40cfd994f27951f43a3ffb1fd0d69a58b
26 +DIST openrc-0.42.tar.gz 242670 BLAKE2B df3c1594cb441228dd9c5f16e0758bd3a62cd51c8797ce57b6c290b0b8d80307eb5e43a4a6107da8d6911777524deac48cea48f6b96a5d4eab4e5c81fa11a835 SHA512 200f3f0054e766accce332bc86941367f99f0c6a0b00bf1faad877ff9ac7cfa36a90a60432361483c0d2a778bed0d811130ad692aea64b2e2d34c5b95940b68a
27
28 diff --git a/sys-apps/openrc/openrc-0.42.ebuild b/sys-apps/openrc/openrc-0.42.ebuild
29 new file mode 100644
30 index 00000000000..dea79c65bd1
31 --- /dev/null
32 +++ b/sys-apps/openrc/openrc-0.42.ebuild
33 @@ -0,0 +1,211 @@
34 +# Copyright 1999-2019 Gentoo Authors
35 +# Distributed under the terms of the GNU General Public License v2
36 +
37 +EAPI=7
38 +
39 +inherit flag-o-matic pam toolchain-funcs usr-ldscript
40 +
41 +DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
42 +HOMEPAGE="https://github.com/openrc/openrc/"
43 +
44 +if [[ ${PV} == "9999" ]]; then
45 + EGIT_REPO_URI="https://github.com/OpenRC/${PN}.git"
46 + inherit git-r3
47 +else
48 + SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
49 + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
50 +fi
51 +
52 +LICENSE="BSD-2"
53 +SLOT="0"
54 +IUSE="audit bash debug ncurses pam newnet prefix +netifrc selinux static-libs
55 + sysv-utils unicode kernel_linux kernel_FreeBSD"
56 +
57 +COMMON_DEPEND="kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) )
58 + ncurses? ( sys-libs/ncurses:0= )
59 + pam? (
60 + sys-auth/pambase
61 + virtual/pam
62 + )
63 + audit? ( sys-process/audit )
64 + kernel_linux? (
65 + sys-process/psmisc
66 + !<sys-process/procps-3.3.9-r2
67 + )
68 + selinux? (
69 + sys-apps/policycoreutils
70 + >=sys-libs/libselinux-2.6
71 + )
72 + !<sys-apps/baselayout-2.1-r1
73 + !<sys-fs/udev-init-scripts-27"
74 +DEPEND="${COMMON_DEPEND}
75 + virtual/os-headers
76 + ncurses? ( virtual/pkgconfig )"
77 +RDEPEND="${COMMON_DEPEND}
78 + bash? ( app-shells/bash )
79 + !prefix? (
80 + kernel_linux? (
81 + sysv-utils? ( !sys-apps/sysvinit )
82 + !sysv-utils? ( >=sys-apps/sysvinit-2.86-r6[selinux?] )
83 + virtual/tmpfiles
84 + )
85 + kernel_FreeBSD? ( sys-freebsd/freebsd-sbin )
86 + )
87 + selinux? (
88 + >=sec-policy/selinux-base-policy-2.20170204-r4
89 + >=sec-policy/selinux-openrc-2.20170204-r4
90 + )
91 + !<app-shells/gentoo-bashcomp-20180302
92 + !<app-shells/gentoo-zsh-completions-20180228
93 +"
94 +
95 +PDEPEND="netifrc? ( net-misc/netifrc )"
96 +
97 +src_prepare() {
98 + default
99 + if [[ ${PV} == "9999" ]] ; then
100 + local ver="git-${EGIT_VERSION:0:6}"
101 + sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/gitver.mk || die
102 + fi
103 +}
104 +
105 +src_compile() {
106 + unset LIBDIR #266688
107 +
108 + MAKE_ARGS="${MAKE_ARGS}
109 + LIBNAME=$(get_libdir)
110 + LIBEXECDIR=${EPREFIX}/lib/rc
111 + MKBASHCOMP=yes
112 + MKNET=$(usex newnet)
113 + MKSELINUX=$(usex selinux)
114 + MKSYSVINIT=$(usex sysv-utils)
115 + MKAUDIT=$(usex audit)
116 + MKPAM=$(usev pam)
117 + MKSTATICLIBS=$(usex static-libs)
118 + MKZSHCOMP=yes
119 + SH=$(usex bash /bin/bash /bin/sh)"
120 +
121 + local brand="Unknown"
122 + if use kernel_linux ; then
123 + MAKE_ARGS="${MAKE_ARGS} OS=Linux"
124 + brand="Linux"
125 + elif use kernel_FreeBSD ; then
126 + MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD"
127 + brand="FreeBSD"
128 + fi
129 + export BRANDING="Gentoo ${brand}"
130 + use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
131 + export DEBUG=$(usev debug)
132 + export MKTERMCAP=$(usev ncurses)
133 +
134 + tc-export CC AR RANLIB
135 + emake ${MAKE_ARGS}
136 +}
137 +
138 +# set_config <file> <option name> <yes value> <no value> test
139 +# a value of "#" will just comment out the option
140 +set_config() {
141 + local file="${ED}/$1" var=$2 val com
142 + eval "${@:5}" && val=$3 || val=$4
143 + [[ ${val} == "#" ]] && com="#" && val='\2'
144 + sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}"
145 +}
146 +
147 +set_config_yes_no() {
148 + set_config "$1" "$2" YES NO "${@:3}"
149 +}
150 +
151 +src_install() {
152 + emake ${MAKE_ARGS} DESTDIR="${D}" install
153 +
154 + # move the shared libs back to /usr so ldscript can install
155 + # more of a minimal set of files
156 + # disabled for now due to #270646
157 + #mv "${ED}"/$(get_libdir)/lib{einfo,rc}* "${ED}"/usr/$(get_libdir)/ || die
158 + #gen_usr_ldscript -a einfo rc
159 + gen_usr_ldscript libeinfo.so
160 + gen_usr_ldscript librc.so
161 +
162 + if ! use kernel_linux; then
163 + keepdir /lib/rc/init.d
164 + fi
165 + keepdir /lib/rc/tmp
166 +
167 + # Setup unicode defaults for silly unicode users
168 + set_config_yes_no /etc/rc.conf unicode use unicode
169 +
170 + # Cater to the norm
171 + set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')'
172 +
173 + # On HPPA, do not run consolefont by default (bug #222889)
174 + if use hppa; then
175 + rm -f "${ED}"/etc/runlevels/boot/consolefont
176 + fi
177 +
178 + # Support for logfile rotation
179 + insinto /etc/logrotate.d
180 + newins "${FILESDIR}"/openrc.logrotate openrc
181 +
182 + # install gentoo pam.d files
183 + newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
184 + newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-daemon
185 +
186 + # install documentation
187 + dodoc ChangeLog *.md
188 + if use newnet; then
189 + dodoc README.newnet
190 + fi
191 +}
192 +
193 +pkg_preinst() {
194 + # avoid default thrashing in conf.d files when possible #295406
195 + if [[ -e "${EROOT}"/etc/conf.d/hostname ]] ; then
196 + (
197 + unset hostname HOSTNAME
198 + source "${EROOT}"/etc/conf.d/hostname
199 + : ${hostname:=${HOSTNAME}}
200 + [[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}"
201 + )
202 + fi
203 +
204 + # set default interactive shell to sulogin if it exists
205 + set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
206 + return 0
207 +}
208 +
209 +pkg_postinst() {
210 + if use hppa; then
211 + elog "Setting the console font does not work on all HPPA consoles."
212 + elog "You can still enable it by running:"
213 + elog "# rc-update add consolefont boot"
214 + fi
215 +
216 + # Added for 0.35.
217 + if use kernel_linux && [[ ! -h "${EROOT}"/lib ]]; then
218 + if [[ -d "${EROOT}/$(get_libdir)"/rc ]]; then
219 + cp -RPp "${EROOT}/$(get_libdir)/rc" "${EROOT}"/lib
220 + fi
221 + elif ! use kernel_linux; then
222 + if [[ -d "${EROOT}/$(get_libdir)"/rc ]]; then
223 + cp -RPp "${EROOT}/$(get_libdir)/rc" "${EROOT}"/lib
224 + fi
225 + fi
226 +
227 + if ! use newnet && ! use netifrc; then
228 + ewarn "You have emerged OpenRc without network support. This"
229 + ewarn "means you need to SET UP a network manager such as"
230 + ewarn " net-misc/netifrc, net-misc/dhcpcd, net-misc/wicd,"
231 + ewarn "net-misc/NetworkManager, or net-vpn/badvpn."
232 + ewarn "Or, you have the option of emerging openrc with the newnet"
233 + ewarn "use flag and configuring /etc/conf.d/network and"
234 + ewarn "/etc/conf.d/staticroute if you only use static interfaces."
235 + ewarn
236 + fi
237 +
238 + if use newnet && [ ! -e "${EROOT}"/etc/runlevels/boot/network ]; then
239 + ewarn "Please add the network service to your boot runlevel"
240 + ewarn "as soon as possible. Not doing so could leave you with a system"
241 + ewarn "without networking."
242 + ewarn
243 + fi
244 +}