opensysusers-0.3.2-4.parabola1: rebuild

2 files changed, 45 insertions, 13 deletions

diff --git a/pcr/opensysusers/PKGBUILD b/pcr/opensysusers/PKGBUILD
index e49c7162e..c4ec3993f 100644
--- a/pcr/opensysusers/PKGBUILD
+++ b/pcr/opensysusers/PKGBUILD
@@ -1,12 +1,12 @@
-# Maintainer: David P. <megver83@parabola.nu>
-# Contributor: Omar Vega Ramos <ovruni@gnu.org.pe>
+# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
+# Contributor: David P. <megver83@parabola.nu>
 # Maintainer (Artix): Chris Cromer <chris@artixlinux.org>
 
 _url="https://github.com/artix-linux/opensysusers/archive"
 
 pkgname=opensysusers
 pkgver=0.3.2
-pkgrel=1.parabola1
+pkgrel=4.parabola1
 pkgdesc="A standalone utility for handling systemd-style sysusers.d users and groups"
 arch=('any')
 url="https://github.com/artix-linux/opensysusers"
@@ -15,17 +15,26 @@ groups=('openrc-base' 'base-openrc')
 depends=('shadow')
 optdepends=('openrc: update automatically on boot')
 source=("${pkgname}-${pkgver}.tar.gz::${_url}/${pkgver}.tar.gz"
-        'opensysusers.hook')
-sha512sums=('713bce28364e4cb19271ad8f3f5fe4e45b688d1c3724c6cdfc6e014fe5ebdd107c1a0f46897e3cb1b885fca3385e46e6cb3cba119558b52580381260a21a23a0'
-            '1f5d110e0575ac41b66b3710e26a85cb9806589fb543c2ffaed81643225de0e23d473342931c12dd725e3b4744a5fb71b7bb9c5731dc0a7dfb02add019acebc9')
+        'opensysusers.hook'
+        sysgid.patch::"https://github.com/artix-linux/opensysusers/commit/3f451ccfe5e5943d0ebc98f5f0d095a6c0ee11b4.patch")
+sha256sums=('0a3ffb2bf5a3baa9bd49ef522d4bef7fbfa2f51ca6cce24d6354a7ae3c0344d8'
+            '90fdf362a29138f1ed65e86e8b97d1251adb6b2e94d829cceb0094a63d00252a'
+            '8575316ee9ab0f9b751e7856fbe28bfbe3d7442d56eab7582342d7bd8f1566d9')
+
+prepare(){
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    patch -Np 1 -i ${srcdir}/sysgid.patch
+}
 
 package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make bindir="/usr/bin" DESTDIR="${pkgdir}" install
-#	install -vDm0755 openrc/opensysusers.initd "${pkgdir}"/etc/init.d/opensysusers
-	install -vDm0644 "${srcdir}"/opensysusers.hook "${pkgdir}/usr/share/libalpm/hooks/opensysusers.hook"
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    make bindir="/usr/bin" DESTDIR="${pkgdir}" install
+    ln -snf "/usr/bin/sysusers" "${pkgdir}/usr/bin/systemd-sysusers"
+
+    install -vDm0755 openrc/opensysusers.initd "${pkgdir}"/etc/init.d/opensysusers
+    
+    install -dm0755 "${pkgdir}/etc/runlevels/boot"
+    ln -snf "/etc/init.d/opensysusers" "${pkgdir}/etc/runlevels/boot/opensysusers"
 
-	ln -snf "/usr/bin/sysusers" "${pkgdir}/usr/bin/systemd-sysusers"
-# 	install -dm0755 "${pkgdir}/etc/runlevels/boot"
-# 	ln -snf "/etc/init.d/opensysusers" "${pkgdir}/etc/runlevels/boot/opensysusers"
+    install -vDm0644 "${srcdir}"/opensysusers.hook "${pkgdir}/usr/share/libalpm/hooks/opensysusers.hook"
 }
diff --git a/pcr/opensysusers/sysgid.patch b/pcr/opensysusers/sysgid.patch
new file mode 100644
index 000000000..502217f5b
--- /dev/null
+++ b/pcr/opensysusers/sysgid.patch
@@ -0,0 +1,23 @@
+From 3f451ccfe5e5943d0ebc98f5f0d095a6c0ee11b4 Mon Sep 17 00:00:00 2001
+From: udeved <artoo@cromnix.org>
+Date: Sun, 7 Jan 2018 11:08:10 +0100
+Subject: [PATCH] sysusers: use a system gid in add_group() if id='-'  to get a
+ gid<1000
+
+---
+ sysusers | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/sysusers b/sysusers
+index 80442d3..d71fb61 100755
+--- a/sysusers
++++ b/sysusers
+@@ -17,7 +17,7 @@ add_group() {
+ 	getent group "${name}" >/dev/null
+ 	if [ "$?" -ne 0 ]; then
+ 		if [ "${id}" == '-' ]; then
+-			groupadd "${name}"
++			groupadd -r "${name}"
+ 		else
+ 			if ! grep -qiw "${id}" /etc/group; then
+ 				groupadd -g "${id}" "${name}"