apache and php minor updates

apache/PKGBUILD

@@ -5,8 +5,8 @@
 # contributor : Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
 
 pkgname=apache
-pkgver=2.4.7
-pkgrel=2
+pkgver=2.4.9
+pkgrel=1
 pkgdesc='A high performance Unix-based HTTP server'
 arch=('x86_64')
 url='http://www.apache.org/dist/httpd'
@@ -18,15 +18,21 @@ backup=(etc/httpd/conf/httpd.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')
+depends=('zlib' 'apr-util' 'pcre' 'systemd')
+makedepends=('libxml2' 'lua' 'openssl')
+optdepends=(
+    'lua: for mod_lua module'
+    'openssl: for mod_ssl module'
+    'libxml2: for mod_proxy_html, mod_xml2enc modules' 
+    'lynx: apachectl status'
+)
 install=${pkgname}.install
 source=(http://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2{,.asc}
         httpd.logrotate
         chakra.layout
         httpd.service
         httpd-tmpfile.conf)
-md5sums=('170d7fb6fe5f28b87d1878020a9ab94e'
+md5sums=('2ef4e65353497606b24fa9bb3e5a3c40'
          'SKIP'
          '6382331e9700ed9e8cc78ea51887b537'
          '9404bc261cffce7ad88850f0569e9067'
@@ -59,10 +65,11 @@ build() {
       --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-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 \

apache/apache.install

@@ -1,12 +1,16 @@
 post_install() {
-  systemd-tmpfiles --create apache.conf
+  if type -P systemd-tmpfiles &> /dev/null; then
+    systemd-tmpfiles --create apache.conf
+  fi
 }
 
 post_upgrade() {
-  systemd-tmpfiles --create apache.conf
+  if type -P systemd-tmpfiles &> /dev/null; then
+    systemd-tmpfiles --create apache.conf
+  fi
 
   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'
+    echo '    Check Apache upgrade instructions: https://httpd.apache.org/docs/2.4/upgrading.html'
   fi
 }

php/PKGBUILD

@@ -25,8 +25,8 @@ pkgname=('php'
          'php-sqlite'
          'php-tidy'
          'php-xsl')
-pkgver=5.5.9
-pkgrel=6
+pkgver=5.5.12
+pkgrel=1
 arch=('x86_64')
 license=('PHP')
 # options=('!buildflags' '!makeflags')
@@ -42,10 +42,10 @@ source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2"
         'logrotate.d.php-fpm'
         'php-fpm.service'
       	'php-fpm.tmpfiles')
-md5sums=('c4a348a07b52f6e177d8fdc75fe507b1'
+md5sums=('943af92c2e67bba29429bdd9acf9cbd4'
          '799cd5f91f5253f4b47ec4fd7fccf4f1'
          'e792470a40eaade691483ca424ea45ff'
-         '5c1f4c967b66ce3eaf819b46951dcbf5'
+         '6bc1fc4ceee039d21ff3b56aa845cc5a'
          'f56b5bb7e93c802ae8519182fbea3387'
          'd2d6101574319aeaeddae649b89f4165'
          'c60343df74f8e1afb13b084d5c0e47ed')

php/php-fpm.conf.in.patch

@@ -1,8 +1,8 @@
---- sapi/fpm/php-fpm.conf.in	2012-08-15 06:26:05.000000000 +0200
-+++ sapi/fpm/php-fpm.conf.in	2012-08-16 14:17:41.809663595 +0200
+--- sapi/fpm/php-fpm.conf.in	2014-04-29 10:04:30.000000000 +0200
++++ sapi/fpm/php-fpm.conf.in	2014-05-01 07:36:14.762839158 +0200
 @@ -12,7 +12,7 @@
  ; Relative path can also be used. They will be prefixed by:
- ;  - the global prefix if it's been set (-p arguement)
+ ;  - the global prefix if it's been set (-p argument)
  ;  - @prefix@ otherwise
 -;include=etc/fpm.d/*.conf
 +;include=/etc/php/fpm.d/*.conf
@@ -18,7 +18,7 @@
  
  ; Error log file
  ; If it's set to "syslog", log is sent to syslogd instead of being written
-@@ -148,7 +148,8 @@
+@@ -156,7 +156,8 @@
  ;                            specific port;
  ;   '/path/to/unix/socket' - to listen on a unix socket.
  ; Note: This value is mandatory.
@@ -27,21 +27,21 @@
 +listen = /run/php-fpm/php-fpm.sock
  
  ; Set listen(2) backlog.
- ; Default Value: 128 (-1 on FreeBSD and OpenBSD)
-@@ -159,9 +160,9 @@
+ ; Default Value: 65535 (-1 on FreeBSD and OpenBSD)
+@@ -167,9 +168,9 @@
  ; BSD-derived systems allow connections regardless of permissions. 
  ; Default Values: user and group are set as the running user
- ;                 mode is set to 0666
+ ;                 mode is set to 0660
 -;listen.owner = @php_fpm_user@
 -;listen.group = @php_fpm_group@
--;listen.mode = 0666
+-;listen.mode = 0660
 +listen.owner = @php_fpm_user@
 +listen.group = @php_fpm_group@
 +listen.mode = 0660
   
  ; List of ipv4 addresses of FastCGI clients which are allowed to connect.
  ; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original
-@@ -458,7 +459,7 @@
+@@ -466,7 +467,7 @@
  ; Chdir to this directory at the start.
  ; Note: relative path can be used.
  ; Default Value: current directory or / when chroot