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: Sat, 23 Feb 2019 01:30:23
Message-Id: 1550885405.40cfe363037e94ce1053c98f59ecb6981b840e5f.williamh@gentoo
1 commit: 40cfe363037e94ce1053c98f59ecb6981b840e5f
2 Author: William Hubbs <william.hubbs <AT> sony <DOT> com>
3 AuthorDate: Sat Feb 23 01:28:45 2019 +0000
4 Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
5 CommitDate: Sat Feb 23 01:30:05 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40cfe363
7
8 sys-apps/openrc: 0.41 version bump
9
10 Copyright: Sony Interactive Entertainment Inc.
11 Package-Manager: Portage-2.3.51, Repoman-2.3.12
12 Signed-off-by: William Hubbs <williamh <AT> gentoo.org>
13
14 sys-apps/openrc/Manifest | 1 +
15 sys-apps/openrc/openrc-0.41.ebuild | 209 +++++++++++++++++++++++++++++++++++++
16 2 files changed, 210 insertions(+)
17
18 diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
19 index cd3b7e3d483..f5fc67ee0df 100644
20 --- a/sys-apps/openrc/Manifest
21 +++ b/sys-apps/openrc/Manifest
22 @@ -2,3 +2,4 @@ DIST openrc-0.34.11.tar.gz 228054 BLAKE2B 8d4fdd7de4b3c44df0ccec728b91bd2624582d
23 DIST openrc-0.38.3.tar.gz 238031 BLAKE2B 87d1546e21d581feda4064cd64bf43f762203becdcc4b002bf868f17403bd42770cb1106a8bc383c8d69e19ad66ad2bedaa7090c95206597e8a9b6e2ba481dcc SHA512 6bb42ccdab5fb24b11f5042bf19850f440d3494b6bd1d7b8db31b592f051fcd26feac1c8d9ef515238c53c6f5bf98a8c367a48471c178ae829e05c56bd24cfde
24 DIST openrc-0.40.2.tar.gz 245006 BLAKE2B 9e0aab4d42121296cb9bcc47e9222e0e99df80ab686636a8060c6271d30ff7c0d999f851d0e24dfab9e7a6532b56a6a1974cfa4514e88e6b82ec5fbbc192d76c SHA512 746e238f792113397486b9abb6e41c8179e51fe823c82c8e8942d71329a806b9c398628f835e2626ed0e8735c05b0dcd1b82bf9b5111f420105eeae6b0b0e3f2
25 DIST openrc-0.40.3.tar.gz 244510 BLAKE2B ed40506693c642358d46fc5fce9b3fbe6e2b699b3e3ed5bbf47ed349e5f7a5c7c1df07a7621622681af33fd68b197d48bfe4aa32e68a8231380de9a01055ced8 SHA512 65dbc5900a22c37af4aab545c52bb7679b4534755bdff0b0e8cba442a3c5fefa0b987caea74cd572dbb791e060116ecc298fd787b9d7efc8eab009b8b44ca3e4
26 +DIST openrc-0.41.tar.gz 245438 BLAKE2B 30329692dca5165bbdc5ac9207a798e62de8380f6249bf2b7e7703cd897465f1d6e81cbf11f5d1f4d2e0810be99e1b24538a2d304214f5b0827c71c47d99b9d6 SHA512 15d18f0169b56ec7e08e0c36b0be1e4b27e7375ddd9b0f828c895c03d2f5eb818195ae56b10a66c7cfd4c21f8b35c0fc06fcec41fd9ea1be58e2f2ee409fb719
27
28 diff --git a/sys-apps/openrc/openrc-0.41.ebuild b/sys-apps/openrc/openrc-0.41.ebuild
29 new file mode 100644
30 index 00000000000..e0ea72a5f60
31 --- /dev/null
32 +++ b/sys-apps/openrc/openrc-0.41.ebuild
33 @@ -0,0 +1,209 @@
34 +# Copyright 1999-2019 Gentoo Authors
35 +# Distributed under the terms of the GNU General Public License v2
36 +
37 +EAPI=6
38 +
39 +inherit flag-o-matic pam toolchain-funcs
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 ~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 + 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 + >=sys-apps/sysvinit-2.86-r6[selinux?]
82 + virtual/tmpfiles
83 + )
84 + kernel_FreeBSD? ( sys-freebsd/freebsd-sbin )
85 + )
86 + selinux? (
87 + >=sec-policy/selinux-base-policy-2.20170204-r4
88 + >=sec-policy/selinux-openrc-2.20170204-r4
89 + )
90 + !<app-shells/gentoo-bashcomp-20180302
91 + !<app-shells/gentoo-zsh-completions-20180228
92 +"
93 +
94 +PDEPEND="netifrc? ( net-misc/netifrc )"
95 +
96 +src_prepare() {
97 + default
98 + if [[ ${PV} == "9999" ]] ; then
99 + local ver="git-${EGIT_VERSION:0:6}"
100 + sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/gitver.mk || die
101 + fi
102 +}
103 +
104 +src_compile() {
105 + unset LIBDIR #266688
106 +
107 + MAKE_ARGS="${MAKE_ARGS}
108 + LIBNAME=$(get_libdir)
109 + LIBEXECDIR=${EPREFIX}/lib/rc
110 + MKBASHCOMP=yes
111 + MKNET=$(usex newnet)
112 + MKSELINUX=$(usex selinux)
113 + MKAUDIT=$(usex audit)
114 + MKPAM=$(usev pam)
115 + MKSTATICLIBS=$(usex static-libs)
116 + MKZSHCOMP=yes
117 + SH=$(usex bash /bin/bash /bin/sh)"
118 +
119 + local brand="Unknown"
120 + if use kernel_linux ; then
121 + MAKE_ARGS="${MAKE_ARGS} OS=Linux"
122 + brand="Linux"
123 + elif use kernel_FreeBSD ; then
124 + MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD"
125 + brand="FreeBSD"
126 + fi
127 + export BRANDING="Gentoo ${brand}"
128 + use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
129 + export DEBUG=$(usev debug)
130 + export MKTERMCAP=$(usev ncurses)
131 +
132 + tc-export CC AR RANLIB
133 + emake ${MAKE_ARGS}
134 +}
135 +
136 +# set_config <file> <option name> <yes value> <no value> test
137 +# a value of "#" will just comment out the option
138 +set_config() {
139 + local file="${ED}/$1" var=$2 val com
140 + eval "${@:5}" && val=$3 || val=$4
141 + [[ ${val} == "#" ]] && com="#" && val='\2'
142 + sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}"
143 +}
144 +
145 +set_config_yes_no() {
146 + set_config "$1" "$2" YES NO "${@:3}"
147 +}
148 +
149 +src_install() {
150 + emake ${MAKE_ARGS} DESTDIR="${D}" install
151 +
152 + # move the shared libs back to /usr so ldscript can install
153 + # more of a minimal set of files
154 + # disabled for now due to #270646
155 + #mv "${ED}"/$(get_libdir)/lib{einfo,rc}* "${ED}"/usr/$(get_libdir)/ || die
156 + #gen_usr_ldscript -a einfo rc
157 + gen_usr_ldscript libeinfo.so
158 + gen_usr_ldscript librc.so
159 +
160 + if ! use kernel_linux; then
161 + keepdir /lib/rc/init.d
162 + fi
163 + keepdir /lib/rc/tmp
164 +
165 + # Setup unicode defaults for silly unicode users
166 + set_config_yes_no /etc/rc.conf unicode use unicode
167 +
168 + # Cater to the norm
169 + set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')'
170 +
171 + # On HPPA, do not run consolefont by default (bug #222889)
172 + if use hppa; then
173 + rm -f "${ED}"/etc/runlevels/boot/consolefont
174 + fi
175 +
176 + # Support for logfile rotation
177 + insinto /etc/logrotate.d
178 + newins "${FILESDIR}"/openrc.logrotate openrc
179 +
180 + # install gentoo pam.d files
181 + newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
182 + newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-daemon
183 +
184 + # install documentation
185 + dodoc ChangeLog *.md
186 + if use newnet; then
187 + dodoc README.newnet
188 + fi
189 +}
190 +
191 +pkg_preinst() {
192 + # avoid default thrashing in conf.d files when possible #295406
193 + if [[ -e "${EROOT}"etc/conf.d/hostname ]] ; then
194 + (
195 + unset hostname HOSTNAME
196 + source "${EROOT}"etc/conf.d/hostname
197 + : ${hostname:=${HOSTNAME}}
198 + [[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}"
199 + )
200 + fi
201 +
202 + # set default interactive shell to sulogin if it exists
203 + set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
204 + return 0
205 +}
206 +
207 +pkg_postinst() {
208 + if use hppa; then
209 + elog "Setting the console font does not work on all HPPA consoles."
210 + elog "You can still enable it by running:"
211 + elog "# rc-update add consolefont boot"
212 + fi
213 +
214 + # Added for 0.35.
215 + if use kernel_linux && [[ ! -h "${EROOT}"/lib ]]; then
216 + if [[ -d "${EROOT}$(get_libdir)"/rc ]]; then
217 + cp -RPp "${EROOT}$(get_libdir)/rc" "${EROOT}"lib
218 + fi
219 + elif ! use kernel_linux; then
220 + if [[ -d "${EROOT}$(get_libdir)"/rc ]]; then
221 + cp -RPp "${EROOT}$(get_libdir)/rc" "${EROOT}"lib
222 + fi
223 + fi
224 +
225 + if ! use newnet && ! use netifrc; then
226 + ewarn "You have emerged OpenRc without network support. This"
227 + ewarn "means you need to SET UP a network manager such as"
228 + ewarn " net-misc/netifrc, net-misc/dhcpcd, net-misc/wicd,"
229 + ewarn "net-misc/NetworkManager, or net-vpn/badvpn."
230 + ewarn "Or, you have the option of emerging openrc with the newnet"
231 + ewarn "use flag and configuring /etc/conf.d/network and"
232 + ewarn "/etc/conf.d/staticroute if you only use static interfaces."
233 + ewarn
234 + fi
235 +
236 + if use newnet && [ ! -e "${EROOT}"etc/runlevels/boot/network ]; then
237 + ewarn "Please add the network service to your boot runlevel"
238 + ewarn "as soon as possible. Not doing so could leave you with a system"
239 + ewarn "without networking."
240 + ewarn
241 + fi
242 +}