[arch-commits] Commit in apache/trunk (PKGBUILD apache.conf.d apachectl-confd.patch)

[Pierre Schmitz]

    Date: Friday, May 31, 2013 @ 10:01:01
  Author: pierre
Revision: 186793

revert to conf.d usage

Added:
  apache/trunk/apache.conf.d
  apache/trunk/apachectl-confd.patch
Modified:
  apache/trunk/PKGBUILD

-----------------------+
 PKGBUILD              |    9 ++++++++-
 apache.conf.d         |   15 +++++++++++++++
 apachectl-confd.patch |   15 +++++++++++++++
 3 files changed, 38 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-31 07:47:58 UTC (rev 186792)
+++ PKGBUILD	2013-05-31 08:01:01 UTC (rev 186793)
@@ -5,7 +5,7 @@
 
 pkgname=apache
 pkgver=2.2.24
-pkgrel=2
+pkgrel=3
 pkgdesc='A high performance Unix-based HTTP server'
 arch=('i686' 'x86_64')
 options=('!libtool')
@@ -32,6 +32,8 @@
         ${_itkurl}/09-capabilities.patch
         ${_itkurl}/10-nice.patch
         ${_itkurl}/11-fix-htaccess-reads-for-persistent-connections.patch
+        apachectl-confd.patch
+        apache.conf.d
         apache.tmpfiles.conf
         httpd.logrotate
         httpd.service
@@ -48,6 +50,8 @@
          'e75b7dd8d8afcd299ba4ab2ab81c11e4'
          'ce1ccc21f3ad8625169c8f62913450ac'
          '1e5b222edcfbf99a3edc56fcb2074fbe'
+         '4ac64df6e019edbe137017cba1ff2f51'
+         '08b3c875f6260644f2f52b4056d656b0'
          '82068753dab92fe86312b1010a2904d7'
          '13dbaaf949c5bc36cfcf5718b95cb020'
          'a823bb355c136fd0e2b3fb820e2d903c'
@@ -56,6 +60,8 @@
 build() {
 	cd "${srcdir}/httpd-${pkgver}"
 
+	patch -Np0 -i "${srcdir}/apachectl-confd.patch"
+
 	# set default user
 	sed -e 's#User daemon#User http#' \
 	    -e 's#Group daemon#Group http#' \
@@ -133,6 +139,7 @@
 	install -m755 build-itk/httpd "${pkgdir}/usr/bin/httpd.itk"
 
 	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

Added: apache.conf.d
===================================================================
--- apache.conf.d	                        (rev 0)
+++ apache.conf.d	2013-05-31 08:01:01 UTC (rev 186793)
@@ -0,0 +1,15 @@
+# Configuration file for the httpd service.
+
+#
+# The default processing model (MPM) is the process-based
+# 'prefork' model. A thread-based model, 'worker', is also
+# available, but does not work with some modules (such as PHP).
+# The service must be stopped before changing this variable.
+#
+#HTTPD=/usr/sbin/httpd.worker
+
+#
+# To pass additional options (for instance, -D definitions) to the
+# httpd binary at startup, set OPTIONS here.
+#
+#OPTIONS=

Added: apachectl-confd.patch
===================================================================
--- apachectl-confd.patch	                        (rev 0)
+++ apachectl-confd.patch	2013-05-31 08:01:01 UTC (rev 186793)
@@ -0,0 +1,15 @@
+--- support/apachectl.in.orig	2010-03-06 18:09:11.000000000 +0100
++++ support/apachectl.in	2010-03-06 18:12:31.000000000 +0100
+@@ -56,6 +56,12 @@
+ # the URL to your server's mod_status status page.  If you do not
+ # have one, then status and fullstatus will not work.
+ STATUSURL="http://localhost:@PORT@/server-status"
++
++# Source /etc/conf.d/apache for $HTTPD setting, etc.
++if [ -r /etc/conf.d/apache ]; then
++    . /etc/conf.d/apache
++fi
++
+ #
+ # Set this variable to a command that increases the maximum
+ # number of file descriptors allowed per child process. This is