December 2013 - rpmfusion-commits

rpms/xmms2-freeworld/devel xmms2-freeworld.spec,1.15,1.16

by Nicolas Chauvet

Author: kwizart Update of /cvs/free/rpms/xmms2-freeworld/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv26643 Modified Files: xmms2-freeworld.spec Log Message: Rebuilt Index: xmms2-freeworld.spec =================================================================== RCS file: /cvs/free/rpms/xmms2-freeworld/devel/xmms2-freeworld.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- xmms2-freeworld.spec 15 Aug 2013 10:20:28 -0000 1.15 +++ xmms2-freeworld.spec 8 Dec 2013 20:07:39 -0000 1.16 @@ -3,7 +3,7 @@ Name: xmms2-freeworld Summary: Plugins for XMMS2 that cannot be included in Fedora Version: 0.8 -Release: 9%{?dist} +Release: 10%{?dist} License: LGPLv2+ and GPL+ and BSD Group: Applications/Multimedia # Fedora's xmms2 has to use a sanitized tarball, we don't. @@ -208,6 +208,9 @@ %{_libdir}/xmms2/libxmms_mp4.so %changelog +* Sun Dec 08 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 0.8-10 +- Rebuilt + * Thu Aug 15 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 0.8-9 - Rebuilt for FFmpeg 2.0.x

11 years, 2 months

1
0
0 / 0

rpms/z-push/EL-6 z-push-2.0.9-package.patch, NONE, 1.1 .cvsignore, 1.11, 1.12 sources, 1.11, 1.12 z-push.conf, 1.3, 1.4 z-push.spec, 1.12, 1.13 z-push-2.0.6-package.patch, 1.1, NONE

by Robert Scheck

Author: robert Update of /cvs/free/rpms/z-push/EL-6 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv25702/EL-6 Modified Files: .cvsignore sources z-push.conf z-push.spec Added Files: z-push-2.0.9-package.patch Removed Files: z-push-2.0.6-package.patch Log Message: Upgrade to 2.0.9 z-push-2.0.9-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 | 79 ++++++++++++++++++++++++++++++++++++++++++++++ config.maildir.php | 55 ++++++++++++++++++++++++++++++++ config.php | 66 +++++++++----------------------------- config.vcarddir.php | 52 ++++++++++++++++++++++++++++++ lib/core/zpush.php | 15 ++++++++ z-push-admin.php | 6 ++- z-push-top.php | 5 ++ 12 files changed, 291 insertions(+), 52 deletions(-) --- NEW FILE z-push-2.0.9-package.patch --- Patch by Robert Scheck <robert(a)fedoraproject.org> for z-push >= 2.0.9, 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.9-1787/config.php 2013-11-06 19:22:59.000000000 +0100 +++ z-push-2.0.9-1787/config.php.package 2013-12-08 20:41:54.000000000 +0100 @@ -165,57 +165,25 @@ // 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 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 - // '@mydomain.com' - 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); - /* BEGIN fmbiete's contribution r1527, ZP-319 */ - // list of folders we want to exclude from sync. Names, or part of it, separated by | - // example: dovecot.sieve|archive|spam - define('IMAP_EXCLUDED_FOLDERS', ''); - /* END fmbiete's contribution r1527, ZP-319 */ - - - // ************************ - // 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', ''); /********************************************************************************** @@ -224,7 +192,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.9-1787/config.imap.php 1970-01-01 01:00:00.000000000 +0100 +++ z-push-2.0.9-1787/config.imap.php.package 2012-11-04 16:45:03.000000000 +0100 @@ -0,0 +1,79 @@ +<?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 +// '@mydomain.com' - 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); + +/* BEGIN fmbiete's contribution r1527, ZP-319 */ +// list of folders we want to exclude from sync. Names, or part of it, separated by | +// example: dovecot.sieve|archive|spam +define('IMAP_EXCLUDED_FOLDERS', ''); +/* END fmbiete's contribution r1527, ZP-319 */ + +?> --- z-push-2.0.9-1787/config.maildir.php 1970-01-01 01:00:00.000000000 +0100 +++ z-push-2.0.9-1787/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.9-1787/config.vcarddir.php 1970-01-01 01:00:00.000000000 +0100 +++ z-push-2.0.9-1787/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.9-1787/backend/zarafa/config.php 1970-01-01 01:00:00.000000000 +0100 +++ z-push-2.0.9-1787/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.9-1787/backend/imap.php 2012-08-30 21:41:25.000000000 +0200 +++ z-push-2.0.9-1787/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.9-1787/backend/maildir.php 2012-02-07 21:24:18.000000000 +0100 +++ z-push-2.0.9-1787/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.9-1787/backend/vcarddir.php 2012-02-07 21:24:18.000000000 +0100 +++ z-push-2.0.9-1787/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.9-1787/backend/zarafa/zarafa.php 2012-08-30 21:41:25.000000000 +0200 +++ z-push-2.0.9-1787/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.9-1787/lib/core/zpush.php 2012-06-02 07:03:16.000000000 +0200 +++ z-push-2.0.9-1787/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.9-1787/z-push-admin.php 2012-07-21 17:20:52.000000000 +0200 +++ z-push-2.0.9-1787/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.9-1787/z-push-top.php 2012-10-17 22:57:36.000000000 +0200 +++ z-push-2.0.9-1787/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(); Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/z-push/EL-6/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 23 Feb 2013 15:36:10 -0000 1.11 +++ .cvsignore 8 Dec 2013 19:56:56 -0000 1.12 @@ -1,2 +1,2 @@ -z-push-2.0.7-1690.tar.gz +z-push-2.0.9-1787.tar.gz z-push-permission.pdf Index: sources =================================================================== RCS file: /cvs/free/rpms/z-push/EL-6/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 23 Feb 2013 15:36:10 -0000 1.11 +++ sources 8 Dec 2013 19:56:56 -0000 1.12 @@ -1,2 +1,2 @@ -b0dd7f6da6b6d6bac49266cca28a4140 z-push-2.0.7-1690.tar.gz +94fad4d31cad30c762018937a4542e17 z-push-2.0.9-1787.tar.gz 0d25be91b27fe7ebab16ed593c9fbf48 z-push-permission.pdf Index: z-push.conf =================================================================== RCS file: /cvs/free/rpms/z-push/EL-6/z-push.conf,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- z-push.conf 5 Aug 2013 00:51:49 -0000 1.3 +++ z-push.conf 8 Dec 2013 19:56:56 -0000 1.4 @@ -15,6 +15,7 @@ Require all granted </IfModule> <IfModule !mod_authz_core.c> + # Apache 2.2 Order allow,deny Allow from all </IfModule> Index: z-push.spec =================================================================== RCS file: /cvs/free/rpms/z-push/EL-6/z-push.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- z-push.spec 5 Aug 2013 00:51:49 -0000 1.12 +++ z-push.spec 8 Dec 2013 19:56:56 -0000 1.13 @@ -1,9 +1,9 @@ -%global svnrevision 1690 +%global svnrevision 1787 Summary: ActiveSync over-the-air implementation for mobile syncing Name: z-push -Version: 2.0.7 -Release: 3%{?dist} +Version: 2.0.9 +Release: 1%{?dist} License: AGPLv3 with exceptions Group: Applications/Productivity URL: http://z-push.sourceforge.net/ @@ -12,7 +12,7 @@ Source2: z-push-README.FEDORA Source3: z-push.conf Source4: z-push.logrotate -Patch0: z-push-2.0.6-package.patch +Patch0: z-push-2.0.9-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) @@ -200,6 +200,9 @@ %{_datadir}/%{name}/backend/zarafa/ %changelog +* Sun Dec 08 2013 Robert Scheck <robert(a)fedoraproject.org> 2.0.9-1 +- Upgrade to 2.0.9 + * Mon Aug 05 2013 Robert Scheck <robert(a)fedoraproject.org> 2.0.7-3 - Added configuration compatibility for Apache 2.2 and 2.4 --- z-push-2.0.6-package.patch DELETED ---

