December 2011 - rpmfusion-commits

rpms/z-push/F-16 z-push-1.5.6-package.patch, NONE, 1.1 z-push-1.5.6-zarafa.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 z-push.spec, 1.3, 1.4 z-push-1.5.5-package.patch, 1.1, NONE z-push-1.5.5-zarafa.patch, 1.1, NONE

by Robert Scheck

Author: robert Update of /cvs/free/rpms/z-push/F-16 In directory se02.es.rpmfusion.net:/tmp/cvs-serv26055/F-16 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 - // '@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/F-16/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 18 Sep 2011 01:27:12 -0000 1.4 +++ .cvsignore 11 Dec 2011 22:41:42 -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/F-16/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 18 Sep 2011 01:27:12 -0000 1.4 +++ sources 11 Dec 2011 22:41:42 -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/F-16/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:12 -0000 1.3 +++ z-push.spec 11 Dec 2011 22:41:42 -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 ---

12 years, 11 months

1
0
0 / 0

rpms/z-push/F-15 z-push-1.5.6-package.patch, NONE, 1.1 z-push-1.5.6-zarafa.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 z-push.spec, 1.3, 1.4 z-push-1.5.5-package.patch, 1.1, NONE z-push-1.5.5-zarafa.patch, 1.1, NONE

by Robert Scheck

Author: robert Update of /cvs/free/rpms/z-push/F-15 In directory se02.es.rpmfusion.net:/tmp/cvs-serv26055/F-15 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 - // '@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/F-15/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 18 Sep 2011 01:27:12 -0000 1.4 +++ .cvsignore 11 Dec 2011 22:41:39 -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/F-15/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 18 Sep 2011 01:27:12 -0000 1.4 +++ sources 11 Dec 2011 22:41:40 -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/F-15/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:12 -0000 1.3 +++ z-push.spec 11 Dec 2011 22:41:42 -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 ---

12 years, 11 months

1
0
0 / 0

rpms/z-push/EL-6 z-push-1.5.6-package.patch, NONE, 1.1 z-push-1.5.6-zarafa.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 z-push.spec, 1.3, 1.4 z-push-1.5.5-package.patch, 1.1, NONE z-push-1.5.5-zarafa.patch, 1.1, NONE

by Robert Scheck

Author: robert Update of /cvs/free/rpms/z-push/EL-6 In directory se02.es.rpmfusion.net:/tmp/cvs-serv26055/EL-6 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 - // '@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-6/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 18 Sep 2011 01:27:11 -0000 1.4 +++ .cvsignore 11 Dec 2011 22:41:38 -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-6/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 18 Sep 2011 01:27:12 -0000 1.4 +++ sources 11 Dec 2011 22:41:38 -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-6/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:12 -0000 1.3 +++ z-push.spec 11 Dec 2011 22:41:39 -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 ---

12 years, 11 months

1
0
0 / 0

rpms/z-push/EL-5 z-push-1.5.6-package.patch, NONE, 1.1 z-push-1.5.6-zarafa.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 z-push.spec, 1.3, 1.4 z-push-1.5.5-package.patch, 1.1, NONE z-push-1.5.5-zarafa.patch, 1.1, NONE

by Robert Scheck

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 - // '@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 ---

12 years, 11 months

1
0
0 / 0

rpms/z-push/devel z-push-1.5.6-package.patch, NONE, 1.1 z-push-1.5.6-zarafa.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 z-push.spec, 1.3, 1.4 z-push-1.5.5-package.patch, 1.1, NONE z-push-1.5.5-zarafa.patch, 1.1, NONE

by Robert Scheck

Author: robert Update of /cvs/free/rpms/z-push/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv26055/devel 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 - // '@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/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 18 Sep 2011 01:27:12 -0000 1.4 +++ .cvsignore 11 Dec 2011 22:41:42 -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/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 18 Sep 2011 01:27:12 -0000 1.4 +++ sources 11 Dec 2011 22:41:42 -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/devel/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:12 -0000 1.3 +++ z-push.spec 11 Dec 2011 22:41:42 -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 ---

12 years, 11 months

1
0
0 / 0

rpms/VirtualBox-OSE-kmod/devel VirtualBox-OSE-kmod.spec,1.57,1.58

by Sérgio M. Basto

