summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Hubbs <williamh@gentoo.org>2021-09-18 15:31:50 -0500
committerWilliam Hubbs <williamh@gentoo.org>2021-09-18 15:32:28 -0500
commitef393aa67b39b67ca5e804a5a74db3771585aec4 (patch)
tree572780677bd4927bd8d060b12ca4871de06aa90d
parentsys-boot/aboot: Add newline at end of file (diff)
downloadgentoo-ef393aa6.tar.gz
gentoo-ef393aa6.tar.bz2
gentoo-ef393aa6.zip
sys-apps/openrc: fix selinux and audit build
Bug: https://bugs.gentoo.org/813483 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: William Hubbs <williamh@gentoo.org>
-rw-r--r--sys-apps/openrc/files/openrc-0.44.4-fix-build.patch36
-rw-r--r--sys-apps/openrc/openrc-0.44.4.ebuild4
2 files changed, 40 insertions, 0 deletions
diff --git a/sys-apps/openrc/files/openrc-0.44.4-fix-build.patch b/sys-apps/openrc/files/openrc-0.44.4-fix-build.patch
new file mode 100644
index 000000000000..f9f91e5d3374
--- /dev/null
+++ b/sys-apps/openrc/files/openrc-0.44.4-fix-build.patch
@@ -0,0 +1,36 @@
+From 28865d994099c4608cbd80f135f0733c1020ed5c Mon Sep 17 00:00:00 2001
+From: William Hubbs <w.d.hubbs@gmail.com>
+Date: Fri, 17 Sep 2021 14:24:36 -0500
+Subject: [PATCH] fix build for openrc and runscript
+
+X-Gentoo-Bug: 813483
+X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=813483
+---
+ src/rc/meson.build | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/rc/meson.build b/src/rc/meson.build
+index fb9de00b..3898ac0c 100644
+--- a/src/rc/meson.build
++++ b/src/rc/meson.build
+@@ -53,7 +53,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: [dl_dep, libpam, selinux_dep, util_dep],
++ dependencies: [audit_dep, dl_dep, libpam, libpam_misc, selinux_dep, util_dep],
+ include_directories: [incdir, einfo_incdir, rc_incdir],
+ install: true,
+ install_dir: sbindir)
+@@ -88,7 +88,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: [dl_dep, libpam, util_dep, selinux_dep],
++ dependencies: [audit_dep, dl_dep, libpam, util_dep, selinux_dep],
+ include_directories: [incdir, einfo_incdir, rc_incdir],
+ install: true,
+ install_dir: sbindir)
+--
+2.32.0
+
diff --git a/sys-apps/openrc/openrc-0.44.4.ebuild b/sys-apps/openrc/openrc-0.44.4.ebuild
index 8edadaf9e4e1..c369f95a562c 100644
--- a/sys-apps/openrc/openrc-0.44.4.ebuild
+++ b/sys-apps/openrc/openrc-0.44.4.ebuild
@@ -55,6 +55,10 @@ RDEPEND="${COMMON_DEPEND}
PDEPEND="netifrc? ( net-misc/netifrc )"
+PATCHES=(
+ "${FILESDIR}/${P}-fix-build.patch"
+)
+
src_configure() {
local emesonargs=(
$(meson_feature audit)