11 years, 2 months

1
0
0 / 0

rpms/z-push/F-18 z-push-2.0.9-package.patch, NONE, 1.1 .cvsignore, 1.11, 1.12 sources, 1.11, 1.12 z-push.conf, 1.3, 1.4 z-push.spec, 1.12, 1.13 z-push-2.0.6-package.patch, 1.1, NONE

by Robert Scheck

Author: robert Update of /cvs/free/rpms/z-push/F-18 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv25702/F-18 Modified Files: .cvsignore sources z-push.conf z-push.spec Added Files: z-push-2.0.9-package.patch Removed Files: z-push-2.0.6-package.patch Log Message: Upgrade to 2.0.9 z-push-2.0.9-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 | 79 ++++++++++++++++++++++++++++++++++++++++++++++ config.maildir.php | 55 ++++++++++++++++++++++++++++++++ config.php | 66 +++++++++----------------------------- config.vcarddir.php | 52 ++++++++++++++++++++++++++++++ lib/core/zpush.php | 15 ++++++++ z-push-admin.php | 6 ++- z-push-top.php | 5 ++ 12 files changed, 291 insertions(+), 52 deletions(-) --- NEW FILE z-push-2.0.9-package.patch --- Patch by Robert Scheck <robert(a)fedoraproject.org> for z-push >= 2.0.9, 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.9-1787/config.php 2013-11-06 19:22:59.000000000 +0100 +++ z-push-2.0.9-1787/config.php.package 2013-12-08 20:41:54.000000000 +0100 @@ -165,57 +165,25 @@ // 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 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 - // '@mydomain.com' - 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); - /* BEGIN fmbiete's contribution r1527, ZP-319 */ - // list of folders we want to exclude from sync. Names, or part of it, separated by | - // example: dovecot.sieve|archive|spam - define('IMAP_EXCLUDED_FOLDERS', ''); - /* END fmbiete's contribution r1527, ZP-319 */ - - - // ************************ - // 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', ''); /********************************************************************************** @@ -224,7 +192,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.9-1787/config.imap.php 1970-01-01 01:00:00.000000000 +0100 +++ z-push-2.0.9-1787/config.imap.php.package 2012-11-04 16:45:03.000000000 +0100 @@ -0,0 +1,79 @@ +<?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 +// '@mydomain.com' - 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); + +/* BEGIN fmbiete's contribution r1527, ZP-319 */ +// list of folders we want to exclude from sync. Names, or part of it, separated by | +// example: dovecot.sieve|archive|spam +define('IMAP_EXCLUDED_FOLDERS', ''); +/* END fmbiete's contribution r1527, ZP-319 */ + +?> --- z-push-2.0.9-1787/config.maildir.php 1970-01-01 01:00:00.000000000 +0100 +++ z-push-2.0.9-1787/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.9-1787/config.vcarddir.php 1970-01-01 01:00:00.000000000 +0100 +++ z-push-2.0.9-1787/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.9-1787/backend/zarafa/config.php 1970-01-01 01:00:00.000000000 +0100 +++ z-push-2.0.9-1787/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.9-1787/backend/imap.php 2012-08-30 21:41:25.000000000 +0200 +++ z-push-2.0.9-1787/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.9-1787/backend/maildir.php 2012-02-07 21:24:18.000000000 +0100 +++ z-push-2.0.9-1787/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.9-1787/backend/vcarddir.php 2012-02-07 21:24:18.000000000 +0100 +++ z-push-2.0.9-1787/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.9-1787/backend/zarafa/zarafa.php 2012-08-30 21:41:25.000000000 +0200 +++ z-push-2.0.9-1787/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.9-1787/lib/core/zpush.php 2012-06-02 07:03:16.000000000 +0200 +++ z-push-2.0.9-1787/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.9-1787/z-push-admin.php 2012-07-21 17:20:52.000000000 +0200 +++ z-push-2.0.9-1787/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.9-1787/z-push-top.php 2012-10-17 22:57:36.000000000 +0200 +++ z-push-2.0.9-1787/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(); Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/z-push/F-18/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 23 Feb 2013 15:36:11 -0000 1.11 +++ .cvsignore 8 Dec 2013 19:56:56 -0000 1.12 @@ -1,2 +1,2 @@ -z-push-2.0.7-1690.tar.gz +z-push-2.0.9-1787.tar.gz z-push-permission.pdf Index: sources =================================================================== RCS file: /cvs/free/rpms/z-push/F-18/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 23 Feb 2013 15:36:11 -0000 1.11 +++ sources 8 Dec 2013 19:56:56 -0000 1.12 @@ -1,2 +1,2 @@ -b0dd7f6da6b6d6bac49266cca28a4140 z-push-2.0.7-1690.tar.gz +94fad4d31cad30c762018937a4542e17 z-push-2.0.9-1787.tar.gz 0d25be91b27fe7ebab16ed593c9fbf48 z-push-permission.pdf Index: z-push.conf =================================================================== RCS file: /cvs/free/rpms/z-push/F-18/z-push.conf,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- z-push.conf 5 Aug 2013 00:51:49 -0000 1.3 +++ z-push.conf 8 Dec 2013 19:56:56 -0000 1.4 @@ -15,6 +15,7 @@ Require all granted </IfModule> <IfModule !mod_authz_core.c> + # Apache 2.2 Order allow,deny Allow from all </IfModule> Index: z-push.spec =================================================================== RCS file: /cvs/free/rpms/z-push/F-18/z-push.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- z-push.spec 5 Aug 2013 00:51:49 -0000 1.12 +++ z-push.spec 8 Dec 2013 19:56:56 -0000 1.13 @@ -1,9 +1,9 @@ -%global svnrevision 1690 +%global svnrevision 1787 Summary: ActiveSync over-the-air implementation for mobile syncing Name: z-push -Version: 2.0.7 -Release: 3%{?dist} +Version: 2.0.9 +Release: 1%{?dist} License: AGPLv3 with exceptions Group: Applications/Productivity URL: http://z-push.sourceforge.net/ @@ -12,7 +12,7 @@ Source2: z-push-README.FEDORA Source3: z-push.conf Source4: z-push.logrotate -Patch0: z-push-2.0.6-package.patch +Patch0: z-push-2.0.9-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) @@ -200,6 +200,9 @@ %{_datadir}/%{name}/backend/zarafa/ %changelog +* Sun Dec 08 2013 Robert Scheck <robert(a)fedoraproject.org> 2.0.9-1 +- Upgrade to 2.0.9 + * Mon Aug 05 2013 Robert Scheck <robert(a)fedoraproject.org> 2.0.7-3 - Added configuration compatibility for Apache 2.2 and 2.4 --- z-push-2.0.6-package.patch DELETED ---

