diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-19 11:22:26 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-19 11:22:26 +0100 |
| commit | 56bf63be7060f55d0048fc1f2e37526723bf0dc7 (patch) | |
| tree | 5072df371092a3bfded8d6aadca1af5018523291 /extra/apache | |
| parent | d697117f3e2c400f8a7cae7bbbbf27166edc277a (diff) | |
| parent | b54c21859be3590a319ceade1f58d0b89ac5ef32 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/bitcoin/PKGBUILD
community/chmsee/PKGBUILD
community/projectm/PKGBUILD
extra/apache/PKGBUILD
extra/gv/PKGBUILD
extra/libdc1394/PKGBUILD
extra/libraw1394/PKGBUILD
extra/samba/PKGBUILD
extra/sg3_utils/PKGBUILD
extra/upower/PKGBUILD
extra/xf86-input-aiptek/PKGBUILD
extra/xf86-video-modesetting/PKGBUILD
extra/xorg-server/PKGBUILD
libre/rp-pppoe-libre/PKGBUILD
Diffstat (limited to 'extra/apache')
| -rw-r--r-- | extra/apache/PKGBUILD | 12 | ||||
| -rw-r--r-- | extra/apache/apache.install | 6 |
2 files changed, 11 insertions, 7 deletions
diff --git a/extra/apache/PKGBUILD b/extra/apache/PKGBUILD index c5d8bc9fb..a119da557 100644 --- a/extra/apache/PKGBUILD +++ b/extra/apache/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 166855 2012-09-19 22:46:12Z jgc $ +# $Id: PKGBUILD 180169 2013-03-18 14:04:21Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=apache -pkgver=2.2.23 -pkgrel=1.1 +pkgver=2.2.24 +pkgrel=1 pkgdesc='A high performance Unix-based HTTP server' arch=('i686' 'x86_64' 'mips64el') options=('!libtool') @@ -16,7 +16,7 @@ backup=(etc/conf.d/apache etc/httpd/conf/httpd.conf etc/httpd/conf/extra/httpd-{manual,mpm,multilang-errordoc}.conf etc/httpd/conf/extra/httpd-{ssl,userdir,vhosts}.conf etc/logrotate.d/httpd) -depends=('openssl' 'zlib' 'apr-util' 'pcre') +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 @@ -39,8 +39,8 @@ source=(http://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2 httpd httpd.service arch.layout) -md5sums=('ca133de0e4b4b15316990a97186b9993' - '3289ae3b16e1a2dc633c811d6569abb6' +md5sums=('91bd1484aca13a7095d6432be37fc7ae' + 'f8f0d879b5fda028aad7ac9f329e057b' 'f1d9d41360908ceb2374da55ae99197a' 'cdfa04985a0efa850976aef01c2a0c40' '0930d2d0612eb0a53a0d00aea7e8687f' diff --git a/extra/apache/apache.install b/extra/apache/apache.install index 9b74e607c..e7b72b74f 100644 --- a/extra/apache/apache.install +++ b/extra/apache/apache.install @@ -1,3 +1,7 @@ post_install() { - systemd-tmpfiles --create usr/lib/tmpfiles.d/apache.conf + systemd-tmpfiles --create apache.conf +} + +post_upgrade() { + systemd-tmpfiles --create apache.conf } |