commit:     132a79b8f1c419e980092d1cc8c5a9c3133a82a7
Author:     Anna (navi) Figueiredo Gomes <navi <AT> vlhl <DOT> dev>
AuthorDate: Sun Mar  2 15:22:08 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Mar  2 15:30:38 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=132a79b8

sys-apps/openrc: add patch to load proper rc.conf

Signed-off-by: Anna (navi) Figueiredo Gomes <navi <AT> vlhl.dev>
Closes: https://github.com/gentoo/gentoo/pull/40849
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-apps/openrc/files/openrc-0.60-rc-conf.patch            | 14 ++++++++++++++
 .../openrc/{openrc-0.60.ebuild => openrc-0.60-r1.ebuild}   |  4 ++++
 2 files changed, 18 insertions(+)

diff --git a/sys-apps/openrc/files/openrc-0.60-rc-conf.patch 
b/sys-apps/openrc/files/openrc-0.60-rc-conf.patch
new file mode 100644
index 000000000000..28ed4a2a3d29
--- /dev/null
+++ b/sys-apps/openrc/files/openrc-0.60-rc-conf.patch
@@ -0,0 +1,14 @@
+# commit 
https://github.com/OpenRC/openrc/commit/01ba72b0b7f9b4c5ef7271ef05094f88ad0c96a8
+diff --git a/src/librc/librc-misc.c b/src/librc/librc-misc.c
+index b1b9da46..b309396c 100644
+--- a/src/librc/librc-misc.c
++++ b/src/librc/librc-misc.c
+@@ -418,7 +418,7 @@ rc_conf_value(const char *setting)
+       }
+ 
+       xasprintf(&conf, "%s/%s", sysconfdir, "rc.conf");
+-      rc_conf_append(sysconfdir);
++      rc_conf_append(conf);
+       free(conf);
+ 
+       /* Support old configs. */

diff --git a/sys-apps/openrc/openrc-0.60.ebuild 
b/sys-apps/openrc/openrc-0.60-r1.ebuild
similarity index 98%
rename from sys-apps/openrc/openrc-0.60.ebuild
rename to sys-apps/openrc/openrc-0.60-r1.ebuild
index 0d8bd26defb3..133fe4156b9c 100644
--- a/sys-apps/openrc/openrc-0.60.ebuild
+++ b/sys-apps/openrc/openrc-0.60-r1.ebuild
@@ -50,6 +50,10 @@ RDEPEND="${COMMON_DEPEND}
 
 PDEPEND="netifrc? ( net-misc/netifrc )"
 
+PATCHES=(
+       "${FILESDIR}/${P}-rc-conf.patch"
+)
+
 src_configure() {
        local emesonargs=(
        --bindir=/bin

Reply via email to