Author: sergiomb Update of /cvs/free/rpms/VirtualBox-OSE-kmod/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv7104 Modified Files: VirtualBox-OSE-kmod.spec Log Message: * Sun Dec 11 2011 Sérgio Basto <sergio(a)serjux.com> - 4.1.6-2 - rebuild for update kmodsrc. Index: VirtualBox-OSE-kmod.spec =================================================================== RCS file: /cvs/free/rpms/VirtualBox-OSE-kmod/devel/VirtualBox-OSE-kmod.spec,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- VirtualBox-OSE-kmod.spec 3 Dec 2011 11:35:04 -0000 1.57 +++ VirtualBox-OSE-kmod.spec 11 Dec 2011 21:21:05 -0000 1.58 @@ -18,7 +18,7 @@ Name: VirtualBox-OSE-kmod Version: 4.1.6 -Release: 1%{?dist}.1 +Release: 2%{?dist}.1 Summary: Kernel module for VirtualBox-OSE Group: System Environment/Kernel @@ -100,6 +100,9 @@ %changelog +* Sun Dec 11 2011 Sérgio Basto <sergio(a)serjux.com> - 4.1.6-2 +- rebuild for update kmodsrc. + * Sat Dec 3 2011 Sérgio Basto <sergio(a)serjux.com> - 4.1.6-1 - Build for new release - added time package to AkmodsBuildRequires

12 years, 11 months

1
0
0 / 0

rpms/VirtualBox-OSE/devel VirtualBox-OSE-4.1.6-kernel-3.2_compile_fixes.patch, NONE, 1.1 VirtualBox-OSE.spec, 1.75, 1.76

by Sérgio M. Basto

