[arch-commits] Commit in apache/trunk (PKGBUILD apache.install apache.tmpfiles.conf)

[Jan Steffens]

    Date: Friday, June 8, 2012 @ 19:46:23
  Author: heftig
Revision: 161294

Use tmpfiles for /run/httpd

Added:
  apache/trunk/apache.install
  apache/trunk/apache.tmpfiles.conf
Modified:
  apache/trunk/PKGBUILD

----------------------+
 PKGBUILD             |    7 ++++++-
 apache.install       |    3 +++
 apache.tmpfiles.conf |    1 +
 3 files changed, 10 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-06-08 23:31:04 UTC (rev 161293)
+++ PKGBUILD	2012-06-08 23:46:23 UTC (rev 161294)
@@ -5,7 +5,7 @@
 
 pkgname=apache
 pkgver=2.2.22
-pkgrel=3
+pkgrel=4
 pkgdesc='A high performance Unix-based HTTP server'
 arch=('i686' 'x86_64')
 options=('!libtool')
@@ -18,6 +18,7 @@
         etc/logrotate.d/httpd)
 depends=('openssl' 'zlib' 'apr-util' 'pcre')
 optdepends=('lynx: apachectl status')
+install=apache.install
 _itkurl=http://mpm-itk.sesse.net/apache2.2-mpm-itk-2.2.17-01
 source=(http://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2
         http://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2.asc
@@ -33,6 +34,7 @@
         ${_itkurl}/11-fix-htaccess-reads-for-persistent-connections.patch
         apachectl-confd.patch
         apache.conf.d
+        apache.tmpfiles.conf
         httpd.logrotate
         httpd
         arch.layout
@@ -51,6 +53,7 @@
          '1e5b222edcfbf99a3edc56fcb2074fbe'
          '4ac64df6e019edbe137017cba1ff2f51'
          '08b3c875f6260644f2f52b4056d656b0'
+         '82068753dab92fe86312b1010a2904d7'
          '6382331e9700ed9e8cc78ea51887b537'
          'c7e300a287ef7e2e066ac7639536f87e'
          '3d659d41276ba3bfcb20c231eb254e0c'
@@ -126,6 +129,7 @@
 	install -D -m755 "${srcdir}/httpd" "${pkgdir}/etc/rc.d/httpd"
 	install -D -m644 "${srcdir}/httpd.logrotate" "${pkgdir}/etc/logrotate.d/httpd"
 	install -D -m644 "${srcdir}/apache.conf.d" "${pkgdir}/etc/conf.d/apache"
+	install -D -m644 "${srcdir}/apache.tmpfiles.conf" "${pkgdir}/usr/lib/tmpfiles.d/apache.conf"
 
 	# symlinks for /etc/httpd
 	ln -fs /var/log/httpd "${pkgdir}/etc/httpd/logs"
@@ -147,4 +151,5 @@
 	rm -rf "${pkgdir}/etc/httpd/conf/original"
 	rm -rf "${pkgdir}/srv/"
 	rm -rf "${pkgdir}/usr/bin"
+	rm -rf "${pkgdir}/var/run"
 }

Added: apache.install
===================================================================
--- apache.install	                        (rev 0)
+++ apache.install	2012-06-08 23:46:23 UTC (rev 161294)
@@ -0,0 +1,3 @@
+post_install() {
+  systemd-tmpfiles --create usr/lib/tmpfiles.d/apache.conf
+}

Added: apache.tmpfiles.conf
===================================================================
--- apache.tmpfiles.conf	                        (rev 0)
+++ apache.tmpfiles.conf	2012-06-08 23:46:23 UTC (rev 161294)
@@ -0,0 +1 @@
+d /run/httpd 0755 root root -