rpms/z-push/devel z-push-2.1.1-package.patch, NONE, 1.1 .cvsignore, 1.12, 1.13 sources, 1.12, 1.13 z-push-README.FEDORA, 1.1, 1.2 z-push.spec, 1.15, 1.16 z-push-2.0.9-package.patch, 1.1, NONE

Robert Scheck robert at rpmfusion.org
Thu Dec 12 22:19:51 CET 2013 

Author: robert

Update of /cvs/free/rpms/z-push/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv17644/devel

Modified Files:
	.cvsignore sources z-push-README.FEDORA z-push.spec 
Added Files:
	z-push-2.1.1-package.patch 
Removed Files:
	z-push-2.0.9-package.patch 
Log Message:
Upgrade to 2.1.1


z-push-2.1.1-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.1-package.patch ---
Patch by Robert Scheck <robert at fedoraproject.org> for z-push >= 2.1.1, 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.1-1788/config.php				2013-11-06 19:20:31.000000000 +0100
+++ z-push-2.1.1-1788/config.php.package			2013-12-12 16:19:30.000000000 +0100
@@ -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
  */
@@ -185,19 +187,33 @@
     // default: 49152 - 48 KB default max photo size in bytes
     define('SYNC_CONTACTS_MAXPICTURESIZE', 49152);
 
