teldra/vp-build
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

apache: added systemd build option; fix -mpm-{event,worker} builds with libressl.

Browse Source
This commit is contained in:
Juan RP 2014-08-21 11:17:40 +02:00
parent 6ad5ef310e
commit fb458ace0e
5 changed files with 35 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
srcpkgs/apache-mpm-event/patches Symbolic link
View File

@ -0,0 +1 @@
../apache/patches

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

@ -20,7 +20,10 @@ short_desc="Apache HTTP Server - event driven model"
# dlopen(3) run-time dependencies.
depends="apache>=$version"
systemd_services="apache-mpm-event.service on"
if [ "$build_option_systemd" ]; then
systemd_services="apache-mpm-event.service on"
fi
pre_configure() {
cat ${XBPS_SRCPKGDIR}/apache/files/xbps.layout >> config.layout
@ -31,5 +34,7 @@ post_install() {
cp -f ${DESTDIR}/usr/sbin/httpd ${wrksrc}
rm -rf ${DESTDIR}/*
vinstall httpd 755 usr/sbin httpd.event
vinstall ${FILESDIR}/${pkgname}.service 644 usr/lib/systemd/system
if [ "$build_option_systemd" ]; then
vinstall ${FILESDIR}/${pkgname}.service 644 usr/lib/systemd/system
fi
}

1
srcpkgs/apache-mpm-worker/patches Symbolic link
View File

@ -0,0 +1 @@
../apache/patches

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

@ -20,7 +20,9 @@ short_desc="Apache HTTP Server - high speed threaded mode"
# dlopen(3) run-time dependencies.
depends="apache>=$version"
systemd_services="apache-mpm-worker.service on"
if [ "$build_option_systemd" ]; then
systemd_services="apache-mpm-worker.service on"
fi
pre_configure() {
cat ${XBPS_SRCPKGDIR}/apache/files/xbps.layout >> config.layout
@ -31,5 +33,7 @@ post_install() {
cp -f ${DESTDIR}/usr/sbin/httpd ${wrksrc}
rm -rf ${DESTDIR}/*
vinstall httpd 755 usr/sbin httpd.worker
vinstall ${FILESDIR}/${pkgname}.service 644 usr/lib/systemd/system
if [ "$build_option_systemd" ]; then
vinstall ${FILESDIR}/${pkgname}.service 644 usr/lib/systemd/system
fi
}

27
srcpkgs/apache/template
View File

@ -1,7 +1,7 @@
# Template file for 'apache'
pkgname=apache
version=2.4.10
revision=1
revision=2
wrksrc=httpd-${version}
build_style=gnu-configure
configure_args="--prefix= --enable-pie --enable-modules=all
@ -37,10 +37,6 @@ conf_files="
/etc/httpd/httpd.conf
/etc/httpd/magic
/etc/httpd/mime.types"
systemd_services="apache.service on"
system_accounts="httpd"
httpd_descr="Apache HTTP server"
httpd_homedir="/srv/httpd"
short_desc="The Number One HTTP Server On The Internet"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://httpd.apache.org/"
@ -48,6 +44,20 @@ license="Apache-2.0"
distfiles="http://www.apache.org/dist/httpd/httpd-${version}.tar.bz2"
checksum=176c4dac1a745f07b7b91e7f4fd48f9c48049fa6f088efe758d61d9738669c6a
system_accounts="httpd"
httpd_descr="Apache HTTP server"
httpd_homedir="/srv/httpd"
make_dirs="
/var/log/httpd 0755 root httpd
/srv/httpd 0755 root httpd
/srv/httpd/cgi-bin 755 root httpd"
build_options="systemd"
if [ "$build_option_systemd" ]; then
systemd_services="apache.service on"
fi
pre_configure() {
# set default user
sed -e 's#User daemon#User httpd#' \
@ -84,8 +94,11 @@ post_install() {
# systemd and logrotate files.
vinstall ${FILESDIR}/apache.logrotate 644 etc/logrotate.d apache
vinstall ${FILESDIR}/apache.service 644 usr/lib/systemd/system
vinstall ${FILESDIR}/apache.tmpfiles 644 usr/lib/tmpfiles.d apache.conf
if [ "$build_option_systemd" ]; then
vinstall ${FILESDIR}/apache.service 644 usr/lib/systemd/system
vinstall ${FILESDIR}/apache.tmpfiles 644 usr/lib/tmpfiles.d apache.conf
fi
rm -rf ${DESTDIR}/etc/httpd/original
}