diff options
author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-03-07 03:52:15 +0000 |
---|---|---|
committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-03-07 03:52:15 +0000 |
commit | d44823e5676f0edd0e259c7c33d5640a043748ac (patch) | |
tree | a861b18b863dacb947ba2b8e9cbcb47ef80a03ef /extra/apache | |
parent | c183da9d3df5445f5021cd6563012ba2abfc393e (diff) |
Fri Mar 7 03:48:12 UTC 2014
Diffstat (limited to 'extra/apache')
-rw-r--r-- | extra/apache/PKGBUILD | 211 | ||||
-rw-r--r-- | extra/apache/apache.conf.d | 15 | ||||
-rw-r--r-- | extra/apache/apache.install | 5 | ||||
-rw-r--r-- | extra/apache/apachectl-confd.patch | 15 |
4 files changed, 81 insertions, 165 deletions
diff --git a/extra/apache/PKGBUILD b/extra/apache/PKGBUILD index 6370959a4..1e9ace8d7 100644 --- a/extra/apache/PKGBUILD +++ b/extra/apache/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 205426 2014-02-04 16:28:18Z andyrtr $ +# $Id: PKGBUILD 207109 2014-03-06 21:41:15Z anatolik $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=apache -pkgver=2.2.26 +pkgver=2.4.7 pkgrel=1 pkgdesc='A high performance Unix-based HTTP server' arch=('i686' 'x86_64') @@ -14,154 +14,95 @@ 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/conf.d/apache + 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') install=apache.install -_itkurl=http://mpm-itk.sesse.net/apache2.2-mpm-itk-2.2.17-01 source=(http://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2{,.asc} - ${_itkurl}/02-rename-prefork-to-itk.patch - ${_itkurl}/03-add-mpm-to-build-system.patch - ${_itkurl}/04-correct-output-makefile-location.patch - ${_itkurl}/05-add-copyright.patch - ${_itkurl}/06-hook-just-after-merging-perdir-config.patch - ${_itkurl}/07-base-functionality.patch - ${_itkurl}/08-max-clients-per-vhost.patch - ${_itkurl}/09-capabilities.patch - ${_itkurl}/10-nice.patch - ${_itkurl}/11-fix-htaccess-reads-for-persistent-connections.patch - apachectl-confd.patch - apache.conf.d apache.tmpfiles.conf httpd.logrotate httpd.service arch.layout) -md5sums=('254eda547f8d624604e4bf403241e617' - 'SKIP' - 'f1d9d41360908ceb2374da55ae99197a' - 'cdfa04985a0efa850976aef01c2a0c40' - '0930d2d0612eb0a53a0d00aea7e8687f' - '3a0c29bb91442c33ea73ebbe072af922' - '0ef4729a6f1ffc848ad0e9b440a66f66' - '940944caa948340b11ddae56adaef89b' - 'ce09a987523884de8838f73dc8ec0d19' - 'e75b7dd8d8afcd299ba4ab2ab81c11e4' - 'ce1ccc21f3ad8625169c8f62913450ac' - '1e5b222edcfbf99a3edc56fcb2074fbe' - '4ac64df6e019edbe137017cba1ff2f51' - '08b3c875f6260644f2f52b4056d656b0' - '82068753dab92fe86312b1010a2904d7' - '13dbaaf949c5bc36cfcf5718b95cb020' - 'a823bb355c136fd0e2b3fb820e2d903c' - '6b7122245a67597230a3b3f317eaf34e') +sha256sums=('64368d8301836815ae237f2b62d909711c896c1bd34573771e0ee5ad808ce71b' + 'SKIP' + '63da1a420f4714a3e7af2672d28384419cc7eedbe7bf35baebd02938fabc15bf' + '875903831634edf35d8d57e9a51bacb818255ecb3bfff29627f03e43d1ab65c3' + '14d0a775eea7f8c66ba55399a9ad1e4fd29e0302f479a15b28bbfc754c5aa347' + 'dda05c6e76f12624e418ca18a36f2e90ec1c5b1cc52fed7142fce6076ec413f3') build() { - cd "${srcdir}/httpd-${pkgver}" + cd httpd-${pkgver} - patch -Np0 -i "${srcdir}/apachectl-confd.patch" + # set default user + sed -e 's#User daemon#User http#' \ + -e 's#Group daemon#Group http#' \ + -i docs/conf/httpd.conf.in - # set default user - sed -e 's#User daemon#User http#' \ - -e 's#Group daemon#Group http#' \ - -i docs/conf/httpd.conf.in - - cat "${srcdir}/arch.layout" >> config.layout - - cd .. - cp -r httpd-${pkgver} httpd-itk-${pkgver} - - cd httpd-itk-${pkgver} + cat "${srcdir}/arch.layout" >> config.layout - # Fix patch to apply with latest Apache version - sed -i -e 's/mpmt_os2}/mpmt_os2|winnt}/g' "${srcdir}/03-add-mpm-to-build-system.patch" - - mkdir -p server/mpm/experimental/itk - cp -r server/mpm/prefork/* server/mpm/experimental/itk/ - mv server/mpm/experimental/itk/prefork.c server/mpm/experimental/itk/itk.c - - patch -Np1 -i "${srcdir}/02-rename-prefork-to-itk.patch" - patch -Np1 -i "${srcdir}/03-add-mpm-to-build-system.patch" - patch -Np1 -i "${srcdir}/04-correct-output-makefile-location.patch" - patch -Np1 -i "${srcdir}/05-add-copyright.patch" - patch -Np1 -i "${srcdir}/06-hook-just-after-merging-perdir-config.patch" - patch -Np1 -i "${srcdir}/07-base-functionality.patch" - patch -Np1 -i "${srcdir}/08-max-clients-per-vhost.patch" - patch -Np1 -i "${srcdir}/09-capabilities.patch" - patch -Np1 -i "${srcdir}/10-nice.patch" - patch -Np1 -i "${srcdir}/11-fix-htaccess-reads-for-persistent-connections.patch" - - autoconf - cd .. - for mpm in prefork worker itk; do - if [ "${mpm}" = "itk" ]; then - CONFIGURE=../httpd-itk-${pkgver}/configure - else - CONFIGURE=../httpd-${pkgver}/configure - fi - - mkdir build-${mpm} - pushd build-${mpm} - $CONFIGURE --enable-layout=Arch \ - --enable-modules=all \ - --enable-mods-shared=all \ - --enable-so \ - --enable-suexec \ - --with-suexec-caller=http \ - --with-suexec-docroot=/srv/http \ - --with-suexec-logfile=/var/log/httpd/suexec.log \ - --with-suexec-bin=/usr/bin/suexec \ - --with-suexec-uidmin=99 --with-suexec-gidmin=99 \ - --enable-ldap --enable-authnz-ldap \ - --enable-cache --enable-disk-cache --enable-mem-cache --enable-file-cache \ - --enable-ssl --with-ssl \ - --enable-deflate --enable-cgid \ - --enable-proxy --enable-proxy-connect \ - --enable-proxy-http --enable-proxy-ftp \ - --enable-dbd \ - --with-apr=/usr/bin/apr-1-config \ - --with-apr-util=/usr/bin/apu-1-config \ - --with-pcre=/usr \ - --with-mpm=${mpm} - make - popd - done + ./configure --sbindir=/usr/bin \ + --enable-layout=Arch \ + --enable-mpms-shared=all \ + --enable-modules=all \ + --enable-mods-shared=all \ + --enable-so \ + --enable-suexec \ + --with-suexec-caller=http \ + --with-suexec-docroot=/srv/http \ + --with-suexec-logfile=/var/log/httpd/suexec.log \ + --with-suexec-bin=/usr/bin/suexec \ + --with-suexec-uidmin=99 --with-suexec-gidmin=99 \ + --enable-ldap --enable-authnz-ldap \ + --enable-cache --enable-disk-cache --enable-mem-cache --enable-file-cache \ + --enable-ssl --with-ssl \ + --enable-deflate --enable-cgid \ + --enable-proxy --enable-proxy-connect \ + --enable-proxy-http --enable-proxy-ftp \ + --enable-dbd \ + --with-apr=/usr/bin/apr-1-config \ + --with-apr-util=/usr/bin/apu-1-config \ + --with-pcre=/usr + + make } package() { - cd "${srcdir}" - cd build-prefork - make DESTDIR="${pkgdir}" install - cd .. - - install -m755 build-worker/httpd "${pkgdir}/usr/bin/httpd.worker" - install -m755 build-itk/httpd "${pkgdir}/usr/bin/httpd.itk" - - install -D -m644 "${srcdir}/httpd.logrotate" "${pkgdir}/etc/logrotate.d/httpd" - install -D -m644 "${srcdir}/apache.conf.d" "${pkgdir}/etc/conf.d/apache" - install -D -m644 "${srcdir}/apache.tmpfiles.conf" "${pkgdir}/usr/lib/tmpfiles.d/apache.conf" - - # symlinks for /etc/httpd - ln -fs /var/log/httpd "${pkgdir}/etc/httpd/logs" - ln -fs /run/httpd "${pkgdir}/etc/httpd/run" - ln -fs /usr/lib/httpd/modules "${pkgdir}/etc/httpd/modules" - ln -fs /usr/lib/httpd/build "${pkgdir}/etc/httpd/build" - - # set sane defaults - sed -e 's#/usr/lib/httpd/modules/#modules/#' \ - -e 's|#\(Include conf/extra/httpd-multilang-errordoc.conf\)|\1|' \ - -e 's|#\(Include conf/extra/httpd-autoindex.conf\)|\1|' \ - -e 's|#\(Include conf/extra/httpd-languages.conf\)|\1|' \ - -e 's|#\(Include conf/extra/httpd-userdir.conf\)|\1|' \ - -e 's|#\(Include conf/extra/httpd-default.conf\)|\1|' \ - -i "${pkgdir}/etc/httpd/conf/httpd.conf" - - # cleanup - rm -rf "${pkgdir}/usr/share/httpd/manual" - rm -rf "${pkgdir}/etc/httpd/conf/original" - rm -rf "${pkgdir}/srv/" - rm -rf "${pkgdir}/run" - - install -m755 -d "${pkgdir}/usr/lib/systemd/system" - install -m644 "${srcdir}/httpd.service" "${pkgdir}/usr/lib/systemd/system/" + cd httpd-${pkgver} + + make DESTDIR="${pkgdir}" install + + install -D -m755 httpd "${pkgdir}/usr/bin/httpd" + 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 + # do we really need these symlinks? + #ln -fs /var/log/httpd "${pkgdir}/etc/httpd/logs" + ln -fs /usr/lib/httpd/modules "${pkgdir}/etc/httpd/modules" + #ln -fs /usr/lib/httpd/build "${pkgdir}/etc/httpd/build" + + # set sane defaults + sed -e 's#/usr/lib/httpd/modules/#modules/#' \ + -e 's|#\(LoadModule negotiation_module \)|\1|' \ + -e 's|#\(LoadModule include_module \)|\1|' \ + -e 's|#\(LoadModule userdir_module \)|\1|' \ + -e 's|#\(LoadModule slotmem_shm_module \)|\1|' \ + -e 's|#\(Include conf/extra/httpd-multilang-errordoc.conf\)|\1|' \ + -e 's|#\(Include conf/extra/httpd-autoindex.conf\)|\1|' \ + -e 's|#\(Include conf/extra/httpd-languages.conf\)|\1|' \ + -e 's|#\(Include conf/extra/httpd-userdir.conf\)|\1|' \ + -e 's|#\(Include conf/extra/httpd-default.conf\)|\1|' \ + -e 's|#\(Include conf/extra/httpd-mpm.conf\)|\1|' \ + -i "${pkgdir}/etc/httpd/conf/httpd.conf" + + # cleanup + rm -r "${pkgdir}/usr/share/httpd/manual" + rm -r "${pkgdir}/etc/httpd/conf/original" + rm -r "${pkgdir}/srv/" + rm -r "${pkgdir}/run" } diff --git a/extra/apache/apache.conf.d b/extra/apache/apache.conf.d deleted file mode 100644 index c6d0ebf52..000000000 --- a/extra/apache/apache.conf.d +++ /dev/null @@ -1,15 +0,0 @@ -# Configuration file for the httpd service. - -# -# The default processing model (MPM) is the process-based -# 'prefork' model. A thread-based model, 'worker', is also -# available, but does not work with some modules (such as PHP). -# The service must be stopped before changing this variable. -# -#HTTPD=/usr/sbin/httpd.worker - -# -# To pass additional options (for instance, -D definitions) to the -# httpd binary at startup, set OPTIONS here. -# -#OPTIONS= diff --git a/extra/apache/apache.install b/extra/apache/apache.install index e7b72b74f..d85194623 100644 --- a/extra/apache/apache.install +++ b/extra/apache/apache.install @@ -4,4 +4,9 @@ post_install() { post_upgrade() { systemd-tmpfiles --create apache.conf + + if [[ $2 == 2\.2\.* ]]; then + # it is a major upgrade, show a useful link to upgrade instructions + echo ' Check Apache upgrade instructions: https://httpd.apache.org/docs/trunk/upgrading.html' + fi } diff --git a/extra/apache/apachectl-confd.patch b/extra/apache/apachectl-confd.patch deleted file mode 100644 index d0f4b699e..000000000 --- a/extra/apache/apachectl-confd.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- support/apachectl.in.orig 2010-03-06 18:09:11.000000000 +0100 -+++ support/apachectl.in 2010-03-06 18:12:31.000000000 +0100 -@@ -56,6 +56,12 @@ - # the URL to your server's mod_status status page. If you do not - # have one, then status and fullstatus will not work. - STATUSURL="http://localhost:@PORT@/server-status" -+ -+# Source /etc/conf.d/apache for $HTTPD setting, etc. -+if [ -r /etc/conf.d/apache ]; then -+ . /etc/conf.d/apache -+fi -+ - # - # Set this variable to a command that increases the maximum - # number of file descriptors allowed per child process. This is |