10:42 p.m.
Author: robert
Update of /cvs/free/rpms/z-push/EL-5
In directory se02.es.rpmfusion.net:/tmp/cvs-serv26055/EL-5
Modified Files:
.cvsignore sources z-push.spec
Added Files:
z-push-1.5.6-package.patch z-push-1.5.6-zarafa.patch
Removed Files:
z-push-1.5.5-package.patch z-push-1.5.5-zarafa.patch
Log Message:
Upgrade to 1.5.6
z-push-1.5.6-package.patch:
config.php | 20 +++++---------------
debug.php | 2 +-
index.php | 9 +++++++++
3 files changed, 15 insertions(+), 16 deletions(-)
--- NEW FILE z-push-1.5.6-package.patch ---
Patch by Robert Scheck <robert(a)fedoraproject.org> for z-push >= 1.5.6, that
changes the original paths from Z-Push upstream to Fedora compliant ones.
--- z-push-1.5.6/debug.php 2010-11-19 22:20:24.000000000 +0100
+++ z-push-1.5.6/debug.php.package 2011-12-11 23:34:15.000000000 +0100
@@ -57,7 +57,7 @@
function debugLog($message) {
global $auth_user;
$user = (isset($auth_user))?"[". $auth_user ."] ":"";
- @$fp = fopen(BASE_PATH . "/debug.txt","a");
+ @$fp = fopen("/var/lib/z-push/debug.txt","a");
@$date = strftime("%x %X");
@fwrite($fp, "$date [". getmypid() ."] ". $user .
"$message\n");
@fclose($fp);
--- z-push-1.5.6/config.php 2011-11-24 22:39:15.000000000 +0100
+++ z-push-1.5.6/config.php.package 2011-12-11 23:35:34.000000000 +0100
@@ -40,10 +40,8 @@
*
* Consult LICENSE file for details
************************************************/
- // Defines the default time zone
- if (function_exists("date_default_timezone_set")){
- date_default_timezone_set("Europe/Amsterdam");
- }
+ // Defines the default time zone, change e.g. to "Europe/London" if
necessary
+ define('TIMEZONE', '');
// Defines the base path on the server, terminated by a slash
define('BASE_PATH', dirname($_SERVER['SCRIPT_FILENAME']) .
"/");
@@ -57,7 +55,7 @@
"/usr/share/php5/" . PATH_SEPARATOR .
"/usr/share/pear/");
- define('STATE_DIR', BASE_PATH.'/state');
+ define('STATE_DIR', '/var/lib/z-push/state');
// Try to set unlimited timeout
define('SCRIPT_TIMEOUT', 0);
@@ -96,16 +94,8 @@
// a higher value if you have a high load on the server.
define('PING_INTERVAL', 10);
- // The data providers that we are using (see configuration below)
- $BACKEND_PROVIDER = "BackendICS";
-
- // ************************
- // BackendICS settings
- // ************************
-
- // Defines the server to which we want to connect
- define('MAPI_SERVER', 'file:///var/run/zarafa');
-
+ // The data provider that we are using
+ $BACKEND_PROVIDER = "BackendIMAP";
// ************************
// BackendIMAP settings
--- z-push-1.5.6/index.php 2011-08-04 19:32:40.000000000 +0200
+++ z-push-1.5.6/index.php.package 2011-12-11 23:35:57.000000000 +0100
@@ -53,6 +53,15 @@
include_once("compat.php");
include_once("version.php");
+// Set timezone, see https://developer.berlios.de/mantis/view.php?id=479
+if(function_exists("date_default_timezone_set")) {
+ if(defined('TIMEZONE') ? constant('TIMEZONE') : false) {
+ date_default_timezone_set(TIMEZONE);
+ } else if(!ini_get('date.timezone')) {
+ date_default_timezone_set('Europe/Amsterdam');
+ }
+}
+
// Attempt to set maximum execution time
ini_set('max_execution_time', SCRIPT_TIMEOUT);
set_time_limit(SCRIPT_TIMEOUT);
z-push-1.5.6-zarafa.patch:
config.php | 45 ++++-----------------------------------------
debug.php | 2 +-
index.php | 9 +++++++++
3 files changed, 14 insertions(+), 42 deletions(-)
--- NEW FILE z-push-1.5.6-zarafa.patch ---
Patch by Robert Scheck <robert(a)fedoraproject.org> for z-push >= 1.5.6, that
changes the original paths from Z-Push upstream to Fedora compliant ones.
--- z-push-1.5.6/debug.php 2010-11-19 22:20:24.000000000 +0100
+++ z-push-1.5.6/debug.php.zarafa 2011-12-11 23:27:55.000000000 +0100
@@ -57,7 +57,7 @@
function debugLog($message) {
global $auth_user;
$user = (isset($auth_user))?"[". $auth_user ."] ":"";
- @$fp = fopen(BASE_PATH . "/debug.txt","a");
+ @$fp = fopen("/var/lib/zarafa-z-push/debug.txt","a");
@$date = strftime("%x %X");
@fwrite($fp, "$date [". getmypid() ."] ". $user .
"$message\n");
@fclose($fp);
--- z-push-1.5.6/config.php 2011-11-24 22:39:15.000000000 +0100
+++ z-push-1.5.6/config.php.zarafa 2011-12-11 23:29:14.000000000 +0100
@@ -40,10 +40,8 @@
*
* Consult LICENSE file for details
************************************************/
- // Defines the default time zone
- if (function_exists("date_default_timezone_set")){
- date_default_timezone_set("Europe/Amsterdam");
- }
+ // Defines the default time zone, change e.g. to "Europe/London" if
necessary
+ define('TIMEZONE', '');
// Defines the base path on the server, terminated by a slash
define('BASE_PATH', dirname($_SERVER['SCRIPT_FILENAME']) .
"/");
@@ -57,7 +55,7 @@
"/usr/share/php5/" . PATH_SEPARATOR .
"/usr/share/pear/");
- define('STATE_DIR', BASE_PATH.'/state');
+ define('STATE_DIR', '/var/lib/zarafa-z-push/state');
// Try to set unlimited timeout
define('SCRIPT_TIMEOUT', 0);
@@ -96,7 +94,7 @@
// a higher value if you have a high load on the server.
define('PING_INTERVAL', 10);
- // The data providers that we are using (see configuration below)
+ // The data provider that we are using
$BACKEND_PROVIDER = "BackendICS";
// ************************
@@ -107,41 +105,6 @@
define('MAPI_SERVER', 'file:///var/run/zarafa');
- // ************************
- // BackendIMAP settings
- // ************************
-
- // Defines the server to which we want to connect
- // recommended to use local servers only
- 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
- // '(a)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 off - as attachment)
- define('IMAP_INLINE_FORWARD', false);
- // use imap_mail() to send emails (default) - off uses mail()
- define('IMAP_USE_IMAPMAIL', true);
-
-
- // ************************
- // BackendMaildir settings
- // ************************
- define('MAILDIR_BASE', '/tmp');
- define('MAILDIR_SUBDIR', 'Maildir');
-
- // **********************
- // BackendVCDir settings
- // **********************
- define('VCARDDIR_DIR', '/home/%u/.kde/share/apps/kabc/stdvcf');
-
// Alternative backend to perform SEARCH requests (GAL search)
// if an empty value is used, the default search functionality of the main backend is
used
// use 'SearchLDAP' to search in a LDAP directory (see
backend/searchldap/config.php)
--- z-push-1.5.6/index.php 2011-08-04 19:32:40.000000000 +0200
+++ z-push-1.5.6/index.php.zarafa 2011-12-11 23:29:43.000000000 +0100
@@ -53,6 +53,15 @@
include_once("compat.php");
include_once("version.php");
+// Set timezone, see https://developer.berlios.de/mantis/view.php?id=479
+if(function_exists("date_default_timezone_set")) {
+ if(defined('TIMEZONE') ? constant('TIMEZONE') : false) {
+ date_default_timezone_set(TIMEZONE);
+ } else if(!ini_get('date.timezone')) {
+ date_default_timezone_set('Europe/Amsterdam');
+ }
+}
+
// Attempt to set maximum execution time
ini_set('max_execution_time', SCRIPT_TIMEOUT);
set_time_limit(SCRIPT_TIMEOUT);
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/z-push/EL-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 18 Sep 2011 01:27:09 -0000 1.4
+++ .cvsignore 11 Dec 2011 22:41:35 -0000 1.5
@@ -1,2 +1,2 @@
-z-push-1.5.5-790.tar.gz
+z-push-1.5.6-954.tar.gz
z-push-permission.pdf
Index: sources
===================================================================
RCS file: /cvs/free/rpms/z-push/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 18 Sep 2011 01:27:10 -0000 1.4
+++ sources 11 Dec 2011 22:41:35 -0000 1.5
@@ -1,2 +1,2 @@
-16641d2a7cc9c05eb5c556c4b18497a1 z-push-1.5.5-790.tar.gz
+730df738da44757fdd270b37b36fa3e7 z-push-1.5.6-954.tar.gz
0d25be91b27fe7ebab16ed593c9fbf48 z-push-permission.pdf
Index: z-push.spec
===================================================================
RCS file: /cvs/free/rpms/z-push/EL-5/z-push.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- z-push.spec 18 Sep 2011 01:27:11 -0000 1.3
+++ z-push.spec 11 Dec 2011 22:41:37 -0000 1.4
@@ -1,9 +1,9 @@
-%global svnrevision 790
+%global svnrevision 954
%global with_ldap 1
Summary: ActiveSync over-the-air implementation for mobile syncing
Name: z-push
-Version: 1.5.5
+Version: 1.5.6
Release: 1%{?dist}
License: AGPLv3 with exceptions
Group: Applications/Productivity
@@ -14,8 +14,8 @@
Source3: z-push-README.FEDORA.zarafa
Source4: z-push.conf
Source5: zarafa-z-push.conf
-Patch0: z-push-1.5.5-package.patch
-Patch1: z-push-1.5.5-zarafa.patch
+Patch0: z-push-1.5.6-package.patch
+Patch1: z-push-1.5.6-zarafa.patch
Requires: httpd, php >= 4.3.0, php-imap >= 4.3.0
%if %{with_ldap}
Requires: php-ldap >= 4.3.0
@@ -178,6 +178,9 @@
%attr(-,apache,apache) %dir %{_localstatedir}/lib/zarafa-%{name}/state/
%changelog
+* Sun Dec 11 2011 Robert Scheck <robert(a)fedoraproject.org> 1.5.6-1
+- Upgrade to 1.5.6
+
* Sun Sep 18 2011 Robert Scheck <robert(a)fedoraproject.org> 1.5.5-1
- Upgrade to 1.5.5
--- z-push-1.5.5-package.patch DELETED ---
--- z-push-1.5.5-zarafa.patch DELETED ---