Author: sergiomb Update of /cvs/free/rpms/VirtualBox-OSE/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv26201 Modified Files: VirtualBox-OSE.spec Added Files: VirtualBox-OSE-4.1.6-kernel-3.2_compile_fixes.patch Log Message: * Sun Dec 11 2011 Sérgio Basto <sergio(a)serjux.com> - 4.1.6-6 - added compile fixes for kernel 3.2, although guest client still not start with X, now I got a segfault, but will help who want try guest client with rawhide. VirtualBox-OSE-4.1.6-kernel-3.2_compile_fixes.patch: Additions/linux/sharedfolders/utils.c | 18 ++++++++++++++++-- HostDrivers/VBoxPci/linux/VBoxPci-linux.c | 30 +++++++++++++++++++----------- 2 files changed, 35 insertions(+), 13 deletions(-) --- NEW FILE VirtualBox-OSE-4.1.6-kernel-3.2_compile_fixes.patch --- from https://www.virtualbox.org/changeset/39224 Index: /trunk/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c =================================================================== --- trunk/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c (revision 38299) +++ trunk/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c (revision 39224) @@ -33,14 +33,22 @@ #include "VBoxPciInternal.h" #ifdef VBOX_WITH_IOMMU -#include <linux/dmar.h> -#include <linux/intel-iommu.h> -#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 1, 0) -# include <asm/amd_iommu.h> -#else -# include <linux/amd-iommu.h> -#endif -#endif +# include <linux/dmar.h> +# include <linux/intel-iommu.h> +# include <linux/pci.h> +# if LINUX_VERSION_CODE < KERNEL_VERSION(3, 1, 0) +# include <asm/amd_iommu.h> +# else +# include <linux/amd-iommu.h> +# endif +# if LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0) +# define IOMMU_PRESENT() iommu_found() +# define IOMMU_DOMAIN_ALLOC() iommu_domain_alloc() +# else +# define IOMMU_PRESENT() iommu_present(&pci_bus_type) +# define IOMMU_DOMAIN_ALLOC() iommu_domain_alloc(&pci_bus_type) +# endif +#endif /* VBOX_WITH_IOMMU */ /******************************************************************************* @@ -146,7 +154,7 @@ #endif #ifdef VBOX_WITH_IOMMU - if (iommu_found()) + if (IOMMU_PRESENT()) printk(KERN_INFO "vboxpci: IOMMU found\n"); else printk(KERN_INFO "vboxpci: IOMMU not found (not registered)\n"); @@ -984,9 +992,9 @@ printk(KERN_DEBUG "vboxPciOsInitVm: %p\n", pThis); #endif #ifdef VBOX_WITH_IOMMU - if (iommu_found()) + if (IOMMU_PRESENT()) { - pThis->pIommuDomain = iommu_domain_alloc(); + pThis->pIommuDomain = IOMMU_DOMAIN_ALLOC(); if (!pThis->pIommuDomain) { printk(KERN_DEBUG "cannot allocate IOMMU domain\n"); Index: /trunk/src/VBox/Additions/linux/sharedfolders/utils.c =================================================================== --- trunk/src/VBox/Additions/linux/sharedfolders/utils.c (revision 38925) +++ trunk/src/VBox/Additions/linux/sharedfolders/utils.c (revision 39224) @@ -110,7 +110,11 @@ inode->i_fop = &sf_dir_fops; /* XXX: this probably should be set to the number of entries in the directory plus two (. ..) */ +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0) + set_nlink(inode, 1); +#else inode->i_nlink = 1; +#endif } #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0) else if (RTFS_IS_SYMLINK(attr->fMode)) @@ -119,7 +123,11 @@ inode->i_mode &= ~sf_g->fmask; inode->i_mode |= S_IFLNK; inode->i_op = &sf_lnk_iops; +# if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0) + set_nlink(inode, 1); +# else inode->i_nlink = 1; +# endif } #endif else @@ -129,7 +137,11 @@ inode->i_mode |= S_IFREG; inode->i_op = &sf_reg_iops; inode->i_fop = &sf_reg_fops; +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0) + set_nlink(inode, 1); +#else inode->i_nlink = 1; +#endif } inode->i_uid = sf_g->uid; @@ -557,11 +569,13 @@ while (in_bound_len) { int nb; - wchar_t uni; /** @todo this should be unicode_t in more recent kernel versions. */ - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 31) + unicode_t uni; + nb = utf8_to_utf32(in, in_bound_len, &uni); #else + linux_wchar_t uni; + nb = utf8_mbtowc(&uni, in, in_bound_len); #endif if (nb < 0) Index: VirtualBox-OSE.spec =================================================================== RCS file: /cvs/free/rpms/VirtualBox-OSE/devel/VirtualBox-OSE.spec,v retrieving revision 1.75 retrieving revision 1.76 diff -u -r1.75 -r1.76 --- VirtualBox-OSE.spec 5 Dec 2011 11:47:02 -0000 1.75 +++ VirtualBox-OSE.spec 11 Dec 2011 19:46:11 -0000 1.76 @@ -15,7 +15,7 @@ Name: VirtualBox-OSE Version: 4.1.6 -Release: 5%{?prerel:.%{prerel}}%{?dist} +Release: 6%{?prerel:.%{prerel}}%{?dist} Summary: A general-purpose full virtualizer for PC hardware Group: Development/Tools @@ -42,6 +42,7 @@ Patch17: VirtualBox-OSE-4.0.0-beramono.patch Patch18: VirtualBox-OSE-4.0.2-aiobug.patch Patch20: VirtualBox-OSE-4.1.2-testmangle.patch +Patch21: VirtualBox-OSE-4.1.6-kernel-3.2_compile_fixes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -167,6 +168,7 @@ %patch17 -p1 -b .beramono %patch18 -p1 -b .aiobug %patch20 -p1 -b .testmangle +%patch21 -p1 -b .kernel3.2 # Remove prebuilt binary tools rm -rf kBuild @@ -475,6 +477,10 @@ %changelog +* Sun Dec 11 2011 Sérgio Basto <sergio(a)serjux.com> - 4.1.6-6 +- added compile fixes for kernel 3.2, although guest client still not start with X, now I got a + segfault, but will help who want try guest client with rawhide. + * Mon Dec 5 2011 Sérgio Basto <sergio(a)serjux.com> - 4.1.6-5 - Now rawhide needs explicit BuildRequires libpng-devel

12 years, 11 months

1
0
0 / 0

rpms/vlc/devel vlc.spec,1.140,1.141

by Nicolas Chauvet

Author: kwizart Update of /cvs/free/rpms/vlc/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv25118 Modified Files: vlc.spec Log Message: Fix version check Index: vlc.spec =================================================================== RCS file: /cvs/free/rpms/vlc/devel/vlc.spec,v retrieving revision 1.140 retrieving revision 1.141 diff -u -r1.140 -r1.141 --- vlc.spec 10 Dec 2011 22:44:47 -0000 1.140 +++ vlc.spec 11 Dec 2011 19:38:00 -0000 1.141 @@ -404,7 +404,7 @@ %{_libdir}/vlc/plugins/access/libaccess_gnomevfs_plugin.so } %{_libdir}/vlc/plugins/access/libxcb_screen_plugin.so -%if 0%{?fedora} >= 17 +%if 0%{?fedora} < 17 %{_libdir}/vlc/plugins/control/libglobalhotkeys_plugin.so %endif %{_libdir}/vlc/plugins/video_output/libaa_plugin.so @@ -433,7 +433,7 @@ %exclude %{_libdir}/vlc/plugins/access/libaccess_jack_plugin.so %exclude %{_libdir}/vlc/plugins/access/libxcb_screen_plugin.so %exclude %{_libdir}/vlc/plugins/codec/libfluidsynth_plugin.so -%if 0%{?fedora} >= 17 +%if 0%{?fedora} < 17 %exclude %{_libdir}/vlc/plugins/control/libglobalhotkeys_plugin.so %endif %exclude %{_libdir}/vlc/plugins/video_output/libaa_plugin.so