+
 /**********************************************************************************
  *  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.1-1788/z-push-admin.php				2013-02-28 22:02:27.000000000 +0100
+++ z-push-2.1.1-1788/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.1-1788/z-push-top.php				2013-01-04 17:51:29.000000000 +0100
+++ z-push-2.1.1-1788/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.1-1788/tools/migrate-2.0.x-2.1.0.php		2013-09-05 20:50:34.000000000 +0200
+++ z-push-2.1.1-1788/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/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	8 Dec 2013 19:56:56 -0000	1.12
+++ .cvsignore	12 Dec 2013 21:19:51 -0000	1.13
@@ -1,2 +1,2 @@
-z-push-2.0.9-1787.tar.gz
+z-push-2.1.1-1788.tar.gz
 z-push-permission.pdf


Index: sources
===================================================================
RCS file: /cvs/free/rpms/z-push/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	8 Dec 2013 19:56:56 -0000	1.12
+++ sources	12 Dec 2013 21:19:51 -0000	1.13
@@ -1,2 +1,2 @@
-94fad4d31cad30c762018937a4542e17  z-push-2.0.9-1787.tar.gz
+f844d0c3b708f151284338c1a938eca8  z-push-2.1.1-1788.tar.gz
 0d25be91b27fe7ebab16ed593c9fbf48  z-push-permission.pdf


Index: z-push-README.FEDORA
===================================================================
RCS file: /cvs/free/rpms/z-push/devel/z-push-README.FEDORA,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- z-push-README.FEDORA	8 Nov 2012 21:38:17 -0000	1.1
+++ z-push-README.FEDORA	12 Dec 2013 21:19:51 -0000	1.2
@@ -80,6 +80,12 @@
  Z-Push will be quite talkative, so it is advisable to use log-rotate
  on the log file.
 
+There might be repeated incorrect password messages if a password contains
+characters which are encoded differently in ISO-8859-1 and Windows-1252
+encodings (e.g. "§") the login might fail with Z-Push but it works fine with
+the WebApp/Webaccess. Solution is to add setlocale(LC_CTYPE, "en_US.UTF-8");
+to the config.php file.
+
 
 Documentation
 -------------
@@ -87,3 +93,58 @@
 Further information can be found in the Zarafa Z-Push configuration manual
 http://doc.zarafa.com/trunk/Administrator_Manual/en-US/html/_zpush.html and
 at the homepage of Z-Push, http://z-push.sourceforge.net.
+
+
+Upgrade
+-------
+
+*Important* States of Z-Push 2.0 and Z-Push 2.1 are not compatible. A state
+migration script is available in the /usr/share/z-push/tools/ folder.
+
+Please also observe the published release notes of the new Z-Push version.
+For some releases it is necessary to e.g. resynchronize the mobile. 
+
+
+S/MIME
+------
+
+Z-Push supports signing and en-/decrypting of emails on mobile devices since
+the version 2.0.7.
+
+*Important* Currently only Android 4.X and higher and Apple iOS 5 and higher
+devices are known to support encryption/signing of emails.
+
+It might be possible that PHP functions require CA information in order to
+validate certs. Therefore the CAINFO parameter in the config.php must be
+configured properly.
+
+The major part of S/MIME deployment is the PKI setup. It includes the
+public-private key/certificate obtaining, their management in directory
+service and roll-out to the mobile devices. Individual certificates can
+either be obtained from a local (company intern) or a public CA. There are
+various public CAs offering certificates: commercial ones e.g. Symantec or
+Comodo or community-driven e.g. CAcert.org.
+
+Both most popular directory services Microsoft Active Directory (MS ADS)
+and free open source solution OpenLDAP allow to save certificates. Private
+keys/certificates reside in user's directory or on a smartcard. Public
+certificates are saved in directory. Both, Microsoft Active Directory and
+OpenLDAP use the userCertificate attribute to save it.
+
+In the Active Directory the public key for contacts from GAB is saved in
+PR_EMS_AB_TAGGED_X509_CERT (0x8C6A1102) property and if you save a key in a
+contact it’s PR_USER_X509_CERTIFICATE (0x3A701102).
+
+In LDAP public key for contacts from GAB is saved in userCertificate
+property. It should be mapped to 0x3A220102 in ldap.propmap.cfg
+(0x3A220102 = userCertificate). Make sure it looks like this in LDAP:
+
+userCertificate;binary
+    MIIFGjCCBAKgAwIBAgIQbRnqpxlPa… 
+
+*Important* It is strongly recommended to use MS AD or LDAP to manage the
+certificates. Other user plugin backend options like db or unix might not
+work correctly and are not supported.
+
+For in-depth information please refer to: http://www.zarafa.com/blog/post/
+2013/05/smime-z-push-signing-and-en-decrypting-emails-mobile-devices 


Index: z-push.spec
===================================================================
RCS file: /cvs/free/rpms/z-push/devel/z-push.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- z-push.spec	8 Dec 2013 19:56:56 -0000	1.15
+++ z-push.spec	12 Dec 2013 21:19:51 -0000	1.16
@@ -1,18 +1,18 @@
-%global svnrevision 1787
+%global svnrevision 1788
 
 Summary:        ActiveSync over-the-air implementation for mobile syncing
 Name:           z-push
-Version:        2.0.9
+Version:        2.1.1
 Release:        1%{?dist}
 License:        AGPLv3 with exceptions
 Group:          Applications/Productivity
 URL:            http://z-push.sourceforge.net/
-Source0:        http://www.zarafa-deutschland.de/z-push-download/final/2.0/%{name}-%{version}-%{svnrevision}.tar.gz
+Source0:        http://www.zarafa-deutschland.de/z-push-download/final/2.1/%{name}-%{version}-%{svnrevision}.tar.gz
 Source1:        z-push-permission.pdf
 Source2:        z-push-README.FEDORA
 Source3:        z-push.conf
 Source4:        z-push.logrotate
-Patch0:         z-push-2.0.9-package.patch
+Patch0:         z-push-2.1.1-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)
@@ -89,7 +89,7 @@
 %package zarafa
 Summary:        Zarafa data backend provider for Z-Push
 Group:          Applications/Productivity
-Requires:       %{name} = %{version}-%{release}, php-mapi >= 6.40.0
+Requires:       %{name} = %{version}-%{release}, php-mapi >= 7.0.6
 Provides:       zarafa-%{name} = %{version}-%{release}
 Obsoletes:      zarafa-%{name} < %{version}-%{release}
 
@@ -118,14 +118,7 @@
 mv -f $RPM_BUILD_ROOT%{_datadir}/%{name}/config.php $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/config.php
 ln -sf ../../..%{_sysconfdir}/%{name}/config.php $RPM_BUILD_ROOT%{_datadir}/%{name}/config.php
 
-for backend in imap maildir vcarddir; do
-  mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/backend/${backend}/
-  mv -f $RPM_BUILD_ROOT%{_datadir}/%{name}/backend/${backend}.php $RPM_BUILD_ROOT%{_datadir}/%{name}/backend/${backend}/
-  mv -f $RPM_BUILD_ROOT%{_datadir}/%{name}/config.${backend}.php $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/${backend}.php
-  ln -sf ../../../../..%{_sysconfdir}/%{name}/${backend}.php $RPM_BUILD_ROOT%{_datadir}/%{name}/backend/${backend}/config.php
-done
-
-for backend in combined searchldap zarafa; do
+for backend in combined imap maildir searchldap vcarddir zarafa; do
   mv -f $RPM_BUILD_ROOT%{_datadir}/%{name}/backend/${backend}/config.php $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/${backend}.php
   ln -sf ../../../../..%{_sysconfdir}/%{name}/${backend}.php $RPM_BUILD_ROOT%{_datadir}/%{name}/backend/${backend}/config.php
 done
@@ -141,7 +134,7 @@
 install -D -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name}
 
 # Remove all unwanted files and directories
-rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/{INSTALL,LICENSE,backend/kolab}
+rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/{INSTALL,LICENSE}
 
 # Copy permission and README for later usage
 cp -pf %{SOURCE1} permission.pdf
@@ -200,6 +193,9 @@
 %{_datadir}/%{name}/backend/zarafa/
 
 %changelog
+* Thu Dec 12 2013 Robert Scheck <robert at fedoraproject.org> 2.1.1-1
+- Upgrade to 2.1.1
+
 * Sun Dec 08 2013 Robert Scheck <robert at fedoraproject.org> 2.0.9-1
 - Upgrade to 2.0.9
 


--- z-push-2.0.9-package.patch DELETED ---

More information about the rpmfusion-commits mailing list