1 |
commit: ef393aa67b39b67ca5e804a5a74db3771585aec4 |
2 |
Author: William Hubbs <williamh <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Sep 18 20:31:50 2021 +0000 |
4 |
Commit: William Hubbs <williamh <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Sep 18 20:32:28 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef393aa6 |
7 |
|
8 |
sys-apps/openrc: fix selinux and audit build |
9 |
|
10 |
Bug: https://bugs.gentoo.org/813483 |
11 |
Package-Manager: Portage-3.0.20, Repoman-3.0.3 |
12 |
Signed-off-by: William Hubbs <williamh <AT> gentoo.org> |
13 |
|
14 |
.../openrc/files/openrc-0.44.4-fix-build.patch | 36 ++++++++++++++++++++++ |
15 |
sys-apps/openrc/openrc-0.44.4.ebuild | 4 +++ |
16 |
2 files changed, 40 insertions(+) |
17 |
|
18 |
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 |
19 |
new file mode 100644 |
20 |
index 00000000000..f9f91e5d337 |
21 |
--- /dev/null |
22 |
+++ b/sys-apps/openrc/files/openrc-0.44.4-fix-build.patch |
23 |
@@ -0,0 +1,36 @@ |
24 |
+From 28865d994099c4608cbd80f135f0733c1020ed5c Mon Sep 17 00:00:00 2001 |
25 |
+From: William Hubbs <w.d.hubbs@×××××.com> |
26 |
+Date: Fri, 17 Sep 2021 14:24:36 -0500 |
27 |
+Subject: [PATCH] fix build for openrc and runscript |
28 |
+ |
29 |
+X-Gentoo-Bug: 813483 |
30 |
+X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=813483 |
31 |
+--- |
32 |
+ src/rc/meson.build | 4 ++-- |
33 |
+ 1 file changed, 2 insertions(+), 2 deletions(-) |
34 |
+ |
35 |
+diff --git a/src/rc/meson.build b/src/rc/meson.build |
36 |
+index fb9de00b..3898ac0c 100644 |
37 |
+--- a/src/rc/meson.build |
38 |
++++ b/src/rc/meson.build |
39 |
+@@ -53,7 +53,7 @@ executable('openrc-run', |
40 |
+ rc_selinux_c, version_h], |
41 |
+ c_args : [cc_audit_flags, cc_branding_flags, cc_pam_flags, cc_selinux_flags], |
42 |
+ link_with: [libeinfo, librc], |
43 |
+- dependencies: [dl_dep, libpam, selinux_dep, util_dep], |
44 |
++ dependencies: [audit_dep, dl_dep, libpam, libpam_misc, selinux_dep, util_dep], |
45 |
+ include_directories: [incdir, einfo_incdir, rc_incdir], |
46 |
+ install: true, |
47 |
+ install_dir: sbindir) |
48 |
+@@ -88,7 +88,7 @@ executable('runscript', |
49 |
+ rc_selinux_c, version_h], |
50 |
+ c_args : [cc_audit_flags, cc_branding_flags, cc_pam_flags, cc_selinux_flags], |
51 |
+ link_with: [libeinfo, librc], |
52 |
+- dependencies: [dl_dep, libpam, util_dep, selinux_dep], |
53 |
++ dependencies: [audit_dep, dl_dep, libpam, util_dep, selinux_dep], |
54 |
+ include_directories: [incdir, einfo_incdir, rc_incdir], |
55 |
+ install: true, |
56 |
+ install_dir: sbindir) |
57 |
+-- |
58 |
+2.32.0 |
59 |
+ |
60 |
|
61 |
diff --git a/sys-apps/openrc/openrc-0.44.4.ebuild b/sys-apps/openrc/openrc-0.44.4.ebuild |
62 |
index 8edadaf9e4e..c369f95a562 100644 |
63 |
--- a/sys-apps/openrc/openrc-0.44.4.ebuild |
64 |
+++ b/sys-apps/openrc/openrc-0.44.4.ebuild |
65 |
@@ -55,6 +55,10 @@ RDEPEND="${COMMON_DEPEND} |
66 |
|
67 |
PDEPEND="netifrc? ( net-misc/netifrc )" |
68 |
|
69 |
+PATCHES=( |
70 |
+ "${FILESDIR}/${P}-fix-build.patch" |
71 |
+) |
72 |
+ |
73 |
src_configure() { |
74 |
local emesonargs=( |
75 |
$(meson_feature audit) |