commit: 7746fcb12204d080f675d7ef4765ee914d26271a Author: William Hubbs <williamh <AT> gentoo <DOT> org> AuthorDate: Wed Apr 12 19:20:10 2023 +0000 Commit: William Hubbs <williamh <AT> gentoo <DOT> org> CommitDate: Wed Apr 12 19:20:28 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7746fcb1
sys-apps/openrc: drop 0.45.2-r2 Signed-off-by: William Hubbs <williamh <AT> gentoo.org> sys-apps/openrc/Manifest | 1 - sys-apps/openrc/files/openrc-0.45.2-grep-3.8.patch | 35 ----- sys-apps/openrc/openrc-0.45.2-r2.ebuild | 173 --------------------- 3 files changed, 209 deletions(-) diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest index 3abb8340e7a7..89ed7ed2a0a1 100644 --- a/sys-apps/openrc/Manifest +++ b/sys-apps/openrc/Manifest @@ -1,2 +1 @@ -DIST openrc-0.45.2.tar.gz 246515 BLAKE2B bb7d52b183612eb8924a2d0f9ec63eea88253d8d83964d6341a4715a6cdc372b3fd99ad0f972f4f539da9d741548777dabf4ced86fd20be741a89a69ffe2ff01 SHA512 ca2958772240f6e5037e39db1ee62a81091a2efa654da967f68e03a721868c6c0a41d32a2bddf55c8eadbc9bf5837b710cc2e4564844a7fbc0e585366da4fdf9 DIST openrc-0.46.tar.gz 247679 BLAKE2B 55490afc179e1e56a58408e8a2b7ebd5376ffee25cb61f2838a47cc97ad1e4eadabcc7f74e5cc2a2d9217917eb42517cf01766de2e82b50a3500bdbe263b0d88 SHA512 7c837e4b553511f0621944222ca0d35bd553a9888bd482ca0f8f3d2923d5b51cbd1f1c2f33cccb26d9f13dfb488939b95064673bedb7fcbf78d68664df2678c7 diff --git a/sys-apps/openrc/files/openrc-0.45.2-grep-3.8.patch b/sys-apps/openrc/files/openrc-0.45.2-grep-3.8.patch deleted file mode 100644 index c6eddeec9048..000000000000 --- a/sys-apps/openrc/files/openrc-0.45.2-grep-3.8.patch +++ /dev/null @@ -1,35 +0,0 @@ -https://bugs.gentoo.org/875557 -https://github.com/OpenRC/openrc/issues/548 -https://github.com/OpenRC/openrc/commit/9380347f042f7d294317f4420b648422817eb75a - -From 9380347f042f7d294317f4420b648422817eb75a Mon Sep 17 00:00:00 2001 -From: Stefan Linke <[email protected]> -Date: Wed, 7 Sep 2022 17:18:09 +0200 -Subject: [PATCH] Avoid warning on grep 3.8 in hwclock - -Starting with grep version 3.8, the hwclock init script logs warnings -about stray backslashes: - -> hwclock | * Setting system clock using the hardware clock [UTC] ... -> hwclock |grep: warning: stray \ before - -> hwclock |grep: warning: stray \ before - - -This is caused by the check for existence of the `--noadjfile` argument -in function `get_noadjfile()`. - -Replacing the affected logic with an explicit argument denoting the -pattern as such resolves the issue. - -Fixes #548 ---- a/init.d/hwclock.in -+++ b/init.d/hwclock.in -@@ -72,7 +72,7 @@ get_noadjfile() - { - if ! yesno $clock_adjfile; then - # Some implementations don't handle adjustments -- if LC_ALL=C hwclock --help 2>&1 | grep -q "\-\-noadjfile"; then -+ if LC_ALL=C hwclock --help 2>&1 | grep -q -e "--noadjfile"; then - echo --noadjfile - fi - fi - diff --git a/sys-apps/openrc/openrc-0.45.2-r2.ebuild b/sys-apps/openrc/openrc-0.45.2-r2.ebuild deleted file mode 100644 index 1d0fad63f7ab..000000000000 --- a/sys-apps/openrc/openrc-0.45.2-r2.ebuild +++ /dev/null @@ -1,173 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit meson pam - -DESCRIPTION="OpenRC manages the services, startup and shutdown of a host" -HOMEPAGE="https://github.com/openrc/openrc/"; - -if [[ ${PV} =~ ^9{4,}$ ]]; then - EGIT_REPO_URI="https://github.com/OpenRC/${PN}.git"; - inherit git-r3 -else - SRC_URI="https://github.com/OpenRC/openrc/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" -fi - -LICENSE="BSD-2" -SLOT="0" -IUSE="audit bash debug ncurses pam newnet +netifrc selinux sysv-utils unicode" - -COMMON_DEPEND=" - ncurses? ( sys-libs/ncurses:0= ) - pam? ( sys-libs/pam ) - audit? ( sys-process/audit ) - sys-process/psmisc - selinux? ( - sys-apps/policycoreutils - >=sys-libs/libselinux-2.6 - )" -DEPEND="${COMMON_DEPEND} - virtual/os-headers - ncurses? ( virtual/pkgconfig )" -RDEPEND="${COMMON_DEPEND} - bash? ( app-shells/bash ) - !prefix? ( - sysv-utils? ( - !sys-apps/systemd[sysv-utils(-)] - !sys-apps/sysvinit - ) - !sysv-utils? ( - || ( - >=sys-apps/sysvinit-2.86-r6[selinux?] - sys-apps/s6-linux-init[sysv-utils(-)] - ) - ) - virtual/tmpfiles - ) - selinux? ( - >=sec-policy/selinux-base-policy-2.20170204-r4 - >=sec-policy/selinux-openrc-2.20170204-r4 - ) -" - -PDEPEND="netifrc? ( net-misc/netifrc )" - -PATCHES=( - "${FILESDIR}"/${P}-grep-3.8.patch -) - -src_configure() { - local emesonargs=( - $(meson_feature audit) - "-Dbranding=\"Gentoo Linux\"" - $(meson_use newnet) - -Dos=Linux - $(meson_use pam) - $(meson_feature selinux) - -Drootprefix="${EPREFIX}" - -Dshell=$(usex bash /bin/bash /bin/sh) - $(meson_use sysv-utils sysvinit) - -Dtermcap=$(usev ncurses) - ) - # export DEBUG=$(usev debug) - meson_src_configure -} - -# 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() { - meson_install - - keepdir /lib/rc/tmp - - # 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}"/etc/runlevels/boot/consolefont - fi - - # Support for logfile rotation - insinto /etc/logrotate.d - newins "${FILESDIR}"/openrc.logrotate openrc - - if use pam; then - # install gentoo pam.d files - newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon - newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-daemon - fi - - # install documentation - dodoc *.md -} - -pkg_preinst() { - # 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 - return 0 -} - -pkg_postinst() { - 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 - - 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/connman," - 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 - - # added for 0.45 to handle seedrng/urandom switching (2022-06-07) - for v in ${REPLACING_VERSIONS}; do - [[ -x $(type rc-update) ]] || continue - if ver_test $v -lt 0.45; then - if rc-update show boot | grep -q urandom; then - rc-update del urandom boot - rc-update add seedrng boot - fi - fi - done -}
