From 9f623d3616707285d6e8ab7678c9f1d911163fa0 Mon Sep 17 00:00:00 2001
From: David P <megver83@parabola.nu>
Date: Sat, 30 May 2020 19:36:00 -0400
Subject: updpkg: nonsystemd/openrc 0.42.1-6

Signed-off-by: David P <megver83@parabola.nu>
---
 nonsystemd/openrc/30-binfmt.hook  |  2 +-
 nonsystemd/openrc/30-sysctl.hook  |  2 +-
 nonsystemd/openrc/PKGBUILD        | 31 +++++++++++++++++++++++++------
 nonsystemd/openrc/binfmt-sh.patch | 18 ------------------
 4 files changed, 27 insertions(+), 26 deletions(-)
 delete mode 100644 nonsystemd/openrc/binfmt-sh.patch

diff --git a/nonsystemd/openrc/30-binfmt.hook b/nonsystemd/openrc/30-binfmt.hook
index 459d38296..40624de5b 100644
--- a/nonsystemd/openrc/30-binfmt.hook
+++ b/nonsystemd/openrc/30-binfmt.hook
@@ -1,5 +1,5 @@
 [Trigger]
-Type = File
+Type = Path
 Operation = Install
 Operation = Upgrade
 Target = usr/lib/binfmt.d/*.conf
diff --git a/nonsystemd/openrc/30-sysctl.hook b/nonsystemd/openrc/30-sysctl.hook
index 922705101..8f3deda0a 100644
--- a/nonsystemd/openrc/30-sysctl.hook
+++ b/nonsystemd/openrc/30-sysctl.hook
@@ -1,5 +1,5 @@
 [Trigger]
-Type = File
+Type = Path
 Operation = Install
 Operation = Upgrade
 Target = etc/sysctl.d/*.conf
diff --git a/nonsystemd/openrc/PKGBUILD b/nonsystemd/openrc/PKGBUILD
index bc4dd651a..52b8a777a 100644
--- a/nonsystemd/openrc/PKGBUILD
+++ b/nonsystemd/openrc/PKGBUILD
@@ -10,7 +10,7 @@ pkgbase=openrc
 pkgname=('openrc' 'openrc-bash-completions' 'openrc-zsh-completions'
          'openrc-init' 'openrc-sysvinit' 'openrc-net')
 pkgver=0.42.1
-pkgrel=5
+pkgrel=6
 pkgdesc="Gentoo's universal init system"
 arch=('x86_64' 'i686' 'armv7h')
 url="https://github.com/OpenRC/openrc"
@@ -24,17 +24,27 @@ source=("${pkgbase}-${pkgver}.tar.gz::${url}/archive/${pkgver}.tar.gz"
         'sysctl.conf'
         '30-binfmt.hook'
         'kmod-static-nodes.initd'
-        'binfmt-sh.patch')
+        gcc-10-fix.patch::${url}/commit/375ef42393f3dc6edbaa2cb70c79b2366072db38.patch
+        supervise-daemon-fix.patch::${url}/commit/6deda13754f1b60245945e953cce8d97e40e86fc.patch
+        openrc-shutdown-fix.patch::${url}/commit/fd852865e06a74ecf8b77ff534fa8053e020160f.patch
+        posix-compliant-grep.patch::${url}/commit/a7e7fd2b37a7666f26c2d4de9386b2d04f583b41.patch
+        binfmt-fix.patch::${url}/commit/eb610859519292c6164c4ba601d22e642c306beb.patch
+        cgroup2-verify.patch::${url}/commit/87cfad3d6cd619c6090e8209092448ae68279b0c.patch)
 sha256sums=('91a01ca6d930a0688fb91338209985de57cac7aa2d37feddacb78fd3d95308e2'
             '5211012d0e1bdfc1a32113cee5a2eec3a2be4b3549f88216cdecbadd6ca46d81'
             '0b44210db9770588bd491cd6c0ac9412d99124c6be4c9d3f7d31ec8746072f5c'
             '7de1e65f48ba31fc015cfb77be167b41aabdf0f20cb6617ecf3f4c3ca434c9e8'
             'a3fda2186e023ae60c0e0d3806ffeb95effe675acea03cdfd0bf30e8f1c188d4'
-            'cb5bc649c2c9998300aff1e9862a9404b44e53178d153d68288603e99c5aaefe'
+            '28ec075d30096bd54499e994f76f8526460474f1e4c33607045c1a71b0684263'
             '4170bcf3655ff6fb32b35fc592a4294a64d25df98d2f0f09f467689ed1ad54ea'
-            '1f4cd15749ff89fd564e216ff0c1f9ff085e0200dba24d74e3de948f681bd80f'
+            '28aa413fd78bca98bb23294eeb3f49149825a2c2f97a7ee10039385f5e8e50e9'
             '3ecbe7761b92a123a5a3d395ec3d9e090b0dfba7910a5987b4a2298c20a7e571'
-            '3680546deb196de39a2ea4f7a3b30977773be011cc1f0285e64015f41c18e853')
+            'addb1bf115b811fba3d120f5c68535ec07f32a55e570b661f1e5575f74327bac'
+            '654dada5ffe56d6ae10d0ea4f9cb62c8c6c39a5398cd02561419a8bbf3f686b7'
+            '5576a8b6c9fbe79ede027ed053f922da60d1cbe818803677f5aa5532f98ffac4'
+            '46f6e809aabb629212a739af7f5177930e9c4a7f2adfdfc59911d778d3716ec9'
+            '7e5d7dc888327ef99637fa7207ac9470d72cc37198ddd7ba2cdf72d10a1c7031'
+            '41c6598da76bcdcdc8d9349f559bc6b587a6f6dec55bf7c79669af2b28af43e1')
 
 _args=(
     BRANDING='Parabola GNU/Linux-libre'
@@ -54,7 +64,12 @@ _args=(
 prepare(){
     cd "${srcdir}/${pkgbase}-${pkgver}"
     sed -i 's:0444:0644:' mk/sys.mk
-    patch -Np 1 -i ../binfmt-sh.patch
+    patch -Np 1 -i ../gcc-10-fix.patch
+    patch -Np 1 -i ../supervise-daemon-fix.patch
+    patch -Np 1 -i ../openrc-shutdown-fix.patch
+    patch -Np 1 -i ../posix-compliant-grep.patch
+    patch -Np 1 -i ../binfmt-fix.patch
+    patch -Np 1 -i ../cgroup2-verify.patch
 
     # make bootmisc work with sysvinit too
     patch -RNp1 -i ../revert.patch
@@ -162,6 +177,10 @@ package_openrc() {
     # kmod staticc nodes
     install -m755 "${srcdir}"/kmod-static-nodes.initd "${pkgdir}"/etc/init.d/kmod-static-nodes
     ln -snf /etc/init.d/kmod-static-nodes "${pkgdir}"/etc/runlevels/sysinit/kmod-static-nodes
+
+    # do not enable hwclock by default since our kernels handle the system time
+    # https://wiki.gentoo.org/wiki/System_time#OpenRC_2
+    rm "${pkgdir}"/etc/runlevels/boot/hwclock
 }
 
 package_openrc-bash-completions() {
diff --git a/nonsystemd/openrc/binfmt-sh.patch b/nonsystemd/openrc/binfmt-sh.patch
deleted file mode 100644
index dc12824d3..000000000
--- a/nonsystemd/openrc/binfmt-sh.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-0a6df09c5bb82bf964177dd3e1c03cb9cf7a8c42
- sh/binfmt.sh.in | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/sh/binfmt.sh.in b/sh/binfmt.sh.in
-index ca4a8833..34d6d5e3 100644
---- a/sh/binfmt.sh.in
-+++ b/sh/binfmt.sh.in
-@@ -29,6 +29,9 @@ apply_file() {
- 			\;*) continue ;;
- 		esac
-
-+		local reg=${line#*:}
-+        [ -e /proc/sys/fs/binfmt_misc/${reg%%:*} ] && echo -1 > /proc/sys/fs/binfmt_misc/${reg%%:*}
-+
- 		echo "${line}" > /proc/sys/fs/binfmt_misc/register
- 		rc=$?
- 		if [ $rc -ne 0 ]; then
-- 
cgit v1.2.3