11 years, 2 months

1
0
0 / 0

rpms/z-push/F-19 z-push-2.0.9-package.patch, NONE, 1.1 .cvsignore, 1.11, 1.12 sources, 1.11, 1.12 z-push.conf, 1.3, 1.4 z-push.spec, 1.14, 1.15 z-push-2.0.6-package.patch, 1.1, NONE

by Robert Scheck

Author: robert Update of /cvs/free/rpms/z-push/F-19 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv25702/F-19 Modified Files: .cvsignore sources z-push.conf z-push.spec Added Files: z-push-2.0.9-package.patch Removed Files: z-push-2.0.6-package.patch Log Message: Upgrade to 2.0.9 z-push-2.0.9-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 | 79 ++++++++++++++++++++++++++++++++++++++++++++++ config.maildir.php | 55 ++++++++++++++++++++++++++++++++ config.php | 66 +++++++++----------------------------- config.vcarddir.php | 52 ++++++++++++++++++++++++++++++ lib/core/zpush.php | 15 ++++++++ z-push-admin.php | 6 ++- z-push-top.php | 5 ++ 12 files changed, 291 insertions(+), 52 deletions(-) --- NEW FILE z-push-2.0.9-package.patch --- Patch by Robert Scheck <robert(a)fedoraproject.org> for z-push >= 2.0.9, 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.9-1787/config.php 2013-11-06 19:22:59.000000000 +0100 +++ z-push-2.0.9-1787/config.php.package 2013-12-08 20:41:54.000000000 +0100 @@ -165,57 +165,25 @@ // 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 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 - // '@mydomain.com' - 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); - /* BEGIN fmbiete's contribution r1527, ZP-319 */ - // list of folders we want to exclude from sync. Names, or part of it, separated by | - // example: dovecot.sieve|archive|spam - define('IMAP_EXCLUDED_FOLDERS', ''); - /* END fmbiete's contribution r1527, ZP-319 */ - - - // ************************ - // 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', ''); /********************************************************************************** @@ -224,7 +192,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.9-1787/config.imap.php 1970-01-01 01:00:00.000000000 +0100 +++ z-push-2.0.9-1787/config.imap.php.package 2012-11-04 16:45:03.000000000 +0100 @@ -0,0 +1,79 @@ +<?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 +// '@mydomain.com' - 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); + +/* BEGIN fmbiete's contribution r1527, ZP-319 */ +// list of folders we want to exclude from sync. Names, or part of it, separated by | +// example: dovecot.sieve|archive|spam +define('IMAP_EXCLUDED_FOLDERS', ''); +/* END fmbiete's contribution r1527, ZP-319 */ + +?> --- z-push-2.0.9-1787/config.maildir.php 1970-01-01 01:00:00.000000000 +0100 +++ z-push-2.0.9-1787/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.9-1787/config.vcarddir.php 1970-01-01 01:00:00.000000000 +0100 +++ z-push-2.0.9-1787/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.9-1787/backend/zarafa/config.php 1970-01-01 01:00:00.000000000 +0100 +++ z-push-2.0.9-1787/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.9-1787/backend/imap.php 2012-08-30 21:41:25.000000000 +0200 +++ z-push-2.0.9-1787/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.9-1787/backend/maildir.php 2012-02-07 21:24:18.000000000 +0100 +++ z-push-2.0.9-1787/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.9-1787/backend/vcarddir.php 2012-02-07 21:24:18.000000000 +0100 +++ z-push-2.0.9-1787/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.9-1787/backend/zarafa/zarafa.php 2012-08-30 21:41:25.000000000 +0200 +++ z-push-2.0.9-1787/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.9-1787/lib/core/zpush.php 2012-06-02 07:03:16.000000000 +0200 +++ z-push-2.0.9-1787/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.9-1787/z-push-admin.php 2012-07-21 17:20:52.000000000 +0200 +++ z-push-2.0.9-1787/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.9-1787/z-push-top.php 2012-10-17 22:57:36.000000000 +0200 +++ z-push-2.0.9-1787/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(); Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/z-push/F-19/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 23 Feb 2013 15:36:11 -0000 1.11 +++ .cvsignore 8 Dec 2013 19:56:56 -0000 1.12 @@ -1,2 +1,2 @@ -z-push-2.0.7-1690.tar.gz +z-push-2.0.9-1787.tar.gz z-push-permission.pdf Index: sources =================================================================== RCS file: /cvs/free/rpms/z-push/F-19/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 23 Feb 2013 15:36:11 -0000 1.11 +++ sources 8 Dec 2013 19:56:56 -0000 1.12 @@ -1,2 +1,2 @@ -b0dd7f6da6b6d6bac49266cca28a4140 z-push-2.0.7-1690.tar.gz +94fad4d31cad30c762018937a4542e17 z-push-2.0.9-1787.tar.gz 0d25be91b27fe7ebab16ed593c9fbf48 z-push-permission.pdf Index: z-push.conf =================================================================== RCS file: /cvs/free/rpms/z-push/F-19/z-push.conf,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- z-push.conf 5 Aug 2013 00:51:50 -0000 1.3 +++ z-push.conf 8 Dec 2013 19:56:56 -0000 1.4 @@ -15,6 +15,7 @@ Require all granted </IfModule> <IfModule !mod_authz_core.c> + # Apache 2.2 Order allow,deny Allow from all </IfModule> Index: z-push.spec =================================================================== RCS file: /cvs/free/rpms/z-push/F-19/z-push.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- z-push.spec 5 Aug 2013 00:51:50 -0000 1.14 +++ z-push.spec 8 Dec 2013 19:56:56 -0000 1.15 @@ -1,9 +1,9 @@ -%global svnrevision 1690 +%global svnrevision 1787 Summary: ActiveSync over-the-air implementation for mobile syncing Name: z-push -Version: 2.0.7 -Release: 3%{?dist} +Version: 2.0.9 +Release: 1%{?dist} License: AGPLv3 with exceptions Group: Applications/Productivity URL: http://z-push.sourceforge.net/ @@ -12,7 +12,7 @@ Source2: z-push-README.FEDORA Source3: z-push.conf Source4: z-push.logrotate -Patch0: z-push-2.0.6-package.patch +Patch0: z-push-2.0.9-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) @@ -200,6 +200,9 @@ %{_datadir}/%{name}/backend/zarafa/ %changelog +* Sun Dec 08 2013 Robert Scheck <robert(a)fedoraproject.org> 2.0.9-1 +- Upgrade to 2.0.9 + * Mon Aug 05 2013 Robert Scheck <robert(a)fedoraproject.org> 2.0.7-3 - Added configuration compatibility for Apache 2.2 and 2.4 --- z-push-2.0.6-package.patch DELETED ---

