gunnar: server/php-kolab/Kolab_Filter issue3594.patch, NONE, 1.1.2.1 ChangeLog, 1.29.2.12, 1.29.2.13 Kolab_Filter.spec, 1.19.2.15, 1.19.2.16 Makefile, 1.8.2.13, 1.8.2.14

cvs at kolab.org cvs at kolab.org
Tue Nov 24 15:00:27 CET 2009


Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Filter
In directory doto:/tmp/cvs-serv5347/php-kolab/Kolab_Filter

Modified Files:
      Tag: kolab_2_2_branch
	ChangeLog Kolab_Filter.spec Makefile 
Added Files:
      Tag: kolab_2_2_branch
	issue3594.patch 
Log Message:
 kolab/issue3594 (Mail containing NUL byte not delivered, Kolab Filter does not report lmtp error)

--- NEW FILE: issue3594.patch ---
diff -u -B -r1.4.2.2 -r1.4.2.3
--- Kolab_Filter/lib/Horde/Kolab/Filter/Transport.php	16 Nov 2009 12:29:37 -0000	1.4.2.2
+++ Kolab_Filter/lib/Horde/Kolab/Filter/Transport.php	24 Nov 2009 13:53:40 -0000	1.4.2.3
@@ -281,12 +281,13 @@
      */
     function rewriteCode($result) 
     {
-        if ($result->getCode() < 500) {
+        list($resultcode, $resultmessage) = $this->_transport->getResponse();
+        if ($resultcode < 500) {
             $code = EX_TEMPFAIL;
         } else {
             $code = EX_UNAVAILABLE;
         }
-        $append = sprintf(', original code %s', $result->getCode());
+        $append = sprintf(': %s, original code %s', $resultmessage, $resultcode);
         $result->message = $result->getMessage() . $append;
         $result->code = OUT_LOG | OUT_STDOUT | $code;
         return $result;

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/ChangeLog,v
retrieving revision 1.29.2.12
retrieving revision 1.29.2.13
diff -u -d -r1.29.2.12 -r1.29.2.13
--- ChangeLog	16 Nov 2009 21:19:46 -0000	1.29.2.12
+++ ChangeLog	24 Nov 2009 14:00:25 -0000	1.29.2.13
@@ -1,3 +1,8 @@
+2009-11-24  root  <Gunnar Wrobel <wrobel at pardus.de>>
+
+	* Kolab_Filter.spec: kolab/issue3594 (Mail containing NUL byte not
+	delivered, Kolab Filter does not report lmtp error)
+
 2009-11-16  Gunnar Wrobel  <p at rdus.de>
 
 	* Kolab_Filter.spec: kolab/issue2499 (Notification messages by the

Index: Kolab_Filter.spec
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Kolab_Filter.spec,v
retrieving revision 1.19.2.15
retrieving revision 1.19.2.16
diff -u -d -r1.19.2.15 -r1.19.2.16
--- Kolab_Filter.spec	16 Nov 2009 21:19:46 -0000	1.19.2.15
+++ Kolab_Filter.spec	24 Nov 2009 14:00:25 -0000	1.19.2.16
@@ -1,7 +1,7 @@
 # Variables
 %define         V_package Kolab_Filter
 %define         V_version 0.1.4
-%define         V_release 20091116
+%define         V_release 20091124
 
 # Package Information
 Name:	   %{V_package}
@@ -32,6 +32,7 @@
 Patch10:   issue3610.patch
 Patch11:   issue3768.patch
 Patch12:   issue3464.patch
+Patch13:   issue3594.patch
 
 # Build Info
 Prefix:	   %{l_prefix}
@@ -79,6 +80,7 @@
 	%patch -p1 -P 10
 	%patch -p1 -P 11
 	%patch -p1 -P 12
+	%patch -p1 -P 13
 	cp %{S:1} .
 %build
 

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Makefile,v
retrieving revision 1.8.2.13
retrieving revision 1.8.2.14
diff -u -d -r1.8.2.13 -r1.8.2.14
--- Makefile	16 Nov 2009 21:19:46 -0000	1.8.2.13
+++ Makefile	24 Nov 2009 14:00:25 -0000	1.8.2.14
@@ -6,7 +6,7 @@
 
 SOURCE_URL=http://pear.horde.org/get
 SOURCE_0=$(PACKAGE)-$(VERSION).tgz
-EXTRA=ChangeLog revert_issue2495.patch issue2499_2.patch issue3435.patch issue3192.patch issue3441.patch issue3464.patch issue3521.patch issue3558.patch issue3568.patch issue3610.patch issue3768.patch issue3868.patch dovecotlda-quoting.patch package.xml
+EXTRA=ChangeLog revert_issue2495.patch issue2499_2.patch issue3435.patch issue3192.patch issue3441.patch issue3464.patch issue3521.patch issue3558.patch issue3568.patch issue3594.patch issue3610.patch issue3768.patch issue3868.patch dovecotlda-quoting.patch package.xml
 
 .PHONY: all
 all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm





More information about the commits mailing list