commit:     d6f787b6c72cb43f1a4b24ee9b4b5ff9f88a7878
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 12 05:26:32 2018 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon Mar 12 05:30:06 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6f787b6

sys-apps/openrc: 0.35.3 version bump

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 sys-apps/openrc/Manifest             |   1 +
 sys-apps/openrc/openrc-0.35.3.ebuild | 331 +++++++++++++++++++++++++++++++++++
 2 files changed, 332 insertions(+)

diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index 0801037042f..450f15ba33d 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -1,2 +1,3 @@
 DIST openrc-0.34.11.tar.gz 228054 BLAKE2B 
8d4fdd7de4b3c44df0ccec728b91bd2624582dc2bbdb1fa7892aa61ce0a953a7cf66964f38da888636d895e3c6b776747a4a7fbbdbbbd26029313695f35837fe
 SHA512 
76245d31c6fe9e90e5e2f35ce918b915fc88c231674e0c99dc98b8f3fa120e794900eec9919a0ab029a081b206393246eccb9119a79c90ad6e39325d022928be
 DIST openrc-0.35.2.tar.gz 241600 BLAKE2B 
09517a33ea7faf2e59d3a194876a3bb55a2477dde5f7f30915f77c24104531a27e752a59a049929878a115710ecbe1ed116e4283357f88c65cbe130787b88220
 SHA512 
61282509bae087a6c94a1947a30eddfa633cd2dbc91392511daa7240318d9f0c0a231005e329b6e46eece194fe497071f40387bea46d27ef09db9eb6e92f07d6
+DIST openrc-0.35.3.tar.gz 241587 BLAKE2B 
e8560243adb6ba4e6e463ad8906f203282ee9e0d16a22c0cf28e3ac7fe22321bb90f5292998745a70c269cee2a82bc6c899cba9ecf07a2e28bd4dc02c0fc737a
 SHA512 
2f247241fb6a7abb972efbd308c47f5621b7a10b11fce2fbbffe6ccb73c6d054bd2d1b860bf9d7bc38f6e2f0ed204a60eecad312347f394efb85b096a513eff1

