rm -rf pcr/opensysusers && mv -T pcr{-testing,}/opensysusers

I've already run `db-move` to move it in the repos.

5 files changed, 5 insertions, 80 deletions

diff --git a/pcr-testing/opensysusers/PKGBUILD b/pcr-testing/opensysusers/PKGBUILD
deleted file mode 100644
index 62624ff69..000000000
--- a/pcr-testing/opensysusers/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# 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=5.parabola1
-pkgdesc="A standalone utility for handling systemd-style sysusers.d users and groups"
-arch=('any')
-url="https://github.com/artix-linux/opensysusers"
-license=('BSD2')
-groups=('openrc-base' 'base-openrc')
-depends=('shadow')
-optdepends=('openrc: update automatically on boot')
-source=("${pkgname}-${pkgver}.tar.gz::${_url}/${pkgver}.tar.gz"
-        '01-parabola-openrc.conf'
-        'opensysusers.hook'
-        sysgid.patch::"https://github.com/artix-linux/opensysusers/commit/3f451ccfe5e5943d0ebc98f5f0d095a6c0ee11b4.patch")
-sha256sums=('0a3ffb2bf5a3baa9bd49ef522d4bef7fbfa2f51ca6cce24d6354a7ae3c0344d8'
-            'cd69beb651c6807cbea4a520a7a38f7ff12431cd26359019e3ce89ed639a200d'
-            '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
-    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"
-
-    install -vDm0644 "${srcdir}"/01-parabola-openrc.conf "${pkgdir}/usr/lib/sysusers.d/01-parabola-openrc.conf"
-    install -vDm0644 "${srcdir}"/opensysusers.hook "${pkgdir}/usr/share/libalpm/hooks/opensysusers.hook"
-}
diff --git a/pcr-testing/opensysusers/opensysusers.hook b/pcr-testing/opensysusers/opensysusers.hook
deleted file mode 100644
index c5360d786..000000000
--- a/pcr-testing/opensysusers/opensysusers.hook
+++ /dev/null
@@ -1,12 +0,0 @@
-[Trigger]
-Type = File
-Operation = Install
-Operation = Upgrade
-Target = usr/lib/sysusers.d/*
-Target = etc/sysusers.d/*
-Target = run/sysusers.d/*
-
-[Action]
-Description = Updating system users and groups
-When = PostTransaction
-Exec = /usr/bin/sysusers
diff --git a/pcr-testing/opensysusers/sysgid.patch b/pcr-testing/opensysusers/sysgid.patch
deleted file mode 100644
index 502217f5b..000000000
--- a/pcr-testing/opensysusers/sysgid.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-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}"
diff --git a/pcr-testing/opensysusers/01-parabola-openrc.conf b/pcr/opensysusers/01-parabola-openrc.conf
index 2b6784c47..2b6784c47 100644
--- a/pcr-testing/opensysusers/01-parabola-openrc.conf
+++ b/pcr/opensysusers/01-parabola-openrc.conf
diff --git a/pcr/opensysusers/PKGBUILD b/pcr/opensysusers/PKGBUILD
index c4ec3993f..62624ff69 100644
--- a/pcr/opensysusers/PKGBUILD
+++ b/pcr/opensysusers/PKGBUILD
@@ -6,7 +6,7 @@ _url="https://github.com/artix-linux/opensysusers/archive"
 
 pkgname=opensysusers
 pkgver=0.3.2
-pkgrel=4.parabola1
+pkgrel=5.parabola1
 pkgdesc="A standalone utility for handling systemd-style sysusers.d users and groups"
 arch=('any')
 url="https://github.com/artix-linux/opensysusers"
@@ -15,9 +15,11 @@ groups=('openrc-base' 'base-openrc')
 depends=('shadow')
 optdepends=('openrc: update automatically on boot')
 source=("${pkgname}-${pkgver}.tar.gz::${_url}/${pkgver}.tar.gz"
+        '01-parabola-openrc.conf'
         'opensysusers.hook'
         sysgid.patch::"https://github.com/artix-linux/opensysusers/commit/3f451ccfe5e5943d0ebc98f5f0d095a6c0ee11b4.patch")
 sha256sums=('0a3ffb2bf5a3baa9bd49ef522d4bef7fbfa2f51ca6cce24d6354a7ae3c0344d8'
+            'cd69beb651c6807cbea4a520a7a38f7ff12431cd26359019e3ce89ed639a200d'
             '90fdf362a29138f1ed65e86e8b97d1251adb6b2e94d829cceb0094a63d00252a'
             '8575316ee9ab0f9b751e7856fbe28bfbe3d7442d56eab7582342d7bd8f1566d9')
 
@@ -32,9 +34,10 @@ package() {
     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"
 
+    install -vDm0644 "${srcdir}"/01-parabola-openrc.conf "${pkgdir}/usr/lib/sysusers.d/01-parabola-openrc.conf"
     install -vDm0644 "${srcdir}"/opensysusers.hook "${pkgdir}/usr/share/libalpm/hooks/opensysusers.hook"
 }