diff options
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/openrc/Manifest | 2 | ||||
| -rw-r--r-- | sys-apps/openrc/files/openrc-gcc10.patch | 48 | ||||
| -rw-r--r-- | sys-apps/openrc/openrc-0.44.10-r1.ebuild (renamed from sys-apps/openrc/openrc-0.42.1-r7.ebuild) | 119 |
3 files changed, 40 insertions, 129 deletions
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest index 82e0a33c..b7c0f9bc 100644 --- a/sys-apps/openrc/Manifest +++ b/sys-apps/openrc/Manifest @@ -1 +1 @@ -DIST openrc-0.42.1.tar.gz 242848 BLAKE2B 381f52552c13afbbcf45456fe71078bacf9182adfd67c97394093986977f5e8262d8a3c64219501745575a5210f525afe9fccee72f7625485a9f575108baa369 SHA512 579b9bfbb151b945a364a2c12b037d2e15991820ca99a07ac18e9bdc50074e67fbf0dcf9865aa4deabe2bf82092e4623be51c9e0b4014384951e0a92ac1e7646 +DIST openrc-0.44.10.tar.gz 254298 BLAKE2B 3cfecc27b560b8bb60d2104ab3dcf176b98677b65b829fa403ad2eb0e2e8bb0d586d374c336328a07c2f35e3abcb3f897cf5df142540a60fc09883aabd0ac79d SHA512 0e41f5268c6b8c325a6773511ca58c38ba52a1987aa47165794df8a99359bd1bfcb99d30e0d129b9242a2661663234f6f85c92c55c891dbb6c5b8a11d93edea4 diff --git a/sys-apps/openrc/files/openrc-gcc10.patch b/sys-apps/openrc/files/openrc-gcc10.patch deleted file mode 100644 index ce2fd102..00000000 --- a/sys-apps/openrc/files/openrc-gcc10.patch +++ /dev/null @@ -1,48 +0,0 @@ -https://bugs.gentoo.org/705868 - -From 375ef42393f3dc6edbaa2cb70c79b2366072db38 Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich <slyfox@gentoo.org> -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-r7.ebuild b/sys-apps/openrc/openrc-0.44.10-r1.ebuild index 724e69a4..ca9c341e 100644 --- a/sys-apps/openrc/openrc-0.42.1-r7.ebuild +++ b/sys-apps/openrc/openrc-0.44.10-r1.ebuild @@ -1,24 +1,24 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit flag-o-matic pam toolchain-funcs usr-ldscript +inherit flag-o-matic meson pam toolchain-funcs DESCRIPTION="OpenRC manages the services, startup and shutdown of a host" HOMEPAGE="https://github.com/openrc/openrc/" -if [[ ${PV} == "9999" ]]; then +if [[ ${PV} =~ ^9{4,}$ ]]; 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="~amd64 ~arm64" + 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="+apparmor audit bash debug +dkms elogind +entropy ncurses pam newnet prefix +netifrc selinux +splash static-libs sysv-utils unicode" +IUSE="+apparmor audit bash debug +dkms elogind +entropy ncurses pam newnet +netifrc selinux +splash sysv-utils unicode" COMMON_DEPEND=" apparmor? ( @@ -27,10 +27,7 @@ COMMON_DEPEND=" sec-policy/apparmor-profiles ) ncurses? ( sys-libs/ncurses:0= ) - pam? ( - sys-auth/pambase - sys-libs/pam - ) + pam? ( sys-libs/pam ) audit? ( sys-process/audit ) dkms? ( sys-kernel/dkms ) elogind? ( sys-auth/elogind ) @@ -50,7 +47,10 @@ DEPEND="${COMMON_DEPEND} RDEPEND="${COMMON_DEPEND} bash? ( app-shells/bash ) !prefix? ( - sysv-utils? ( !sys-apps/sysvinit ) + sysv-utils? ( + !sys-apps/systemd[sysv-utils(-)] + !sys-apps/sysvinit + ) !sysv-utils? ( >=sys-apps/sysvinit-2.86-r6[selinux?] ) virtual/tmpfiles ) @@ -66,45 +66,27 @@ 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 - - if use dkms ; then + if use dkms; then eapply "${FILESDIR}"/${PN}-dkms.patch fi - eapply "${FILESDIR}"/${PN}-enable-rclogger.patch - eapply "${FILESDIR}"/${PN}-gcc10.patch } -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="Redcore ${brand} Hardened" - 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} +src_configure() { + local emesonargs=( + $(meson_feature audit) + "-Dbranding=\"Redcore Linux Hardened\"" + $(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 @@ -121,15 +103,7 @@ set_config_yes_no() { } 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 + meson_install keepdir /lib/rc/tmp @@ -148,15 +122,14 @@ src_install() { 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 + 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() { @@ -176,23 +149,9 @@ pkg_preinst() { } 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 - - # Redcore Linux Hardened : if [ -e "${ROOT}"/etc/init.d/dkms ] && use dkms; then if [ "$(rc-config list boot | grep dkms)" != "" ]; then - einfo + einfo > /dev/null 2>&1 else "${ROOT}"/sbin/rc-update add dkms boot > /dev/null 2>&1 fi @@ -200,7 +159,7 @@ pkg_postinst() { if [ -e "${ROOT}"/etc/init.d/dbus ] && use elogind; then if [ "$(rc-config list boot | grep dbus)" != "" ]; then - einfo + einfo > /dev/null 2>&1 elif [ "$(rc-config list default | grep dbus)" != "" ]; then "${ROOT}"/sbin/rc-update del dbus default > /dev/null 2>&1 "${ROOT}"/sbin/rc-update add dbus boot > /dev/null 2>&1 @@ -211,7 +170,7 @@ pkg_postinst() { if [ -e "${ROOT}"/etc/init.d/elogind ] && use elogind; then if [ "$(rc-config list boot | grep elogind)" != "" ]; then - einfo + einfo > /dev/null 2>&1 else "${ROOT}"/sbin/rc-update add elogind boot > /dev/null 2>&1 fi @@ -227,7 +186,7 @@ pkg_postinst() { if [ -e "${ROOT}"/etc/init.d/apparmor ] && use apparmor; then if [ "$(rc-config list boot | grep apparmor)" != "" ]; then - einfo + einfo > /dev/null 2>&1 else "${ROOT}"/sbin/rc-update add apparmor boot > /dev/null 2>&1 fi @@ -235,7 +194,7 @@ pkg_postinst() { if [ -e "${ROOT}"/etc/init.d/haveged ] && use entropy; then if [ "$(rc-config list default | grep haveged)" != "" ]; then - einfo + einfo > /dev/null 2>&1 else "${ROOT}"/sbin/rc-update add haveged default > /dev/null 2>&1 fi @@ -245,7 +204,7 @@ pkg_postinst() { if [ "$(rc-config list default | grep openrc-settingsd)" != "" ]; then "${ROOT}"/sbin/rc-update del openrc-settingsd default > /dev/null 2>&1 else - einfo + einfo > /dev/null 2>&1 fi fi } |