Author: robert Update of /cvs/free/rpms/z-push/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv27244/devel Modified Files: .cvsignore sources z-push-README.FEDORA z-push.spec Added Files: z-push-2.2.4-package.patch z-push-autodiscover-README.FEDORA z-push-autodiscover.conf Removed Files: z-push-2.1.2-package.patch Log Message: Upgrade to 2.2.4 z-push-2.2.4-package.patch: autodiscover/config.php | 17 ++++++++++++++++- config.php | 21 +++++++++++++++++++-- tools/migrate-2.0.x-2.1.0.php | 2 +- z-push-admin.php | 6 ++++-- z-push-top.php | 5 ++++- 5 files changed, 44 insertions(+), 7 deletions(-) --- NEW FILE z-push-2.2.4-package.patch --- Patch by Robert Scheck <robert(a)fedoraproject.org&gt; for z-push >= 2.2.4, 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.2.4/config.php 2015-09-30 15:05:38.000000000 +0200 +++ z-push-2.2.4/config.php.package. 2015-10-02 16:41:22.017747249 +0200 @@ -69,6 +69,8 @@ * true - use the complete email address. */ define('USE_FULLEMAIL_FOR_LOGIN', false); + + /********************************************************************************** * Default FileStateMachine settings */ @@ -110,6 +112,7 @@ // Uncomment and modify the following line if the validation of the certificates fails. // define('CAINFO', '/etc/ssl/certs/EmailCA.pem'); + /********************************************************************************** * Mobile settings */ @@ -208,19 +211,33 @@ // NOTE: THIS IS AN EXPERIMENTAL FEATURE WHICH COULD PREVENT YOUR MOBILES FROM SYNCHRONIZING. define('USE_PARTIAL_FOLDERSYNC', 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.2.4/z-push-admin.php 2015-09-30 19:10:45.000000000 +0200 +++ z-push-2.2.4/z-push-admin.php.package 2015-10-02 16:41:57.955453602 +0200 @@ -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'); @@ -103,8 +107,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.2.4/z-push-top.php 2015-09-30 19:10:44.000000000 +0200 +++ z-push-2.2.4/z-push-top.php.package 2015-10-02 16:42:27.440212676 +0200 @@ -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'); @@ -61,7 +65,6 @@ * MAIN */ declare(ticks = 1); - define('BASE_PATH_CLI', dirname(__FILE__) ."/"); try { ZPush::CheckConfig(); --- z-push-2.2.4/tools/migrate-2.0.x-2.1.0.php 2015-09-30 19:10:45.000000000 +0200 +++ z-push-2.2.4/tools/migrate-2.0.x-2.1.0.php.package 2015-10-02 16:42:51.376017089 +0200 @@ -44,7 +44,7 @@ ************************************************/ // Please adjust to match your z-push installation directory, usually /usr/share/z-push -define('ZPUSH_BASE_PATH', "../src"); +define('ZPUSH_BASE_PATH', "/usr/share/z-push/"); --- z-push-2.2.4/autodiscover/config.php 2015-09-30 15:05:39.000000000 +0200 +++ z-push-2.2.4/autodiscover/config.php.package 2015-10-02 17:02:20.586475499 +0200 @@ -59,6 +59,7 @@ */ define('USE_FULLEMAIL_FOR_LOGIN', false); + /********************************************************************************** * Logging settings * Possible LOGLEVEL and LOGUSERLEVEL values are: @@ -81,9 +82,23 @@ define('LOGERRORFILE', LOGFILEDIR . 'autodiscover-error.log'); define('LOGLEVEL', LOGLEVEL_INFO); define('LOGUSERLEVEL', LOGLEVEL); + + /********************************************************************************** * 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', ''); ?> \ No newline at end of file --- NEW FILE z-push-autodiscover-README.FEDORA --- Z-Push AutoDiscover manual ========================== Introduction ------------ AutoDiscover is the service used to simplify the configuration of collaboration accounts for clients, especially for mobile phones. While in the past the user was required to enter the server name, user name and password manually into his mobile phone in order to connect, with AutoDiscover the user is only required to fill in his e-mail address and the password. AutoDiscover will try several methods to reach the correct server automatically. How does it work? ----------------- When speaking about AutoDiscover, this includes two distinct realms: - AutoDiscover is a specification which defines the steps a client should take in order to contact a service to request additional data. - The AutoDiscover service is piece of software which accepts requests from the clients, authenticates them, requests some additional data from the collaboration server and sends this data back to the client. The specification suggests several ways for client to contact the responsible server to receive additional information. Tests have shown, that basically all mobile phones tested support only the most basic ways. These are sufficient for almost all types of scenarios and are the ones implemented by Z-Push AutoDiscover. Please refer to the Mobile Compatibility List (http://z-push.sf.net/compatibility) for an overview of supported and tested devices. The used e-mail address is the key for the process. The client splits it up into the local and domain part (before and after the @-sign). The client then tries to connect to this domain in order to get in contact with the AutoDiscover service. The local part of the e-mail address is used as "login" to the AutoDiscover service. There is also an option, to use the full e-mail address as login name (see "Configuration" section below for details). --------------- | Client | | e.g. mobile | --------------- / \ 1. Searches for / \ 2. Data access information / \ / \ V V ---------------- -------------- | AutoDiscover | redirects to | Z-Push | | | --------------------> | ActiveSync | ---------------- -------------- \ / Authen- \ / Synchronizes ticates \ / via Z-Push \ / Backend V V ----------------- | Collaboration | | Platform | ----------------- Requirements ------------ As described in the previous chapter, the local part of the e-mail address or the e-mail address is used in order to log in. Your configuration requires that this type of login is possible: - either the user name is used to login and must be used in the e-mail address entered on the mobile, or - the entire e-mail address is used to login. Which option is used has to be configured in the AutoDiscover configuration and in the underlying platform (e.g. ZCP (hosting mode)). Most companies use the user name as local part of the e-mail by default. From the AutoDiscover point of view, it is not required that user is able to receive e-mails at the used e-mail address. It is recommended allowing that in order not to confuse end users. AutoDiscover also requires a valid SSL certificate to work as expected. A very little percentage of mobiles support self-signed certificates (showing a pop-up alerting the user). Most mobiles silently ignore self-signed certificates and just declare the AutoDiscover process as failed in such cases. If AutoDiscover fails, the user is generally redirected to the "manual configuration" of the client. If you do not plan to acquire an official certificate, you will probably not be able to use the AutoDiscover service. Depending on your setup, it could be necessary to add new DNS entries for your mail domain. Domain setup ------------ There are two general ways the AutoDiscover process can be configured: 1. Directly with "yourdomain.com" website ("www.yourdomain.com" will most probably not work) 2. With the sub-domain "autodiscover.yourdomain.com" In both cases, an official SSL certificate is required. If you already have a certificate for your domain, the webserver answering for that domain could be reconfigured to allow AutoDiscover requests as well. In the case that you do not have direct access to this type of configuration (e.g. hosting provider), it's recommended to acquire a dedicated certificate for "autodiscover.yourdomain.com". Please note, that this sub-domain can NOT be renamed. In general, "wildcard" certificates can be used, as long they are valid for the required domain. Installation ------------ AutoDiscover is part of the "z-push-autodiscover" RPM package and uses some of the functionality available in Z-Push. It is possible to install AutoDiscover on the same host as Z-Push, or to install them on different hosts. If you do not want to setup Z-Push on the host, disable the "Alias" for the ActiveSync configuration in "/etc/httpd/conf.d/z-push.conf". To setup the SSL certificate, please refer to one of the many setup guides available on the internet, like that one: http://www.apache.com/resources/how-to-setup-an-ssl-certificate-on-apache/ The mobiles requests these URLs (where "yourdomain.com" corresponds to the domain part of the e-mail used in the client): https://yourdomain.com/Autodiscover/Autodiscover.xml and/or https://autodiscover.yourdomain.com/Autodiscover/Autodiscover.xml Configuration ------------- There are several parameters in the configuration file, which allow to customize the behaviour of the AutoDiscover Service. The configuration is located in the file "/etc/z-push/autodiscover.php". The parameters: BASE_PATH This property specifies where the AutoDiscover files are located. Normally there is no need to adjust this parameter. SERVERURL This is the full URL where the Z-Push server is available. You should adjust it to the domain/server where Z-Push is installed. USE_FULLEMAIL_FOR_LOGIN If this is set to "true", AutoDiscover will attempt to login on the collaboration server with the full e-mail address sent by the client. If disabled (default), the local part of the e-mail address is used. LOGFILEDIR The directory where logfiles are created. LOGFILE The default AutoDiscover log file. LOGERRORFILE The default AutoDiscover error log file. LOGLEVEL The loglevel, set it to WBXML to see the data received and sent from/to clients. LOGAUTHFAIL Set to true, to explicitly log failed login attempts. BACKEND_PROVIDER The backend to be used. If empty (default) the code will auto detect which backend to use. Please note: The desired backend also needs to be configured, in the "/etc/z-push/<backend>.php" file. Test installation ----------------- If everything is correct, accessing with a browser the URL for your setup, you should see: 1. a pop-up asking for your username + password. Always use the e-mail address which you would also enter on the mobile (independently from the configuration). 2. if the authentication was successful, you will see a Z-Push informational page (like when accessing the Z-Push location). Note: The same test can also be performed in the mobiles web browser to check if the access works correctly from the mobile network. If the authentication fails, please check the configuration options of AutoDiscover. Also check the logfiles for possible failures. If the manual method works, try setting up your mobile phone! :) --- NEW FILE z-push-autodiscover.conf --- # # Z-Push AutoDiscover - ActiveSync over-the-air implementation # AliasMatch (?i)/Autodiscover/Autodiscover.xml /usr/share/z-push/autodiscover/autodiscover.php # If the PHP settings are not set up correctly, login will fail # <Directory /usr/share/z-push/> # Some apache settings Options -Indexes +FollowSymLinks <IfModule mod_authz_core.c> # Apache 2.4 Require all granted </IfModule> <IfModule !mod_authz_core.c> # Apache 2.2 Order allow,deny Allow from all </IfModule> # Register globals must be off php_flag register_globals off # Magic quotes must be off php_flag magic_quotes_gpc off php_flag magic_quotes_runtime off # Short open tags must be on php_flag short_open_tag on # Set memory limit to 128 MB php_value memory_limit 128M </Directory> Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/z-push/devel/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 8 Jul 2014 10:00:26 -0000 1.15 +++ .cvsignore 2 Oct 2015 15:50:45 -0000 1.16 @@ -1,2 +1,2 @@ -z-push-2.1.3-1892.tar.gz +z-push-2.2.4.tar.gz z-push-permission.pdf Index: sources =================================================================== RCS file: /cvs/free/rpms/z-push/devel/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 8 Jul 2014 10:00:26 -0000 1.15 +++ sources 2 Oct 2015 15:50:45 -0000 1.16 @@ -1,2 +1,2 @@ -a5bc26143cf1961988bbff1eb1442d98 z-push-2.1.3-1892.tar.gz +9ed1a04d122c44b5c03aa8ceb8d79c3d z-push-2.2.4.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.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- z-push-README.FEDORA 12 Dec 2013 21:19:51 -0000 1.2 +++ z-push-README.FEDORA 2 Oct 2015 15:50:45 -0000 1.3 @@ -108,11 +108,11 @@ S/MIME ------ -Z-Push supports signing and en-/decrypting of emails on mobile devices since +Z-Push supports signing and en-/decrypting of e-mails 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. +devices are known to support encryption/signing of e-mails. 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 Index: z-push.spec =================================================================== RCS file: /cvs/free/rpms/z-push/devel/z-push.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- z-push.spec 8 Jul 2014 10:00:26 -0000 1.18 +++ z-push.spec 2 Oct 2015 15:50:45 -0000 1.19 @@ -1,18 +1,18 @@ -%global svnrevision 1892 - Summary: ActiveSync over-the-air implementation for mobile syncing Name: z-push -Version: 2.1.3 +Version: 2.2.4 Release: 1%{?dist} License: AGPLv3 with exceptions Group: Applications/Productivity -URL: http://www.z-push.org/ -Source0: http://download.z-push.org/final/2.1/%{name}-%{version}-%{svnrevision}.ta... +URL: https://z-push.org/ +Source0: http://download.z-push.org/final/2.2/%{name}-%{version}.tar.gz Source1: z-push-permission.pdf Source2: z-push-README.FEDORA -Source3: z-push.conf -Source4: z-push.logrotate -Patch0: z-push-2.1.2-package.patch +Source3: z-push-autodiscover-README.FEDORA +Source4: z-push.conf +Source5: z-push-autodiscover.conf +Source6: z-push.logrotate +Patch0: z-push-2.2.4-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) @@ -30,6 +30,20 @@ Mobile, Android, iPhone, Sony Ericsson and Nokia mobile devices. With Z-Push any groupware can be connected and synced with these devices. +%package autodiscover +Summary: Simplify account configuration for ActiveSync users +Group: Applications/Productivity +Requires: %{name} = %{version}-%{release}, php-xml >= 5.1.0 + +%description autodiscover +The z-push-autodiscover package contains the AutoDiscover service to +simplify the account configuration for clients, especially for mobile +phones. While in the past the user was required to enter the server +name, username and password manually into his mobile phone in order to +connect, with AutoDiscover the user is only required to fill in his +e-mail address and the password. AutoDiscover will try several methods +to reach the correct server automatically. + %package combined Summary: Combines several data backend providers for Z-Push Group: Applications/Productivity @@ -89,7 +103,7 @@ %package zarafa Summary: Zarafa data backend provider for Z-Push Group: Applications/Productivity -Requires: %{name} = %{version}-%{release}, php-mapi >= 7.0.6 +Requires: %{name} = %{version}-%{release}, php-mapi >= 7.1.11 Provides: zarafa-%{name} = %{version}-%{release} Obsoletes: zarafa-%{name} < %{version}-%{release} @@ -100,7 +114,7 @@ install this package. %prep -%setup -q -n %{name}-%{version}-%{svnrevision} +%setup -q -n %{name}-%{version} %patch0 -p1 %build @@ -123,29 +137,39 @@ ln -sf ../../../../..%{_sysconfdir}/%{name}/${backend}.php $RPM_BUILD_ROOT%{_datadir}/%{name}/backend/${backend}/config.php done +mv -f $RPM_BUILD_ROOT%{_datadir}/%{name}/autodiscover/config.php $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/autodiscover.php +ln -sf ../../../..%{_sysconfdir}/%{name}/${backend}.php $RPM_BUILD_ROOT%{_datadir}/%{name}/autodiscover/config.php + # Install the command line utilities mv -f $RPM_BUILD_ROOT%{_datadir}/%{name}/%{name}-admin.php $RPM_BUILD_ROOT%{_sbindir}/%{name}-admin mv -f $RPM_BUILD_ROOT%{_datadir}/%{name}/%{name}-top.php $RPM_BUILD_ROOT%{_sbindir}/%{name}-top -# Install the apache configuration file -install -D -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/%{name}.conf +# Install the apache configuration files +install -D -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/%{name}.conf +install -D -p -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/%{name}-autodiscover.conf # Install the logrotate configuration file -install -D -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name} +install -D -p -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name} # Remove all unwanted files and directories -rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/{INSTALL,LICENSE} +rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/{autodiscover/INSTALL,composer.json,INSTALL,LICENSE} + +# Correct the wrong file permissions +chmod 644 $RPM_BUILD_ROOT%{_datadir}/%{name}/lib/syncobjects/syncresolverecipient.php # Copy permission and README for later usage cp -pf %{SOURCE1} permission.pdf cp -pf %{SOURCE2} README.FEDORA +cp -pf %{SOURCE3} autodiscover/README.FEDORA %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc LICENSE README.FEDORA permission.pdf +%{!?_licensedir:%global license %%doc} +%license LICENSE permission.pdf +%doc README.FEDORA %config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %dir %{_sysconfdir}/%{name}/ @@ -153,6 +177,7 @@ %{_sbindir}/z-push-admin %{_sbindir}/z-push-top %{_datadir}/%{name}/ +%exclude %{_datadir}/%{name}/autodiscover/ %exclude %{_datadir}/%{name}/backend/combined/ %exclude %{_datadir}/%{name}/backend/imap/ %exclude %{_datadir}/%{name}/backend/maildir/ @@ -162,6 +187,13 @@ %attr(-,apache,apache) %dir %{_localstatedir}/lib/%{name}/ %attr(-,apache,apache) %dir %{_localstatedir}/log/%{name}/ +%files autodiscover +%defattr(-,root,root,-) +%doc autodiscover/README.FEDORA +%config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}-autodiscover.conf +%config(noreplace) %{_sysconfdir}/%{name}/autodiscover.php +%{_datadir}/%{name}/autodiscover/ + %files combined %defattr(-,root,root,-) %config(noreplace) %{_sysconfdir}/%{name}/combined.php @@ -193,6 +225,9 @@ %{_datadir}/%{name}/backend/zarafa/ %changelog +* Fri Oct 02 2015 Robert Scheck <robert(a)fedoraproject.org&gt; 2.2.4-1 +- Upgrade to 2.2.4 + * Mon Jun 30 2014 Robert Scheck <robert(a)fedoraproject.org&gt; 2.1.3-1 - Upgrade to 2.1.3 --- z-push-2.1.2-package.patch DELETED ---