From 93b0513be9422e1666163d89031419412866e370 Mon Sep 17 00:00:00 2001 From: Max Rees Date: Mon, 22 Jul 2019 02:13:03 -0400 Subject: user/*: use useradd, groupadd instead of adduser, addgroup --- user/pcsc-lite/APKBUILD | 2 +- user/pcsc-lite/pcsc-lite.pre-install | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) (limited to 'user/pcsc-lite') diff --git a/user/pcsc-lite/APKBUILD b/user/pcsc-lite/APKBUILD index 9746a2d46..ff8a667a9 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 2e654f28d..d5135dea6 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 -- cgit v1.2.3-70-g09d2 From 035cd8dccd0a470468131da7a3b87322bc979d78 Mon Sep 17 00:00:00 2001 From: Max Rees Date: Mon, 22 Jul 2019 02:21:57 -0400 Subject: user/*: don't add -k /etc/skel for system users --- user/apache-httpd/apache-httpd.pre-install | 2 +- user/bind/bind.pre-install | 3 ++- user/chrony/chrony.pre-install | 2 +- user/dbus/dbus.pre-install | 2 +- user/distcc/distcc.pre-install | 2 +- user/nextcloud/nextcloud.pre-install | 2 +- user/openldap/openldap.pre-install | 2 +- user/openvpn/openvpn.pre-install | 2 +- user/pcsc-lite/pcsc-lite.pre-install | 2 +- user/prosody/prosody.pre-install | 2 +- user/pulseaudio/pulseaudio.pre-install | 2 +- user/redis/redis.pre-install | 2 +- user/rpcbind/rpcbind.pre-install | 2 +- user/sane/saned.pre-install | 2 +- user/strongswan/strongswan.pre-install | 2 +- user/vde2/vde2.pre-install | 2 +- user/vlc/vlc-daemon.pre-install | 2 +- 17 files changed, 18 insertions(+), 17 deletions(-) (limited to 'user/pcsc-lite') diff --git a/user/apache-httpd/apache-httpd.pre-install b/user/apache-httpd/apache-httpd.pre-install index 49adfaab7..65cf5b926 100644 --- a/user/apache-httpd/apache-httpd.pre-install +++ b/user/apache-httpd/apache-httpd.pre-install @@ -3,6 +3,6 @@ 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 + -m -d /var/www -r apache 2>/dev/null exit 0 diff --git a/user/bind/bind.pre-install b/user/bind/bind.pre-install index b9be04967..2801f5172 100644 --- a/user/bind/bind.pre-install +++ b/user/bind/bind.pre-install @@ -1,6 +1,7 @@ #!/bin/sh 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 +useradd -c named -s /sbin/nologin -g named \ + -m -d /etc/bind -r named 2>/dev/null exit 0 diff --git a/user/chrony/chrony.pre-install b/user/chrony/chrony.pre-install index dca301662..b143d0a4c 100644 --- a/user/chrony/chrony.pre-install +++ b/user/chrony/chrony.pre-install @@ -2,6 +2,6 @@ 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 + -m -d /var/log/chrony -r chrony 2>/dev/null exit 0 diff --git a/user/dbus/dbus.pre-install b/user/dbus/dbus.pre-install index e5b299aaf..39e5464f2 100644 --- a/user/dbus/dbus.pre-install +++ b/user/dbus/dbus.pre-install @@ -2,6 +2,6 @@ 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 + -m -d /dev/null -r messagebus 2>/dev/null exit 0 diff --git a/user/distcc/distcc.pre-install b/user/distcc/distcc.pre-install index 9f5010cd1..16b5e4f59 100644 --- a/user/distcc/distcc.pre-install +++ b/user/distcc/distcc.pre-install @@ -2,6 +2,6 @@ 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 + -m -d /var/lib/distcc -r distcc 2>/dev/null exit 0 diff --git a/user/nextcloud/nextcloud.pre-install b/user/nextcloud/nextcloud.pre-install index f84fd15d8..746906a7a 100644 --- a/user/nextcloud/nextcloud.pre-install +++ b/user/nextcloud/nextcloud.pre-install @@ -2,6 +2,6 @@ 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 + -m -d /var/lib/nextcloud -r nextcloud 2>/dev/null exit 0 diff --git a/user/openldap/openldap.pre-install b/user/openldap/openldap.pre-install index 6b8a4ce03..a98a882ae 100644 --- a/user/openldap/openldap.pre-install +++ b/user/openldap/openldap.pre-install @@ -2,6 +2,6 @@ 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 + -m -d /usr/lib/openldap -r ldap 2>/dev/null exit 0 diff --git a/user/openvpn/openvpn.pre-install b/user/openvpn/openvpn.pre-install index 07addd12f..f17d62880 100644 --- a/user/openvpn/openvpn.pre-install +++ b/user/openvpn/openvpn.pre-install @@ -2,6 +2,6 @@ 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 + -m -d /dev/null -r openvpn 2>/dev/null exit 0 diff --git a/user/pcsc-lite/pcsc-lite.pre-install b/user/pcsc-lite/pcsc-lite.pre-install index d5135dea6..d7938a846 100644 --- a/user/pcsc-lite/pcsc-lite.pre-install +++ b/user/pcsc-lite/pcsc-lite.pre-install @@ -2,6 +2,6 @@ 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 + -m -d /var/run/pcscd -r pcscd 2>/dev/null exit 0 diff --git a/user/prosody/prosody.pre-install b/user/prosody/prosody.pre-install index fc2cf5194..d7b34c634 100644 --- a/user/prosody/prosody.pre-install +++ b/user/prosody/prosody.pre-install @@ -2,6 +2,6 @@ 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 + -m -d /var/lib/prosody -r prosody 2>/dev/null exit 0 diff --git a/user/pulseaudio/pulseaudio.pre-install b/user/pulseaudio/pulseaudio.pre-install index 4b942c2f8..ae20dce54 100644 --- a/user/pulseaudio/pulseaudio.pre-install +++ b/user/pulseaudio/pulseaudio.pre-install @@ -3,6 +3,6 @@ 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 + -m -d /var/empty -r pulse 2>/dev/null exit 0 diff --git a/user/redis/redis.pre-install b/user/redis/redis.pre-install index 31faf206f..bdea387cb 100644 --- a/user/redis/redis.pre-install +++ b/user/redis/redis.pre-install @@ -2,6 +2,6 @@ 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 + -m -d /var/lib/redis -r redis 2>/dev/null exit 0 diff --git a/user/rpcbind/rpcbind.pre-install b/user/rpcbind/rpcbind.pre-install index 668b734b6..0d4d46885 100644 --- a/user/rpcbind/rpcbind.pre-install +++ b/user/rpcbind/rpcbind.pre-install @@ -2,6 +2,6 @@ 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 + -m -d /var/lib/rpcbind -r rpc 2>/dev/null exit 0 diff --git a/user/sane/saned.pre-install b/user/sane/saned.pre-install index ef5706854..79ca791dd 100644 --- a/user/sane/saned.pre-install +++ b/user/sane/saned.pre-install @@ -1,6 +1,6 @@ #!/bin/sh useradd -c saned -s /sbin/nologin -g scanner \ - -m -d /run/saned -k /etc/skel -r saned 2>/dev/null + -m -d /run/saned -r saned 2>/dev/null exit 0 diff --git a/user/strongswan/strongswan.pre-install b/user/strongswan/strongswan.pre-install index f41a4ab11..71663f7d2 100644 --- a/user/strongswan/strongswan.pre-install +++ b/user/strongswan/strongswan.pre-install @@ -2,6 +2,6 @@ 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 + -m -d /var/empty -r ipsec 2>/dev/null exit 0 diff --git a/user/vde2/vde2.pre-install b/user/vde2/vde2.pre-install index 958e5a97d..3c86dc732 100644 --- a/user/vde2/vde2.pre-install +++ b/user/vde2/vde2.pre-install @@ -2,6 +2,6 @@ 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 + -m -d /var/run/vde2 -r vde2-net 2>/dev/null exit 0 diff --git a/user/vlc/vlc-daemon.pre-install b/user/vlc/vlc-daemon.pre-install index c02d4a911..5ebf91ac7 100644 --- a/user/vlc/vlc-daemon.pre-install +++ b/user/vlc/vlc-daemon.pre-install @@ -4,6 +4,6 @@ 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 + -m -d /home/vlc -r vlc 2>/dev/null exit 0 -- cgit v1.2.3-70-g09d2