apache: use /run/apache as rundir

apache/.footprint

@@ -258,8 +258,6 @@ drwxr-xr-x	root/root	usr/share/man/man8/
 drwxr-xr-x	root/root	var/
 drwxr-xr-x	root/root	var/log/
 drwxr-xr-x	root/root	var/log/apache/
-drwxr-xr-x	root/root	var/run/
-drwxr-xr-x	root/root	var/run/apache/
 drwxr-xr-x	root/root	var/www/
 drwxr-xr-x	root/root	var/www/cgi-bin/
 -rw-r--r--	root/root	var/www/cgi-bin/printenv

apache/.signature

@@ -1,7 +1,7 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/UNTmvpTQWCJIWTOc13xhgG0bgGQJLXx/5Qx1yPeQ5pZm1I8eLooKIgTOvOK4xvMWZ/M+2Z+pB04t7LBL+GNhQ4=
-SHA256 (Pkgfile) = 1ad1512606f472124a0b116c38ee7bbefd7192ffbcbcaa865d16473f32b74895
-SHA256 (.footprint) = acf30483788e8e161ff93877feff858f69b6e70c7115798bbf5418b33183d628
+RWSE3ohX2g5d/S7vDLwygqMhxj8Ds2mkozV5dqYKPQ0w8WG8EclY0oR2NtAI1qNowFvKClUcjfJgysfPiQdJRkitWYG7RG3Avgw=
+SHA256 (Pkgfile) = 8c4abe4f35555267013dfc285e1cd432d0433b3ca8818284933f0fde976ff88e
+SHA256 (.footprint) = dba3c715b79fd08ec9bea040a0ef3b16efa1c0d37315cc650dbab75ebadc4a8f
 SHA256 (httpd-2.4.52.tar.bz2) = 0127f7dc497e9983e9c51474bed75e45607f2f870a7675a86dc90af6d572f5c9
-SHA256 (crux.layout) = cf555f92cdc9a078d9e89035819da1ac0d2e248f0d31637b9e8f48fc8d3f42cf
-SHA256 (apache) = f4ff530751a937bead9030e15689a3b19591f790095b46bddc073efc82f756dd
+SHA256 (crux.layout) = a72a0d72c47aa72df4378f4bf1ff291eb9cdfd29f6c827b9970b8775f38f4dd6
+SHA256 (apache) = 12d9aff5a78428589aba0b43988f383af434a546ae5daadc5f5ce7b9804e56a4

apache/Pkgfile

@@ -5,7 +5,7 @@
 
 name=apache
 version=2.4.52
-release=1
+release=2
 source=(http://www.apache.org/dist/httpd/httpd-$version.tar.bz2 \
 	crux.layout apache)
 
@@ -31,6 +31,7 @@ build(){
 	install -D -m 755 $SRC/apache $PKG/etc/rc.d/apache
 
 	rm -r $PKG/var/www/htdocs/*
+	rm -r $PKG/run
 	rm $PKG/var/www/{error,icons}/README*
 
 	chmod -R g-s $PKG/var/www/

apache/apache

@@ -5,7 +5,7 @@
 
 SSD=/sbin/start-stop-daemon
 PROG=/usr/sbin/httpd
-PID=/var/run/apache/httpd.pid
+PID=/run/apache/httpd.pid
 OPTS="-k start"
 KEY=/etc/apache/server.key
 CRT=/etc/apache/server.crt
@@ -15,6 +15,7 @@ start)
 	if [ ! -s $KEY -o ! -s $CRT ]; then
 		/usr/bin/mksslcert $KEY $CRT
 	fi
+	mkdir -p /run/apache
 	$SSD --start --pidfile $PID --exec $PROG -- $OPTS
 	;;
 stop)

apache/crux.layout

@@ -16,9 +16,9 @@
     cgidir:          ${datadir}/cgi-bin
     errordir:        ${datadir}/error
     includedir:      ${prefix}/include/apache
+    runtimedir:      /run/apache
+    runstatedir:     /run/apache
     localstatedir:   /var
-    runtimedir:      ${localstatedir}/run/apache
     logfiledir:      ${localstatedir}/log/apache
     proxycachedir:   ${localstatedir}/cache/apache
 </Layout>
-