11 years, 2 months

1
0
0 / 0

rpms/z-push/EL-5 z-push-2.0.9-package.patch, NONE, 1.1 .cvsignore, 1.11, 1.12 sources, 1.11, 1.12 z-push.conf, 1.3, 1.4 z-push.spec, 1.13, 1.14 z-push-2.0.6-package.patch, 1.1, NONE

by Robert Scheck

Author: robert Update of /cvs/free/rpms/z-push/EL-5 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv25702/EL-5 Modified Files: .cvsignore sources z-push.conf z-push.spec Added Files: z-push-2.0.9-package.patch Removed Files: z-push-2.0.6-package.patch Log Message: Upgrade to 2.0.9 z-push-2.0.9-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 | 79 ++++++++++++++++++++++++++++++++++++++++++++++ config.maildir.php | 55 ++++++++++++++++++++++++++++++++ config.php | 66 +++++++++----------------------------- config.vcarddir.php | 52 ++++++++++++++++++++++++++++++ lib/core/zpush.php | 15 ++++++++ z-push-admin.php | 6 ++- z-push-top.php | 5 ++ 12 files changed, 291 insertions(+), 52 deletions(-) --- NEW FILE z-push-2.0.9-package.patch --- Patch by Robert Scheck <robert(a)fedoraproject.org> for z-push >= 2.0.9, 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.9-1787/config.php 2013-11-06 19:22:59.000000000 +0100 +++ z-push-2.0.9-1787/config.php.package 2013-12-08 20:41:54.000000000 +0100 @@ -165,57 +165,25 @@ // 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 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 - // '@mydomain.com' - 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); - /* BEGIN fmbiete's contribution r1527, ZP-319 */ - // list of folders we want to exclude from sync. Names, or part of it, separated by | - // example: dovecot.sieve|archive|spam - define('IMAP_EXCLUDED_FOLDERS', ''); - /* END fmbiete's contribution r1527, ZP-319 */ - - - // ************************ - // 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', ''); /********************************************************************************** @@ -224,7 +192,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.9-1787/config.imap.php 1970-01-01 01:00:00.000000000 +0100 +++ z-push-2.0.9-1787/config.imap.php.package 2012-11-04 16:45:03.000000000 +0100 @@ -0,0 +1,79 @@ +<?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 +// '@mydomain.com' - 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); + +/* BEGIN fmbiete's contribution r1527, ZP-319 */ +// list of folders we want to exclude from sync. Names, or part of it, separated by | +// example: dovecot.sieve|archive|spam +define('IMAP_EXCLUDED_FOLDERS', ''); +/* END fmbiete's contribution r1527, ZP-319 */ + +?> --- z-push-2.0.9-1787/config.maildir.php 1970-01-01 01:00:00.000000000 +0100 +++ z-push-2.0.9-1787/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.9-1787/config.vcarddir.php 1970-01-01 01:00:00.000000000 +0100 +++ z-push-2.0.9-1787/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.9-1787/backend/zarafa/config.php 1970-01-01 01:00:00.000000000 +0100 +++ z-push-2.0.9-1787/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.9-1787/backend/imap.php 2012-08-30 21:41:25.000000000 +0200 +++ z-push-2.0.9-1787/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.9-1787/backend/maildir.php 2012-02-07 21:24:18.000000000 +0100 +++ z-push-2.0.9-1787/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.9-1787/backend/vcarddir.php 2012-02-07 21:24:18.000000000 +0100 +++ z-push-2.0.9-1787/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.9-1787/backend/zarafa/zarafa.php 2012-08-30 21:41:25.000000000 +0200 +++ z-push-2.0.9-1787/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.9-1787/lib/core/zpush.php 2012-06-02 07:03:16.000000000 +0200 +++ z-push-2.0.9-1787/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.9-1787/z-push-admin.php 2012-07-21 17:20:52.000000000 +0200 +++ z-push-2.0.9-1787/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.9-1787/z-push-top.php 2012-10-17 22:57:36.000000000 +0200 +++ z-push-2.0.9-1787/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(); Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/z-push/EL-5/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 23 Feb 2013 15:36:10 -0000 1.11 +++ .cvsignore 8 Dec 2013 19:56:55 -0000 1.12 @@ -1,2 +1,2 @@ -z-push-2.0.7-1690.tar.gz +z-push-2.0.9-1787.tar.gz z-push-permission.pdf Index: sources =================================================================== RCS file: /cvs/free/rpms/z-push/EL-5/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 23 Feb 2013 15:36:10 -0000 1.11 +++ sources 8 Dec 2013 19:56:56 -0000 1.12 @@ -1,2 +1,2 @@ -b0dd7f6da6b6d6bac49266cca28a4140 z-push-2.0.7-1690.tar.gz +94fad4d31cad30c762018937a4542e17 z-push-2.0.9-1787.tar.gz 0d25be91b27fe7ebab16ed593c9fbf48 z-push-permission.pdf Index: z-push.conf =================================================================== RCS file: /cvs/free/rpms/z-push/EL-5/z-push.conf,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- z-push.conf 5 Aug 2013 00:51:49 -0000 1.3 +++ z-push.conf 8 Dec 2013 19:56:56 -0000 1.4 @@ -15,6 +15,7 @@ Require all granted </IfModule> <IfModule !mod_authz_core.c> + # Apache 2.2 Order allow,deny Allow from all </IfModule> Index: z-push.spec =================================================================== RCS file: /cvs/free/rpms/z-push/EL-5/z-push.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- z-push.spec 5 Aug 2013 00:51:49 -0000 1.13 +++ z-push.spec 8 Dec 2013 19:56:56 -0000 1.14 @@ -1,9 +1,9 @@ -%global svnrevision 1690 +%global svnrevision 1787 Summary: ActiveSync over-the-air implementation for mobile syncing Name: z-push -Version: 2.0.7 -Release: 3%{?dist} +Version: 2.0.9 +Release: 1%{?dist} License: AGPLv3 with exceptions Group: Applications/Productivity URL: http://z-push.sourceforge.net/ @@ -12,7 +12,7 @@ Source2: z-push-README.FEDORA Source3: z-push.conf Source4: z-push.logrotate -Patch0: z-push-2.0.6-package.patch +Patch0: z-push-2.0.9-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) @@ -200,6 +200,9 @@ %{_datadir}/%{name}/backend/zarafa/ %changelog +* Sun Dec 08 2013 Robert Scheck <robert(a)fedoraproject.org> 2.0.9-1 +- Upgrade to 2.0.9 + * Mon Aug 05 2013 Robert Scheck <robert(a)fedoraproject.org> 2.0.7-3 - Added configuration compatibility for Apache 2.2 and 2.4 --- z-push-2.0.6-package.patch DELETED ---

