summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO17
-rw-r--r--PKGBUILD14
-rw-r--r--php-fpm.example.conf5
-rw-r--r--z-push.ini2
4 files changed, 16 insertions, 22 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 9e529213914c..dd3902eba102 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Tue Dec 6 19:40:33 UTC 2016
+# Tue Dec 13 00:37:37 UTC 2016
pkgbase = z-push
pkgdesc = open-source implementation of the ActiveSync protocol
- pkgver = 2.3.0
- pkgrel = 95
+ pkgver = 2.3.3
+ pkgrel = 1
url = http://z-push.sf.net/
install = install
arch = any
@@ -12,9 +12,6 @@ pkgbase = z-push
license = AGPL3
depends = nginx
depends = php<7
- depends = memcached
- depends = libmemcached
- depends = php-memcached
depends = zarafa-server
depends = php-fpm<7
optdepends = apache
@@ -23,7 +20,7 @@ pkgbase = z-push
backup = etc/webapps/z-push/nginx-location.conf
backup = etc/php/conf.d/z-push.ini
backup = etc/php/fpm.d/z-push.conf
- source = z-push-2.3.0.tar.gz::http://download.z-push.org/final/2.3/z-push-2.3.0.tar.gz
+ source = z-push-2.3.3.tar.gz::http://download.z-push.org/final/2.3/z-push-2.3.3.tar.gz
source = apache.example.conf
source = htaccess
source = z-push.ini
@@ -33,14 +30,14 @@ pkgbase = z-push
source = php-fpm.example.conf
source = z-push-admin
source = z-push-top
- md5sums = 5f8333a6bce182b801a37aed1fa6256a
+ md5sums = 64a23c8842ee94b07ba6622e649cb40f
md5sums = 32a459bd61135b6c5e99e82e3a6b0007
md5sums = 1091aa1ba272ef05bf628f73b05c527a
- md5sums = cfb472eac560284d935927720e6a2311
+ md5sums = fee38ae6ba98ae7afcb49b1edbc31d8e
md5sums = b61c194ee4e3e3bf8bfa6a72e6f38019
md5sums = 9637d4164f85cb3fb9a886654645a46c
md5sums = 1bdab5b1e4473c1b0f6ce2e5c8f1da61
- md5sums = 7adcf5e023718421a5e8e07e5e9a2480
+ md5sums = cacf375cabab0eaf7792d2d3a1a6b11a
md5sums = 626a81889bebd6184d8f90deb00f6119
md5sums = dfa0d3eceef2433ded6229b6611c5e02
diff --git a/PKGBUILD b/PKGBUILD
index c6a6171921e3..70b430be1c15 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,18 +5,15 @@
pkgname=z-push
groups=('zarafa'
'kopano')
-pkgver=2.3.0
+pkgver=2.3.3
_pkgrel=2.3
-pkgrel=95
+pkgrel=1
pkgdesc="open-source implementation of the ActiveSync protocol"
arch=('any')
url="http://z-push.sf.net/"
license=('AGPL3')
depends=('nginx'
'php<7'
- 'memcached'
- 'libmemcached'
- 'php-memcached'
'zarafa-server' # php-mapi
'php-fpm<7')
optdepends=('apache'
@@ -36,14 +33,14 @@ source=("${pkgname}-${pkgver}.tar.gz::http://download.z-push.org/final/${_pkgrel
"php-fpm.example.conf"
"z-push-admin"
"z-push-top")
-md5sums=('5f8333a6bce182b801a37aed1fa6256a'
+md5sums=('64a23c8842ee94b07ba6622e649cb40f'
'32a459bd61135b6c5e99e82e3a6b0007'
'1091aa1ba272ef05bf628f73b05c527a'
- 'cfb472eac560284d935927720e6a2311'
+ 'fee38ae6ba98ae7afcb49b1edbc31d8e'
'b61c194ee4e3e3bf8bfa6a72e6f38019'
'9637d4164f85cb3fb9a886654645a46c'
'1bdab5b1e4473c1b0f6ce2e5c8f1da61'
- '7adcf5e023718421a5e8e07e5e9a2480'
+ 'cacf375cabab0eaf7792d2d3a1a6b11a'
'626a81889bebd6184d8f90deb00f6119'
'dfa0d3eceef2433ded6229b6611c5e02')
@@ -66,7 +63,6 @@ package() {
cp ${srcdir}/nginx-location.conf ${pkgdir}/etc/webapps/z-push/
cp ${srcdir}/${pkgname}-${pkgver}/config.php ${pkgdir}/etc/webapps/z-push/config.example.php
sed -i -e "s|\('BACKEND_PROVIDER', \).*$|\1'BackendKopano'\);|" ${pkgdir}/etc/webapps/z-push/config.example.php
- sed -i -e "s|\('IPC_PROVIDER', \).*$|\1'IpcMemcachedProvider'\);|" ${pkgdir}/etc/webapps/z-push/config.example.php
ln -s /etc/webapps/z-push/config.php ${pkgdir}/usr/share/webapps/z-push/config.php
diff --git a/php-fpm.example.conf b/php-fpm.example.conf
index 9c70c26482fd..1dcbc0fcf1f6 100644
--- a/php-fpm.example.conf
+++ b/php-fpm.example.conf
@@ -1,3 +1,6 @@
+include = /etc/php/fpm.d/*.conf
+
[global]
pid = /run/php-fpm/php-fpm.pid
-include = /etc/php/fpm.d/*.conf \ No newline at end of file
+error_log = syslog
+log_level = notice \ No newline at end of file
diff --git a/z-push.ini b/z-push.ini
index d7f024ee4701..5ba4bfddff81 100644
--- a/z-push.ini
+++ b/z-push.ini
@@ -5,8 +5,6 @@ extension=shmop.so
extension=soap.so
extension=sysvsem.so
extension=sysvshm.so
-extension=pcntl.so
-extension=memcached.so
; in order to use the utils this system wide is needed
open_basedir=${open_basedir}:/usr/share/webapps/z-push:/etc/webapps/z-push:/var/lib/z-push:/var/log/z-push:/usr/share/php/mapi