From 93b0513be9422e1666163d89031419412866e370 Mon Sep 17 00:00:00 2001
From: Max Rees <maxcrees@me.com>
Date: Mon, 22 Jul 2019 02:13:03 -0400
Subject: [PATCH] user/*: use useradd, groupadd instead of adduser, addgroup
---
user/apache-httpd/APKBUILD | 2 +-
user/apache-httpd/apache-httpd.pre-install | 8 ++++----
user/apache-httpd/apache-httpd.pre-upgrade | 9 +--------
user/bind/APKBUILD | 2 +-
user/bind/bind.pre-install | 4 ++--
user/chrony/APKBUILD | 2 +-
user/chrony/chrony.pre-install | 5 +++--
user/cups/APKBUILD | 2 +-
user/cups/cups.pre-install | 7 +++----
user/dbus/APKBUILD | 2 +-
user/dbus/dbus.pre-install | 5 +++--
user/distcc/APKBUILD | 2 +-
user/distcc/distcc.pre-install | 5 +++--
user/libgphoto2/APKBUILD | 2 +-
user/libgphoto2/libgphoto2.pre-install | 2 +-
user/lighttpd/APKBUILD | 2 +-
user/lighttpd/lighttpd.pre-install | 8 ++++----
user/nextcloud/APKBUILD | 2 +-
user/nextcloud/nextcloud.pre-install | 5 +++--
user/openldap/APKBUILD | 2 +-
user/openldap/openldap.pre-install | 6 +++---
user/openvpn/APKBUILD | 2 +-
user/openvpn/openvpn.pre-install | 5 +++--
user/pcsc-lite/APKBUILD | 2 +-
user/pcsc-lite/pcsc-lite.pre-install | 9 +++------
user/prosody/APKBUILD | 2 +-
user/prosody/prosody.pre-install | 10 +++-------
user/pulseaudio/APKBUILD | 2 +-
user/pulseaudio/pulseaudio.pre-install | 8 ++++----
user/qemu/APKBUILD | 2 +-
user/qemu/qemu.pre-install | 4 ++--
user/redis/APKBUILD | 2 +-
user/redis/redis.pre-install | 5 +++--
user/rpcbind/APKBUILD | 2 +-
user/rpcbind/rpcbind.pre-install | 5 +++--
user/sane/APKBUILD | 2 +-
user/sane/sane.pre-install | 2 +-
user/sane/saned.pre-install | 3 ++-
user/strongswan/APKBUILD | 2 +-
user/strongswan/strongswan.pre-install | 5 +++--
user/vde2/APKBUILD | 2 +-
user/vde2/vde2.pre-install | 5 +++--
user/vlc/APKBUILD | 2 +-
user/vlc/vlc-daemon.pre-install | 16 +++++-----------
44 files changed, 86 insertions(+), 97 deletions(-)
mode change 100644 => 120000 user/apache-httpd/apache-httpd.pre-upgrade
diff --git a/user/apache-httpd/APKBUILD b/user/apache-httpd/APKBUILD
index fb5e75d290..90a098922f 100644
--- a/user/apache-httpd/APKBUILD
+++ b/user/apache-httpd/APKBUILD
@@ -3,7 +3,7 @@
pkgname=apache-httpd
_pkgreal=httpd
pkgver=2.4.39
-pkgrel=0
+pkgrel=1
pkgdesc="Open-source HTTP server"
url="https://httpd.apache.org"
arch="all"
diff --git a/user/apache-httpd/apache-httpd.pre-install b/user/apache-httpd/apache-httpd.pre-install
index d4ede74766..49adfaab73 100644
--- a/user/apache-httpd/apache-httpd.pre-install
+++ b/user/apache-httpd/apache-httpd.pre-install
@@ -1,8 +1,8 @@
#!/bin/sh
-addgroup -S -g 82 www-data 2>/dev/null
-addgroup -S apache 2>/dev/null
-adduser -S -D -H -h /var/www -s /sbin/nologin -G apache -g apache apache 2>/dev/null
-addgroup apache www-data 2>/dev/null
+groupadd -r -g 82 www-data 2>/dev/null
+groupadd -r apache 2>/dev/null
+useradd -c apache -s /sbin/nologin -g apache -G www-data \
+ -m -d /var/www -k /etc/skel -r apache 2>/dev/null
exit 0
diff --git a/user/apache-httpd/apache-httpd.pre-upgrade b/user/apache-httpd/apache-httpd.pre-upgrade
deleted file mode 100644
index d4ede74766..0000000000
--- a/user/apache-httpd/apache-httpd.pre-upgrade
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-addgroup -S -g 82 www-data 2>/dev/null
-addgroup -S apache 2>/dev/null
-adduser -S -D -H -h /var/www -s /sbin/nologin -G apache -g apache apache 2>/dev/null
-addgroup apache www-data 2>/dev/null
-
-exit 0
diff --git a/user/apache-httpd/apache-httpd.pre-upgrade b/user/apache-httpd/apache-httpd.pre-upgrade
new file mode 120000
index 0000000000..02edc914cf
--- /dev/null
+++ b/user/apache-httpd/apache-httpd.pre-upgrade
@@ -0,0 +1 @@
+apache-httpd.pre-install
\ No newline at end of file
diff --git a/user/bind/APKBUILD b/user/bind/APKBUILD
index 41eca142e8..aae3a8f340 100644
--- a/user/bind/APKBUILD
+++ b/user/bind/APKBUILD
@@ -9,7 +9,7 @@ _p=${pkgver#*_p}
_ver=${pkgver%_p*}
_major=${pkgver%%.*}
[ "$_p" != "$pkgver" ] && _ver="${_ver}-P$_p"
-pkgrel=1
+pkgrel=2
pkgdesc="The ISC DNS server"
url="https://www.isc.org/downloads/bind/"
arch="all"
diff --git a/user/bind/bind.pre-install b/user/bind/bind.pre-install
index 3f7c36847c..b9be049673 100644
--- a/user/bind/bind.pre-install
+++ b/user/bind/bind.pre-install
@@ -1,6 +1,6 @@
#!/bin/sh
-addgroup -S named 2>/dev/null
-adduser -S -D -H -h /etc/bind -s /sbin/nologin -G named -g named named 2>/dev/null
+groupadd -r named 2>/dev/null
+useradd -c named -s /sbin/nologin -g named -m -d /etc/bind -k /etc/skel -r named 2>/dev/null
exit 0
diff --git a/user/chrony/APKBUILD b/user/chrony/APKBUILD
index 3132b5f33e..01f3a13b7a 100644
--- a/user/chrony/APKBUILD
+++ b/user/chrony/APKBUILD
@@ -4,7 +4,7 @@
# Maintainer: Dan Theisen <djt@hxx.in>
pkgname=chrony
pkgver=3.5
-pkgrel=0
+pkgrel=1
pkgdesc="NTP client and server programs"
url="https://chrony.tuxfamily.org"
pkgusers="$pkgname"
diff --git a/user/chrony/chrony.pre-install b/user/chrony/chrony.pre-install
index 897fb74cca..dca301662b 100644
--- a/user/chrony/chrony.pre-install
+++ b/user/chrony/chrony.pre-install
@@ -1,6 +1,7 @@
#!/bin/sh
-addgroup -S chrony 2>/dev/null
-adduser -S -D -h /var/log/chrony -s /sbin/nologin -G chrony -g chrony chrony 2>/dev/null
+groupadd -r chrony 2>/dev/null
+useradd -c chrony -s /sbin/nologin -g chrony \
+ -m -d /var/log/chrony -k /etc/skel -r chrony 2>/dev/null
exit 0
diff --git a/user/cups/APKBUILD b/user/cups/APKBUILD
index f37bc34d08..efc7566af2 100644
--- a/user/cups/APKBUILD
+++ b/user/cups/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer:
pkgname=cups
pkgver=2.2.11
-pkgrel=0
+pkgrel=1
pkgdesc="The CUPS Printing System"
url="https://www.cups.org/"
arch="all"
diff --git a/user/cups/cups.pre-install b/user/cups/cups.pre-install
index cdb75cac56..9776f0796b 100644
--- a/user/cups/cups.pre-install
+++ b/user/cups/cups.pre-install
@@ -1,8 +1,7 @@
#!/bin/sh
-addgroup -S lpadmin 2>/dev/null
-addgroup -S lp 2>/dev/null
-adduser -S -G lp -g lp lp 2>/dev/null
-addgroup lp lp 2>/dev/null
+groupadd -r lpadmin 2>/dev/null
+groupadd -r lp 2>/dev/null
+useradd -c lp -s /sbin/nologin -g lp -r lp 2>/dev/null
exit 0
diff --git a/user/dbus/APKBUILD b/user/dbus/APKBUILD
index 72b009f385..d9a305186d 100644
--- a/user/dbus/APKBUILD
+++ b/user/dbus/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=dbus
pkgver=1.12.16
-pkgrel=0
+pkgrel=1
pkgdesc="IPC/message bus system, allowing user applications to communicate"
url="http://www.freedesktop.org/wiki/Software/dbus/"
pkggroups="messagebus"
diff --git a/user/dbus/dbus.pre-install b/user/dbus/dbus.pre-install
index 8896517210..e5b299aaf6 100644
--- a/user/dbus/dbus.pre-install
+++ b/user/dbus/dbus.pre-install
@@ -1,6 +1,7 @@
#!/bin/sh
-addgroup -S messagebus 2>/dev/null
-adduser -S -D -H -h /dev/null -s /sbin/nologin -G messagebus -g "D-Bus User" messagebus 2>/dev/null
+groupadd -r messagebus 2>/dev/null
+useradd -c "D-Bus User" -s /sbin/nologin -g messagebus \
+ -m -d /dev/null -k /etc/skel -r messagebus 2>/dev/null
exit 0
diff --git a/user/distcc/APKBUILD b/user/distcc/APKBUILD
index 9584cab673..c70c6225eb 100644
--- a/user/distcc/APKBUILD
+++ b/user/distcc/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer:
pkgname=distcc
pkgver=3.3.2
-pkgrel=0
+pkgrel=1
pkgdesc="Distributed builds for C, C++ and Objective C"
url="https://distcc.github.io/"
arch="all"
diff --git a/user/distcc/distcc.pre-install b/user/distcc/distcc.pre-install
index ded93fd090..9f5010cd16 100644
--- a/user/distcc/distcc.pre-install
+++ b/user/distcc/distcc.pre-install
@@ -1,6 +1,7 @@
#!/bin/sh
-addgroup -S distcc 2>/dev/null
-adduser -S -D -H -h /var/lib/distcc -s /bin/false -G distcc -g distcc distcc 2>/dev/null
+groupadd -r distcc 2>/dev/null
+useradd -c distcc -s /sbin/nologin -g distcc \
+ -m -d /var/lib/distcc -k /etc/skel -r distcc 2>/dev/null
exit 0
diff --git a/user/libgphoto2/APKBUILD b/user/libgphoto2/APKBUILD
index 59cd04e357..c1250aabbd 100644
--- a/user/libgphoto2/APKBUILD
+++ b/user/libgphoto2/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer:
pkgname=libgphoto2
pkgver=2.5.23
-pkgrel=0
+pkgrel=1
pkgdesc="Digital camera library"
url="http://www.gphoto.org"
arch="all"
diff --git a/user/libgphoto2/libgphoto2.pre-install b/user/libgphoto2/libgphoto2.pre-install
index c696fcdcaf..7e52e2fe3e 100644
--- a/user/libgphoto2/libgphoto2.pre-install
+++ b/user/libgphoto2/libgphoto2.pre-install
@@ -1,5 +1,5 @@
#!/bin/sh
-addgroup -S camera 2>/dev/null
+groupadd -r camera 2>/dev/null
exit 0
diff --git a/user/lighttpd/APKBUILD b/user/lighttpd/APKBUILD
index 113d84c043..6a6420b067 100644
--- a/user/lighttpd/APKBUILD
+++ b/user/lighttpd/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=lighttpd
pkgver=1.4.54
-pkgrel=0
+pkgrel=1
pkgdesc="A secure, fast, compliant and very flexible web-server"
url="http://www.lighttpd.net/"
arch="all"
diff --git a/user/lighttpd/lighttpd.pre-install b/user/lighttpd/lighttpd.pre-install
index 81ccda1f95..bdc9b91b6d 100644
--- a/user/lighttpd/lighttpd.pre-install
+++ b/user/lighttpd/lighttpd.pre-install
@@ -1,8 +1,8 @@
#!/bin/sh
-addgroup -S -g 82 www-data 2>/dev/null
-addgroup -S lighttpd 2>/dev/null
-adduser -S -D -H -h /var/www/localhost/htdocs -s /sbin/nologin -G lighttpd -g lighttpd lighttpd 2>/dev/null
-addgroup lighttpd www-data 2>/dev/null
+groupadd -r -g 82 www-data 2>/dev/null
+groupadd -S lighttpd 2>/dev/null
+useradd -c lighttpd -s /sbin/nologin -g -G www-data \
+ lighttpd -m -d /var/www/localhost/htdocs -k /etc/skel -r lighttpd 2>/dev/null
exit 0
diff --git a/user/nextcloud/APKBUILD b/user/nextcloud/APKBUILD
index 6f86863ac6..e21c3bf545 100644
--- a/user/nextcloud/APKBUILD
+++ b/user/nextcloud/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: Max Rees <maxcrees@me.com>
pkgname=nextcloud
pkgver=14.0.3
-pkgrel=0
+pkgrel=1
pkgdesc="Self-hosted file sync and groupware server"
url="https://nextcloud.com"
arch="noarch"
diff --git a/user/nextcloud/nextcloud.pre-install b/user/nextcloud/nextcloud.pre-install
index e9cf53919c..f84fd15d83 100644
--- a/user/nextcloud/nextcloud.pre-install
+++ b/user/nextcloud/nextcloud.pre-install
@@ -1,6 +1,7 @@
#!/bin/sh
-addgroup -S -g 82 www-data 2>/dev/null
-adduser -S -D -H -h /var/lib/nextcloud -s /sbin/nologin -G www-data -g Nextcloud nextcloud 2>/dev/null
+groupadd -r -g 82 www-data 2>/dev/null
+useradd -c Nextcloud -s /sbin/nologin -g www-data \
+ -m -d /var/lib/nextcloud -k /etc/skel -r nextcloud 2>/dev/null
exit 0
diff --git a/user/openldap/APKBUILD b/user/openldap/APKBUILD
index 552c760c60..22d31dac76 100644
--- a/user/openldap/APKBUILD
+++ b/user/openldap/APKBUILD
@@ -10,7 +10,7 @@
#
pkgname=openldap
pkgver=2.4.47
-pkgrel=0
+pkgrel=1
pkgdesc="LDAP Server"
url="http://www.openldap.org/"
arch="all"
diff --git a/user/openldap/openldap.pre-install b/user/openldap/openldap.pre-install
index eb6b10fa41..6b8a4ce030 100644
--- a/user/openldap/openldap.pre-install
+++ b/user/openldap/openldap.pre-install
@@ -1,7 +1,7 @@
#!/bin/sh
-addgroup -S ldap 2>/dev/null
-adduser -S -D -H -h /usr/lib/openldap -s /sbin/nologin -G ldap \
- -g "OpenLdap User" ldap 2>/dev/null
+groupadd -r ldap 2>/dev/null
+useradd -c "OpenLdap User" -s /sbin/nologin -g ldap \
+ -m -d /usr/lib/openldap -k /etc/skel -r ldap 2>/dev/null
exit 0
diff --git a/user/openvpn/APKBUILD b/user/openvpn/APKBUILD
index 06317735b7..83627323d1 100644
--- a/user/openvpn/APKBUILD
+++ b/user/openvpn/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: Lee Starnes <lee@canned-death.us>
pkgname=openvpn
pkgver=2.4.6
-pkgrel=1
+pkgrel=2
pkgdesc="A robust, and highly configurable VPN (Virtual Private Network)"
url="https://openvpn.net/"
arch="all"
diff --git a/user/openvpn/openvpn.pre-install b/user/openvpn/openvpn.pre-install
index c072535310..07addd12f6 100644
--- a/user/openvpn/openvpn.pre-install
+++ b/user/openvpn/openvpn.pre-install
@@ -1,6 +1,7 @@
#!/bin/sh
-addgroup -S openvpn 2>/dev/null
-adduser -S -D -H -h /dev/null -s /sbin/nologin -G openvpn -g openvpn openvpn 2>/dev/null
+groupadd -r openvpn 2>/dev/null
+useradd -c openvpn -s /sbin/nologin -g openvpn \
+ -m -d /dev/null -k /etc/skel -r openvpn 2>/dev/null
exit 0
diff --git a/user/pcsc-lite/APKBUILD b/user/pcsc-lite/APKBUILD
index 9746a2d466..ff8a667a97 100644
--- a/user/pcsc-lite/APKBUILD
+++ b/user/pcsc-lite/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer:
pkgname=pcsc-lite
pkgver=1.8.25
-pkgrel=0
+pkgrel=1
pkgdesc="Middleware to access a smart card using SCard API (PC/SC)"
url="https://pcsclite.apdu.fr/"
arch="all"
diff --git a/user/pcsc-lite/pcsc-lite.pre-install b/user/pcsc-lite/pcsc-lite.pre-install
index 2e654f28dc..d5135dea65 100644
--- a/user/pcsc-lite/pcsc-lite.pre-install
+++ b/user/pcsc-lite/pcsc-lite.pre-install
@@ -1,10 +1,7 @@
#!/bin/sh
-username=pcscd
-groupname=$username
-
-addgroup -S $username 2>/dev/null
-adduser -S -D -H -h /var/run/$username -s /sbin/nologin -G $groupname \
- -g $username $username 2>/dev/null
+groupadd -r pcscd 2>/dev/null
+useradd -c pcscd -s /sbin/nologin -g pcscd \
+ -m -d /var/run/pcscd -k /etc/skel -r pcscd 2>/dev/null
exit 0
diff --git a/user/prosody/APKBUILD b/user/prosody/APKBUILD
index 8fc6ce35c0..89849d5a58 100644
--- a/user/prosody/APKBUILD
+++ b/user/prosody/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
pkgname=prosody
pkgver=0.11.2
-pkgrel=0
+pkgrel=1
pkgdesc="Lua based Jabber/XMPP server"
url="http://prosody.im/"
arch="all"
diff --git a/user/prosody/prosody.pre-install b/user/prosody/prosody.pre-install
index 39d9cfadda..fc2cf5194d 100644
--- a/user/prosody/prosody.pre-install
+++ b/user/prosody/prosody.pre-install
@@ -1,11 +1,7 @@
#!/bin/sh
-addgroup -S prosody 2>/dev/null
-adduser -S -D \
- -h /var/lib/prosody \
- -s /sbin/nologin \
- -G prosody \
- -g "Prosody XMPP Server" \
- prosody 2>/dev/null
+groupadd -r prosody 2>/dev/null
+useradd -c "Prosody XMPP Server" -s /sbin/nologin -g prosody \
+ -m -d /var/lib/prosody -k /etc/skel -r prosody 2>/dev/null
exit 0
diff --git a/user/pulseaudio/APKBUILD b/user/pulseaudio/APKBUILD
index bacaab7312..2829f044ab 100644
--- a/user/pulseaudio/APKBUILD
+++ b/user/pulseaudio/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=pulseaudio
pkgver=12.2
-pkgrel=3
+pkgrel=4
pkgdesc="A featureful, general-purpose sound server"
url="https://www.freedesktop.org/wiki/Software/PulseAudio"
pkgusers="pulse"
diff --git a/user/pulseaudio/pulseaudio.pre-install b/user/pulseaudio/pulseaudio.pre-install
index 7a1a18d594..4b942c2f88 100644
--- a/user/pulseaudio/pulseaudio.pre-install
+++ b/user/pulseaudio/pulseaudio.pre-install
@@ -1,8 +1,8 @@
#!/bin/sh
-addgroup -S pulse 2>/dev/null
-addgroup -S pulse-access 2>/dev/null
-adduser -S -D -H -h /var/empty -s /sbin/nologin -G pulse -g "PulseAudio daemon" pulse 2>/dev/null
-addgroup pulse pulse-access 2>/dev/null
+groupadd -r pulse 2>/dev/null
+groupadd -r pulse-access 2>/dev/null
+useradd -c "PulseAudio daemon" -s /sbin/nologin -g pulse -G pulse-access \
+ -m -d /var/empty -k /etc/skel -r pulse 2>/dev/null
exit 0
diff --git a/user/qemu/APKBUILD b/user/qemu/APKBUILD
index cd6e236d88..d2b372b0cc 100644
--- a/user/qemu/APKBUILD
+++ b/user/qemu/APKBUILD
@@ -5,7 +5,7 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=qemu
pkgver=3.0.0
-pkgrel=2
+pkgrel=3
pkgdesc="Machine emulator and virtualisation software"
url="https://www.qemu.org/"
arch="all"
diff --git a/user/qemu/qemu.pre-install b/user/qemu/qemu.pre-install
index 2ef9b5366d..2927f9aff0 100644
--- a/user/qemu/qemu.pre-install
+++ b/user/qemu/qemu.pre-install
@@ -1,6 +1,6 @@
#!/bin/sh
-addgroup -S -g 34 kvm 2>/dev/null
-addgroup -S -g 36 qemu 2>/dev/null
+groupadd -r -g 34 kvm 2>/dev/null
+groupadd -r -g 36 qemu 2>/dev/null
exit 0
diff --git a/user/redis/APKBUILD b/user/redis/APKBUILD
index b4b9f47f07..64be5cda6d 100644
--- a/user/redis/APKBUILD
+++ b/user/redis/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer:
pkgname=redis
pkgver=4.0.14
-pkgrel=0
+pkgrel=1
pkgdesc="Advanced key-value store"
url="https://redis.io/"
arch="all"
diff --git a/user/redis/redis.pre-install b/user/redis/redis.pre-install
index f732131266..31faf206fd 100644
--- a/user/redis/redis.pre-install
+++ b/user/redis/redis.pre-install
@@ -1,6 +1,7 @@
#!/bin/sh
-addgroup -S redis 2>/dev/null
-adduser -S -D -H -h /var/lib/redis -s /bin/false -G redis -g redis redis 2>/dev/null
+groupadd -r redis 2>/dev/null
+useradd -c redis -s /sbin/nologin -g redis \
+ -m -d /var/lib/redis -k /etc/skel -r redis 2>/dev/null
exit 0
diff --git a/user/rpcbind/APKBUILD b/user/rpcbind/APKBUILD
index c9f8cc956b..d1af0d6f9c 100644
--- a/user/rpcbind/APKBUILD
+++ b/user/rpcbind/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Dan Theisen <djt@hxx.in>
pkgname=rpcbind
pkgver=1.2.5
-pkgrel=0
+pkgrel=1
pkgdesc="portmap replacement which supports RPC over various protocols"
url="http://rpcbind.sourceforge.net"
arch="all"
diff --git a/user/rpcbind/rpcbind.pre-install b/user/rpcbind/rpcbind.pre-install
index 771cdbf7b6..668b734b6d 100644
--- a/user/rpcbind/rpcbind.pre-install
+++ b/user/rpcbind/rpcbind.pre-install
@@ -1,6 +1,7 @@
#!/bin/sh
-addgroup -S rpc 2>/dev/null
-adduser -S -D -h /var/lib/rpcbind -s /sbin/nologin -G rpc -g rpc rpc 2>/dev/null
+groupadd -r rpc 2>/dev/null
+useradd -c rpc -s /sbin/nologin -g rpc \
+ -m -d /var/lib/rpcbind -k /etc/skel -r rpc 2>/dev/null
exit 0
diff --git a/user/sane/APKBUILD b/user/sane/APKBUILD
index a2f2c3a3a7..42b4984c71 100644
--- a/user/sane/APKBUILD
+++ b/user/sane/APKBUILD
@@ -4,7 +4,7 @@
pkgname=sane
_pkgname=sane-backends
pkgver=1.0.27
-pkgrel=5
+pkgrel=6
pkgdesc="Scanner access library"
url="http://www.sane-project.org/"
arch="all"
diff --git a/user/sane/sane.pre-install b/user/sane/sane.pre-install
index b75c867de9..9b89cab57d 100644
--- a/user/sane/sane.pre-install
+++ b/user/sane/sane.pre-install
@@ -1,5 +1,5 @@
#!/bin/sh
-addgroup -S scanner 2>/dev/null
+groupadd -r scanner 2>/dev/null
exit 0
diff --git a/user/sane/saned.pre-install b/user/sane/saned.pre-install
index caad990d96..ef57068544 100644
--- a/user/sane/saned.pre-install
+++ b/user/sane/saned.pre-install
@@ -1,5 +1,6 @@
#!/bin/sh
-adduser -SDH -h /run/saned -s /sbin/nologin -G scanner -g saned saned 2>/dev/null
+useradd -c saned -s /sbin/nologin -g scanner \
+ -m -d /run/saned -k /etc/skel -r saned 2>/dev/null
exit 0
diff --git a/user/strongswan/APKBUILD b/user/strongswan/APKBUILD
index 8f2bf88d5a..e81d0be7c5 100644
--- a/user/strongswan/APKBUILD
+++ b/user/strongswan/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: Lee Starnes <lee@canned-death.us>
pkgname=strongswan
pkgver=5.7.1
-pkgrel=0
+pkgrel=1
pkgdesc="IPsec-based VPN solution focused on security and ease of use, supporting IKEv1/IKEv2 and MOBIKE"
url="https://www.strongswan.org/"
arch="all"
diff --git a/user/strongswan/strongswan.pre-install b/user/strongswan/strongswan.pre-install
index da43ede665..f41a4ab117 100644
--- a/user/strongswan/strongswan.pre-install
+++ b/user/strongswan/strongswan.pre-install
@@ -1,6 +1,7 @@
#!/bin/sh
-addgroup -S ipsec 2>/dev/null
-adduser -S -D -H -h /var/empty -s /sbin/nologin -G ipsec -g ipsec ipsec 2>/dev/null
+groupadd -r ipsec 2>/dev/null
+useradd -c ipsec -s /sbin/nologin -g ipsec \
+ -m -d /var/empty -k /etc/skel -r ipsec 2>/dev/null
exit 0
diff --git a/user/vde2/APKBUILD b/user/vde2/APKBUILD
index f300513210..037c4cd22a 100644
--- a/user/vde2/APKBUILD
+++ b/user/vde2/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer:
pkgname=vde2
pkgver=2.3.2
-pkgrel=8
+pkgrel=9
pkgdesc="Virtual Distributed Ethernet - User mode networking for QEMU et al"
url="http://vde.sourceforge.net/"
arch="all"
diff --git a/user/vde2/vde2.pre-install b/user/vde2/vde2.pre-install
index 3c3e08d47b..958e5a97d8 100644
--- a/user/vde2/vde2.pre-install
+++ b/user/vde2/vde2.pre-install
@@ -1,6 +1,7 @@
#!/bin/sh
-addgroup -S vde2-net 2>/dev/null
-adduser -S -D -H -h /var/run/vde2 -s /sbin/nologin -G vde2-net -g vde2-net vde2-net 2>/dev/null
+groupadd -r vde2-net 2>/dev/null
+useradd -c vde2-net -s /sbin/nologin -g vde2-net \
+ -m -d /var/run/vde2 -k /etc/skel -r vde2-net 2>/dev/null
exit 0
diff --git a/user/vlc/APKBUILD b/user/vlc/APKBUILD
index 6bd76fafed..675db1478b 100644
--- a/user/vlc/APKBUILD
+++ b/user/vlc/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=vlc
pkgver=3.0.7.1
-pkgrel=1
+pkgrel=2
pkgdesc="Multi-platform MPEG, VCD/DVD, and DivX player"
triggers="vlc-libs.trigger=/usr/lib/vlc/plugins"
pkgusers="vlc"
diff --git a/user/vlc/vlc-daemon.pre-install b/user/vlc/vlc-daemon.pre-install
index aed6c18932..c02d4a9115 100644
--- a/user/vlc/vlc-daemon.pre-install
+++ b/user/vlc/vlc-daemon.pre-install
@@ -1,15 +1,9 @@
#!/bin/sh
-groups="vlc audio video"
-
-for group in $groups; do
- addgroup -S $group 2>/dev/null
-done
-adduser -S -D -h /home/vlc -s /bin/sh -G vlc -g vlc vlc 2>/dev/null
-
-# make sure vlc are in all groups
-for group in $groups; do
- addgroup vlc $group 2>/dev/null
-done
+groupadd -r vlc 2>/dev/null
+groupadd -r audio 2>/dev/null
+groupadd -r video 2>/dev/null
+useradd -c vlc -s /sbin/nologin -g vlc -G audio,video \
+ -m -d /home/vlc -k /etc/skel -r vlc 2>/dev/null
exit 0
--
GitLab