11 years, 2 months

1
0
0 / 0

rpms/z-push/devel z-push-2.0.9-package.patch, NONE, 1.1 .cvsignore, 1.11, 1.12 sources, 1.11, 1.12 z-push.conf, 1.3, 1.4 z-push.spec, 1.14, 1.15 z-push-2.0.6-package.patch, 1.1, NONE

by Robert Scheck

Author: robert Update of /cvs/free/rpms/z-push/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv25702/devel Modified Files: .cvsignore sources z-push.conf z-push.spec Added Files: z-push-2.0.9-package.patch Removed Files: z-push-2.0.6-package.patch Log Message: Upgrade to 2.0.9 z-push-2.0.9-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 | 79 ++++++++++++++++++++++++++++++++++++++++++++++ config.maildir.php | 55 ++++++++++++++++++++++++++++++++ config.php | 66 +++++++++----------------------------- config.vcarddir.php | 52 ++++++++++++++++++++++++++++++ lib/core/zpush.php | 15 ++++++++ z-push-admin.php | 6 ++- z-push-top.php | 5 ++ 12 files changed, 291 insertions(+), 52 deletions(-) --- NEW FILE z-push-2.0.9-package.patch --- Patch by Robert Scheck <robert(a)fedoraproject.org> for z-push >= 2.0.9, 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.9-1787/config.php 2013-11-06 19:22:59.000000000 +0100 +++ z-push-2.0.9-1787/config.php.package 2013-12-08 20:41:54.000000000 +0100 @@ -165,57 +165,25 @@ // 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 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 - // '@mydomain.com' - 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); - /* BEGIN fmbiete's contribution r1527, ZP-319 */ - // list of folders we want to exclude from sync. Names, or part of it, separated by | - // example: dovecot.sieve|archive|spam - define('IMAP_EXCLUDED_FOLDERS', ''); - /* END fmbiete's contribution r1527, ZP-319 */ - - - // ************************ - // 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', ''); /********************************************************************************** @@ -224,7 +192,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.9-1787/config.imap.php 1970-01-01 01:00:00.000000000 +0100 +++ z-push-2.0.9-1787/config.imap.php.package 2012-11-04 16:45:03.000000000 +0100 @@ -0,0 +1,79 @@ +<?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 +// '@mydomain.com' - 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); + +/* BEGIN fmbiete's contribution r1527, ZP-319 */ +// list of folders we want to exclude from sync. Names, or part of it, separated by | +// example: dovecot.sieve|archive|spam +define('IMAP_EXCLUDED_FOLDERS', ''); +/* END fmbiete's contribution r1527, ZP-319 */ + +?> --- z-push-2.0.9-1787/config.maildir.php 1970-01-01 01:00:00.000000000 +0100 +++ z-push-2.0.9-1787/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.9-1787/config.vcarddir.php 1970-01-01 01:00:00.000000000 +0100 +++ z-push-2.0.9-1787/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.9-1787/backend/zarafa/config.php 1970-01-01 01:00:00.000000000 +0100 +++ z-push-2.0.9-1787/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.9-1787/backend/imap.php 2012-08-30 21:41:25.000000000 +0200 +++ z-push-2.0.9-1787/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.9-1787/backend/maildir.php 2012-02-07 21:24:18.000000000 +0100 +++ z-push-2.0.9-1787/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.9-1787/backend/vcarddir.php 2012-02-07 21:24:18.000000000 +0100 +++ z-push-2.0.9-1787/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.9-1787/backend/zarafa/zarafa.php 2012-08-30 21:41:25.000000000 +0200 +++ z-push-2.0.9-1787/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.9-1787/lib/core/zpush.php 2012-06-02 07:03:16.000000000 +0200 +++ z-push-2.0.9-1787/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.9-1787/z-push-admin.php 2012-07-21 17:20:52.000000000 +0200 +++ z-push-2.0.9-1787/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.9-1787/z-push-top.php 2012-10-17 22:57:36.000000000 +0200 +++ z-push-2.0.9-1787/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(); Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/z-push/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 23 Feb 2013 15:36:11 -0000 1.11 +++ .cvsignore 8 Dec 2013 19:56:56 -0000 1.12 @@ -1,2 +1,2 @@ -z-push-2.0.7-1690.tar.gz +z-push-2.0.9-1787.tar.gz z-push-permission.pdf Index: sources =================================================================== RCS file: /cvs/free/rpms/z-push/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 23 Feb 2013 15:36:11 -0000 1.11 +++ sources 8 Dec 2013 19:56:56 -0000 1.12 @@ -1,2 +1,2 @@ -b0dd7f6da6b6d6bac49266cca28a4140 z-push-2.0.7-1690.tar.gz +94fad4d31cad30c762018937a4542e17 z-push-2.0.9-1787.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.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- z-push.conf 5 Aug 2013 00:51:50 -0000 1.3 +++ z-push.conf 8 Dec 2013 19:56:56 -0000 1.4 @@ -15,6 +15,7 @@ Require all granted </IfModule> <IfModule !mod_authz_core.c> + # Apache 2.2 Order allow,deny Allow from all </IfModule> Index: z-push.spec =================================================================== RCS file: /cvs/free/rpms/z-push/devel/z-push.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- z-push.spec 5 Aug 2013 00:51:50 -0000 1.14 +++ z-push.spec 8 Dec 2013 19:56:56 -0000 1.15 @@ -1,9 +1,9 @@ -%global svnrevision 1690 +%global svnrevision 1787 Summary: ActiveSync over-the-air implementation for mobile syncing Name: z-push -Version: 2.0.7 -Release: 3%{?dist} +Version: 2.0.9 +Release: 1%{?dist} License: AGPLv3 with exceptions Group: Applications/Productivity URL: http://z-push.sourceforge.net/ @@ -12,7 +12,7 @@ Source2: z-push-README.FEDORA Source3: z-push.conf Source4: z-push.logrotate -Patch0: z-push-2.0.6-package.patch +Patch0: z-push-2.0.9-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) @@ -200,6 +200,9 @@ %{_datadir}/%{name}/backend/zarafa/ %changelog +* Sun Dec 08 2013 Robert Scheck <robert(a)fedoraproject.org> 2.0.9-1 +- Upgrade to 2.0.9 + * Mon Aug 05 2013 Robert Scheck <robert(a)fedoraproject.org> 2.0.7-3 - Added configuration compatibility for Apache 2.2 and 2.4 --- z-push-2.0.6-package.patch DELETED ---

