diff options
Diffstat (limited to 'sys-apps/openrc')
-rw-r--r-- | sys-apps/openrc/Manifest | 11 | ||||
-rw-r--r-- | sys-apps/openrc/openrc-0.34.11.ebuild | 327 | ||||
-rw-r--r-- | sys-apps/openrc/openrc-0.38.3.ebuild | 326 | ||||
-rw-r--r-- | sys-apps/openrc/openrc-0.41.2.ebuild | 2 | ||||
-rw-r--r-- | sys-apps/openrc/openrc-0.42.1.ebuild (renamed from sys-apps/openrc/openrc-0.38.3-r1.ebuild) | 151 | ||||
-rw-r--r-- | sys-apps/openrc/openrc-9999.ebuild | 10 |
6 files changed, 28 insertions, 799 deletions
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest index c1d0067c716c..1c2a5cabcf0a 100644 --- a/sys-apps/openrc/Manifest +++ b/sys-apps/openrc/Manifest @@ -1,11 +1,8 @@ AUX openrc.logrotate 43 BLAKE2B 0587cd211767937fd6273e6b159271490443a94d80a54b5a20ef625a1959e77dbf38cd1756838337fb39a061c4ee19a39cccd2f5867fab9f04fb916a74029aaa SHA512 12bb6354e808fbf47bbab963de55ee7901738b4a912659982c57ef2777fff9a670e867fcb8ec316a76b151032c92dc89a950d7d1d835ef53f753a8f3b41d2cec AUX start-stop-daemon.pam 63 BLAKE2B df39a1a12fe09dbbc0746eac67035d9e6d4a63323f6c937ef3888c70787354128e415b3c1c8bccccec0c987b3e789711cd1ddaba55e9b53a7f67b332c4ca9d5b SHA512 85cf440611b8f87f51bf24bdd9fa03639a75b950f00096d81b8826c21ae85ff9784b8c56b8ddb482e70f08bce933d4561b30750346d51fb2cef3be34acc065cb -DIST openrc-0.34.11.tar.gz 228054 BLAKE2B 8d4fdd7de4b3c44df0ccec728b91bd2624582dc2bbdb1fa7892aa61ce0a953a7cf66964f38da888636d895e3c6b776747a4a7fbbdbbbd26029313695f35837fe SHA512 76245d31c6fe9e90e5e2f35ce918b915fc88c231674e0c99dc98b8f3fa120e794900eec9919a0ab029a081b206393246eccb9119a79c90ad6e39325d022928be -DIST openrc-0.38.3.tar.gz 238031 BLAKE2B 87d1546e21d581feda4064cd64bf43f762203becdcc4b002bf868f17403bd42770cb1106a8bc383c8d69e19ad66ad2bedaa7090c95206597e8a9b6e2ba481dcc SHA512 6bb42ccdab5fb24b11f5042bf19850f440d3494b6bd1d7b8db31b592f051fcd26feac1c8d9ef515238c53c6f5bf98a8c367a48471c178ae829e05c56bd24cfde DIST openrc-0.41.2.tar.gz 245302 BLAKE2B ab80dc4f3a7c2c464fe64cdfa7fd31363d5a9d25e90d0239325be05561e5802f22c47013fde82650f5ce08cf99f16f5f479d8617c254647b8c40cec9609d0b6b SHA512 ebfa691cae4704bb3023ea0508a712a45b8c20809828729dfa5292e96f3fd1b309813d80d7c286d0c09680bf5378aba40cfd994f27951f43a3ffb1fd0d69a58b -EBUILD openrc-0.34.11.ebuild 10106 BLAKE2B e692651c5fdf62040819ad528cac336df93f2b93169f25dba8e1cc37b31fab50c10066053d108d77a826842b6a1f3bc721e0567b06e32f310a39e08bea786025 SHA512 f6121acf134baae65ff6a264e901cf01da92216c20ca4df95f7855f088be1081d31705768f36881377d90743d8994390b8d984cbbe251b83158d68272a95c964 -EBUILD openrc-0.38.3-r1.ebuild 9786 BLAKE2B fc8a25d65fa13aa21ec16ebbed7f3f08a8986f1af70b26064d474ab5aad0d2d9ee9d4dd7b1c06f4a1b267a9bdf8e914188dd10132869166d695e7cce5a5845fa SHA512 199e4adb759d4a4d55f8dbee24904894fd4970b3c54ebe0dd3b5dd1599c2acd1d61433b29c41000516e45582710481bab25ef6fed894e4e0950af0be713645b0 -EBUILD openrc-0.38.3.ebuild 9848 BLAKE2B a9a2f112c032d234e65c682208e229728c24b97c7ea2656655d4f66a9f9396cad6e6cb75bd48235a9f1affdaa62e9e165822126aaa75e507f8bf8db4b46dbdb6 SHA512 0aae8c02e67b473f5df71b056aef1af8b8b05f0bbe214a3cfe75605d9ae367e3bebcc50c31607360152f536d31c96422628abd413ccdf49721d99c8cb3225f59 -EBUILD openrc-0.41.2.ebuild 5810 BLAKE2B 9bc1fc576bc52172c9c1227b8470d79b847bbaa498a9b7e701c81cd7fdc3dab551ed681b907531495a253cde51a2d8a2b7dd8ca63f7d860f7e99d978e64de758 SHA512 10900d5a7daceeb77f54e2f90ef4cc0e8f5f82309c7d287c98414031ba9eac04076148f289b78e80cbcf118053aa0513f6b70925a4761563b85c4dd6955b0a22 -EBUILD openrc-9999.ebuild 5912 BLAKE2B 04f3dc950d050f94782549833e58f3703c39f0e09764dab6d55538dad2ca4c02c11e71038a7724cbb99134aac3222cb41ba697526f37f468375e8c930438dfe2 SHA512 432c8580e5335918e96b9ae352aac74c4a9234c3b98bd7a8a7f9859a5dcf1295202bcaefb27d3bdca576ebf64313901a32e243fbe0d57964d9a4b87004540a8e +DIST openrc-0.42.1.tar.gz 242848 BLAKE2B 381f52552c13afbbcf45456fe71078bacf9182adfd67c97394093986977f5e8262d8a3c64219501745575a5210f525afe9fccee72f7625485a9f575108baa369 SHA512 579b9bfbb151b945a364a2c12b037d2e15991820ca99a07ac18e9bdc50074e67fbf0dcf9865aa4deabe2bf82092e4623be51c9e0b4014384951e0a92ac1e7646 +EBUILD openrc-0.41.2.ebuild 5808 BLAKE2B 18e7a7a5fba7c8aa73f31d7b8d3b4c375ce9fe41cdca0070de697fc741ac285e7d80baca5ce540f93b7180c2110c790cbbfeffc4ce41cf4f698b7218093a98a5 SHA512 a29a99a664e956b891bb05cc1e7d295de4185488809874a564cc2de4a189d4545f682782451a64a8dea7d1ea27288ebd9573f3af692b5c1769dd03f4a01ca1ff +EBUILD openrc-0.42.1.ebuild 5923 BLAKE2B 5f14234d049902f60cab34b3d967cdf4115103cefac7e27d9a951aafafebb4e5d806c19669befa52a7bd09acdd4ff26624541104cb60ed6cff8ed1440e734c32 SHA512 a192c291a7faf02079671bc78c2c7edae228e2ff092de7f37906e1ead1f334847a71d1c8667117d66360e6e5eb4c2301414c1ca651303c15f2c304b24f7cb796 +EBUILD openrc-9999.ebuild 5923 BLAKE2B 5f14234d049902f60cab34b3d967cdf4115103cefac7e27d9a951aafafebb4e5d806c19669befa52a7bd09acdd4ff26624541104cb60ed6cff8ed1440e734c32 SHA512 a192c291a7faf02079671bc78c2c7edae228e2ff092de7f37906e1ead1f334847a71d1c8667117d66360e6e5eb4c2301414c1ca651303c15f2c304b24f7cb796 MISC metadata.xml 706 BLAKE2B 1d6a4937d577fff7db7fd64617328ca49faccaa61749adabc411a215960ee06c1af32499be697921012eee34f5c680295e46f545099f06393965a17c0d0d034d SHA512 d5d669cdcf8707689c855cab678031c6e9b1e33e4b931c7d80bbe2ad442aedabef718018466f0cb15bd8a329292a0de844935f9332611f3fb334b57d14aa39c1 diff --git a/sys-apps/openrc/openrc-0.34.11.ebuild b/sys-apps/openrc/openrc-0.34.11.ebuild deleted file mode 100644 index 9ae507eb58b0..000000000000 --- a/sys-apps/openrc/openrc-0.34.11.ebuild +++ /dev/null @@ -1,327 +0,0 @@ -# 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 usr-ldscript - -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 - ) -" - -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}/$(get_libdir)/rc - MKNET=$(usex newnet) - MKSELINUX=$(usex selinux) - MKAUDIT=$(usex audit) - MKPAM=$(usev pam) - MKSTATICLIBS=$(usex static-libs)" - - 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 /$(get_libdir)/rc/init.d - fi - keepdir /$(get_libdir)/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 - fi - - # these were added in 0.12. - if ! has_version ">=sys-apps/openrc-0.12"; then - add_boot_init loopback - - # 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 -} - -# >=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 - - # Handle the conf.d/local.{start,stop} -> local.d transition - if [[ -f ${EROOT}etc/conf.d/local.start || -f ${EROOT}etc/conf.d/local.stop ]] ; then - elog "Moving your ${EROOT}etc/conf.d/local.{start,stop}" - elog "files to ${EROOT}etc/local.d" - mv "${EROOT}"etc/conf.d/local.start "${EROOT}"etc/local.d/baselayout1.start - mv "${EROOT}"etc/conf.d/local.stop "${EROOT}"etc/local.d/baselayout1.stop - chmod +x "${EROOT}"etc/local.d/*{start,stop} - fi - - if use kernel_linux && [[ "${EROOT}" = "/" ]]; then - if ! /$(get_libdir)/rc/sh/migrate-to-run.sh; then - ewarn "The dependency data could not be migrated to /run/openrc." - ewarn "This means you need to reboot your system." - fi - fi - - # update the dependency tree after touching all files #224171 - [[ "${EROOT}" = "/" ]] && "${EROOT}/${LIBDIR}"/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 -} diff --git a/sys-apps/openrc/openrc-0.38.3.ebuild b/sys-apps/openrc/openrc-0.38.3.ebuild deleted file mode 100644 index f11de7bde25d..000000000000 --- a/sys-apps/openrc/openrc-0.38.3.ebuild +++ /dev/null @@ -1,326 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit flag-o-matic pam toolchain-funcs usr-ldscript - -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 - 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 - fi - - # these were added in 0.12. - if ! has_version ">=sys-apps/openrc-0.12"; then - add_boot_init loopback - - # 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 -} diff --git a/sys-apps/openrc/openrc-0.41.2.ebuild b/sys-apps/openrc/openrc-0.41.2.ebuild index efd8b930cfff..602cb5c3c494 100644 --- a/sys-apps/openrc/openrc-0.41.2.ebuild +++ b/sys-apps/openrc/openrc-0.41.2.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then 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 ~riscv ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd" + KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd" fi LICENSE="BSD-2" diff --git a/sys-apps/openrc/openrc-0.38.3-r1.ebuild b/sys-apps/openrc/openrc-0.42.1.ebuild index e9d7ad4ad0c1..dea79c65bd1c 100644 --- a/sys-apps/openrc/openrc-0.38.3-r1.ebuild +++ b/sys-apps/openrc/openrc-0.42.1.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit flag-o-matic pam toolchain-funcs usr-ldscript @@ -13,13 +13,13 @@ if [[ ${PV} == "9999" ]]; then 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" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~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" +IUSE="audit bash debug ncurses pam newnet prefix +netifrc selinux static-libs + sysv-utils 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= ) @@ -42,9 +42,11 @@ DEPEND="${COMMON_DEPEND} virtual/os-headers ncurses? ( virtual/pkgconfig )" RDEPEND="${COMMON_DEPEND} + bash? ( app-shells/bash ) !prefix? ( kernel_linux? ( - >=sys-apps/sysvinit-2.86-r6[selinux?] + sysv-utils? ( !sys-apps/sysvinit ) + !sysv-utils? ( >=sys-apps/sysvinit-2.86-r6[selinux?] ) virtual/tmpfiles ) kernel_FreeBSD? ( sys-freebsd/freebsd-sbin ) @@ -76,10 +78,12 @@ src_compile() { MKBASHCOMP=yes MKNET=$(usex newnet) MKSELINUX=$(usex selinux) + MKSYSVINIT=$(usex sysv-utils) MKAUDIT=$(usex audit) MKPAM=$(usev pam) MKSTATICLIBS=$(usex static-libs) - MKZSHCOMP=yes" + MKZSHCOMP=yes + SH=$(usex bash /bin/bash /bin/sh)" local brand="Unknown" if use kernel_linux ; then @@ -127,11 +131,6 @@ src_install() { 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 @@ -140,7 +139,7 @@ src_install() { # On HPPA, do not run consolefont by default (bug #222889) if use hppa; then - rm -f "${ED}"/usr/share/openrc/runlevels/boot/consolefont + rm -f "${ED}"/etc/runlevels/boot/consolefont fi # Support for logfile rotation @@ -158,42 +157,12 @@ src_install() { 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 + if [[ -e "${EROOT}"/etc/conf.d/hostname ]] ; then ( unset hostname HOSTNAME - source "${EROOT}"etc/conf.d/hostname + source "${EROOT}"/etc/conf.d/hostname : ${hostname:=${HOSTNAME}} [[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}" ) @@ -201,91 +170,10 @@ pkg_preinst() { # 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 - fi - - # these were added in 0.12. - if ! has_version ">=sys-apps/openrc-0.12"; then - add_boot_init loopback - - # 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 [[ -z "${REPLACING_VERSIONS}" ]]; 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:" @@ -294,18 +182,15 @@ pkg_postinst() { # 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 + 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 + 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" @@ -317,7 +202,7 @@ pkg_postinst() { ewarn fi - if use newnet && [ ! -e "${EROOT}"etc/runlevels/boot/network ]; then + 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." diff --git a/sys-apps/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild index 6bf7ded639ba..dea79c65bd1c 100644 --- a/sys-apps/openrc/openrc-9999.ebuild +++ b/sys-apps/openrc/openrc-9999.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then 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" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" fi LICENSE="BSD-2" @@ -182,12 +182,12 @@ pkg_postinst() { # 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 + 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 + if [[ -d "${EROOT}/$(get_libdir)"/rc ]]; then + cp -RPp "${EROOT}/$(get_libdir)/rc" "${EROOT}"/lib fi fi |