10:13 a.m.
Author: robert
Update of /cvs/free/rpms/z-push/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv2378/F-20
Modified Files:
.cvsignore sources z-push.spec
Added Files:
z-push-2.1.2-package.patch
Removed Files:
z-push-2.1.1-package.patch
Log Message:
Upgrade to 2.1.2
z-push-2.1.2-package.patch:
config.php | 20 ++++++++++++++++++--
tools/migrate-2.0.x-2.1.0.php | 2 +-
z-push-admin.php | 6 ++++--
z-push-top.php | 5 ++++-
4 files changed, 27 insertions(+), 6 deletions(-)
--- NEW FILE z-push-2.1.2-package.patch ---
Patch by Robert Scheck <robert(a)fedoraproject.org> for z-push >= 2.1.2, which
changes the original
paths from Z-Push upstream to Fedora compliant ones. Additionally, it adds some
installation and
configuration hints regarding multiple data backend providers.
--- z-push-2.1.2-1873/config.php 2014-02-21 20:10:16.000000000 +0100
+++ z-push-2.1.2-1873/config.php.package 2014-05-27 11:51:32.000000000 +0200
@@ -60,6 +60,7 @@
// This setting specifies the owner parameter in the certificate to look at.
define("CERTIFICATE_OWNER_PARAMETER", "SSL_CLIENT_S_DN_CN");
+
/**********************************************************************************
* Default FileStateMachine settings
*/
@@ -101,6 +102,7 @@
// Uncomment and modify the following line if the validation of the certificates
fails.
// define('CAINFO', '/etc/ssl/certs/EmailCA.pem');
+
/**********************************************************************************
* Mobile settings
*/
@@ -192,19 +194,33 @@
// this full list, so this feature is disabled by default. Enable with care.
define('ALLOW_WEBSERVICE_USERS_ACCESS', false);
+
/**********************************************************************************
* Backend settings
+ *
+ * Z-Push supports currently the data backend providers Zarafa, IMAP, vCard directory,
+ * Maildir and a mixture by the combined one. Ensure that the used backend is installed
+ * and proper configured as well:
+ * BackendZarafa - configure /etc/z-push/zarafa.php (provided by z-push-zarafa)
+ * BackendCombined - configure /etc/z-push/combined.php (provided by z-push-combined)
+ * and of course the wanted (at least two) other backend providers
+ * BackendIMAP - configure /etc/z-push/imap.php (provided by z-push-imap)
+ * BackendVCardDir - configure /etc/z-push/vcarddir.php (provided by z-push-vcarddir)
+ * BackendMaildir - configure /etc/z-push/maildir.php (provided by z-push-maildir)
+ * If only one data backend provider has been installed, that one is used by default.
+ * In case of multiple installed data backend providers, they are tried in order above.
*/
- // the backend data provider
+ // The backend data provider
define('BACKEND_PROVIDER', '');
+
/**********************************************************************************
* Search provider settings
*
* Alternative backend to perform SEARCH requests (GAL search)
* By default the main Backend defines the preferred search functionality.
* If set, the Search Provider will always be preferred.
- * Use 'BackendSearchLDAP' to search in a LDAP directory (see
backend/searchldap/config.php)
+ * Use 'BackendSearchLDAP' to search in a LDAP directory (see
/etc/z-push/searchldap.php)
*/
define('SEARCH_PROVIDER', '');
// Time in seconds for the server search. Setting it too high might result in
timeout.
--- z-push-2.1.2-1873/z-push-admin.php 2013-02-28 22:02:27.000000000 +0100
+++ z-push-2.1.2-1873/z-push-admin.php.package 2013-12-12 16:20:55.000000000 +0100
@@ -44,6 +44,10 @@
* Consult LICENSE file for details
************************************************/
+// Script stays in /usr/sbin and is not a symlink to /usr/share/z-push
+define('BASE_PATH_CLI', "/usr/share/z-push/");
+set_include_path(get_include_path() . PATH_SEPARATOR . BASE_PATH_CLI);
+
include('lib/core/zpushdefs.php');
include('lib/core/zpush.php');
include('lib/core/stateobject.php');
@@ -102,8 +106,6 @@
/************************************************
* MAIN
*/
- define('BASE_PATH_CLI', dirname(__FILE__) ."/");
- set_include_path(get_include_path() . PATH_SEPARATOR . BASE_PATH_CLI);
try {
ZPush::CheckConfig();
ZPushAdminCLI::CheckEnv();
--- z-push-2.1.2-1873/z-push-top.php 2013-01-04 17:51:29.000000000 +0100
+++ z-push-2.1.2-1873/z-push-top.php.package 2013-12-12 16:21:28.000000000 +0100
@@ -44,6 +44,10 @@
* Consult LICENSE file for details
************************************************/
+// Script stays in /usr/sbin and is not a symlink to /usr/share/z-push
+define('BASE_PATH_CLI', "/usr/share/z-push/");
+set_include_path(get_include_path() . PATH_SEPARATOR . BASE_PATH_CLI);
+
include('lib/exceptions/exceptions.php');
include('lib/core/zpushdefs.php');
include('lib/core/zpush.php');
@@ -60,7 +64,6 @@
* MAIN
*/
declare(ticks = 1);
- define('BASE_PATH_CLI', dirname(__FILE__) ."/");
try {
ZPush::CheckConfig();
--- z-push-2.1.2-1873/tools/migrate-2.0.x-2.1.0.php 2013-09-05 20:50:34.000000000 +0200
+++ z-push-2.1.2-1873/tools/migrate-2.0.x-2.1.0.php.package 2013-12-12 22:04:34.000000000
+0100
@@ -44,7 +44,7 @@
************************************************/
// Please adjust to match your z-push installation directory, usually /usr/share/z-push
-define('ZPUSH_BASE_PATH', "../");
+define('ZPUSH_BASE_PATH', "/usr/share/z-push/");
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/z-push/F-20/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore 12 Dec 2013 21:19:51 -0000 1.13
+++ .cvsignore 27 May 2014 10:12:37 -0000 1.14
@@ -1,2 +1,2 @@
-z-push-2.1.1-1788.tar.gz
+z-push-2.1.2-1873.tar.gz
z-push-permission.pdf
Index: sources
===================================================================
RCS file: /cvs/free/rpms/z-push/F-20/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources 12 Dec 2013 21:19:51 -0000 1.13
+++ sources 27 May 2014 10:12:37 -0000 1.14
@@ -1,2 +1,2 @@
-f844d0c3b708f151284338c1a938eca8 z-push-2.1.1-1788.tar.gz
+f05edda2cadcbad260a861d75a2ba5a7 z-push-2.1.2-1873.tar.gz
0d25be91b27fe7ebab16ed593c9fbf48 z-push-permission.pdf
Index: z-push.spec
===================================================================
RCS file: /cvs/free/rpms/z-push/F-20/z-push.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- z-push.spec 12 Dec 2013 21:19:51 -0000 1.16
+++ z-push.spec 27 May 2014 10:12:37 -0000 1.17
@@ -1,8 +1,8 @@
-%global svnrevision 1788
+%global svnrevision 1873
Summary: ActiveSync over-the-air implementation for mobile syncing
Name: z-push
-Version: 2.1.1
+Version: 2.1.2
Release: 1%{?dist}
License: AGPLv3 with exceptions
Group: Applications/Productivity
@@ -12,7 +12,7 @@
Source2: z-push-README.FEDORA
Source3: z-push.conf
Source4: z-push.logrotate
-Patch0: z-push-2.1.1-package.patch
+Patch0: z-push-2.1.2-package.patch
Requires: httpd, php-iconv, php-sysvsem, php-sysvshm
Requires: coreutils, bash, grep, less, php-pcntl
# Bug: php53 from RHEL 5 does not provide php (#717158)
@@ -193,6 +193,9 @@
%{_datadir}/%{name}/backend/zarafa/
%changelog
+* Tue May 27 2014 Robert Scheck <robert(a)fedoraproject.org> 2.1.2-1
+- Upgrade to 2.1.2
+
* Thu Dec 12 2013 Robert Scheck <robert(a)fedoraproject.org> 2.1.1-1
- Upgrade to 2.1.1
--- z-push-2.1.1-package.patch DELETED ---