11 years, 2 months

1
0
0 / 0

rpms/pdflib-lite/devel pdflib-lite.spec,1.11,1.12

by Nicolas Chauvet

Author: kwizart Update of /cvs/nonfree/rpms/pdflib-lite/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv24564 Modified Files: pdflib-lite.spec Log Message: Rebuilt Index: pdflib-lite.spec =================================================================== RCS file: /cvs/nonfree/rpms/pdflib-lite/devel/pdflib-lite.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- pdflib-lite.spec 10 Oct 2012 20:48:18 -0000 1.11 +++ pdflib-lite.spec 8 Dec 2013 19:30:21 -0000 1.12 @@ -5,7 +5,7 @@ Name: pdflib-lite # Remenber to check the URL after changing this... Version: 7.0.5 -Release: 3%{?dist} +Release: 4%{?dist} License: Distributable Group: System Environment/Libraries URL: http://www.pdflib.com/ @@ -192,6 +192,9 @@ %changelog +* Sun Dec 08 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 7.0.5-4 +- Rebuilt + * Wed Oct 10 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 7.0.5-3 - Rebuilt for perl

11 years, 2 months

1
0
0 / 0

rpms/terminatorX/devel terminatorX.spec,1.11,1.12

by Nicolas Chauvet

Author: kwizart Update of /cvs/free/rpms/terminatorX/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv24443 Modified Files: terminatorX.spec Log Message: Rebuilt Index: terminatorX.spec =================================================================== RCS file: /cvs/free/rpms/terminatorX/devel/terminatorX.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- terminatorX.spec 24 Mar 2013 20:07:08 -0000 1.11 +++ terminatorX.spec 8 Dec 2013 19:29:29 -0000 1.12 @@ -1,7 +1,7 @@ Summary: Real-time Audio Synthesizer Name: terminatorX Version: 3.84 -Release: 4%{?dist} +Release: 5%{?dist} Group: Applications/Multimedia License: GPLv2+ and GFDL URL: http://terminatorx.org/ @@ -123,6 +123,9 @@ %changelog +* Sun Dec 08 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 3.84-5 +- Rebuilt + * Sun Mar 24 2013 Orcan Ogetbil <oged[DOT]fedora[AT]gmail[DOT]com> - 3.84-4 - Build fix against newer zlib - Spec file cleanup

