update to zarafa 7.2.4

4 files changed, 56 insertions, 50 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5386ff213628..3bd865b0068b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,22 @@
 # Generated by mksrcinfo v8
-# Tue Aug  9 14:54:54 UTC 2016
+# Fri Aug 19 13:34:24 UTC 2016
 pkgbase = zarafa-webapp
 	pkgdesc = WebApp for Zarafa
-	pkgver = 2.1.2
-	pkgrel = 87
+	pkgver = 2.2.0.414
+	pkgrel = 1
 	url = http://www.zarafa.com/
 	arch = any
 	groups = zarafa
+	groups = kopano
+	groups = zarafa-webapp-plugins
 	license = AGPL3
 	makedepends = apache-ant
 	makedepends = gettext
+	makedepends = libxml2
 	depends = php<7
+	depends = nginx
 	depends = php-fpm<7
-	source = webapp-2.1.2.tar.gz::http://download.zarafa.com/community/final/WebApp/2.1.2/sourcecode/webapp-2.1.2.tar.gz
+	source = webapp-2.2.0.414.tar.gz::https://download.zarafa.com/community/final/WebApp/2.2.0/sourcecode/webapp-2.2.0.414.tar.gz
 	source = nginx-location.conf
 	source = nginx-ssl.example.conf
 	source = php-fpm.example.conf
@@ -20,13 +24,13 @@ pkgbase = zarafa-webapp
 	source = zarafa-webapp.ini
 	source = zarafa-webapp.install
 	source = compress-static
-	md5sums = 231a0ceb064c9c213de6dcdd2b7ae732
+	md5sums = SKIP
 	md5sums = fa930c1df0c132dd9edbbe7004452851
 	md5sums = 1bdab5b1e4473c1b0f6ce2e5c8f1da61
 	md5sums = 7adcf5e023718421a5e8e07e5e9a2480
 	md5sums = cc8143c1fa12911a17578c1e775225fe
-	md5sums = daedd4114b213e9279806ee720eeb1ef
-	md5sums = bf62e8e0d7d5be45762f93b8340bf673
+	md5sums = SKIP
+	md5sums = SKIP
 	md5sums = d737d82dfab24adc516c001238a4119f
 
 pkgname = zarafa-webapp
@@ -50,18 +54,12 @@ pkgname = zarafa-webapp-folderwidgets
 
 pkgname = zarafa-webapp-gmaps
 
-pkgname = zarafa-webapp-oauthlib
-
 pkgname = zarafa-webapp-pimfolder
 
-pkgname = zarafa-webapp-quickitems
-
 pkgname = zarafa-webapp-titlecounter
 
 pkgname = zarafa-webapp-webappmanual
 
-pkgname = zarafa-webapp-webodf
-
 pkgname = zarafa-webapp-xmpp
 
 pkgname = zarafa-webapp-zdeveloper
diff --git a/PKGBUILD b/PKGBUILD
index 5f40e78a0f27..254f4b28cd65 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer: MartiMcFly martimcfly@autorisation.de
+# Maintainer: MartiMcFly <martimcfly [at] autorisation.de>
 # Contributor: Archist archist@die-optimisten.net
 
 # according to https://wiki.archlinux.org/index.php/Web_application_package_guidelines
@@ -9,27 +9,28 @@ pkgname=('zarafa-webapp'
 	 'zarafa-webapp-files'
 	 'zarafa-webapp-folderwidgets'
 	 'zarafa-webapp-gmaps'
-	 'zarafa-webapp-oauthlib'
 	 'zarafa-webapp-pimfolder'
-	 'zarafa-webapp-quickitems'
 	 'zarafa-webapp-titlecounter'
 	 'zarafa-webapp-webappmanual'
-	 'zarafa-webapp-webodf'
 	 'zarafa-webapp-xmpp'
          'zarafa-webapp-zdeveloper')
