From 0824488ffbc2f59d417ffc91492f789d7c7b7c06 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Sun, 28 Jul 2019 02:12:46 +0000
Subject: user/lighttpd: finally fix user addition

---
 user/lighttpd/APKBUILD             | 7 +------
 user/lighttpd/lighttpd.pre-install | 6 +++---
 2 files changed, 4 insertions(+), 9 deletions(-)

(limited to 'user')

diff --git a/user/lighttpd/APKBUILD b/user/lighttpd/APKBUILD
index 6a6420b06..5f768bbdd 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=1
+pkgrel=2
 pkgdesc="A secure, fast, compliant and very flexible web-server"
 url="http://www.lighttpd.net/"
 arch="all"
@@ -26,8 +26,6 @@ source="http://download.lighttpd.net/lighttpd/releases-1.4.x/$pkgname-$pkgver.ta
 	"
 
 build() {
-	cd "$builddir"
-
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -49,13 +47,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
-
 	make DESTDIR="$pkgdir" install
 
 	# create dirs
diff --git a/user/lighttpd/lighttpd.pre-install b/user/lighttpd/lighttpd.pre-install
index bdc9b91b6..3d6124de0 100644
--- a/user/lighttpd/lighttpd.pre-install
+++ b/user/lighttpd/lighttpd.pre-install
@@ -1,8 +1,8 @@
 #!/bin/sh
 
 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
+groupadd -r lighttpd 2>/dev/null
+useradd -c lighttpd -s /sbin/nologin -G www-data \
+	-d /var/www/localhost/htdocs -r lighttpd 2>/dev/null
 
 exit 0
-- 
cgit v1.2.3-60-g2f50