[arch-commits] Commit in apache/trunk (PKGBUILD apache.install)
Anatol Pomozov
anatolik at nymeria.archlinux.org
Sat Mar 8 14:47:59 UTC 2014
Date: Saturday, March 8, 2014 @ 15:47:59
Author: anatolik
Revision: 207390
Enable the rest of modules, move openssl to optional as it needed only for mod_ssl.
Modified:
apache/trunk/PKGBUILD
apache/trunk/apache.install
----------------+
PKGBUILD | 42 ++++++++++++++++++++++++++----------------
apache.install | 4 ++--
2 files changed, 28 insertions(+), 18 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2014-03-08 14:00:43 UTC (rev 207389)
+++ PKGBUILD 2014-03-08 14:47:59 UTC (rev 207390)
@@ -10,21 +10,31 @@
arch=('i686' 'x86_64')
url='http://www.apache.org/dist/httpd'
license=('APACHE')
-backup=(etc/httpd/conf/httpd.conf
- etc/httpd/conf/extra/httpd-{autoindex,dav,default,info,languages}.conf
- etc/httpd/conf/extra/httpd-{manual,mpm,multilang-errordoc}.conf
- etc/httpd/conf/extra/httpd-{ssl,userdir,vhosts}.conf
- etc/httpd/conf/extra/proxy-html.conf
- etc/httpd/conf/{mime.types,magic}
- etc/logrotate.d/httpd)
-depends=('openssl' 'zlib' 'apr-util' 'pcre' 'systemd')
-optdepends=('lynx: apachectl status')
+backup=(
+ etc/httpd/conf/httpd.conf
+ etc/httpd/conf/extra/httpd-{autoindex,dav,default,info,languages}.conf
+ etc/httpd/conf/extra/httpd-{manual,mpm,multilang-errordoc}.conf
+ etc/httpd/conf/extra/httpd-{ssl,userdir,vhosts}.conf
+ etc/httpd/conf/extra/proxy-html.conf
+ etc/httpd/conf/{mime.types,magic}
+ etc/logrotate.d/httpd
+)
+depends=('zlib' 'apr-util' 'pcre')
+makedepends=('libxml2' 'lua' 'openssl')
+optdepends=(
+ 'lua: for mod_lua support'
+ 'openssl: for mod_ssl support'
+ 'libxml2: for mod_xml2enc support'
+ 'lynx: apachectl status'
+)
install=apache.install
-source=(http://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2{,.asc}
- apache.tmpfiles.conf
- httpd.logrotate
- httpd.service
- arch.layout)
+source=(
+ http://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2{,.asc}
+ apache.tmpfiles.conf
+ httpd.logrotate
+ httpd.service
+ arch.layout
+)
sha256sums=('64368d8301836815ae237f2b62d909711c896c1bd34573771e0ee5ad808ce71b'
'SKIP'
'63da1a420f4714a3e7af2672d28384419cc7eedbe7bf35baebd02938fabc15bf'
@@ -60,7 +70,8 @@
--enable-deflate --enable-cgi --enable-cgid \
--enable-proxy --enable-proxy-connect \
--enable-proxy-http --enable-proxy-ftp \
- --enable-dbd \
+ --enable-dbd --enable-imagemap --enable-ident --enable-cern-meta \
+ --enable-lua --enable-xml2enc \
--with-apr=/usr/bin/apr-1-config \
--with-apr-util=/usr/bin/apu-1-config \
--with-pcre=/usr
@@ -76,7 +87,6 @@
install -D -m644 "${srcdir}/httpd.logrotate" "${pkgdir}/etc/logrotate.d/httpd"
install -D -m644 "${srcdir}/apache.tmpfiles.conf" "${pkgdir}/usr/lib/tmpfiles.d/apache.conf"
install -D -m644 "${srcdir}/httpd.service" "${pkgdir}/usr/lib/systemd/system/httpd.service"
-
install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
# symlinks for /etc/httpd
Modified: apache.install
===================================================================
--- apache.install 2014-03-08 14:00:43 UTC (rev 207389)
+++ apache.install 2014-03-08 14:47:59 UTC (rev 207390)
@@ -1,9 +1,9 @@
post_install() {
- systemd-tmpfiles --create apache.conf
+ type -P systemd-tmpfiles >/dev/null && systemd-tmpfiles --create apache.conf
}
post_upgrade() {
- systemd-tmpfiles --create apache.conf
+ type -P systemd-tmpfiles >/dev/null && systemd-tmpfiles --create apache.conf
if [[ $2 == 2\.2\.* ]]; then
# it is a major upgrade, show a useful link to upgrade instructions
More information about the arch-commits
mailing list