From 075970a50c69b05426bf09e5e59480e3997d2218 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sun, 30 Nov 2014 08:58:11 +0100
Subject: [PATCH] apache-mpm-{event,worker}: sync with apache; unbreak; add
 runit service.

---
 .../apache-mpm-event/files/apache-mpm-event/run    |  6 ++++++
 srcpkgs/apache-mpm-event/template                  | 14 +++++++-------
 .../apache-mpm-worker/files/apache-mpm-worker/run  |  6 ++++++
 srcpkgs/apache-mpm-worker/template                 | 13 +++++++------
 4 files changed, 26 insertions(+), 13 deletions(-)
 create mode 100755 srcpkgs/apache-mpm-event/files/apache-mpm-event/run
 create mode 100755 srcpkgs/apache-mpm-worker/files/apache-mpm-worker/run

diff --git a/srcpkgs/apache-mpm-event/files/apache-mpm-event/run b/srcpkgs/apache-mpm-event/files/apache-mpm-event/run
new file mode 100755
index 00000000000..35ee0d7128f
--- /dev/null
+++ b/srcpkgs/apache-mpm-event/files/apache-mpm-event/run
@@ -0,0 +1,6 @@
+#!/bin/sh
+set -e
+mkdir -p /run/httpd
+chmod 0710 /run/httpd
+chown root:httpd /run/httpd
+exec httpd.event -DNO_DETACH
diff --git a/srcpkgs/apache-mpm-event/template b/srcpkgs/apache-mpm-event/template
index 28d7ea70936..9db7fe3a036 100644
--- a/srcpkgs/apache-mpm-event/template
+++ b/srcpkgs/apache-mpm-event/template
@@ -11,8 +11,8 @@ unset -f apache-devel_package
 # Override some vars.
 pkgname=apache-mpm-event
 configure_args+=" --enable-modules= --prefix=/usr --with-mpm=event"
-version=2.4.7
-revision=2
+version=2.4.10
+revision=1
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://httpd.apache.org/"
 update_site="http://httpd.apache.org/download.cgi"
@@ -21,13 +21,11 @@ license="Apache-2.0"
 short_desc="Apache HTTP Server - event driven model"
 
 # dlopen(3) run-time dependencies.
-depends="apache>=$version"
-
-if [ "$build_option_systemd" ]; then
-	systemd_services="apache-mpm-event.service on"
-fi
+depends="apache>=${version}"
 
 pre_configure() {
+	# SSL_CTX_use_certificate_chain() conflicts with libressl-2.1.
+	sed -e 's,SSL_CTX_use_certificate_chain,_SSL_CTX_use_certificate_chain,g' -i modules/ssl/*.[ch]
 	cat ${XBPS_SRCPKGDIR}/apache/files/xbps.layout >> config.layout
 }
 
@@ -36,6 +34,8 @@ post_install() {
 	cp -f ${DESTDIR}/usr/sbin/httpd ${wrksrc}
 	rm -rf ${DESTDIR}/*
 	vinstall httpd 755 usr/sbin httpd.event
+	vsv ${pkgname}
+
 	if [ "$build_option_systemd" ]; then
 		vinstall ${FILESDIR}/${pkgname}.service 644 usr/lib/systemd/system
 	fi
diff --git a/srcpkgs/apache-mpm-worker/files/apache-mpm-worker/run b/srcpkgs/apache-mpm-worker/files/apache-mpm-worker/run
new file mode 100755
index 00000000000..60de82a9b7c
--- /dev/null
+++ b/srcpkgs/apache-mpm-worker/files/apache-mpm-worker/run
@@ -0,0 +1,6 @@
+#!/bin/sh
+set -e
+mkdir -p /run/httpd
+chmod 0710 /run/httpd
+chown root:httpd /run/httpd
+exec httpd.worker -DNO_DETACH
diff --git a/srcpkgs/apache-mpm-worker/template b/srcpkgs/apache-mpm-worker/template
index 0a954b5cc30..9463aab2e0e 100644
--- a/srcpkgs/apache-mpm-worker/template
+++ b/srcpkgs/apache-mpm-worker/template
@@ -11,8 +11,8 @@ unset -f apache-devel_package
 # Override some vars.
 pkgname=apache-mpm-worker
 configure_args+=" --enable-modules= --prefix=/usr --with-mpm=worker"
-version=2.4.7
-revision=2
+version=2.4.10
+revision=1
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://httpd.apache.org/"
 update_site="http://httpd.apache.org/download.cgi"
@@ -21,12 +21,11 @@ license="Apache-2.0"
 short_desc="Apache HTTP Server - high speed threaded mode"
 
 # dlopen(3) run-time dependencies.
-depends="apache>=$version"
-if [ "$build_option_systemd" ]; then
-	systemd_services="apache-mpm-worker.service on"
-fi
+depends="apache>=${version}"
 
 pre_configure() {
+	# SSL_CTX_use_certificate_chain() conflicts with libressl-2.1.
+	sed -e 's,SSL_CTX_use_certificate_chain,_SSL_CTX_use_certificate_chain,g' -i modules/ssl/*.[ch]
 	cat ${XBPS_SRCPKGDIR}/apache/files/xbps.layout >> config.layout
 }
 
@@ -35,6 +34,8 @@ post_install() {
 	cp -f ${DESTDIR}/usr/sbin/httpd ${wrksrc}
 	rm -rf ${DESTDIR}/*
 	vinstall httpd 755 usr/sbin httpd.worker
+	vsv ${pkgname}
+
 	if [ "$build_option_systemd" ]; then
 		vinstall ${FILESDIR}/${pkgname}.service 644 usr/lib/systemd/system
 	fi