12 years, 11 months

1
0
0 / 0

rpms/dgen-sdl/F-15 dgen-sdl-1.28-execstack.patch, NONE, 1.1 dgen-sdl-1.28-man_warning.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 dgen-sdl.spec, 1.3, 1.4 sources, 1.2, 1.3 dgen-sdl-1.23-command_line.patch, 1.1, NONE dgen-sdl-1.23-execstack.patch, 1.1, NONE dgen-sdl-1.23-gcc34.patch, 1.1, NONE dgen-sdl-1.23-gcc4.patch, 1.1, NONE dgen-sdl-1.23-gzip_security_hole.patch, 1.1, NONE dgen-sdl-1.23-man_warning.patch, 1.1, NONE

by Andrea Musuruane

Author: musuruan Update of /cvs/nonfree/rpms/dgen-sdl/F-15 In directory se02.es.rpmfusion.net:/tmp/cvs-serv17482 Modified Files: .cvsignore dgen-sdl.spec sources Added Files: dgen-sdl-1.28-execstack.patch dgen-sdl-1.28-man_warning.patch Removed Files: dgen-sdl-1.23-command_line.patch dgen-sdl-1.23-execstack.patch dgen-sdl-1.23-gcc34.patch dgen-sdl-1.23-gcc4.patch dgen-sdl-1.23-gzip_security_hole.patch dgen-sdl-1.23-man_warning.patch Log Message: * Sun Dec 11 2011 Andrea Musuruane <musuruan(a)gmail.com> 1.28-1 - updated to new upstream version - updated URL and Source tags - updated summary and description - dropped no longer needed patches - submitted patches upstream dgen-sdl-1.28-execstack.patch: mz80/makez80.c | 2 ++ star/star.c | 2 ++ x86_ctv.asm | 3 +++ x86_memcpy.asm | 3 +++ x86_mmx_memcpy.asm | 3 +++ x86_tiles.asm | 3 +++ 6 files changed, 16 insertions(+) --- NEW FILE dgen-sdl-1.28-execstack.patch --- diff -durN dgen-sdl-1.28.orig/mz80/makez80.c dgen-sdl-1.28/mz80/makez80.c --- dgen-sdl-1.28.orig/mz80/makez80.c 2011-11-17 22:49:02.000000000 +0100 +++ dgen-sdl-1.28/mz80/makez80.c 2011-12-11 18:18:39.121410978 +0100 @@ -7121,6 +7121,8 @@ { if (MZ80_ASSEMBLY_X86 == bWhat) { + fprintf(fp, "\n"); + fprintf(fp, "section .note.GNU-stack noalloc noexec nowrite progbits\n"); } else if (MZ80_C == bWhat) diff -durN dgen-sdl-1.28.orig/star/star.c dgen-sdl-1.28/star/star.c --- dgen-sdl-1.28.orig/star/star.c 2011-11-17 22:49:02.000000000 +0100 +++ dgen-sdl-1.28/star/star.c 2011-12-11 18:13:49.853913096 +0100 @@ -2428,6 +2428,8 @@ ** the jump table / loop info table */ static void suffixes(void) { + emit("\n"); + emit("section .note.GNU-stack noalloc noexec nowrite progbits\n"); } /**************************************************************************** diff -durN dgen-sdl-1.28.orig/x86_ctv.asm dgen-sdl-1.28/x86_ctv.asm --- dgen-sdl-1.28.orig/x86_ctv.asm 2011-11-17 22:49:02.000000000 +0100 +++ dgen-sdl-1.28/x86_ctv.asm 2011-12-11 18:09:15.354529188 +0100 @@ -162,3 +162,6 @@ pop edi xor eax,eax ret + +section .note.GNU-stack noalloc noexec nowrite progbits + diff -durN dgen-sdl-1.28.orig/x86_memcpy.asm dgen-sdl-1.28/x86_memcpy.asm --- dgen-sdl-1.28.orig/x86_memcpy.asm 2011-11-17 22:49:02.000000000 +0100 +++ dgen-sdl-1.28/x86_memcpy.asm 2011-12-11 18:09:25.474623101 +0100 @@ -33,3 +33,6 @@ ret ; -------------------------------------- + +section .note.GNU-stack noalloc noexec nowrite progbits + diff -durN dgen-sdl-1.28.orig/x86_mmx_memcpy.asm dgen-sdl-1.28/x86_mmx_memcpy.asm --- dgen-sdl-1.28.orig/x86_mmx_memcpy.asm 2011-11-17 22:49:02.000000000 +0100 +++ dgen-sdl-1.28/x86_mmx_memcpy.asm 2011-12-11 18:09:40.598763991 +0100 @@ -40,3 +40,6 @@ ret ; -------------------------------------- + +section .note.GNU-stack noalloc noexec nowrite progbits + diff -durN dgen-sdl-1.28.orig/x86_tiles.asm dgen-sdl-1.28/x86_tiles.asm --- dgen-sdl-1.28.orig/x86_tiles.asm 2011-11-17 22:49:02.000000000 +0100 +++ dgen-sdl-1.28/x86_tiles.asm 2011-12-11 18:10:12.001055826 +0100 @@ -1088,3 +1088,6 @@ __highpal dd 0 ; ---------------------------------------- + +section .note.GNU-stack noalloc noexec nowrite progbits + dgen-sdl-1.28-man_warning.patch: dgenrc.5 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- NEW FILE dgen-sdl-1.28-man_warning.patch --- diff -durN dgen-sdl-1.28.orig/dgenrc.5 dgen-sdl-1.28/dgenrc.5 --- dgen-sdl-1.28.orig/dgenrc.5 2011-11-17 22:49:02.000000000 +0100 +++ dgen-sdl-1.28/dgenrc.5 2011-12-09 15:09:46.141956178 +0100 @@ -259,13 +259,13 @@ ` ~ - _ = + -\ | +\\ | [ { ] } : ; -' " +\' " , < -\. > +\&. > / ? .Ed .Sh SEE ALSO Index: .cvsignore =================================================================== RCS file: /cvs/nonfree/rpms/dgen-sdl/F-15/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 26 Jul 2008 13:06:01 -0000 1.2 +++ .cvsignore 11 Dec 2011 18:37:55 -0000 1.3 @@ -1 +1 @@ -dgen-sdl-1.23.tar.gz +dgen-sdl-1.28.tar.gz Index: dgen-sdl.spec =================================================================== RCS file: /cvs/nonfree/rpms/dgen-sdl/F-15/dgen-sdl.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- dgen-sdl.spec 29 Mar 2009 14:49:15 -0000 1.3 +++ dgen-sdl.spec 11 Dec 2011 18:37:57 -0000 1.4 @@ -1,38 +1,41 @@ -Summary: DGen/SDL is a Sega Genesis (MegaDrive outside the US) emulator +Summary: A Sega Genesis (MegaDrive outside the US) emulator Name: dgen-sdl -Version: 1.23 -Release: 5%{?dist} +Version: 1.28 +Release: 1%{?dist} License: BSD Group: Applications/Emulators -URL: http://tamentis.net/projects/dgen/ -Source: http://tamentis.net/projects/dgen/files/%{name}-%{version}.tar.gz -Patch0: dgen-sdl-1.23-gcc4.patch -Patch1: dgen-sdl-1.23-gcc34.patch -Patch2: dgen-sdl-1.23-man_warning.patch -Patch3: dgen-sdl-1.23-gzip_security_hole.patch -Patch4: dgen-sdl-1.23-command_line.patch -Patch5: dgen-sdl-1.23-execstack.patch +URL: http://dgen.sourceforge.net/ +Source: http://downloads.sourceforge.net/dgen/%{name}-%{version}.tar.gz +# Fix man page warnings +# http://sourceforge.net/tracker/?func=detail&aid=3455451&group_id=227519&a... +Patch0: dgen-sdl-1.28-man_warning.patch +# Fix not to require an executable stack +# http://sourceforge.net/tracker/?func=detail&aid=3457405&group_id=227519&a... +Patch1: dgen-sdl-1.28-execstack.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel >= 1.0.0 +BuildRequires: libarchive-devel %ifarch %{ix86} BuildRequires: nasm %endif %description -DGen/SDL is a semi-fantastic emulator for Unix-esque operating systems -supported by SDL library. It produces a virtual environment in which -Sega Genesis (MegaDrive outside the US) games may run with fairly -accurate audio and video. +DGen/SDL is an emulator for the Sega Genesis/MegaDrive game console. It +supports save states, full screen mode, interlace mode, Game Genie, joystick, +compressed ROM images, and more. %prep %setup -q -%patch0 -p0 -%patch1 -p0 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -sed -i 's/\r//' mz80/mz80.txt +%patch0 -p1 +%patch1 -p1 + +# Fix file encoding +for txtfile in cz80/readme.txt +do + iconv --from=ISO-8859-1 --to=UTF-8 $txtfile > tmp + touch -r $txtfile tmp + mv tmp $txtfile +done %build %configure @@ -43,6 +46,11 @@ rm -rf %{buildroot} make install DESTDIR=%{buildroot} mkdir docs +mkdir docs/cz80 +cp -a cz80/readme.txt docs/cz80 +mkdir docs/musa +cp -a musa/readme.txt docs/musa +cp -a musa/history.txt docs/musa mkdir docs/mz80 cp -a mz80/mz80.txt docs/mz80 mkdir docs/star @@ -54,14 +62,21 @@ %files %defattr(-,root,root) %{_bindir}/dgen -%{_bindir}/tobin +%{_bindir}/dgen_tobin %{_mandir}/man1/dgen.1* -%{_mandir}/man1/tobin.1* +%{_mandir}/man1/dgen_tobin.1* %{_mandir}/man5/dgenrc.5* %doc AUTHORS ChangeLog COPYING README sample.dgenrc -%doc docs/mz80 docs/star +%doc docs/cz80 docs/musa docs/mz80 docs/star %changelog +* Sun Dec 11 2011 Andrea Musuruane <musuruan(a)gmail.com> 1.28-1 +- updated to new upstream version +- updated URL and Source tags +- updated summary and description +- dropped no longer needed patches +- submitted patches upstream + * Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.23-5 - rebuild for new F11 features Index: sources =================================================================== RCS file: /cvs/nonfree/rpms/dgen-sdl/F-15/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 26 Jul 2008 13:06:01 -0000 1.2 +++ sources 11 Dec 2011 18:37:57 -0000 1.3 @@ -1 +1 @@ -b1896c1b21ddb152626aec2e8a157a3a dgen-sdl-1.23.tar.gz +4fa71cd04375e6de547dc9703c518cb3 dgen-sdl-1.28.tar.gz --- dgen-sdl-1.23-command_line.patch DELETED --- --- dgen-sdl-1.23-execstack.patch DELETED --- --- dgen-sdl-1.23-gcc34.patch DELETED --- --- dgen-sdl-1.23-gcc4.patch DELETED --- --- dgen-sdl-1.23-gzip_security_hole.patch DELETED --- --- dgen-sdl-1.23-man_warning.patch DELETED ---

12 years, 11 months

1
0
0 / 0

rpms/dgen-sdl/F-16 dgen-sdl-1.28-execstack.patch, NONE, 1.1 dgen-sdl-1.28-man_warning.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 dgen-sdl.spec, 1.3, 1.4 sources, 1.2, 1.3 dgen-sdl-1.23-command_line.patch, 1.1, NONE dgen-sdl-1.23-execstack.patch, 1.1, NONE dgen-sdl-1.23-gcc34.patch, 1.1, NONE dgen-sdl-1.23-gcc4.patch, 1.1, NONE dgen-sdl-1.23-gzip_security_hole.patch, 1.1, NONE dgen-sdl-1.23-man_warning.patch, 1.1, NONE

by Andrea Musuruane

Author: musuruan Update of /cvs/nonfree/rpms/dgen-sdl/F-16 In directory se02.es.rpmfusion.net:/tmp/cvs-serv17341 Modified Files: .cvsignore dgen-sdl.spec sources Added Files: dgen-sdl-1.28-execstack.patch dgen-sdl-1.28-man_warning.patch Removed Files: dgen-sdl-1.23-command_line.patch dgen-sdl-1.23-execstack.patch dgen-sdl-1.23-gcc34.patch dgen-sdl-1.23-gcc4.patch dgen-sdl-1.23-gzip_security_hole.patch dgen-sdl-1.23-man_warning.patch Log Message: * Sun Dec 11 2011 Andrea Musuruane <musuruan(a)gmail.com> 1.28-1 - updated to new upstream version - updated URL and Source tags - updated summary and description - dropped no longer needed patches - submitted patches upstream dgen-sdl-1.28-execstack.patch: mz80/makez80.c | 2 ++ star/star.c | 2 ++ x86_ctv.asm | 3 +++ x86_memcpy.asm | 3 +++ x86_mmx_memcpy.asm | 3 +++ x86_tiles.asm | 3 +++ 6 files changed, 16 insertions(+) --- NEW FILE dgen-sdl-1.28-execstack.patch --- diff -durN dgen-sdl-1.28.orig/mz80/makez80.c dgen-sdl-1.28/mz80/makez80.c --- dgen-sdl-1.28.orig/mz80/makez80.c 2011-11-17 22:49:02.000000000 +0100 +++ dgen-sdl-1.28/mz80/makez80.c 2011-12-11 18:18:39.121410978 +0100 @@ -7121,6 +7121,8 @@ { if (MZ80_ASSEMBLY_X86 == bWhat) { + fprintf(fp, "\n"); + fprintf(fp, "section .note.GNU-stack noalloc noexec nowrite progbits\n"); } else if (MZ80_C == bWhat) diff -durN dgen-sdl-1.28.orig/star/star.c dgen-sdl-1.28/star/star.c --- dgen-sdl-1.28.orig/star/star.c 2011-11-17 22:49:02.000000000 +0100 +++ dgen-sdl-1.28/star/star.c 2011-12-11 18:13:49.853913096 +0100 @@ -2428,6 +2428,8 @@ ** the jump table / loop info table */ static void suffixes(void) { + emit("\n"); + emit("section .note.GNU-stack noalloc noexec nowrite progbits\n"); } /**************************************************************************** diff -durN dgen-sdl-1.28.orig/x86_ctv.asm dgen-sdl-1.28/x86_ctv.asm --- dgen-sdl-1.28.orig/x86_ctv.asm 2011-11-17 22:49:02.000000000 +0100 +++ dgen-sdl-1.28/x86_ctv.asm 2011-12-11 18:09:15.354529188 +0100 @@ -162,3 +162,6 @@ pop edi xor eax,eax ret + +section .note.GNU-stack noalloc noexec nowrite progbits + diff -durN dgen-sdl-1.28.orig/x86_memcpy.asm dgen-sdl-1.28/x86_memcpy.asm --- dgen-sdl-1.28.orig/x86_memcpy.asm 2011-11-17 22:49:02.000000000 +0100 +++ dgen-sdl-1.28/x86_memcpy.asm 2011-12-11 18:09:25.474623101 +0100 @@ -33,3 +33,6 @@ ret ; -------------------------------------- + +section .note.GNU-stack noalloc noexec nowrite progbits + diff -durN dgen-sdl-1.28.orig/x86_mmx_memcpy.asm dgen-sdl-1.28/x86_mmx_memcpy.asm --- dgen-sdl-1.28.orig/x86_mmx_memcpy.asm 2011-11-17 22:49:02.000000000 +0100 +++ dgen-sdl-1.28/x86_mmx_memcpy.asm 2011-12-11 18:09:40.598763991 +0100 @@ -40,3 +40,6 @@ ret ; -------------------------------------- + +section .note.GNU-stack noalloc noexec nowrite progbits + diff -durN dgen-sdl-1.28.orig/x86_tiles.asm dgen-sdl-1.28/x86_tiles.asm --- dgen-sdl-1.28.orig/x86_tiles.asm 2011-11-17 22:49:02.000000000 +0100 +++ dgen-sdl-1.28/x86_tiles.asm 2011-12-11 18:10:12.001055826 +0100 @@ -1088,3 +1088,6 @@ __highpal dd 0 ; ---------------------------------------- + +section .note.GNU-stack noalloc noexec nowrite progbits + dgen-sdl-1.28-man_warning.patch: dgenrc.5 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- NEW FILE dgen-sdl-1.28-man_warning.patch --- diff -durN dgen-sdl-1.28.orig/dgenrc.5 dgen-sdl-1.28/dgenrc.5 --- dgen-sdl-1.28.orig/dgenrc.5 2011-11-17 22:49:02.000000000 +0100 +++ dgen-sdl-1.28/dgenrc.5 2011-12-09 15:09:46.141956178 +0100 @@ -259,13 +259,13 @@ ` ~ - _ = + -\ | +\\ | [ { ] } : ; -' " +\' " , < -\. > +\&. > / ? .Ed .Sh SEE ALSO Index: .cvsignore =================================================================== RCS file: /cvs/nonfree/rpms/dgen-sdl/F-16/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 26 Jul 2008 13:06:01 -0000 1.2 +++ .cvsignore 11 Dec 2011 18:37:28 -0000 1.3 @@ -1 +1 @@ -dgen-sdl-1.23.tar.gz +dgen-sdl-1.28.tar.gz Index: dgen-sdl.spec =================================================================== RCS file: /cvs/nonfree/rpms/dgen-sdl/F-16/dgen-sdl.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- dgen-sdl.spec 29 Mar 2009 14:49:15 -0000 1.3 +++ dgen-sdl.spec 11 Dec 2011 18:37:30 -0000 1.4 @@ -1,38 +1,41 @@ -Summary: DGen/SDL is a Sega Genesis (MegaDrive outside the US) emulator +Summary: A Sega Genesis (MegaDrive outside the US) emulator Name: dgen-sdl -Version: 1.23 -Release: 5%{?dist} +Version: 1.28 +Release: 1%{?dist} License: BSD Group: Applications/Emulators -URL: http://tamentis.net/projects/dgen/ -Source: http://tamentis.net/projects/dgen/files/%{name}-%{version}.tar.gz -Patch0: dgen-sdl-1.23-gcc4.patch -Patch1: dgen-sdl-1.23-gcc34.patch -Patch2: dgen-sdl-1.23-man_warning.patch -Patch3: dgen-sdl-1.23-gzip_security_hole.patch -Patch4: dgen-sdl-1.23-command_line.patch -Patch5: dgen-sdl-1.23-execstack.patch +URL: http://dgen.sourceforge.net/ +Source: http://downloads.sourceforge.net/dgen/%{name}-%{version}.tar.gz +# Fix man page warnings +# http://sourceforge.net/tracker/?func=detail&aid=3455451&group_id=227519&a... +Patch0: dgen-sdl-1.28-man_warning.patch +# Fix not to require an executable stack +# http://sourceforge.net/tracker/?func=detail&aid=3457405&group_id=227519&a... +Patch1: dgen-sdl-1.28-execstack.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel >= 1.0.0 +BuildRequires: libarchive-devel %ifarch %{ix86} BuildRequires: nasm %endif %description -DGen/SDL is a semi-fantastic emulator for Unix-esque operating systems -supported by SDL library. It produces a virtual environment in which -Sega Genesis (MegaDrive outside the US) games may run with fairly -accurate audio and video. +DGen/SDL is an emulator for the Sega Genesis/MegaDrive game console. It +supports save states, full screen mode, interlace mode, Game Genie, joystick, +compressed ROM images, and more. %prep %setup -q -%patch0 -p0 -%patch1 -p0 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -sed -i 's/\r//' mz80/mz80.txt +%patch0 -p1 +%patch1 -p1 + +# Fix file encoding +for txtfile in cz80/readme.txt +do + iconv --from=ISO-8859-1 --to=UTF-8 $txtfile > tmp + touch -r $txtfile tmp + mv tmp $txtfile +done %build %configure @@ -43,6 +46,11 @@ rm -rf %{buildroot} make install DESTDIR=%{buildroot} mkdir docs +mkdir docs/cz80 +cp -a cz80/readme.txt docs/cz80 +mkdir docs/musa +cp -a musa/readme.txt docs/musa +cp -a musa/history.txt docs/musa mkdir docs/mz80 cp -a mz80/mz80.txt docs/mz80 mkdir docs/star @@ -54,14 +62,21 @@ %files %defattr(-,root,root) %{_bindir}/dgen -%{_bindir}/tobin +%{_bindir}/dgen_tobin %{_mandir}/man1/dgen.1* -%{_mandir}/man1/tobin.1* +%{_mandir}/man1/dgen_tobin.1* %{_mandir}/man5/dgenrc.5* %doc AUTHORS ChangeLog COPYING README sample.dgenrc -%doc docs/mz80 docs/star +%doc docs/cz80 docs/musa docs/mz80 docs/star %changelog +* Sun Dec 11 2011 Andrea Musuruane <musuruan(a)gmail.com> 1.28-1 +- updated to new upstream version +- updated URL and Source tags +- updated summary and description +- dropped no longer needed patches +- submitted patches upstream + * Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.23-5 - rebuild for new F11 features Index: sources =================================================================== RCS file: /cvs/nonfree/rpms/dgen-sdl/F-16/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 26 Jul 2008 13:06:01 -0000 1.2 +++ sources 11 Dec 2011 18:37:30 -0000 1.3 @@ -1 +1 @@ -b1896c1b21ddb152626aec2e8a157a3a dgen-sdl-1.23.tar.gz +4fa71cd04375e6de547dc9703c518cb3 dgen-sdl-1.28.tar.gz --- dgen-sdl-1.23-command_line.patch DELETED --- --- dgen-sdl-1.23-execstack.patch DELETED --- --- dgen-sdl-1.23-gcc34.patch DELETED --- --- dgen-sdl-1.23-gcc4.patch DELETED --- --- dgen-sdl-1.23-gzip_security_hole.patch DELETED --- --- dgen-sdl-1.23-man_warning.patch DELETED ---

12 years, 11 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

rpmfusion-commits December 2011