diff --git a/sys-apps/openrc/openrc-0.35.3.ebuild 
b/sys-apps/openrc/openrc-0.35.3.ebuild
new file mode 100644
index 00000000000..3420adf2a4c
--- /dev/null
+++ b/sys-apps/openrc/openrc-0.35.3.ebuild
@@ -0,0 +1,331 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic pam toolchain-funcs
+
+DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
+HOMEPAGE="https://github.com/openrc/openrc/";
+
+if [[ ${PV} == "9999" ]]; then
+       EGIT_REPO_URI="https://github.com/OpenRC/${PN}.git";
+       inherit git-r3
+else
+       SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> 
${P}.tar.gz"
+       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="audit debug ncurses pam newnet prefix +netifrc selinux static-libs
+       unicode kernel_linux kernel_FreeBSD"
+
+COMMON_DEPEND="kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc 
sys-process/fuser-bsd ) )
+       ncurses? ( sys-libs/ncurses:0= )
+       pam? (
+               sys-auth/pambase
+               virtual/pam
+       )
+       audit? ( sys-process/audit )
+       kernel_linux? (
+               sys-process/psmisc
+               !<sys-process/procps-3.3.9-r2
+       )
+       selinux? (
+               sys-apps/policycoreutils
+               >=sys-libs/libselinux-2.6
+       )
+       !<sys-apps/baselayout-2.1-r1
+       !<sys-fs/udev-init-scripts-27"
+DEPEND="${COMMON_DEPEND}
+       virtual/os-headers
+       ncurses? ( virtual/pkgconfig )"
+RDEPEND="${COMMON_DEPEND}
+       !prefix? (
+               kernel_linux? (
+                       >=sys-apps/sysvinit-2.86-r6[selinux?]
+                       virtual/tmpfiles
+               )
+               kernel_FreeBSD? ( sys-freebsd/freebsd-sbin )
+       )
+       selinux? (
+               >=sec-policy/selinux-base-policy-2.20170204-r4
+               >=sec-policy/selinux-openrc-2.20170204-r4
+       )
+       !<app-shells/gentoo-bashcomp-20180302
+       !<app-shells/gentoo-zsh-completions-20180228
+"
+
+PDEPEND="netifrc? ( net-misc/netifrc )"
+
+src_prepare() {
+       default
+
+       sed -i 's:0444:0644:' mk/sys.mk || die
+
+       if [[ ${PV} == "9999" ]] ; then
+               local ver="git-${EGIT_VERSION:0:6}"
+               sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/gitver.mk || 
die
+       fi
+}
+
+src_compile() {
+       unset LIBDIR #266688
+
+       MAKE_ARGS="${MAKE_ARGS}
+               LIBNAME=$(get_libdir)
+               LIBEXECDIR=${EPREFIX}/lib/rc
+               MKBASHCOMP=yes
+               MKNET=$(usex newnet)
+               MKSELINUX=$(usex selinux)
+               MKAUDIT=$(usex audit)
+               MKPAM=$(usev pam)
+               MKSTATICLIBS=$(usex static-libs)
+               MKZSHCOMP=yes"
+
+       local brand="Unknown"
+       if use kernel_linux ; then
+               MAKE_ARGS="${MAKE_ARGS} OS=Linux"
+               brand="Linux"
+       elif use kernel_FreeBSD ; then
+               MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD"
+               brand="FreeBSD"
+       fi
+       export BRANDING="Gentoo ${brand}"
+       use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
+       export DEBUG=$(usev debug)
+       export MKTERMCAP=$(usev ncurses)
+
+       tc-export CC AR RANLIB
+       emake ${MAKE_ARGS}
+}
+
+# set_config <file> <option name> <yes value> <no value> test
+# a value of "#" will just comment out the option
+set_config() {
+       local file="${ED}/$1" var=$2 val com
+       eval "${@:5}" && val=$3 || val=$4
+       [[ ${val} == "#" ]] && com="#" && val='\2'
+       sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ 
]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}"
+}
+
+set_config_yes_no() {
+       set_config "$1" "$2" YES NO "${@:3}"
+}
+
+src_install() {
+       emake ${MAKE_ARGS} DESTDIR="${D}" install
+
+       # move the shared libs back to /usr so ldscript can install
+       # more of a minimal set of files
+       # disabled for now due to #270646
+       #mv "${ED}"/$(get_libdir)/lib{einfo,rc}* "${ED}"/usr/$(get_libdir)/ || 
die
+       #gen_usr_ldscript -a einfo rc
+       gen_usr_ldscript libeinfo.so
+       gen_usr_ldscript librc.so
+
+       if ! use kernel_linux; then
+               keepdir /lib/rc/init.d
+       fi
+       keepdir /lib/rc/tmp
+
+       # Backup our default runlevels
+       dodir /usr/share/"${PN}"
+       cp -PR "${ED}"/etc/runlevels "${ED}"/usr/share/${PN} || die
+       rm -rf "${ED}"/etc/runlevels
+
+       # Setup unicode defaults for silly unicode users
+       set_config_yes_no /etc/rc.conf unicode use unicode
+
+       # Cater to the norm
+       set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use 
amd64 ')'
+
+       # On HPPA, do not run consolefont by default (bug #222889)
+       if use hppa; then
+               rm -f "${ED}"/usr/share/openrc/runlevels/boot/consolefont
+       fi
+
+       # Support for logfile rotation
+       insinto /etc/logrotate.d
+       newins "${FILESDIR}"/openrc.logrotate openrc
+
+       # install gentoo pam.d files
+       newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
+       newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-daemon
+
+       # install documentation
+       dodoc ChangeLog *.md
+       if use newnet; then
+               dodoc README.newnet
+       fi
+}
+
+add_boot_init() {
+       local initd=$1
+       local runlevel=${2:-boot}
+       # if the initscript is not going to be installed and is not
+       # currently installed, return
+       [[ -e "${ED}"/etc/init.d/${initd} || -e "${EROOT}"etc/init.d/${initd} 
]] \
+               || return
+       [[ -e "${EROOT}"etc/runlevels/${runlevel}/${initd} ]] && return
+
+       # if runlevels dont exist just yet, then create it but still flag
+       # to pkg_postinst that it needs real setup #277323
+       if [[ ! -d "${EROOT}"etc/runlevels/${runlevel} ]] ; then
+               mkdir -p "${EROOT}"etc/runlevels/${runlevel}
+               touch "${EROOT}"etc/runlevels/.add_boot_init.created
+       fi
+
+       elog "Auto-adding '${initd}' service to your ${runlevel} runlevel"
+       ln -snf /etc/init.d/${initd} 
"${EROOT}"etc/runlevels/${runlevel}/${initd}
+}
+add_boot_init_mit_config() {
+       local config=$1 initd=$2
+       if [[ -e ${EROOT}${config} ]] ; then
+               if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' 
"${EROOT}"${config}) ]] ; then
+                       add_boot_init ${initd}
+               fi
+       fi
+}
+
+pkg_preinst() {
+       local f LIBDIR=$(get_libdir)
+
+       # avoid default thrashing in conf.d files when possible #295406
+       if [[ -e "${EROOT}"etc/conf.d/hostname ]] ; then
+               (
+               unset hostname HOSTNAME
+               source "${EROOT}"etc/conf.d/hostname
+               : ${hostname:=${HOSTNAME}}
+               [[ -n ${hostname} ]] && set_config /etc/conf.d/hostname 
hostname "${hostname}"
+               )
+       fi
+
+       # set default interactive shell to sulogin if it exists
+       set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
+
+       # termencoding was added in 0.2.1 and needed in boot
+       has_version ">=sys-apps/openrc-0.2.1" || add_boot_init termencoding
+
+       # swapfiles was added in 0.9.9 and needed in boot (february 2012)
+       has_version ">=sys-apps/openrc-0.9.9" || add_boot_init swapfiles
+
+       if ! has_version ">=sys-apps/openrc-0.11"; then
+               add_boot_init sysfs sysinit
+       fi
+
+       if ! has_version ">=sys-apps/openrc-0.11.3" ; then
+               migrate_udev_mount_script
+               add_boot_init tmpfiles.setup boot
+       fi
+
+       # these were added in 0.12.
+       if ! has_version ">=sys-apps/openrc-0.12"; then
+               add_boot_init loopback
+               add_boot_init tmpfiles.dev sysinit
+
+               # ensure existing /etc/conf.d/net is not removed
+               # undoes the hack to get around CONFIG_PROTECT in openrc-0.11.8 
and earlier
+               # this needs to stay in openrc ebuilds for a long time. :(
+               # Added in 0.12.
+               if [[ -f "${EROOT}"etc/conf.d/net ]]; then
+                       einfo "Modifying conf.d/net to keep it from being 
removed"
+                       cat <<-EOF >>"${EROOT}"etc/conf.d/net
+
+# The network scripts are now part of net-misc/netifrc
+# In order to avoid sys-apps/${P} from removing this file, this comment was
+# added; you can safely remove this comment.  Please see
+# /usr/share/doc/netifrc*/README* for more information.
+EOF
+               fi
+       fi
+       has_version ">=sys-apps/openrc-0.14" || add_boot_init binfmt
+
+       if ! has_version ">=sys-apps/openrc-0.18.3"; then
+               add_boot_init mtab
+               if [[ -f "${EROOT}"etc/mtab ]] && [[ ! -L "${EROOT}"etc/mtab 
]]; then
+                       ewarn "${EROOT}etc/mtab will be replaced with a"
+                       ewarn "symbolic link to /proc/self/mounts on the next"
+                       ewarn "reboot."
+                       ewarn "Change the setting in ${EROOT}etc/conf.d/mtab"
+                       ewarn "if you do not want this to happen."
+               fi
+       fi
+
+       has_version ">=sys-apps/openrc-0.35" || add_boot_init cgroups sysinit
+
+}
+
+# >=OpenRC-0.11.3 requires udev-mount to be in the sysinit runlevel with udev.
+migrate_udev_mount_script() {
+       if [ -e "${EROOT}"etc/runlevels/sysinit/udev -a \
+               ! -e "${EROOT}"etc/runlevels/sysinit/udev-mount ]; then
+               add_boot_init udev-mount sysinit
+       fi
+       return 0
+}
+
+pkg_postinst() {
+       local LIBDIR=$(get_libdir)
+
+       # Make our runlevels if they don't exist
+       if [[ ! -e "${EROOT}"etc/runlevels ]] || [[ -e 
"${EROOT}"etc/runlevels/.add_boot_init.created ]] ; then
+               einfo "Copying across default runlevels"
+               cp -RPp "${EROOT}"usr/share/${PN}/runlevels "${EROOT}"etc
+               rm -f "${EROOT}"etc/runlevels/.add_boot_init.created
+       else
+               if [[ ! -e "${EROOT}"etc/runlevels/sysinit/devfs ]] ; then
+                       mkdir -p "${EROOT}"etc/runlevels/sysinit
+                       cp -RPp "${EROOT}"usr/share/${PN}/runlevels/sysinit/* \
+                               "${EROOT}"etc/runlevels/sysinit
+               fi
+               if [[ ! -e "${EROOT}"etc/runlevels/shutdown/mount-ro ]] ; then
+                       mkdir -p "${EROOT}"etc/runlevels/shutdown
+                       cp -RPp "${EROOT}"usr/share/${PN}/runlevels/shutdown/* \
+                               "${EROOT}"etc/runlevels/shutdown
+               fi
+               if [[ ! -e "${EROOT}"etc/runlevels/nonetwork/local ]]; then
+                       cp -RPp "${EROOT}"usr/share/${PN}/runlevels/nonetwork \
+                               "${EROOT}"etc/runlevels
+               fi
+       fi
+
+       if use hppa; then
+               elog "Setting the console font does not work on all HPPA 
consoles."
+               elog "You can still enable it by running:"
+               elog "# rc-update add consolefont boot"
+       fi
+
+       # Added for 0.35.
+       if use kernel_linux && [[ ! -h "${EROOT}"/lib ]]; then
+               if [[ -d "${EROOT}$(get_libdir)"/rc ]]; then
+                       cp -RPp "${EROOT}$(get_libdir)/rc" "${EROOT}"lib
+               fi
+       elif ! use kernel_linux; then
+               if [[ -d "${EROOT}$(get_libdir)"/rc ]]; then
+                       cp -RPp "${EROOT}$(get_libdir)/rc" "${EROOT}"lib
+               fi
+       fi
+
+       # update the dependency tree after touching all files #224171
+       [[ "${EROOT}" = "/" ]] && "${EROOT}"/lib/rc/bin/rc-depend -u
+
+       if ! use newnet && ! use netifrc; then
+               ewarn "You have emerged OpenRc without network support. This"
+               ewarn "means you need to SET UP a network manager such as"
+               ewarn " net-misc/netifrc, net-misc/dhcpcd, net-misc/wicd,"
+               ewarn "net-misc/NetworkManager, or net-vpn/badvpn."
+               ewarn "Or, you have the option of emerging openrc with the 
newnet"
+               ewarn "use flag and configuring /etc/conf.d/network and"
+               ewarn "/etc/conf.d/staticroute if you only use static 
interfaces."
+               ewarn
+       fi
+
+       if use newnet && [ ! -e "${EROOT}"etc/runlevels/boot/network ]; then
+               ewarn "Please add the network service to your boot runlevel"
+               ewarn "as soon as possible. Not doing so could leave you with a 
system"
+               ewarn "without networking."
+               ewarn
+       fi
+}

Reply via email to