[crux-commits] ports/contrib (refs/remotes/origin/3.6): lighttpd: core ports -> Depends, go /run not /var/run, create sys user

crux at crux.nu crux at crux.nu
Sat Apr 10 19:05:54 UTC 2021


commit 7abe77be0a873950ac22e7d6ea5f993c85e44898
Author: Steffen Nurpmeso <steffen at sdaoden.eu>
Date:   Sat Feb 6 21:23:24 2021 +0100

    lighttpd: core ports -> Depends, go /run not /var/run, create sys user

diff --git a/lighttpd/.signature b/lighttpd/.signature
index c31b4e722..d44e02797 100644
--- a/lighttpd/.signature
+++ b/lighttpd/.signature
@@ -1,7 +1,7 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF3xxo5rP8auWfaRkgYr7qv5mC8cJLaojsKXMGYyhg3XlA+VD2v5v31ayBmn3v6PGkUuQMlDIN5GmLMY9hRohJtws=
-SHA256 (Pkgfile) = 54a4544658634d148b3d1483fa2d194b6fdff3dba849723cfd9f8555d472679e
+RWSagIOpLGJF3wRJKoXohOm6JlwrtMQnud+zyWdZLDtv32SkaUIZYckUDFz6mqGdjlCwepelR2vVieXegfxxJILeS8gN0Ka69Ak=
+SHA256 (Pkgfile) = 24282f972a2e9ab5fd0256cfa25a9234db5d64baebdd59a3511d4c03435ad76d
 SHA256 (.footprint) = e97305350f7145b67cf1415a0b4ece4e9809cd3136f5c207d7de7b97c1a2b9bd
 SHA256 (lighttpd-1.4.59.tar.xz) = fb953db273daef08edb6e202556cae8a3d07eed6081c96bd9903db957d1084d5
-SHA256 (lighttpd.rc) = b1aa0eb6d097098ac65cdc36e522b47e67cb2a0ea912cfe2157d01bbfb1af08d
-SHA256 (lighttpd.conf) = f414c4d52fe8a6f29586744f511035fe289be616ceac0d86960d525f6db38e03
+SHA256 (lighttpd.rc) = 777e6d46980c9f8b042c649241466e135fc0dce55b7c5caf932b68bf443392c9
+SHA256 (lighttpd.conf) = 7452298dcb6edcaa670113cecb936e2457b4c24112c641a5e356254d3b4955a2
diff --git a/lighttpd/Pkgfile b/lighttpd/Pkgfile
index 718360d4c..f9deb3529 100644
--- a/lighttpd/Pkgfile
+++ b/lighttpd/Pkgfile
@@ -1,11 +1,11 @@
 # Description: Secure, fast, compliant and very flexible web server
 # URL:         https://www.lighttpd.net/
 # Maintainer:  Steffen Nurpmeso, steffen at sdaoden dot eu
-# Depends on:  libpcre lua
+# Depends on:  libpcre lua   bzip2 linux-pam openssl zlib zstd
 
 name=lighttpd
 version=1.4.59
-release=2
+release=3
 source=(
   https://download.${name}.net/${name}/releases-1.4.x/${name}-${version}.tar.xz
    ${name}.rc ${name}.conf
diff --git a/lighttpd/lighttpd.conf b/lighttpd/lighttpd.conf
index cb25bcd71..b27105dfe 100644
--- a/lighttpd/lighttpd.conf
+++ b/lighttpd/lighttpd.conf
@@ -14,7 +14,7 @@ server.max-connections = "120"
 server.username = "lighttpd"
 server.groupname = "lighttpd"
 server.document-root = var.basedir + "/htdocs"
-server.pid-file = "/var/run/lighttpd.pid"
+server.pid-file = "/run/lighttpd.pid"
 #server.breakagelog = "/tmp/cgibreak" # var.logdir  + "/error.log"
 # log errors to syslog instead
 #server.errorlog-use-syslog = "enable"
diff --git a/lighttpd/lighttpd.rc b/lighttpd/lighttpd.rc
index e86d6cdc5..47788f891 100755
--- a/lighttpd/lighttpd.rc
+++ b/lighttpd/lighttpd.rc
@@ -3,7 +3,7 @@
 
 SSD=/sbin/start-stop-daemon
 PROG=/usr/sbin/lighttpd
-PID=/var/run/lighttpd.pid
+PID=/run/lighttpd.pid
 OPTS='-f /etc/lighttpd.conf'
 
 case ${1} in
diff --git a/lighttpd/post-install b/lighttpd/post-install
index 2d62a2957..12317ddb1 100644
--- a/lighttpd/post-install
+++ b/lighttpd/post-install
@@ -1,10 +1,14 @@
 #!/bin/sh -
 
-getent group lighttpd || groupadd -r lighttpd
+usr=lighttpd
+grp=${usr}
+dir=${usr}
 
-if [ -z "`getent passwd named`" ]; then
-	useradd -g lighttpd -d /var/www/lighttpd -s /bin/false lighttpd
-	passwd -l lighttpd
+getent group ${grp} || groupadd -r ${grp}
+
+if [ -z "`getent passwd ${usr}`" ]; then
+	useradd -r -g ${grp} -d /var/www/${usr} -s /bin/false ${usr}
+	passwd -l ${usr}
 fi
 
-chown lighttpd:wheel /var/log/lighttpd /var/lib/lighttpd
+chown ${usr}:daemon /var/log/${usr} /var/lib/${usr}


More information about the crux-commits mailing list