From 2c6e5f19b1dc9627d494fece03dd87b033dff227 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 4 Oct 2021 21:39:56 +0200
Subject: [PATCH] tree-wide: make system_accounts pass xlint

---
 srcpkgs/apache/template    | 2 +-
 srcpkgs/bitlbee/template   | 2 +-
 srcpkgs/darkhttpd/template | 2 +-
 srcpkgs/haproxy/template   | 2 +-
 srcpkgs/lighttpd/template  | 2 +-
 srcpkgs/nethack/template   | 2 +-
 srcpkgs/openntpd/template  | 2 +-
 srcpkgs/stubby/template    | 2 +-
 srcpkgs/suricata/template  | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 20de314d6f8..7c2143a557c 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -38,7 +38,7 @@ changelog="http://www.apache.org/dist/httpd/CHANGES_2.4"
 distfiles="https://archive.apache.org/dist/httpd/httpd-${version}.tar.bz2"
 checksum=65b965d6890ea90d9706595e4b7b9365b5060bec8ea723449480b4769974133b
 
-system_accounts="_${pkgname}"
+system_accounts="_apache"
 _apache_homedir="/srv/www/$pkgname"
 
 make_dirs="
diff --git a/srcpkgs/bitlbee/template b/srcpkgs/bitlbee/template
index 76302732248..1b59bf3f646 100644
--- a/srcpkgs/bitlbee/template
+++ b/srcpkgs/bitlbee/template
@@ -25,7 +25,7 @@ build_options="purple pam ldap"
 build_options_default="pam"
 desc_option_purple="Build with libpurple support"
 
-system_accounts="$pkgname"
+system_accounts="bitlbee"
 bitlbee_homedir="/var/lib/${pkgname}"
 
 make_dirs="/var/lib/bitlbee 0755 bitlbee bitlbee"
diff --git a/srcpkgs/darkhttpd/template b/srcpkgs/darkhttpd/template
index 9a1baa0c4fc..4a07f0c0ae5 100644
--- a/srcpkgs/darkhttpd/template
+++ b/srcpkgs/darkhttpd/template
@@ -11,7 +11,7 @@ checksum=1d88c395ac79ca9365aa5af71afe4ad136a4ed45099ca398168d4a2014dc0fc2
 CFLAGS="$CFLAGS $LDFLAGS"
 
 # Create darkhttpd system user/group
-system_accounts="_${pkgname}"
+system_accounts="_darkhttpd"
 make_dirs="/srv/www/${pkgname} 0755 _${pkgname} _${pkgname}
  /var/log/${pkgname} 0755 _${pkgname} _${pkgname}"
 
diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index fc69374c9fd..40e6b2efc5c 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -17,7 +17,7 @@ checksum=116b7329cebee5dab8ba47ad70feeabd0c91680d9ef68c28e41c34869920d1fe
 haproxy_homedir="/var/lib/${pkgname}"
 make_dirs="$haproxy_homedir 0750 ${pkgname} ${pkgname}"
 conf_files="/etc/${pkgname}/${pkgname}.cfg"
-system_accounts="$pkgname"
+system_accounts="haproxy"
 
 CFLAGS="-Wno-address-of-packed-member"
 do_build() {
diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index 7ae82aecfc3..4891e13d3d6 100644
--- a/srcpkgs/lighttpd/template
+++ b/srcpkgs/lighttpd/template
@@ -23,7 +23,7 @@ distfiles="https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${vers
 checksum=fb953db273daef08edb6e202556cae8a3d07eed6081c96bd9903db957d1084d5
 
 conf_files="/etc/lighttpd/lighttpd.conf"
-system_accounts="_${pkgname}"
+system_accounts="_lighttpd"
 _lighttpd_homedir="/srv/www/${pkgname}"
 lib32disabled=yes
 
diff --git a/srcpkgs/nethack/template b/srcpkgs/nethack/template
index e39eafb0b5c..740d855f638 100644
--- a/srcpkgs/nethack/template
+++ b/srcpkgs/nethack/template
@@ -15,7 +15,7 @@ homepage="http://www.nethack.org/"
 distfiles="https://www.nethack.org/download/${version}/nethack-${version//./}-src.tgz"
 checksum=cfde0c3ab6dd7c22ae82e1e5a59ab80152304eb23fb06e3129439271e5643ed2
 nocross=yes
-system_accounts="$pkgname"
+system_accounts="nethack"
 
 do_configure() {
 	sh sys/unix/setup.sh sys/unix/hints/linux
diff --git a/srcpkgs/openntpd/template b/srcpkgs/openntpd/template
index 34bb4ed3a5e..697cd0b2521 100644
--- a/srcpkgs/openntpd/template
+++ b/srcpkgs/openntpd/template
@@ -16,7 +16,7 @@ checksum=7b02691524197e01ba6b1b4b7595b33956e657ba6d5c4cf2fc20ea3f4914c13a
 
 conf_files="/etc/ntpd.conf"
 provides="ntp-daemon-0_1"
-system_accounts="$pkgname"
+system_accounts="openntpd"
 alternatives="
  ntpd:ntpd:/usr/bin/openntpd
  ntpd:ntpd.8:/usr/share/man/man8/openntpd.8
diff --git a/srcpkgs/stubby/template b/srcpkgs/stubby/template
index 7eaaf5e4617..7d7a2502b65 100644
--- a/srcpkgs/stubby/template
+++ b/srcpkgs/stubby/template
@@ -15,7 +15,7 @@ distfiles="https://github.com/getdnsapi/stubby/archive/v${version}.tar.gz"
 checksum=8e6a4ba76f04b23612d58813c4998141b0cc6194432d87f8653f3ba5cf64152a
 
 # Create stubby system user/group
-system_accounts="_${pkgname}"
+system_accounts="_stubby"
 _stubby_homedir="/var/lib/${pkgname}"
 make_dirs="/var/lib/${pkgname} 0755 _${pkgname} _${pkgname}"
 
diff --git a/srcpkgs/suricata/template b/srcpkgs/suricata/template
index f715e3fde91..672108b8278 100644
--- a/srcpkgs/suricata/template
+++ b/srcpkgs/suricata/template
@@ -29,7 +29,7 @@ if [ -z "$CROSS_BUILD" ]; then
 	build_options_default+=" rust lua"
 fi
 
-system_accounts="$pkgname"
+system_accounts="suricata"
 conf_files="/etc/${pkgname}/*.* /etc/${pkgname}/rules/*"
 
 CFLAGS="-fcommon"