apache: enable and build mpm shared modules by default.
This seems to be required to make php work, as has been seen in
This commit is contained in:
Juan RP
parent
d5a5b68a72
commit
aefdea87e5
9 changed files with 3 additions and 132 deletions
|
|
@ -1,16 +0,0 @@
|
|||
[Unit]
|
||||
Description=The Apache HTTP Server (Event MPM)
|
||||
After=syslog.target network.target remote-fs.target
|
||||
Conflicts=apache.service apache-mpm-worker.service
|
||||
|
||||
[Service]
|
||||
Type=forking
|
||||
PIDFile=/var/run/httpd/httpd.pid
|
||||
ExecStart=/usr/sbin/httpd.event -k start
|
||||
ExecReload=/usr/sbin/httpd.event -t
|
||||
ExecReload=/bin/kill -HUP $MAINPID
|
||||
ExecStop=/usr/sbin/httpd.event -k stop
|
||||
PrivateTmp=true
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
#!/bin/sh
|
||||
set -e
|
||||
mkdir -p /run/httpd
|
||||
chmod 0710 /run/httpd
|
||||
chown root:httpd /run/httpd
|
||||
exec httpd.event -DNO_DETACH
|
||||
|
|
@ -1 +0,0 @@
|
|||
../apache/patches
|
||||
|
|
@ -1,42 +0,0 @@
|
|||
# Template file for 'apache-mpm-event'
|
||||
#
|
||||
# We inherit all stuff from the apache build template.
|
||||
. ${XBPS_SRCPKGDIR}/apache/template
|
||||
|
||||
# Unset unused stuff.
|
||||
unset conf_files system_accounts systemd_services
|
||||
unset post_install pre_configure depends
|
||||
unset -f apache-devel_package
|
||||
|
||||
# Override some vars.
|
||||
pkgname=apache-mpm-event
|
||||
configure_args+=" --enable-modules= --prefix=/usr --with-mpm=event"
|
||||
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"
|
||||
update_pattern='httpd-\K[\d.]+'
|
||||
license="Apache-2.0"
|
||||
short_desc="Apache HTTP Server - event driven model"
|
||||
|
||||
# dlopen(3) run-time dependencies.
|
||||
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
|
||||
}
|
||||
|
||||
post_install() {
|
||||
# We are only interested in the httpd binary.
|
||||
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
|
||||
}
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
[Unit]
|
||||
Description=The Apache HTTP Server (Worker MPM)
|
||||
After=syslog.target network.target remote-fs.target
|
||||
Conflicts=apache.service apache-mpm-event.service
|
||||
|
||||
[Service]
|
||||
Type=forking
|
||||
PIDFile=/var/run/httpd/httpd.pid
|
||||
ExecStart=/usr/sbin/httpd.worker -k start
|
||||
ExecReload=/usr/sbin/httpd.worker -t
|
||||
ExecReload=/bin/kill -HUP $MAINPID
|
||||
ExecStop=/usr/sbin/httpd.worker -k stop
|
||||
PrivateTmp=true
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
#!/bin/sh
|
||||
set -e
|
||||
mkdir -p /run/httpd
|
||||
chmod 0710 /run/httpd
|
||||
chown root:httpd /run/httpd
|
||||
exec httpd.worker -DNO_DETACH
|
||||
|
|
@ -1 +0,0 @@
|
|||
../apache/patches
|
||||
|
|
@ -1,42 +0,0 @@
|
|||
# Template file for 'apache-mpm-worker'
|
||||
#
|
||||
# We inherit all stuff from the apache build template.
|
||||
. ${XBPS_SRCPKGDIR}/apache/template
|
||||
|
||||
# Unset unused stuff.
|
||||
unset conf_files system_accounts systemd_services
|
||||
unset post_install pre_configure depends
|
||||
unset -f apache-devel_package
|
||||
|
||||
# Override some vars.
|
||||
pkgname=apache-mpm-worker
|
||||
configure_args+=" --enable-modules= --prefix=/usr --with-mpm=worker"
|
||||
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"
|
||||
update_pattern='httpd-\K[\d.]+'
|
||||
license="Apache-2.0"
|
||||
short_desc="Apache HTTP Server - high speed threaded mode"
|
||||
|
||||
# dlopen(3) run-time dependencies.
|
||||
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
|
||||
}
|
||||
|
||||
post_install() {
|
||||
# We are only interested in the httpd binary.
|
||||
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
|
||||
}
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
# Template file for 'apache'
|
||||
pkgname=apache
|
||||
version=2.4.10
|
||||
revision=7
|
||||
revision=8
|
||||
wrksrc=httpd-${version}
|
||||
build_style=gnu-configure
|
||||
configure_args="--prefix= --enable-pie --enable-modules=all
|
||||
|
|
@ -18,7 +18,8 @@ configure_args="--prefix= --enable-pie --enable-modules=all
|
|||
--enable-proxy-balancer --enable-ssl --enable-http --enable-speling
|
||||
--enable-dav --enable-info --enable-cgi --enable-cgid --enable-dav-fs
|
||||
--enable-dav-lock --enable-vhost-alias --enable-imagemap --enable-so
|
||||
--enable-rewrite --with-pcre=/usr --enable-layout=XBPS --sysconfdir=/etc/httpd"
|
||||
--enable-rewrite --with-pcre=/usr --enable-layout=XBPS --sysconfdir=/etc/httpd
|
||||
--enable-mpms-shared=all"
|
||||
hostmakedepends="pkg-config perl"
|
||||
makedepends="zlib-devel libuuid-devel pcre-devel>=8.30
|
||||
libressl-devel>=2.1.2 db-devel gdbm-devel expat-devel libldap-devel apr-util-devel"
|
||||
|
|
|
|||
Loading…
Reference in a new issue