-groups=('zarafa')
-pkgver=2.1.2
-_pkgrel=2.1.2
-pkgrel=87
+groups=('zarafa'
+	'kopano'
+	'zarafa-webapp-plugins')
+pkgver=2.2.0.414
+_pkgrel=2.2.0
+pkgrel=1
 pkgdesc='WebApp for Zarafa'
 arch=('any')
 url='http://www.zarafa.com/'
 license=('AGPL3')
 depends=('php<7'
+	 'nginx'
 	 'php-fpm<7')
 makedepends=('apache-ant'
-	     'gettext')
-source=("webapp-${pkgver}.tar.gz::http://download.zarafa.com/community/final/WebApp/${_pkgrel}/sourcecode/webapp-${pkgver}.tar.gz"
+	     'gettext'
+	     'libxml2')
+source=("webapp-${pkgver}.tar.gz::https://download.zarafa.com/community/final/WebApp/${_pkgrel}/sourcecode/webapp-${pkgver}.tar.gz"
 	"nginx-location.conf"
 	"nginx-ssl.example.conf"
 	"php-fpm.example.conf"
@@ -37,20 +38,20 @@ source=("webapp-${pkgver}.tar.gz::http://download.zarafa.com/community/final/Web
 	"zarafa-webapp.ini"
 	"zarafa-webapp.install"
 	"compress-static")
-md5sums=('231a0ceb064c9c213de6dcdd2b7ae732'
+md5sums=('SKIP'
          'fa930c1df0c132dd9edbbe7004452851'
          '1bdab5b1e4473c1b0f6ce2e5c8f1da61'
          '7adcf5e023718421a5e8e07e5e9a2480'
          'cc8143c1fa12911a17578c1e775225fe'
-         'daedd4114b213e9279806ee720eeb1ef'
-         'bf62e8e0d7d5be45762f93b8340bf673'
+         'SKIP'
+         'SKIP'
          'd737d82dfab24adc516c001238a4119f')
 
 build() {
     # create translations, compress javascript-files
     cd ${srcdir}/zarafa-webapp-${pkgver}
-    ant deploy
-    ant deploy-plugins
+    
+    make antdeploy
 }
 
 package_zarafa-webapp() {
@@ -82,18 +83,18 @@ package_zarafa-webapp() {
 
     mkdir -p ${pkgdir}/etc/webapps/${pkgname}
     
-    ## config mains
-    cp config.php.dist ${pkgdir}/etc/webapps/${pkgname}/config.php
-    cp debug.php.dist ${pkgdir}/etc/webapps/${pkgname}/debug.php
-    ln -s /etc/webapps/${pkgname}/config.php ${pkgdir}/usr/share/webapps/${pkgname}/config.php    
-
     ## config examples
     cp ${srcdir}/php-fpm.example.conf ${pkgdir}/etc/webapps/${pkgname}/
     cp ${srcdir}/nginx-ssl.example.conf ${pkgdir}/etc/webapps/${pkgname}/
     cp ${srcdir}/nginx-location.conf ${pkgdir}/etc/webapps/${pkgname}/
     cp zarafa-webapp.conf ${pkgdir}/etc/webapps/${pkgname}/apache.example.conf
-    cp ${pkgdir}/etc/webapps/${pkgname}/config.php ${pkgdir}/etc/webapps/${pkgname}/config.example.php
-    cp ${pkgdir}/etc/webapps/${pkgname}/debug.php ${pkgdir}/etc/webapps/${pkgname}/debug.example.php
+    
+    ## config mains
+    cp config.php.dist ${pkgdir}/etc/webapps/${pkgname}/config.example.php
+    cp debug.php.dist ${pkgdir}/etc/webapps/${pkgname}/debug.example.php
+    sed -i -e 's|\(\"DEBUG_LOADER\", \).*$|\1LOAD_DEBUG);|' ${pkgdir}/etc/webapps/${pkgname}/debug.example.php    
+
+    ln -s /etc/webapps/${pkgname}/config.php ${pkgdir}/usr/share/webapps/${pkgname}/config.php    
 
     ## php 
     mkdir -p ${pkgdir}/etc/php/conf.d
@@ -116,6 +117,8 @@ package_plugin() {
 
     # plugin
     depends=('zarafa-webapp')
+    groups=('zarafa'
+	    'zarafa-webapp-plugins')
     
     mkdir -p ${pkgdir}/usr/share/webapps/zarafa-webapp/plugins/${pluginname}/
     cp -R * ${pkgdir}/usr/share/webapps/zarafa-webapp/plugins/${pluginname}/
@@ -166,18 +169,10 @@ package_zarafa-webapp-gmaps() {
     package_plugin ${pkgname//zarafa-webapp-/}
 }
 
-package_zarafa-webapp-oauthlib() {
-    package_plugin ${pkgname//zarafa-webapp-/}
-}
-
 package_zarafa-webapp-pimfolder() {
     package_plugin ${pkgname//zarafa-webapp-/}
 }
 
-package_zarafa-webapp-quickitems() {
-    package_plugin ${pkgname//zarafa-webapp-/}
-}
-
 package_zarafa-webapp-titlecounter() {
     package_plugin ${pkgname//zarafa-webapp-/}
 }
@@ -186,10 +181,6 @@ package_zarafa-webapp-webappmanual() {
     package_plugin ${pkgname//zarafa-webapp-/}
 }
 
-package_zarafa-webapp-webodf() {
-    package_plugin ${pkgname//zarafa-webapp-/}
-}
-
 package_zarafa-webapp-xmpp() {
     package_plugin ${pkgname//zarafa-webapp-/}
 }
diff --git a/zarafa-webapp.ini b/zarafa-webapp.ini
index c1c160a62184..33ceb092cca2 100644
--- a/zarafa-webapp.ini
+++ b/zarafa-webapp.ini
@@ -1,3 +1,4 @@
 extension=mapi.so
 extension=iconv.so
 extension=gettext.so
+extension=openssl.so
\ No newline at end of file
diff --git a/zarafa-webapp.install b/zarafa-webapp.install
index c40f0dd0a7be..00be24b27639 100644
--- a/zarafa-webapp.install
+++ b/zarafa-webapp.install
@@ -1,6 +1,22 @@
+#!/bin/bash
+
+# care about existing files
+function installdir() {
+    local owner="$1"
+    local moddir="$2"
+    local modfile="$3"
+    local directory="$4"
+
+    mkdir -p "$directory"
+    find $directory -exec chown "$owner" {} \;
+    find $directory -type f -exec chmod "$modfile" {} \;
+    find $directory -type d -exec chmod "$moddir" {} \;
+}
+
 post_install() {
-    mkdir -p /var/lib/zarafa-webapp
+    cp -n /etc/webapps/zarafa-webapp/config.example.php /etc/webapps/zarafa-webapp/config.php
+    cp -n /etc/webapps/zarafa-webapp/debug.example.php /etc/webapps/zarafa-webapp/debug.php    
 
-    chown -R http:http /var/log/zarafa-webapp
-    chown -R http:http /var/lib/zarafa-webapp
+    installdir http:http 0700 0600 /var/log/zarafa-webapp
+    installdir http:http 0700 0600 /var/lib/zarafa-webapp
 }
\ No newline at end of file