snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 2 Actions Activity

apache-mpm-{event,worker}: sync with apache; unbreak; add runit service.

This commit is contained in:
Juan RP 2014-11-30 08:58:11 +01:00
parent 8aecc09645
commit 075970a50c
4 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
srcpkgs/apache-mpm-event/files/apache-mpm-event/run Executable file
View File

@ -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

14
srcpkgs/apache-mpm-event/template
View File

@ -11,8 +11,8 @@ unset -f apache-devel_package
# Override some vars. # Override some vars.
pkgname=apache-mpm-event pkgname=apache-mpm-event
configure_args+=" --enable-modules= --prefix=/usr --with-mpm=event" configure_args+=" --enable-modules= --prefix=/usr --with-mpm=event"
version=2.4.7 version=2.4.10
revision=2 revision=1
maintainer="Juan RP <xtraeme@gmail.com>" maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://httpd.apache.org/" homepage="http://httpd.apache.org/"
update_site="http://httpd.apache.org/download.cgi" update_site="http://httpd.apache.org/download.cgi"
@ -21,13 +21,11 @@ license="Apache-2.0"
short_desc="Apache HTTP Server - event driven model" short_desc="Apache HTTP Server - event driven model"
# dlopen(3) run-time dependencies. # dlopen(3) run-time dependencies.
depends="apache>=$version" depends="apache>=${version}"
if [ "$build_option_systemd" ]; then
systemd_services="apache-mpm-event.service on"
fi
pre_configure() { 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 cat ${XBPS_SRCPKGDIR}/apache/files/xbps.layout >> config.layout
} }
@ -36,6 +34,8 @@ post_install() {
cp -f ${DESTDIR}/usr/sbin/httpd ${wrksrc} cp -f ${DESTDIR}/usr/sbin/httpd ${wrksrc}
rm -rf ${DESTDIR}/* rm -rf ${DESTDIR}/*
vinstall httpd 755 usr/sbin httpd.event vinstall httpd 755 usr/sbin httpd.event
vsv ${pkgname}
if [ "$build_option_systemd" ]; then if [ "$build_option_systemd" ]; then
vinstall ${FILESDIR}/${pkgname}.service 644 usr/lib/systemd/system vinstall ${FILESDIR}/${pkgname}.service 644 usr/lib/systemd/system
fi fi

6
srcpkgs/apache-mpm-worker/files/apache-mpm-worker/run Executable file
View File

@ -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

13
srcpkgs/apache-mpm-worker/template
View File

@ -11,8 +11,8 @@ unset -f apache-devel_package
# Override some vars. # Override some vars.
pkgname=apache-mpm-worker pkgname=apache-mpm-worker
configure_args+=" --enable-modules= --prefix=/usr --with-mpm=worker" configure_args+=" --enable-modules= --prefix=/usr --with-mpm=worker"
version=2.4.7 version=2.4.10
revision=2 revision=1
maintainer="Juan RP <xtraeme@gmail.com>" maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://httpd.apache.org/" homepage="http://httpd.apache.org/"
update_site="http://httpd.apache.org/download.cgi" 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" short_desc="Apache HTTP Server - high speed threaded mode"
# dlopen(3) run-time dependencies. # dlopen(3) run-time dependencies.
depends="apache>=$version" depends="apache>=${version}"
if [ "$build_option_systemd" ]; then
systemd_services="apache-mpm-worker.service on"
fi
pre_configure() { 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 cat ${XBPS_SRCPKGDIR}/apache/files/xbps.layout >> config.layout
} }
@ -35,6 +34,8 @@ post_install() {
cp -f ${DESTDIR}/usr/sbin/httpd ${wrksrc} cp -f ${DESTDIR}/usr/sbin/httpd ${wrksrc}
rm -rf ${DESTDIR}/* rm -rf ${DESTDIR}/*
vinstall httpd 755 usr/sbin httpd.worker vinstall httpd 755 usr/sbin httpd.worker
vsv ${pkgname}
if [ "$build_option_systemd" ]; then if [ "$build_option_systemd" ]; then
vinstall ${FILESDIR}/${pkgname}.service 644 usr/lib/systemd/system vinstall ${FILESDIR}/${pkgname}.service 644 usr/lib/systemd/system
fi fi