11 years, 2 months

1
0
0 / 0

rpms/libvdpau-va-gl/EL-6 libvdpau-va-gl.spec,1.1,1.2

by Nicolas Chauvet

Author: kwizart Update of /cvs/free/rpms/libvdpau-va-gl/EL-6 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv21593 Modified Files: libvdpau-va-gl.spec Log Message: Fix build on EL Index: libvdpau-va-gl.spec =================================================================== RCS file: /cvs/free/rpms/libvdpau-va-gl/EL-6/libvdpau-va-gl.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libvdpau-va-gl.spec 7 Dec 2013 18:18:03 -0000 1.1 +++ libvdpau-va-gl.spec 8 Dec 2013 18:08:21 -0000 1.2 @@ -1,6 +1,6 @@ Name: libvdpau-va-gl Version: 0.2.1 -Release: 1%{?dist} +Release: 1%{?dist}.1 Summary: VDPAU driver with OpenGL/VAAPI back-end License: LGPLv3 @@ -13,7 +13,7 @@ BuildRequires: cmake BuildRequires: pkgconfig(vdpau) BuildRequires: pkgconfig(glib-2.0) -BuildRequires: pkgconfig(libswscale) +BuildRequires: pkgconfig(libswscale) ffmpeg-devel BuildRequires: pkgconfig(libva-glx) BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(glu) @@ -62,6 +62,9 @@ %changelog +* Sun Dec 08 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 0.2.1-1.1 +- Enforce ffmpeg over ffmpeg-compat on EL + * Tue Nov 19 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 0.2.1-1 - Update to 0.2.1

