* [gentoo-commits] repo/gentoo:master commit in: sys-apps/openrc/files/, sys-apps/openrc/
@ 2018-05-01 21:19 William Hubbs
0 siblings, 0 replies; 6+ messages in thread
From: William Hubbs @ 2018-05-01 21:19 UTC (permalink / raw
To: gentoo-commits
commit: e4afc1bb6afddad8601a5f88d71a23d31bb06570
Author: William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Tue May 1 21:18:27 2018 +0000
Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue May 1 21:19:07 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4afc1bb
sys-apps/openrc: Fix build on uclibc-ng
Bug: https://bugs.gentoo.org/show_bug.cgi?id=650908
Package-Manager: Portage-2.3.24, Repoman-2.3.6
..._POSIX_C_SOURCE-definition-to-Linux-build.patch | 29 ++++++++++++++++++++++
sys-apps/openrc/openrc-0.35.5.ebuild | 4 +++
2 files changed, 33 insertions(+)
diff --git a/sys-apps/openrc/files/openrc-0.35.5-Add-_POSIX_C_SOURCE-definition-to-Linux-build.patch b/sys-apps/openrc/files/openrc-0.35.5-Add-_POSIX_C_SOURCE-definition-to-Linux-build.patch
new file mode 100644
index 00000000000..b547fe2b61e
--- /dev/null
+++ b/sys-apps/openrc/files/openrc-0.35.5-Add-_POSIX_C_SOURCE-definition-to-Linux-build.patch
@@ -0,0 +1,29 @@
+From f4e2142089487b7f5c99da949d7bf8d038724df7 Mon Sep 17 00:00:00 2001
+From: William Hubbs <w.d.hubbs@gmail.com>
+Date: Tue, 1 May 2018 13:28:57 -0500
+Subject: [PATCH] Add _POSIX_C_SOURCE definition to Linux build
+
+We need this to allow builds on uclibc-ng based systems.
+
+X-Gentoo-Bug: 650908
+X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=650908
+---
+ mk/os-Linux.mk | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mk/os-Linux.mk b/mk/os-Linux.mk
+index 2479ff5b..9e8a1485 100644
+--- a/mk/os-Linux.mk
++++ b/mk/os-Linux.mk
+@@ -11,7 +11,7 @@
+ SFX= .Linux.in
+ PKG_PREFIX?= /usr
+
+-CPPFLAGS+= -D_DEFAULT_SOURCE
++CPPFLAGS+= -D_DEFAULT_SOURCE -D_POSIX_C_SOURCE=200809L
+ LIBDL= -Wl,-Bdynamic -ldl
+
+ ifeq (${MKSELINUX},yes)
+--
+2.16.1
+
diff --git a/sys-apps/openrc/openrc-0.35.5.ebuild b/sys-apps/openrc/openrc-0.35.5.ebuild
index 3420adf2a4c..820ec13085b 100644
--- a/sys-apps/openrc/openrc-0.35.5.ebuild
+++ b/sys-apps/openrc/openrc-0.35.5.ebuild
@@ -59,6 +59,10 @@ RDEPEND="${COMMON_DEPEND}
PDEPEND="netifrc? ( net-misc/netifrc )"
+PATCHES=(
+ "${FILESDIR}"/${P}-Add-_POSIX_C_SOURCE-definition-to-Linux-build.patch
+ )
+
src_prepare() {
default
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/openrc/files/, sys-apps/openrc/
@ 2020-03-21 20:35 Sergei Trofimovich
0 siblings, 0 replies; 6+ messages in thread
From: Sergei Trofimovich @ 2020-03-21 20:35 UTC (permalink / raw
To: gentoo-commits
commit: d086f300a07aac023c2f0729ee2eba9865888207
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 21 20:35:01 2020 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Mar 21 20:35:13 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d086f300
sys-apps/openrc: tweak for gcc-10, bug #705868
Closes: https://bugs.gentoo.org/705868
Package-Manager: Portage-2.3.94, Repoman-2.3.21
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
sys-apps/openrc/files/openrc-0.42.1-gcc-10.patch | 48 ++++++++++++++++++++++++
sys-apps/openrc/openrc-0.42.1.ebuild | 2 +
2 files changed, 50 insertions(+)
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
new file mode 100644
index 00000000000..ce2fd102d24
--- /dev/null
+++ b/sys-apps/openrc/files/openrc-0.42.1-gcc-10.patch
@@ -0,0 +1,48 @@
+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.ebuild b/sys-apps/openrc/openrc-0.42.1.ebuild
index 3a80774a11d..46f3497690d 100644
--- a/sys-apps/openrc/openrc-0.42.1.ebuild
+++ b/sys-apps/openrc/openrc-0.42.1.ebuild
@@ -56,6 +56,8 @@ RDEPEND="${COMMON_DEPEND}
PDEPEND="netifrc? ( net-misc/netifrc )"
+PATCHES=("${FILESDIR}"/${PN}-0.42.1-gcc-10.patch)
+
src_prepare() {
default
if [[ ${PV} == "9999" ]] ; then
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/openrc/files/, sys-apps/openrc/
@ 2021-09-04 21:26 William Hubbs
0 siblings, 0 replies; 6+ messages in thread
From: William Hubbs @ 2021-09-04 21:26 UTC (permalink / raw
To: gentoo-commits
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 <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-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
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/openrc/files/, sys-apps/openrc/
@ 2021-11-22 11:44 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2021-11-22 11:44 UTC (permalink / raw
To: gentoo-commits
commit: f4fdf74bad1aa4db3522939aa70c2ed2e948cc22
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 22 11:44:30 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Nov 22 11:44:46 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4fdf74b
sys-apps/openrc: backport SELinux + no PAM build fixes
Closes: https://bugs.gentoo.org/825286
Closes: https://bugs.gentoo.org/824954
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/openrc-0.44.8-selinux-no-pam.patch | 89 ++++++++++++++++++++++
sys-apps/openrc/openrc-0.44.8.ebuild | 5 ++
2 files changed, 94 insertions(+)
diff --git a/sys-apps/openrc/files/openrc-0.44.8-selinux-no-pam.patch b/sys-apps/openrc/files/openrc-0.44.8-selinux-no-pam.patch
new file mode 100644
index 000000000000..28749433f69f
--- /dev/null
+++ b/sys-apps/openrc/files/openrc-0.44.8-selinux-no-pam.patch
@@ -0,0 +1,89 @@
+https://github.com/OpenRC/openrc/commit/bd5cdaafadf997c0ab3c4ad362dbdfd7dc6fd987.patch
+https://github.com/OpenRC/openrc/commit/f3f0fde861b438c80f99afdd49fe175e9d0a68ca
+
+From: Sam James <sam@gentoo.org>
+Date: Sat, 20 Nov 2021 12:05:56 +0000
+Subject: [PATCH] meson: fix pam_misc_dep definition
+
+X-Gentoo-Bug: 824954
+X-Gentoo-Bug-URL: https://bugs.gentoo.org/824954
+Fixes: https://github.com/OpenRC/openrc/issues/470
+Fixes: https://github.com/OpenRC/openrc/pull/477
+--- a/meson.build
++++ b/meson.build
+@@ -94,6 +94,7 @@ rc_sbindir = rc_libexecdir / 'sbin'
+ sbindir = rootprefix / get_option('sbindir')
+
+ selinux_dep = dependency('libselinux', required : get_option('selinux'))
++pam_misc_dep = []
+ if selinux_dep.found()
+ cc_selinux_flags = '-DHAVE_SELINUX'
+ if pam_dep.found() and get_option('pam')
+@@ -107,7 +108,6 @@ if selinux_dep.found()
+ endif
+ else
+ cc_selinux_flags = []
+- pam_misc_dep = []
+ endif
+
+ termcap = get_option('termcap')
+
+From: Sam James <sam@gentoo.org>
+Date: Sat, 20 Nov 2021 12:06:37 +0000
+Subject: [PATCH] meson: link against libcrypt for SELinux if no PAM
+
+We use libcrypt's crypt() if we're _not_ using PAM
+in the SELinux code (rc-selinux, specifically).
+
+X-Gentoo-Bug: 824954
+X-Gentoo-Bug-URL: https://bugs.gentoo.org/824954
+Fixes: https://github.com/openrc/openrc/pull/477
+--- a/meson.build
++++ b/meson.build
+@@ -93,6 +93,8 @@ rc_bindir = rc_libexecdir / 'bin'
+ rc_sbindir = rc_libexecdir / 'sbin'
+ sbindir = rootprefix / get_option('sbindir')
+
++crypt_dep = dependency('libcrypt', required : not get_option('pam'))
++
+ selinux_dep = dependency('libselinux', required : get_option('selinux'))
+ pam_misc_dep = []
+ if selinux_dep.found()
+--- a/src/rc/meson.build
++++ b/src/rc/meson.build
+@@ -50,7 +50,7 @@ executable('openrc-run',
+ rc_selinux_c, version_h],
+ c_args : [cc_audit_flags, cc_branding_flags, cc_pam_flags, cc_selinux_flags],
+ link_with: [libeinfo, librc],
+- dependencies: [audit_dep, dl_dep, pam_dep, pam_misc_dep, selinux_dep, util_dep],
++ dependencies: [audit_dep, dl_dep, pam_dep, pam_misc_dep, selinux_dep, util_dep, crypt_dep],
+ include_directories: [incdir, einfo_incdir, rc_incdir],
+ install: true,
+ install_dir: sbindir)
+@@ -85,7 +85,7 @@ executable('runscript',
+ rc_selinux_c, version_h],
+ c_args : [cc_audit_flags, cc_branding_flags, cc_pam_flags, cc_selinux_flags],
+ link_with: [libeinfo, librc],
+- dependencies: [audit_dep, dl_dep, pam_dep, pam_misc_dep, util_dep, selinux_dep],
++ dependencies: [audit_dep, dl_dep, pam_dep, pam_misc_dep, util_dep, selinux_dep, crypt_dep],
+ include_directories: [incdir, einfo_incdir, rc_incdir],
+ install: true,
+ install_dir: sbindir)
+@@ -95,7 +95,7 @@ executable('start-stop-daemon',
+ rc_selinux_c, usage_c, version_h],
+ c_args : [cc_audit_flags, cc_branding_flags, cc_pam_flags, cc_selinux_flags],
+ link_with: [libeinfo, librc],
+- dependencies: [audit_dep, dl_dep, pam_dep, pam_misc_dep, util_dep, selinux_dep],
++ dependencies: [audit_dep, dl_dep, pam_dep, pam_misc_dep, util_dep, selinux_dep, crypt_dep],
+ include_directories: [incdir, einfo_incdir, rc_incdir],
+ install: true,
+ install_dir: sbindir)
+@@ -169,7 +169,7 @@ executable('checkpath',
+ c_args : [cc_audit_flags, cc_branding_flags, cc_pam_flags, cc_selinux_flags],
+ include_directories: [incdir, einfo_incdir, rc_incdir],
+ link_with: [libeinfo, librc],
+- dependencies: [audit_dep, pam_dep, pam_misc_dep, selinux_dep],
++ dependencies: [audit_dep, pam_dep, pam_misc_dep, selinux_dep, crypt_dep],
+ install: true,
+ install_dir: rc_bindir)
+
diff --git a/sys-apps/openrc/openrc-0.44.8.ebuild b/sys-apps/openrc/openrc-0.44.8.ebuild
index 4e57ae57a034..182e1761f233 100644
--- a/sys-apps/openrc/openrc-0.44.8.ebuild
+++ b/sys-apps/openrc/openrc-0.44.8.ebuild
@@ -55,6 +55,11 @@ RDEPEND="${COMMON_DEPEND}
PDEPEND="netifrc? ( net-misc/netifrc )"
+PATCHES=(
+ # Backported from master
+ "${FILESDIR}"/${P}-selinux-no-pam.patch
+)
+
src_configure() {
local emesonargs=(
$(meson_feature audit)
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/openrc/files/, sys-apps/openrc/
@ 2022-12-03 12:17 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2022-12-03 12:17 UTC (permalink / raw
To: gentoo-commits
commit: 09e6575b72d2b8bb8948feb0bbdcfd47eddb903b
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 3 12:16:46 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Dec 3 12:16:46 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09e6575b
sys-apps/openrc: backport grep 3.8 warning fix
Closes: https://bugs.gentoo.org/875557
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/openrc/files/openrc-0.45.2-grep-3.8.patch | 35 ++++++++++++++++++++++
...rc-0.45.2-r1.ebuild => openrc-0.45.2-r2.ebuild} | 8 +++--
2 files changed, 41 insertions(+), 2 deletions(-)
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
new file mode 100644
index 000000000000..c6eddeec9048
--- /dev/null
+++ b/sys-apps/openrc/files/openrc-0.45.2-grep-3.8.patch
@@ -0,0 +1,35 @@
+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 <particleflux@gmail.com>
+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-r1.ebuild b/sys-apps/openrc/openrc-0.45.2-r2.ebuild
similarity index 97%
rename from sys-apps/openrc/openrc-0.45.2-r1.ebuild
rename to sys-apps/openrc/openrc-0.45.2-r2.ebuild
index 806d414f6ac0..1d0fad63f7ab 100644
--- a/sys-apps/openrc/openrc-0.45.2-r1.ebuild
+++ b/sys-apps/openrc/openrc-0.45.2-r2.ebuild
@@ -55,10 +55,14 @@ RDEPEND="${COMMON_DEPEND}
PDEPEND="netifrc? ( net-misc/netifrc )"
+PATCHES=(
+ "${FILESDIR}"/${P}-grep-3.8.patch
+)
+
src_configure() {
local emesonargs=(
- $(meson_feature audit)
- "-Dbranding=\"Gentoo Linux\""
+ $(meson_feature audit)
+ "-Dbranding=\"Gentoo Linux\""
$(meson_use newnet)
-Dos=Linux
$(meson_use pam)
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/openrc/files/, sys-apps/openrc/
@ 2023-04-12 19:20 William Hubbs
0 siblings, 0 replies; 6+ messages in thread
From: William Hubbs @ 2023-04-12 19:20 UTC (permalink / raw
To: gentoo-commits
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 <particleflux@gmail.com>
-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
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-04-12 19:20 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-11-22 11:44 [gentoo-commits] repo/gentoo:master commit in: sys-apps/openrc/files/, sys-apps/openrc/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2023-04-12 19:20 William Hubbs
2022-12-03 12:17 Sam James
2021-09-04 21:26 William Hubbs
2020-03-21 20:35 Sergei Trofimovich
2018-05-01 21:19 William Hubbs
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox