From c2da6a9e5bbdd33788674f1a6220290f7a6d0a8c Mon Sep 17 00:00:00 2001 From: bill-auger Date: Mon, 11 Jun 2018 02:23:21 -0400 Subject: [opensysusers]: add missing groups adm,wheel,users (pcr-testing) --- pcr-testing/opensysusers/01-parabola-openrc.conf | 4 +++ pcr-testing/opensysusers/PKGBUILD | 43 ++++++++++++++++++++++++ pcr-testing/opensysusers/opensysusers.hook | 12 +++++++ pcr-testing/opensysusers/sysgid.patch | 23 +++++++++++++ 4 files changed, 82 insertions(+) create mode 100644 pcr-testing/opensysusers/01-parabola-openrc.conf create mode 100644 pcr-testing/opensysusers/PKGBUILD create mode 100644 pcr-testing/opensysusers/opensysusers.hook create mode 100644 pcr-testing/opensysusers/sysgid.patch diff --git a/pcr-testing/opensysusers/01-parabola-openrc.conf b/pcr-testing/opensysusers/01-parabola-openrc.conf new file mode 100644 index 000000000..2b6784c47 --- /dev/null +++ b/pcr-testing/opensysusers/01-parabola-openrc.conf @@ -0,0 +1,4 @@ +# default parabola groups +g adm 4 - - +g wheel 10 - - +g users 100 - - diff --git a/pcr-testing/opensysusers/PKGBUILD b/pcr-testing/opensysusers/PKGBUILD new file mode 100644 index 000000000..62624ff69 --- /dev/null +++ b/pcr-testing/opensysusers/PKGBUILD @@ -0,0 +1,43 @@ +# Maintainer: Omar Vega Ramos +# Contributor: David P. +# Maintainer (Artix): Chris Cromer + +_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 new file mode 100644 index 000000000..c5360d786 --- /dev/null +++ b/pcr-testing/opensysusers/opensysusers.hook @@ -0,0 +1,12 @@ +[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 new file mode 100644 index 000000000..502217f5b --- /dev/null +++ b/pcr-testing/opensysusers/sysgid.patch @@ -0,0 +1,23 @@ +From 3f451ccfe5e5943d0ebc98f5f0d095a6c0ee11b4 Mon Sep 17 00:00:00 2001 +From: udeved +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}" -- cgit v1.2.2