[Buildroot] [PATCH 1/1] package/openrc: bump to version 0.56

[Adam Duskett]

Other changes:
  - Update 0007-allow-setting-rc_libexecdir-path.patch to apply cleanly
  - Remove the split-usr logic, as it was removed in version 0.54. This
    logic is now handled by passing the following to meson during the
    configure stage: --bindir /bin --libdir /lib64 --libexecdir /lib
                     --sbindir /sbin
  - libcap is now a dependency
  - The audit package must be explicity set as disabled if not available.
    If not, configuration errors occure if audit is not found.

    
./support/testing/run-tests tests.init.test_openrc

11:45:44 TestInitSystemOpenrcRwFull               Starting
11:45:57 TestInitSystemOpenrcRwFull               Cleaning up
11:45:57 TestInitSystemOpenrcRoFull               Starting
11:46:10 TestInitSystemOpenrcRoFull               Cleaning up
11:46:10 TestInitSystemOpenrcMergedUsrFull        Starting
11:46:10 TestInitSystemOpenrcMergedUsrFull        Building
11:51:59 TestInitSystemOpenrcMergedUsrFull        Building done
11:52:12 TestInitSystemOpenrcMergedUsrFull        Cleaning up

----------------------------------------------------------------------
Ran 3 tests in 388.180s
OK

Signed-off-by: Adam Duskett <adam.duskett at amarulasolutions.com>
---
 ...0007-allow-setting-rc_libexecdir-path.patch | 16 ++++++++--------
 package/openrc/Config.in                       |  1 +
 package/openrc/openrc.hash                     |  2 +-
 package/openrc/openrc.mk                       | 18 +++++++++---------
 4 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/package/openrc/0007-allow-setting-rc_libexecdir-path.patch b/package/openrc/0007-allow-setting-rc_libexecdir-path.patch
index a11c789275..5787c26dde 100644
--- a/package/openrc/0007-allow-setting-rc_libexecdir-path.patch
+++ b/package/openrc/0007-allow-setting-rc_libexecdir-path.patch
@@ -4,12 +4,12 @@ Date: Wed, 8 Sep 2021 22:41:58 +0200
 Subject: [PATCH] allow setting rc_libexecdir path
 
   - Allow to change the rc dir name of the rc_libexecdir path
-  - Introduce a librcdir option for override with value 'rc'
+  - Introduce a librcdir option for override with value 'rc'6
 
 Upstream: https://github.com/OpenRC/openrc/pull/443
 
 Signed-off-by: artoo <artoo at artixlinux.org>
-[Adam: update for 0.50]
+[Adam: update for 0.56]
 Signed-off-by: Adam Duskett <adam.duskett at amarulasolutions.com>
 ---
  meson.build       | 2 +-
@@ -20,10 +20,10 @@ diff --git a/meson.build b/meson.build
 index 5b3f8fa..40d4be1 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -102,7 +102,7 @@ if os == 'Linux' and libexecdir == 'libexec'
-   libexecdir = 'lib'
- endif
- libexecdir = rootprefix / libexecdir
+@@ -85,7 +85,7 @@ bindir = get_option('prefix') / get_option('bindir')
+ libdir = get_option('prefix') / get_option('libdir')
+ pluginsdir = libdir / 'rc/plugins'
+ libexecdir = get_option('prefix') / get_option('libexecdir')
 -rc_libexecdir = libexecdir / 'rc'
 +rc_libexecdir = libexecdir / get_option('librcdir')
  rc_bindir = rc_libexecdir / 'bin'
@@ -33,8 +33,8 @@ diff --git a/meson_options.txt b/meson_options.txt
 index 2c74152..d2f67e4 100644
 --- a/meson_options.txt
 +++ b/meson_options.txt
-@@ -37,3 +37,5 @@ option('termcap', type : 'combo',
-   description : 'the termcap library to use')
+@@ -26,3 +26,5 @@ option('sysvinit', type : 'boolean', value : false,
+   description : 'enable SysVinit compatibility (linux only)')
  option('zsh-completions', type : 'boolean',
    description : 'install zsh completions')
 +option('librcdir', type : 'string', value : 'rc',
diff --git a/package/openrc/Config.in b/package/openrc/Config.in
index 42d7347b0e..e1f004212b 100644
--- a/package/openrc/Config.in
+++ b/package/openrc/Config.in
@@ -7,6 +7,7 @@ config BR2_PACKAGE_OPENRC
 	select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # kmod tools
 	select BR2_PACKAGE_KMOD # runtime
 	select BR2_PACKAGE_KMOD_TOOLS # runtime
+	select BR2_PACKAGE_LIBCAP # runtime
 	select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC
 	select BR2_PACKAGE_NCURSES
 	help
diff --git a/package/openrc/openrc.hash b/package/openrc/openrc.hash
index c1c16a8c45..85e869f82a 100644
--- a/package/openrc/openrc.hash
+++ b/package/openrc/openrc.hash
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256  0b911eee4e64ad5e6945c6fed572220d537dfd0108838fa6d6797a2d7ff9f052  openrc-0.52.1.tar.gz
+sha256  a06b530290057637eab17fc943cbf79c0335eb734ba71ece38b9f3acd8a341d4  openrc-0.56.tar.gz
 sha256  6ac2bf77510808fbec7dc86cbfbca98dfc4c6b47dc99e4ca77b5370e097d8e70  LICENSE
diff --git a/package/openrc/openrc.mk b/package/openrc/openrc.mk
index 69f5b3a121..67846ce0ea 100644
--- a/package/openrc/openrc.mk
+++ b/package/openrc/openrc.mk
@@ -4,22 +4,28 @@
 #
 ################################################################################
 
-OPENRC_VERSION = 0.52.1
+OPENRC_VERSION = 0.56
 OPENRC_SITE = $(call github,OpenRC,openrc,$(OPENRC_VERSION))
 OPENRC_LICENSE = BSD-2-Clause
 OPENRC_LICENSE_FILES = LICENSE
 OPENRC_CPE_ID_VALID = YES
 
-OPENRC_DEPENDENCIES = ncurses
+OPENRC_DEPENDENCIES = libcap ncurses
 
 OPENRC_CONF_OPTS = \
 	-Dos=Linux \
 	-Dlibrcdir=/usr/libexec/rc \
 	-Dpkgconfig=false \
 	-Dsysvinit=true \
-	-Drootprefix=/ \
 	-Dbranding="\"Buildroot $(BR2_VERSION_FULL)\""
 
+ifeq ($(BR2_PACKAGE_AUDIT),y)
+OPENRC_CONF_OPTS += -Daudit=enabled
+OPENRC_DEPENDENCIES += audit
+else
+OPENRC_CONF_OPTS += -Daudit=disabled
+endif
+
 ifeq ($(BR2_PACKAGE_BASH_COMPLETION),y)
 OPENRC_CONF_OPTS += -Dbash-completions=true
 else
@@ -44,12 +50,6 @@ else
 OPENRC_CONF_OPTS += -Dpam=false
 endif
 
-ifeq ($(BR2_ROOTFS_MERGED_USR),y)
-OPENRC_CONF_OPTS += -Dsplit-usr=false
-else
-OPENRC_CONF_OPTS += -Dsplit-usr=true
-endif
-
 define OPENRC_INSTALL_SYSV_RCS_SCRIPT
 	$(INSTALL) -D -m 0755 $(OPENRC_PKGDIR)/sysv-rcs \
 		$(TARGET_DIR)/etc/init.d/sysv-rcs
-- 
2.47.1