user/*: use useradd, groupadd instead of adduser, addgroup

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"

user/apache-httpd/apache-httpd.pre-install

 #!/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

user/apache-httpd/apache-httpd.pre-upgrade

-#!/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

user/apache-httpd/apache-httpd.pre-upgrade

+apache-httpd.pre-install
\ No newline at end of file

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"

user/bind/bind.pre-install

 #!/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

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"

user/chrony/chrony.pre-install

 #!/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

user/cups/APKBUILD

 # Maintainer: 
 pkgname=cups
 pkgver=2.2.11
-pkgrel=0
+pkgrel=1
 pkgdesc="The CUPS Printing System"
 url="https://www.cups.org/"
 arch="all"

user/cups/cups.pre-install

 #!/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

user/dbus/APKBUILD

 # 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"

user/dbus/dbus.pre-install

 #!/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

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"

user/distcc/distcc.pre-install

 #!/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

user/libgphoto2/APKBUILD

 # Maintainer: 
 pkgname=libgphoto2
 pkgver=2.5.23
-pkgrel=0
+pkgrel=1
 pkgdesc="Digital camera library"
 url="http://www.gphoto.org"
 arch="all"

user/libgphoto2/libgphoto2.pre-install

 #!/bin/sh
 
-addgroup -S camera 2>/dev/null
+groupadd -r camera 2>/dev/null
 
 exit 0

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"

user/lighttpd/lighttpd.pre-install

 #!/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

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"

user/nextcloud/nextcloud.pre-install

 #!/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