[pkg-kolab] r1513 - in php-kolab-filter/trunk/debian: . patches

[Mathieu Parent]

Author: sathieu
Date: 2010-09-10 07:31:05 +0000 (Fri, 10 Sep 2010)
New Revision: 1513

Added:
   php-kolab-filter/trunk/debian/patches/70-deprecated-warnings.diff
Modified:
   php-kolab-filter/trunk/debian/changelog
   php-kolab-filter/trunk/debian/patches/series
Log:
 Fix "shared folder mail stopped working with php5.3.2 ..." by correcting        the E_DEPRECATED errors and ignoring the not-yet-known remaining ones    
    (Closes: #594541)

Modified: php-kolab-filter/trunk/debian/changelog
===================================================================
--- php-kolab-filter/trunk/debian/changelog	2010-09-10 07:00:27 UTC (rev 1512)
+++ php-kolab-filter/trunk/debian/changelog	2010-09-10 07:31:05 UTC (rev 1513)
@@ -2,8 +2,11 @@
 
   * debian/rules:
     + Use DEB_COMPRESS_EXCLUDE_ALL instead of deprecated DEB_COMPRESS_EXCLUDE
+  * Fix "shared folder mail stopped working with php5.3.2 ..." by correcting
+    the E_DEPRECATED errors and ignoring the not-yet-known remaining ones
+    (Closes: #594541)
 
- -- Mathieu Parent <sathieu at debian.org>  Wed, 07 Jul 2010 06:06:40 +0200
+ -- Mathieu Parent <sathieu at debian.org>  Fri, 10 Sep 2010 09:30:51 +0200
 
 php-kolab-filter (0.1.9-1) unstable; urgency=low
 

Added: php-kolab-filter/trunk/debian/patches/70-deprecated-warnings.diff
===================================================================
--- php-kolab-filter/trunk/debian/patches/70-deprecated-warnings.diff	                        (rev 0)
+++ php-kolab-filter/trunk/debian/patches/70-deprecated-warnings.diff	2010-09-10 07:31:05 UTC (rev 1513)
@@ -0,0 +1,77 @@
+Goal: Avoid deprecated warnings
+
+ Those warnings make kolabmailboxfilter fail
+ (See http://bugs.debian.org/594541)
+
+Author: Mathieu Parent <math.parent at gmail.com>
+
+Upstream status: Already fixed during the isolation of Kolab_Resource.
+
+Index: php-kolab-filter-0.1.9/Kolab_Filter-0.1.9/lib/Horde/Kolab/Filter/Incoming.php
+===================================================================
+--- php-kolab-filter-0.1.9.orig/Kolab_Filter-0.1.9/lib/Horde/Kolab/Filter/Incoming.php	1970-01-01 10:13:08.000000000 +0100
++++ php-kolab-filter-0.1.9/Kolab_Filter-0.1.9/lib/Horde/Kolab/Filter/Incoming.php	2010-09-10 09:27:52.000000000 +0200
+@@ -143,7 +143,7 @@
+                                           $this->_fqhostname, $this->_sender,
+                                           $resource, $this->_tmpfile), __FILE__, __LINE__,
+                                   PEAR_LOG_DEBUG);
+-                $r = &new Kolab_Resource();
++                $r = new Kolab_Resource();
+                 $rc = $r->handleMessage($this->_fqhostname, $this->_sender,
+                                         $resource, $this->_tmpfile);
+                 $r->cleanup();
+Index: php-kolab-filter-0.1.9/Kolab_Filter-0.1.9/lib/Horde/Kolab/Filter/Response.php
+===================================================================
+--- php-kolab-filter-0.1.9.orig/Kolab_Filter-0.1.9/lib/Horde/Kolab/Filter/Response.php	1970-01-01 10:13:08.000000000 +0100
++++ php-kolab-filter-0.1.9/Kolab_Filter-0.1.9/lib/Horde/Kolab/Filter/Response.php	2010-09-10 09:27:52.000000000 +0200
+@@ -103,10 +103,10 @@
+      */
+     function _fatal($errno, $errmsg, $filename, $linenum, $vars)
+     {
+-        /* Ignore strict errors for now since even PEAR will raise
+-         * strict notices 
++        /* Ignore strict and deprecated errors for now since even
++         * PEAR will raise strict and deprecated notices 
+          */
+-        if ($errno == E_STRICT) {
++        if (($errno == E_STRICT) || ($errno == E_DEPRECATED)) {
+             return false;
+         }
+ 
+@@ -124,7 +124,7 @@
+             $msg = 'PHP Error: ' . $errmsg;
+         }
+ 
+-        $error = &new PEAR_Error($msg, $code);
++        $error = new PEAR_Error($msg, $code);
+         $this->handle($error);
+ 
+         return false;
+Index: php-kolab-filter-0.1.9/Kolab_Filter-0.1.9/lib/Horde/Kolab/Filter/Transport.php
+===================================================================
+--- php-kolab-filter-0.1.9.orig/Kolab_Filter-0.1.9/lib/Horde/Kolab/Filter/Transport.php	1970-01-01 10:13:08.000000000 +0100
++++ php-kolab-filter-0.1.9/Kolab_Filter-0.1.9/lib/Horde/Kolab/Filter/Transport.php	2010-09-10 09:27:52.000000000 +0200
+@@ -75,7 +75,7 @@
+             include dirname(__FILE__) . '/Transport/' . $driver . '.php';
+         }
+         if (class_exists($class)) {
+-            $transport = &new $class($params);
++            $transport = new $class($params);
+             return $transport;
+         }
+         return PEAR::raiseError(sprintf('No such class \"%s\"', $class),
+Index: php-kolab-filter-0.1.9/Kolab_Filter-0.1.9/script/Horde/Kolab/Filter/kolabmailboxfilter.php
+===================================================================
+--- php-kolab-filter-0.1.9.orig/Kolab_Filter-0.1.9/script/Horde/Kolab/Filter/kolabmailboxfilter.php	1970-01-01 10:13:08.000000000 +0100
++++ php-kolab-filter-0.1.9/Kolab_Filter-0.1.9/script/Horde/Kolab/Filter/kolabmailboxfilter.php	2010-09-10 09:27:52.000000000 +0200
+@@ -19,8 +19,8 @@
+ require_once 'Horde/Kolab/Filter/Response.php';
+ 
+ /* Parse the mail */
+-$parser = &new Horde_Kolab_Filter_Incoming();
+-$response = &new Horde_Kolab_Filter_Response();
++$parser = new Horde_Kolab_Filter_Incoming();
++$response = new Horde_Kolab_Filter_Response();
+ 
+ $result = $parser->parse();
+ if (is_a($result, 'PEAR_Error')) {

Modified: php-kolab-filter/trunk/debian/patches/series
===================================================================
--- php-kolab-filter/trunk/debian/patches/series	2010-09-10 07:00:27 UTC (rev 1512)
+++ php-kolab-filter/trunk/debian/patches/series	2010-09-10 07:31:05 UTC (rev 1513)
@@ -1,3 +1,4 @@
 10-remove-md5.diff
 30-horde-path.diff
 40-phpunit.diff
+70-deprecated-warnings.diff