commit: ccd7a1ff340193f8544e59bba1d5bc82228ba1f5 Author: William Hubbs <williamh <AT> gentoo <DOT> org> AuthorDate: Sat Sep 4 21:23:58 2021 +0000 Commit: William Hubbs <williamh <AT> gentoo <DOT> org> CommitDate: Sat Sep 4 21:25:55 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ccd7a1ff
sys-apps/openrc: remove old Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: William Hubbs <williamh <AT> gentoo.org> sys-apps/openrc/Manifest | 1 - sys-apps/openrc/files/openrc-0.42.1-gcc-10.patch | 48 ------ sys-apps/openrc/openrc-0.42.1-r1.ebuild | 201 ----------------------- 3 files changed, 250 deletions(-) diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest index e5204e76026..20b88cbaae8 100644 --- a/sys-apps/openrc/Manifest +++ b/sys-apps/openrc/Manifest @@ -1,2 +1 @@ -DIST openrc-0.42.1.tar.gz 242848 BLAKE2B 381f52552c13afbbcf45456fe71078bacf9182adfd67c97394093986977f5e8262d8a3c64219501745575a5210f525afe9fccee72f7625485a9f575108baa369 SHA512 579b9bfbb151b945a364a2c12b037d2e15991820ca99a07ac18e9bdc50074e67fbf0dcf9865aa4deabe2bf82092e4623be51c9e0b4014384951e0a92ac1e7646 DIST openrc-0.43.5.tar.gz 242146 BLAKE2B 993d3895588e8f1383049006834f944faaae0f889d3afcae5bff697db9f26383712f18aba52ce07d835f1d2bbe8ef19ef116ad60141d1eb0650767430d1d9967 SHA512 680c1549a8a37eb3a719f3e026888d045d26c98357d6e6eaf09069a23a001272deaca8cac4a9b8fd79f489c4cfb4fe2c7b5d481d1469798a8f5ec470d0cadbe3 diff --git a/sys-apps/openrc/files/openrc-0.42.1-gcc-10.patch b/sys-apps/openrc/files/openrc-0.42.1-gcc-10.patch deleted file mode 100644 index ce2fd102d24..00000000000 --- a/sys-apps/openrc/files/openrc-0.42.1-gcc-10.patch +++ /dev/null @@ -1,48 +0,0 @@ -https://bugs.gentoo.org/705868 - -From 375ef42393f3dc6edbaa2cb70c79b2366072db38 Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich <[email protected]> -Date: Sun, 19 Jan 2020 15:24:20 +0000 -Subject: [PATCH] src/rc/rc-logger.h: fix build failure against gcc-10 - -On gcc-10 (and gcc-9 -fno-common) build fails as: - -``` -cc -L../librc -L../libeinfo -O2 -g -std=c99 -Wall -Wextra -Wimplicit -Wshadow \ - -Wformat=2 -Wmissing-prototypes -Wmissing-declarations -Wmissing-noreturn \ - -Wmissing-format-attribute -Wnested-externs -Winline -Wwrite-strings \ - -Wcast-align -Wcast-qual -Wpointer-arith -Wdeclaration-after-statement \ - -Wsequence-point -Werror=implicit-function-declaration \ - -Wl,-rpath=/lib -o openrc rc.o rc-logger.o rc-misc.o rc-plugin.o _usage.o -lutil -lrc -leinfo -Wl,-Bdynamic -ldl -ld: rc-logger.o:/home/slyfox/dev/git/openrc/src/rc/rc-logger.h:16: - multiple definition of `rc_logger_pid'; rc.o:openrc/src/rc/rc-logger.h:16: first defined here -ld: rc-logger.o:/home/slyfox/dev/git/openrc/src/rc/rc-logger.h:17: - multiple definition of `rc_logger_tty'; rc.o:openrc/src/rc/rc-logger.h:17: first defined here -``` - -gcc-10 will change the default from -fcommon to fno-common: -https://gcc.gnu.org/PR85678. - -The error also happens if CFLAGS=-fno-common passed explicitly. - -This fixes #348. ---- - src/rc/rc-logger.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/src/rc/rc-logger.h -+++ b/src/rc/rc-logger.h -@@ -13,8 +13,8 @@ - #ifndef RC_LOGGER_H - #define RC_LOGGER_H - --pid_t rc_logger_pid; --int rc_logger_tty; -+extern pid_t rc_logger_pid; -+extern int rc_logger_tty; - extern bool rc_in_logger; - - void rc_logger_open(const char *runlevel); --- -2.25.2 - diff --git a/sys-apps/openrc/openrc-0.42.1-r1.ebuild b/sys-apps/openrc/openrc-0.42.1-r1.ebuild deleted file mode 100644 index 24ee8a894fc..00000000000 --- a/sys-apps/openrc/openrc-0.42.1-r1.ebuild +++ /dev/null @@ -1,201 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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 ~riscv ~s390 sparc x86" -fi - -LICENSE="BSD-2" -SLOT="0" -IUSE="audit bash debug ncurses pam newnet prefix +netifrc selinux static-libs - sysv-utils unicode" - -COMMON_DEPEND=" - ncurses? ( sys-libs/ncurses:0= ) - pam? ( - sys-auth/pambase - sys-libs/pam - ) - audit? ( sys-process/audit ) - 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} - bash? ( app-shells/bash ) - !prefix? ( - sysv-utils? ( - !sys-apps/systemd[sysv-utils(-)] - !sys-apps/sysvinit - ) - !sysv-utils? ( >=sys-apps/sysvinit-2.86-r6[selinux?] ) - virtual/tmpfiles - ) - 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 )" - -PATCHES=("${FILESDIR}"/${PN}-0.42.1-gcc-10.patch) - -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) - MKSYSVINIT=$(usex sysv-utils) - MKAUDIT=$(usex audit) - MKPAM=$(usev pam) - MKSTATICLIBS=$(usex static-libs) - MKZSHCOMP=yes - SH=$(usex bash /bin/bash /bin/sh)" - - local brand="Unknown" - MAKE_ARGS="${MAKE_ARGS} OS=Linux" - brand="Linux" - 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 - - 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 ChangeLog *.md - if use newnet; then - dodoc README.newnet - fi -} - -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 - - # Added for 0.35. - if [[ ! -h "${EROOT}"/lib ]]; then - if [[ -d "${EROOT}/$(get_libdir)"/rc ]]; then - cp -RPp "${EROOT}/$(get_libdir)/rc" "${EROOT}"/lib - fi - 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 -}