11 years, 2 months

1
0
0 / 0

rpms/xorg-x11-drv-nvidia-304xx/F-18 sources, 1.2, 1.3 xorg-x11-drv-nvidia-304xx.spec, 1.13, 1.14

by Leigh Scott

Author: leigh123linux Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia-304xx/F-18 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv6681 Modified Files: sources xorg-x11-drv-nvidia-304xx.spec Log Message: * Sun Dec 08 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 304.116-1 - Update to 304.116 Index: sources =================================================================== RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-304xx/F-18/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 30 May 2013 15:23:42 -0000 1.2 +++ sources 8 Dec 2013 12:39:19 -0000 1.3 @@ -1,2 +1,2 @@ -a6d8010c5e4f0d65615a196326a3219c NVIDIA-Linux-x86_64-304.88.run -f60d4aef766029c98914ed665235029a NVIDIA-Linux-x86-304.88.run +5d5d50335d05f738abde45bd28126978 NVIDIA-Linux-x86_64-304.116.run +0626e8582fd81f14e7fbd906fbca1d51 NVIDIA-Linux-x86-304.116.run Index: xorg-x11-drv-nvidia-304xx.spec =================================================================== RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-304xx/F-18/xorg-x11-drv-nvidia-304xx.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- xorg-x11-drv-nvidia-304xx.spec 21 Jul 2013 14:57:23 -0000 1.13 +++ xorg-x11-drv-nvidia-304xx.spec 8 Dec 2013 12:39:19 -0000 1.14 @@ -6,8 +6,8 @@ %global __strip /bin/true Name: xorg-x11-drv-nvidia-304xx -Version: 304.88 -Release: 12%{?dist} +Version: 304.116 +Release: 1%{?dist} Summary: NVIDIA's 304xx serie proprietary display driver for NVIDIA graphic cards Group: User Interface/X Hardware Support @@ -388,6 +388,9 @@ %changelog +* Sun Dec 08 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 304.116-1 +- Update to 304.116 + * Sun Jul 21 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 304.88-12 - Disable Obsoletes/Provides of nvidia tools until rhbz#985944

11 years, 2 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

rpmfusion-commits December 2013