Author: robert Update of /cvs/free/rpms/z-push/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv22598 Modified Files: .cvsignore sources z-push.conf z-push.spec Added Files: z-push-2.0.5-package.patch z-push-README.FEDORA z-push.logrotate Removed Files: z-push-1.5.7-package.patch z-push-1.5.7-zarafa.patch z-push-README.FEDORA.package z-push-README.FEDORA.zarafa zarafa-z-push.conf Log Message: Upgrade to 2.0.5 z-push-2.0.5-package.patch: backend/imap.php | 3 + backend/maildir.php | 3 + backend/vcarddir.php | 4 ++ backend/zarafa/config.php | 52 ++++++++++++++++++++++++++++++++ backend/zarafa/zarafa.php | 3 + config.imap.php | 73 ++++++++++++++++++++++++++++++++++++++++++++++ config.maildir.php | 55 ++++++++++++++++++++++++++++++++++ config.php | 61 ++++++++++---------------------------- config.vcarddir.php | 52 ++++++++++++++++++++++++++++++++ lib/core/zpush.php | 15 +++++++++ z-push-admin.php | 6 ++- z-push-top.php | 6 +++ 12 files changed, 286 insertions(+), 47 deletions(-) --- NEW FILE z-push-2.0.5-package.patch --- Patch by Robert Scheck <robert(a)fedoraproject.org&gt; for z-push >= 2.0.5, which changes the original paths from Z-Push upstream to Fedora compliant ones. Additionally, it splits up the large configuration file for the multiple data backend providers to allow a much more flexible RPM packaging. --- z-push-2.0.5-1541/config.php 2012-10-17 22:57:36.000000000 +0200 +++ z-push-2.0.5-1541/config.php.package 2012-11-08 21:34:01.000000000 +0100 @@ -157,52 +157,25 @@ // default: 100 - value used if mobile does not limit amount of items define('SYNC_MAX_ITEMS', 100); + /********************************************************************************** * Backend settings + * + * Z-Push supports currently the data backend providers IMAP, Maildir, vCard directory, + * Zarafa and a mixture by the combined one. Ensure that the used backend is installed + * and proper configured as well: + * BackendIMAP - configure /etc/z-push/imap.php (provided by z-push-imap) + * BackendMaildir - configure /etc/z-push/maildir.php (provided by z-push-maildir) + * BackendVCardDir - configure /etc/z-push/vcarddir.php (provided by z-push-vcarddir) + * 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 + * If only one data backend provider has been installed, that one is used by default. + * In case of multiple installed data backend providers, Zarafa is preferred over IMAP + * over Maildir over vCard directory. The combined backend is never choosen by default. */ - // The data providers that we are using (see configuration below) - define('BACKEND_PROVIDER', "BackendZarafa"); - - - // ************************ - // BackendZarafa settings - // ************************ - // Defines the server to which we want to connect - define('MAPI_SERVER', 'file:///var/run/zarafa'); - - - // ************************ - // BackendIMAP settings - // ************************ - // Defines the server to which we want to connect - define('IMAP_SERVER', 'localhost'); - // connecting to default port (143) - define('IMAP_PORT', 143); - // best cross-platform compatibility (see http://php.net/imap_open for options) - define('IMAP_OPTIONS', '/notls/norsh'); - // overwrite the "from" header if it isn't set when sending emails - // options: 'username' - the username will be set (usefull if your login is equal to your emailaddress) - // 'domain' - the value of the "domain" field is used - // &#39;(a)mydomain.com&#39; - the username is used and the given string will be appended - define('IMAP_DEFAULTFROM', ''); - // copy outgoing mail to this folder. If not set z-push will try the default folders - define('IMAP_SENTFOLDER', ''); - // forward messages inline (default false - as attachment) - define('IMAP_INLINE_FORWARD', false); - // use imap_mail() to send emails (default) - if false mail() is used - define('IMAP_USE_IMAPMAIL', true); - - - // ************************ - // BackendMaildir settings - // ************************ - define('MAILDIR_BASE', '/tmp'); - define('MAILDIR_SUBDIR', 'Maildir'); - - // ********************** - // BackendVCardDir settings - // ********************** - define('VCARDDIR_DIR', '/home/%u/.kde/share/apps/kabc/stdvcf'); + // The data provider that we are using + define('BACKEND_PROVIDER', ''); /********************************************************************************** @@ -211,7 +184,7 @@ * 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/zarafa/searchldap.php) */ define('SEARCH_PROVIDER', ''); // Time in seconds for the server search. Setting it too high might result in timeout. --- z-push-2.0.5-1541/config.imap.php 1970-01-01 01:00:00.000000000 +0100 +++ z-push-2.0.5-1541/config.imap.php.package 2012-11-04 16:45:03.000000000 +0100 @@ -0,0 +1,73 @@ +<?php +/*********************************************** +* File : /etc/z-push/imap.php +* Project : Z-Push +* Descr : configuration file for the +* IMAP backend. +* +* Created : 01.10.2007 +* +* Copyright 2007 - 2012 Zarafa Deutschland GmbH +* +* This program is free software: you can redistribute it and/or modify +* it under the terms of the GNU Affero General Public License, version 3, +* as published by the Free Software Foundation with the following additional +* term according to sec. 7: +* +* According to sec. 7 of the GNU Affero General Public License, version 3, +* the terms of the AGPL are supplemented with the following terms: +* +* "Zarafa" is a registered trademark of Zarafa B.V. +* "Z-Push" is a registered trademark of Zarafa Deutschland GmbH +* The licensing of the Program under the AGPL does not imply a trademark license. +* Therefore any rights, title and interest in our trademarks remain entirely with us. +* +* However, if you propagate an unmodified version of the Program you are +* allowed to use the term "Z-Push" to indicate that you distribute the Program. +* Furthermore you may use our trademarks where it is necessary to indicate +* the intended purpose of a product or service provided you use it in accordance +* with honest practices in industrial or commercial matters. +* If you want to propagate modified versions of the Program under the name "Z-Push", +* you may only do so if you have a written permission by Zarafa Deutschland GmbH +* (to acquire a permission please contact Zarafa at trademark(a)zarafa.com). +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU Affero General Public License for more details. +* +* You should have received a copy of the GNU Affero General Public License +* along with this program. If not, see <http://www.gnu.org/licenses/>;. +* +* Consult LICENSE file for details +************************************************/ + +// Please do not forget to configure "BACKEND_PROVIDER" in /etc/z-push/config.php to +// either "BackendIMAP" or "BackendCombined", if more than one data backend provider +// has been installed! + +// Defines the server to which we want to connect +define('IMAP_SERVER', 'localhost'); + +// connecting to default port (143) +define('IMAP_PORT', 143); + +// best cross-platform compatibility (see http://php.net/imap_open for options) +define('IMAP_OPTIONS', '/notls/norsh'); + +// overwrite the "from" header if it isn't set when sending emails +// options: 'username' - the username will be set (usefull if your login is equal to your emailaddress) +// 'domain' - the value of the "domain" field is used +// &#39;(a)mydomain.com&#39; - the username is used and the given string will be appended +define('IMAP_DEFAULTFROM', ''); + +// copy outgoing mail to this folder. If not set z-push will try the default folders +define('IMAP_SENTFOLDER', ''); + +// forward messages inline (default false - as attachment) +define('IMAP_INLINE_FORWARD', false); + +// use imap_mail() to send emails (default) - if false mail() is used +define('IMAP_USE_IMAPMAIL', true); + +?> --- z-push-2.0.5-1541/config.maildir.php 1970-01-01 01:00:00.000000000 +0100 +++ z-push-2.0.5-1541/config.maildir.php.package 2012-11-04 16:46:24.000000000 +0100 @@ -0,0 +1,55 @@ +<?php +/*********************************************** +* File : /etc/z-push/maildir.php +* Project : Z-Push +* Descr : configuration file for the +* Maildir backend. +* +* Created : 01.10.2007 +* +* Copyright 2007 - 2012 Zarafa Deutschland GmbH +* +* This program is free software: you can redistribute it and/or modify +* it under the terms of the GNU Affero General Public License, version 3, +* as published by the Free Software Foundation with the following additional +* term according to sec. 7: +* +* According to sec. 7 of the GNU Affero General Public License, version 3, +* the terms of the AGPL are supplemented with the following terms: +* +* "Zarafa" is a registered trademark of Zarafa B.V. +* "Z-Push" is a registered trademark of Zarafa Deutschland GmbH +* The licensing of the Program under the AGPL does not imply a trademark license. +* Therefore any rights, title and interest in our trademarks remain entirely with us. +* +* However, if you propagate an unmodified version of the Program you are +* allowed to use the term "Z-Push" to indicate that you distribute the Program. +* Furthermore you may use our trademarks where it is necessary to indicate +* the intended purpose of a product or service provided you use it in accordance +* with honest practices in industrial or commercial matters. +* If you want to propagate modified versions of the Program under the name "Z-Push", +* you may only do so if you have a written permission by Zarafa Deutschland GmbH +* (to acquire a permission please contact Zarafa at trademark(a)zarafa.com). +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU Affero General Public License for more details. +* +* You should have received a copy of the GNU Affero General Public License +* along with this program. If not, see <http://www.gnu.org/licenses/>;. +* +* Consult LICENSE file for details +************************************************/ + +// Please do not forget to configure "BACKEND_PROVIDER" in /etc/z-push/config.php to +// either "BackendMaildir" or "BackendCombined", if more than one data backend provider +// has been installed! + +// Defines the Maildir base path +define('MAILDIR_BASE', '/tmp'); + +// Defines the name of the Maildir +define('MAILDIR_SUBDIR', 'Maildir'); + +?> --- z-push-2.0.5-1541/config.vcarddir.php 1970-01-01 01:00:00.000000000 +0100 +++ z-push-2.0.5-1541/config.vcarddir.php.package 2012-11-04 16:46:55.000000000 +0100 @@ -0,0 +1,52 @@ +<?php +/*********************************************** +* File : /etc/z-push/vcarddir.php +* Project : Z-Push +* Descr : configuration file for the +* vCard directory backend. +* +* Created : 01.10.2007 +* +* Copyright 2007 - 2012 Zarafa Deutschland GmbH +* +* This program is free software: you can redistribute it and/or modify +* it under the terms of the GNU Affero General Public License, version 3, +* as published by the Free Software Foundation with the following additional +* term according to sec. 7: +* +* According to sec. 7 of the GNU Affero General Public License, version 3, +* the terms of the AGPL are supplemented with the following terms: +* +* "Zarafa" is a registered trademark of Zarafa B.V. +* "Z-Push" is a registered trademark of Zarafa Deutschland GmbH +* The licensing of the Program under the AGPL does not imply a trademark license. +* Therefore any rights, title and interest in our trademarks remain entirely with us. +* +* However, if you propagate an unmodified version of the Program you are +* allowed to use the term "Z-Push" to indicate that you distribute the Program. +* Furthermore you may use our trademarks where it is necessary to indicate +* the intended purpose of a product or service provided you use it in accordance +* with honest practices in industrial or commercial matters. +* If you want to propagate modified versions of the Program under the name "Z-Push", +* you may only do so if you have a written permission by Zarafa Deutschland GmbH +* (to acquire a permission please contact Zarafa at trademark(a)zarafa.com). +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU Affero General Public License for more details. +* +* You should have received a copy of the GNU Affero General Public License +* along with this program. If not, see <http://www.gnu.org/licenses/>;. +* +* Consult LICENSE file for details +************************************************/ + +// Please do not forget to configure "BACKEND_PROVIDER" in /etc/z-push/config.php to +// either "BackendVCardDir" or "BackendCombined", if more than one data backend provider +// has been installed! + +// Defines the vCard directory path +define('VCARDDIR_DIR', '/home/%u/.kde/share/apps/kabc/stdvcf'); + +?> --- z-push-2.0.5-1541/backend/zarafa/config.php 1970-01-01 01:00:00.000000000 +0100 +++ z-push-2.0.5-1541/backend/zarafa/config.php.package 2012-11-04 16:45:42.000000000 +0100 @@ -0,0 +1,52 @@ +<?php +/*********************************************** +* File : /etc/z-push/zarafa.php +* Project : Z-Push +* Descr : configuration file for the +* Zarafa backend. +* +* Created : 01.10.2007 +* +* Copyright 2007 - 2012 Zarafa Deutschland GmbH +* +* This program is free software: you can redistribute it and/or modify +* it under the terms of the GNU Affero General Public License, version 3, +* as published by the Free Software Foundation with the following additional +* term according to sec. 7: +* +* According to sec. 7 of the GNU Affero General Public License, version 3, +* the terms of the AGPL are supplemented with the following terms: +* +* "Zarafa" is a registered trademark of Zarafa B.V. +* "Z-Push" is a registered trademark of Zarafa Deutschland GmbH +* The licensing of the Program under the AGPL does not imply a trademark license. +* Therefore any rights, title and interest in our trademarks remain entirely with us. +* +* However, if you propagate an unmodified version of the Program you are +* allowed to use the term "Z-Push" to indicate that you distribute the Program. +* Furthermore you may use our trademarks where it is necessary to indicate +* the intended purpose of a product or service provided you use it in accordance +* with honest practices in industrial or commercial matters. +* If you want to propagate modified versions of the Program under the name "Z-Push", +* you may only do so if you have a written permission by Zarafa Deutschland GmbH +* (to acquire a permission please contact Zarafa at trademark(a)zarafa.com). +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU Affero General Public License for more details. +* +* You should have received a copy of the GNU Affero General Public License +* along with this program. If not, see <http://www.gnu.org/licenses/>;. +* +* Consult LICENSE file for details +************************************************/ + +// Please do not forget to configure "BACKEND_PROVIDER" in /etc/z-push/config.php to +// either "BackendZarafa" or "BackendCombined", if more than one data backend provider +// has been installed! + +// Defines the server to which we want to connect +define('MAPI_SERVER', 'file:///var/run/zarafa'); + +?> --- z-push-2.0.5-1541/backend/imap.php 2012-08-30 21:41:25.000000000 +0200 +++ z-push-2.0.5-1541/backend/imap.php.package 2012-11-04 17:17:30.000000000 +0100 @@ -43,6 +43,9 @@ * Consult LICENSE file for details ************************************************/ +// Include the IMAP backend's own config file +require_once("backend/imap/config.php"); + include_once('lib/default/diffbackend/diffbackend.php'); include_once('include/mimeDecode.php'); require_once('include/z_RFC822.php'); --- z-push-2.0.5-1541/backend/maildir.php 2012-02-07 21:24:18.000000000 +0100 +++ z-push-2.0.5-1541/backend/maildir.php.package 2012-11-04 17:17:47.000000000 +0100 @@ -53,6 +53,9 @@ * Consult LICENSE file for details ************************************************/ +// Include the Maildir backend's own config file +require_once("backend/maildir/config.php"); + include_once('lib/default/diffbackend/diffbackend.php'); include_once('include/mimeDecode.php'); require_once('include/z_RFC822.php'); --- z-push-2.0.5-1541/backend/vcarddir.php 2012-02-07 21:24:18.000000000 +0100 +++ z-push-2.0.5-1541/backend/vcarddir.php.package 2012-11-04 17:18:06.000000000 +0100 @@ -40,6 +40,10 @@ * * Consult LICENSE file for details ************************************************/ + +// Include the vCard directory backend's own config file +require_once("backend/vcarddir/config.php"); + include_once('lib/default/diffbackend/diffbackend.php'); class BackendVCardDir extends BackendDiff { --- z-push-2.0.5-1541/backend/zarafa/zarafa.php 2012-08-30 21:41:25.000000000 +0200 +++ z-push-2.0.5-1541/backend/zarafa/zarafa.php.package 2012-11-04 18:34:46.000000000 +0100 @@ -45,6 +45,9 @@ * Consult LICENSE file for details *************************************************/ +// Include the Zarafa backend's own config file +require_once("backend/zarafa/config.php"); + // include PHP-MAPI classes include_once('backend/zarafa/mapi/mapi.util.php'); include_once('backend/zarafa/mapi/mapidefs.php'); --- z-push-2.0.5-1541/lib/core/zpush.php 2012-06-02 07:03:16.000000000 +0200 +++ z-push-2.0.5-1541/lib/core/zpush.php.package 2012-11-04 18:30:42.000000000 +0100 @@ -439,6 +439,21 @@ if (!isset(ZPush::$backend)) { // Initialize our backend $ourBackend = @constant('BACKEND_PROVIDER'); + + // Some admin-friendly guessing if no backend has been configured + if (empty($ourBackend)) { + if (file_exists(REAL_BASE_PATH . "backend/zarafa/")) + $ourBackend = "BackendZarafa"; + elseif (file_exists(REAL_BASE_PATH . "backend/imap/")) + $ourBackend = "BackendIMAP"; + elseif (file_exists(REAL_BASE_PATH . "backend/maildir/")) + $ourBackend = "BackendMaildir"; + elseif (file_exists(REAL_BASE_PATH . "backend/vcarddir/")) + $ourBackend = "BackendVCardDir"; + else + throw new FatalMisconfigurationException("No backend provider has been configured. Check configuration!"); + } + self::IncludeBackend($ourBackend); if (class_exists($ourBackend)) --- z-push-2.0.5-1541/z-push-admin.php 2012-07-21 17:20:52.000000000 +0200 +++ z-push-2.0.5-1541/z-push-admin.php.package 2012-11-04 15:16:15.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.0.5-1541/z-push-top.php 2012-10-17 22:57:36.000000000 +0200 +++ z-push-2.0.5-1541/z-push-top.php.package 2012-11-08 21:38:01.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(); @@ -88,6 +91,7 @@ } echo "terminated\n"; + system("bash -c 'stty sane'"); /************************************************ --- NEW FILE z-push-README.FEDORA --- Using Z-Push ============ Configuration ------------- Edit the Z-Push configuration file /etc/z-push/config.php to fit your needs. If you intend to use Z-Push with an IMAP server (like Dovecot or Cyrus IMAPd for example), you should run "yum install z-push-imap". In case you intend to use Z-Push with Zarafa, you should execute instead the "yum install z-push-zarafa" command. Do not forget to configure the timezone in /etc/php.ini or in the Z-Push configuration file. Restart afterwards the Apache Web Server by using "service httpd restart". After doing this, you should be already able to synchronize with your mobile device. Technical information --------------------- Z-Push parameters and their roles for a more individual configuration are also explained in the /etc/z-push/config.php file. By default the state directory is /var/lib/z-push, the log directory is /var/log/z-push. The Apache configuration /etc/httpd/conf.d/z-push.conf contains an alias from "/Microsoft-Server-ActiveSync" to Z-Push itself, as well as some PHP settings. Setting up your mobile device ----------------------------- This is simply a case of adding an 'exchange server' to your ActiveSync server list, specifying the IP address of the Z-Push's Apache server, disabling SSL, unless you have already setup SSL on your Apache server, setting the correct username and password (the domain is ignored, you can simply specify 'domain' or some other random string), and then going through the standard activesync settings. Once you have done this, you should be able to synchronise your mobile simply by clicking the 'Sync' button in ActiveSync on your mobile. *NOTE* using the synchronisation without SSL is not recommended because your private data is transmitted in clear text over the net. Configuring SSL on Apache is beyond of the scope of this document. Please refer to Apache documention available at http://httpd.apache.org/docs/ Troubleshooting --------------- Most problems will be caused by incorrect Apache settings. To test whether your Apache setup is working correctly, you can simply type the Z-Push URL in your browser, to see if apache is correctly redirecting your request to z-push. You can simply use: http://<serverip>/Microsoft-Server-ActiveSync If correctly configured, you should see a username/password request and when you specify a valid username and password, you should see a Z-Push information page, saying that this kind of requests is not supported. Without authentication credentials Z-Push displays general information. If not then check your PHP and Apache settings and Apache error logs. If you have other synchronisation problems, you can increase the LOGLEVEL parameter in the config e.g. to LOGLEVEL_DEBUG or LOGLEVEL_WBXML. The z-push.log file will then collect detailed debug information from your synchronisation. *NOTE* This setting will set Z-Push to log the detailed information for *every* user on the system. You can set a different log level for particular users by adding them comma separated to $specialLogUsers in the config.php e.g. $specialLogUsers = array("user1", "user2", "user3"); *NOTE* Be aware that if you are using LOGLEVEL_DEBUG and LOGLEVEL_WBXML Z-Push will be quite talkative, so it is advisable to use log-rotate on the log file. Documentation ------------- 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. --- NEW FILE z-push.logrotate --- /var/log/z-push/*.log { weekly missingok rotate 52 compress notifempty create 0644 apache apache } Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/z-push/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 4 Jun 2012 22:19:07 -0000 1.8 +++ .cvsignore 8 Nov 2012 21:38:17 -0000 1.9 @@ -1,2 +1,2 @@ -z-push-1.5.10-1262.tar.gz +z-push-2.0.5-1541.tar.gz z-push-permission.pdf Index: sources =================================================================== RCS file: /cvs/free/rpms/z-push/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 4 Jun 2012 22:19:07 -0000 1.8 +++ sources 8 Nov 2012 21:38:17 -0000 1.9 @@ -1,2 +1,2 @@ -934a3f33e1f7045c5f656b163f8714ec z-push-1.5.10-1262.tar.gz +b6f3fdf6bb1f3022f2ae354490562387 z-push-2.0.5-1541.tar.gz 0d25be91b27fe7ebab16ed593c9fbf48 z-push-permission.pdf Index: z-push.conf =================================================================== RCS file: /cvs/free/rpms/z-push/devel/z-push.conf,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- z-push.conf 12 Jun 2011 22:42:40 -0000 1.1 +++ z-push.conf 8 Nov 2012 21:38:17 -0000 1.2 @@ -11,15 +11,15 @@ Options -Indexes +FollowSymLinks # Register globals must be off - php_value register_globals off + php_flag register_globals off # Magic quotes must be off - php_value magic_quotes_gpc off - php_value magic_quotes_runtime off + php_flag magic_quotes_gpc off + php_flag magic_quotes_runtime off # Short open tags must be on - php_value short_open_tag on + php_flag short_open_tag on - # Allow passing variable by reference - php_value allow_call_time_pass_reference on + # Set memory limit to 128 MB + php_value memory_limit 128M </Directory> Index: z-push.spec =================================================================== RCS file: /cvs/free/rpms/z-push/devel/z-push.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- z-push.spec 4 Jun 2012 22:19:07 -0000 1.8 +++ z-push.spec 8 Nov 2012 21:38:17 -0000 1.9 @@ -1,24 +1,25 @@ -%global svnrevision 1262 -%global with_ldap 1 +%global svnrevision 1541 Summary: ActiveSync over-the-air implementation for mobile syncing Name: z-push -Version: 1.5.10 +Version: 2.0.5 Release: 1%{?dist} License: AGPLv3 with exceptions Group: Applications/Productivity URL: http://z-push.sourceforge.net/ -Source0: http://download.berlios.de/%{name}/%{name}-%{version}-%{svnrevision}.tar.gz +Source0: http://www.zarafa-deutschland.de/z-push-download/final/2.0/%{name}-%{vers... Source1: z-push-permission.pdf -Source2: z-push-README.FEDORA.package -Source3: z-push-README.FEDORA.zarafa -Source4: z-push.conf -Source5: zarafa-z-push.conf -Patch0: z-push-1.5.7-package.patch -Patch1: z-push-1.5.7-zarafa.patch -Requires: httpd, php >= 4.3.0, php-imap >= 4.3.0 -%if %{with_ldap} -Requires: php-ldap >= 4.3.0 +Source2: z-push-README.FEDORA +Source3: z-push.conf +Source4: z-push.logrotate +Patch0: z-push-2.0.5-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) +%if 0%{?rhel} == 5 +Requires: mod_php >= 5.1 +%else +Requires: php >= 5.1 %endif BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -29,51 +30,79 @@ Mobile, Android, iPhone, Sony Ericsson and Nokia mobile devices. With Z-Push any groupware can be connected and synced with these devices. -For use cases of Z-Push with the Zarafa Collaboration Platform and Open -Source Collaboration, please use the prepared package zarafa-z-push. +%package combined +Summary: Combines several data backend providers for Z-Push +Group: Applications/Productivity +Requires: %{name} = %{version}-%{release} + +%description combined +The z-push-combined package contains a special data backend provider +for Z-Push to combine several data backend providers. This allows to +handle each type of item (e-mails, contacts, calendar entries, tasks) +by a different backend. A combination could be to handle e-mails via +the IMAP data backend provider, while all other items are handled by +the Zarafa data backend provider. If you want to use this, you will +need to install this package and additionally the other Z-Push data +backend providers that shall be combined. -%package -n zarafa-%{name} -Summary: ActiveSync over-the-air implementation for Zarafa +%package imap +Summary: IMAP data backend provider for Z-Push Group: Applications/Productivity -Requires: httpd, php >= 4.3.0, php-mapi >= 6.40.0 -%if %{with_ldap} -Requires: php-ldap >= 4.3.0 -%endif +Requires: %{name} = %{version}-%{release}, php-imap >= 5.1.0 -%description -n zarafa-%{name} -Z-Push is an implementation of the ActiveSync protocol which is used -'over-the-air' for multi platform ActiveSync devices, including Windows -Mobile, Android, iPhone, Sony Ericsson and Nokia mobile devices. With -Z-Push any groupware can be connected and synced with these devices. +%description imap +The z-push-imap package contains the IMAP data backend provider for +Z-Push. If you want Z-Push to access an IMAP server, you will need to +install this package. -This package is prepared for use with the Zarafa Collaboration Platform -and Open Source Collaboration. For non-Zarafa use cases, please use the -regular Z-Push package. +%package maildir +Summary: Maildir data backend provider for Z-Push +Group: Applications/Productivity +Requires: %{name} = %{version}-%{release} -%prep -%setup -q -T -c -a 0 +%description maildir +The z-push-maildir package contains the Maildir data backend provider +for Z-Push. If you want Z-Push to access a Maildir, you will need to +install this package. -# Copy permission for later usage -cp -pf %{SOURCE1} permission.pdf +%package searchldap +Summary: LDAP search backend provider for Z-Push +Group: Applications/Productivity +Requires: %{name} = %{version}-%{release}, php-ldap >= 5.1.0 -# Correct wrong file permissions -chmod 644 %{name}-%{version}-%{svnrevision}/{include/z_RFC822,streamer}.php +%description searchldap +The z-push-searchldap contains the LDAP search backend provider for +Z-Push. If you want to perform search requests (Global Address Book +search) in an LDAP directory rather the default search functionality +provided by the data backend, you will need to install this package. -# Z-Push for Zarafa -mkdir zarafa-%{name}-%{version}-%{svnrevision} -pushd zarafa-%{name}-%{version}-%{svnrevision} -cp -af ../%{name}-%{version}-%{svnrevision}/* . -cp -pf %{SOURCE3} README.FEDORA -%patch1 -p1 -b .zarafa -touch -c -r config.php{.zarafa,} -popd +%package vcarddir +Summary: vCard directory data backend provider for Z-Push +Group: Applications/Productivity +Requires: %{name} = %{version}-%{release} -# Z-Push without Zarafa -pushd %{name}-%{version}-%{svnrevision} -cp -pf %{SOURCE2} README.FEDORA +%description vcarddir +The z-push-vcarddir package contains the vCard directory backend data +provider for Z-Push. If you want Z-Push to access a vCard directory, +you will need to install this package. + +%package zarafa +Summary: Zarafa data backend provider for Z-Push +Group: Applications/Productivity +Requires: %{name} = %{version}-%{release}, php-mapi >= 6.40.0 +Provides: zarafa-%{name} = %{version}-%{release} +Obsoletes: zarafa-%{name} < %{version}-%{release} + +%description zarafa +The z-push-zarafa package contains the Zarafa Collaboration Plattform +data backend provider for Z-Push. If you want Z-Push to access a MAPI- +based service or the Zarafa Collaboration Plattform, you will need to +install this package. + +%prep +%setup -q -n %{name}-%{version}-%{svnrevision} %patch0 -p1 -b .package -touch -c -r config.php{.package,} -popd +touch -c -r config.php{.package,} config.*.php backend/zarafa/config.php %build @@ -81,103 +110,112 @@ rm -rf $RPM_BUILD_ROOT # Create all needed directories -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/{{,zarafa}/%{name},httpd/conf.d}/ -mkdir -p $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/{%{name},zarafa-%{name}}}/ -mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/{%{name},zarafa-%{name}}/state/ - -# Z-Push without Zarafa -pushd %{name}-%{version}-%{svnrevision} +mkdir -p $RPM_BUILD_ROOT{{%{_sysconfdir},%{_datadir},%{_localstatedir}/{lib,log}}/%{name},%{_sbindir}} # Install all files into destination cp -af * $RPM_BUILD_ROOT%{_datadir}/%{name}/ -# Move configuration file to its place +# Move configuration files to its places 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 -# Install the apache configuration file -install -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/%{name}.conf - -# Remove all Zarafa requiring files -rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/{backend/ics,include/z_{ical,tnef}}.php - -# Move searchldap configuration to its place -%if %{with_ldap} -mv -f $RPM_BUILD_ROOT%{_datadir}/%{name}/backend/searchldap/config.php $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/searchldap.php -ln -sf ../../../../..%{_sysconfdir}/%{name}/searchldap.php $RPM_BUILD_ROOT%{_datadir}/%{name}/backend/searchldap/config.php -%else -rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/backend/{searchbackend.php,searchldap/} -%endif - -popd - -# Z-Push for Zarafa -pushd zarafa-%{name}-%{version}-%{svnrevision} - -# Install all files into destination -cp -af * $RPM_BUILD_ROOT%{_datadir}/zarafa-%{name}/ - -# Move configuration file to its place -mv -f $RPM_BUILD_ROOT%{_datadir}/zarafa-%{name}/config.php $RPM_BUILD_ROOT%{_sysconfdir}/zarafa/%{name}/config.php -ln -sf ../../..%{_sysconfdir}/zarafa/%{name}/config.php $RPM_BUILD_ROOT%{_datadir}/zarafa-%{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 + 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 + +# 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 -p -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/zarafa-%{name}.conf - -# Remove all non-Zarafa related files -rm -f $RPM_BUILD_ROOT%{_datadir}/zarafa-%{name}/backend/{diffbackend,imap,maildir,vcarddir}.php +install -D -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/%{name}.conf -# Move searchldap configuration to its place -%if %{with_ldap} -mv -f $RPM_BUILD_ROOT%{_datadir}/zarafa-%{name}/backend/searchldap/config.php $RPM_BUILD_ROOT%{_sysconfdir}/zarafa/%{name}/searchldap.php -ln -sf ../../../../..%{_sysconfdir}/zarafa/%{name}/searchldap.php $RPM_BUILD_ROOT%{_datadir}/zarafa-%{name}/backend/searchldap/config.php -%else -rm -rf $RPM_BUILD_ROOT%{_datadir}/zarafa-%{name}/backend/{searchbackend.php,searchldap/} -%endif - -# Install Zarafa-related command line tool -install -p -m 755 backend/zarafa/z-push-admin.php $RPM_BUILD_ROOT%{_bindir}/z-push-admin - -popd +# Install the logrotate configuration file +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},zarafa-%{name}}/{state,backend/{kolab,zarafa}}/ -rm -f $RPM_BUILD_ROOT%{_datadir}/{%{name},zarafa-%{name}}/{INSTALL,LICENSE,{config,debug,index}.php.{package,zarafa},README.FEDORA} +rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/{INSTALL,LICENSE,backend/kolab,{.,*,*/*}/*.package} + +# Copy permission and README for later usage +cp -pf %{SOURCE1} permission.pdf +cp -pf %{SOURCE2} README.FEDORA %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc %{name}-%{version}-%{svnrevision}/LICENSE permission.pdf -%doc %{name}-%{version}-%{svnrevision}/README.FEDORA +%doc LICENSE README.FEDORA permission.pdf %config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf +%config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %dir %{_sysconfdir}/%{name}/ %config(noreplace) %{_sysconfdir}/%{name}/config.php -%if %{with_ldap} -%config(noreplace) %{_sysconfdir}/%{name}/searchldap.php -%endif +%{_sbindir}/z-push-admin +%{_sbindir}/z-push-top %{_datadir}/%{name}/ -%dir %{_localstatedir}/lib/%{name}/ -%attr(-,apache,apache) %dir %{_localstatedir}/lib/%{name}/state/ +%exclude %{_datadir}/%{name}/backend/combined/ +%exclude %{_datadir}/%{name}/backend/imap/ +%exclude %{_datadir}/%{name}/backend/maildir/ +%exclude %{_datadir}/%{name}/backend/searchldap/ +%exclude %{_datadir}/%{name}/backend/vcarddir/ +%exclude %{_datadir}/%{name}/backend/zarafa/ +%attr(-,apache,apache) %dir %{_localstatedir}/lib/%{name}/ +%attr(-,apache,apache) %dir %{_localstatedir}/log/%{name}/ -%files -n zarafa-%{name} +%files combined %defattr(-,root,root,-) -%doc zarafa-%{name}-%{version}-%{svnrevision}/LICENSE permission.pdf -%doc zarafa-%{name}-%{version}-%{svnrevision}/README.FEDORA -%config(noreplace) %{_sysconfdir}/httpd/conf.d/zarafa-%{name}.conf -%dir %{_sysconfdir}/zarafa/ -%dir %{_sysconfdir}/zarafa/%{name}/ -%config(noreplace) %{_sysconfdir}/zarafa/%{name}/config.php -%if %{with_ldap} -%config(noreplace) %{_sysconfdir}/zarafa/%{name}/searchldap.php -%endif -%{_bindir}/z-push-admin -%{_datadir}/zarafa-%{name}/ -%dir %{_localstatedir}/lib/zarafa-%{name}/ -%attr(-,apache,apache) %dir %{_localstatedir}/lib/zarafa-%{name}/state/ +%config(noreplace) %{_sysconfdir}/%{name}/combined.php +%{_datadir}/%{name}/backend/combined/ + +%files imap +%defattr(-,root,root,-) +%config(noreplace) %{_sysconfdir}/%{name}/imap.php +%{_datadir}/%{name}/backend/imap/ + +%files maildir +%defattr(-,root,root,-) +%config(noreplace) %{_sysconfdir}/%{name}/maildir.php +%{_datadir}/%{name}/backend/maildir/ + +%files searchldap +%defattr(-,root,root,-) +%config(noreplace) %{_sysconfdir}/%{name}/searchldap.php +%{_datadir}/%{name}/backend/searchldap/ + +%files vcarddir +%defattr(-,root,root,-) +%config(noreplace) %{_sysconfdir}/%{name}/vcarddir.php +%{_datadir}/%{name}/backend/vcarddir/ + +%files zarafa +%defattr(-,root,root,-) +%config(noreplace) %{_sysconfdir}/%{name}/zarafa.php +%{_datadir}/%{name}/backend/zarafa/ %changelog +* Thu Nov 08 2012 Robert Scheck <robert(a)fedoraproject.org&gt; 2.0.5-1 +- Upgrade to 2.0.5 + +* Sun Nov 04 2012 Robert Scheck <robert(a)fedoraproject.org&gt; 2.0.4-1 +- Upgrade to 2.0.4 + +* Wed Oct 31 2012 Robert Scheck <robert(a)fedoraproject.org&gt; 1.5.13-1 +- Upgrade to 1.5.13 + +* Sun Aug 26 2012 Robert Scheck <robert(a)fedoraproject.org&gt; 1.5.12-1 +- Upgrade to 1.5.12 + +* Sat Jun 30 2012 Robert Scheck <robert(a)fedoraproject.org&gt; 1.5.11-1 +- Upgrade to 1.5.11 + * Tue Jun 05 2012 Robert Scheck <robert(a)fedoraproject.org&gt; 1.5.10-1 - Upgrade to 1.5.10 --- z-push-1.5.7-package.patch DELETED --- --- z-push-1.5.7-zarafa.patch DELETED --- --- z-push-README.FEDORA.package DELETED --- --- z-push-README.FEDORA.zarafa DELETED --- --- zarafa-z-push.conf DELETED ---