rpms/libvmime07/F-12 libvmime07-0.7.1-sigset-signal.patch, NONE, 1.1 libvmime07-0.7.1-strip-header-endspaces-and-header-end.patch, NONE, 1.1 libvmime07.spec, 1.2, 1.3 libvmime07-0.7.1-strip-header-endspaces.patch, 1.1, NONE

[Robert Scheck]

Author: robert

Update of /cvs/pkgs/rpms/libvmime07/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8185/F-12

Modified Files:
	libvmime07.spec 
Added Files:
	libvmime07-0.7.1-sigset-signal.patch 
	libvmime07-0.7.1-strip-header-endspaces-and-header-end.patch 
Removed Files:
	libvmime07-0.7.1-strip-header-endspaces.patch 
Log Message:
- Added a patch with include for sigset_t definition (#565148)
- Updated a patch to fix end of headers detection at last header


libvmime07-0.7.1-sigset-signal.patch:
 posixChildProcess.hpp |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE libvmime07-0.7.1-sigset-signal.patch ---
Patch by Robert Scheck <robert at fedoraproject.org> for libvmime >= 0.7.1, which adds a missing include file
in order to build successfully with glibc 2.11.90 (2010-02-08) and newer. There was a glibc header cleanup
which no longer gets the sigset_t definition by accident, so the signal.h needs to be included explicitly.

--- libvmime-0.7.1/vmime/platforms/posix/posixChildProcess.hpp		2005-05-25 21:14:54.000000000 +0200
+++ libvmime-0.7.1/vmime/platforms/posix/posixChildProcess.hpp.sigset	2010-02-14 02:14:11.000000000 +0100
@@ -22,6 +22,7 @@
 
 
 #include "vmime/utility/childProcess.hpp"
+#include <signal.h>
 
 
 namespace vmime {

libvmime07-0.7.1-strip-header-endspaces-and-header-end.patch:
 headerField.cpp |   13 +++++++++++++
 1 file changed, 13 insertions(+)

--- NEW FILE libvmime07-0.7.1-strip-header-endspaces-and-header-end.patch ---
Patch by Zarafa <http://www.zarafa.com/> - this patch makes sure that vmime does not parse trailing spaces
on an header. Otherwise vmime will throw an exception and a fallback delivery will be started. It includes
a patch when then last header does not end with \n; fixes read receipt e-mails.

--- libvmime-0.7.1/src/headerField.cpp					2005-03-18 22:26:47.000000000 +0100
+++ libvmime-0.7.1/src/headerField.cpp.strip-header-endspaces-and-end	2010-02-15 21:38:37.000000000 +0100
@@ -190,6 +190,19 @@
 					}
 				}
 
+				if (pos == end && contentsEnd == 0) {
+					// end of data, and an enter was not found at the end
+					contentsEnd = end;
+				} else {
+					// strip spaces from end of header lines, also through continuation headers
+					contentsEnd--;  // original enter
+					while (contentsEnd>contentsStart &&
+						   (buffer[contentsEnd] == ' ' || buffer[contentsEnd] == '\t' ||
+							buffer[contentsEnd] == '\r' || buffer[contentsEnd] == '\n'))
+						contentsEnd--;
+					contentsEnd++;  // new 'enter'
+				}
+
 				// Return a new field
 				headerField* field = headerFieldFactory::getInstance()->create(name);
 


Index: libvmime07.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvmime07/F-12/libvmime07.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- libvmime07.spec	16 Sep 2009 21:37:47 -0000	1.2
+++ libvmime07.spec	15 Feb 2010 20:54:39 -0000	1.3
@@ -1,7 +1,7 @@
 Summary:	A powerful C++ class library for working with MIME/Internet messages
 Name:		libvmime07
 Version:	0.7.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPLv2+
 Group:		System Environment/Libraries
 URL:		http://www.zarafa.com/wiki/index.php/Libvmime_patches
@@ -11,7 +11,7 @@ Patch1:		libvmime07-0.7.1-charset-catch.
 Patch2:		libvmime07-0.7.1-missing-boundary.patch
 Patch3:		libvmime07-0.7.1-allow-no-recips-and-senders.patch
 Patch4:		libvmime07-0.7.1-bmoted-printable.patch
-Patch5:		libvmime07-0.7.1-strip-header-endspaces.patch
+Patch5:		libvmime07-0.7.1-strip-header-endspaces-and-header-end.patch
 Patch6:		libvmime07-0.7.1-attachfnamelen.patch
 Patch7:		libvmime07-0.7.1-remove-bcc.patch
 Patch8:		libvmime07-0.7.1-mdn-disposition.patch
@@ -35,6 +35,7 @@ Patch25:	libvmime07-0.7.1-socket-tcp-nod
 Patch26:	libvmime07-0.7.1-threading-remove-static_non-abi-change.patch
 Patch27:	libvmime07-0.7.1-gcc-4.4-support.patch
 Patch28:	libvmime07-0.7.1-plain-bodycopy.patch
+Patch29:	libvmime07-0.7.1-sigset-signal.patch
 BuildRequires:	sendmail, libtool, autoconf, automake
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -73,7 +74,7 @@ to work with the newer version and the n
 %patch2 -p1 -b .missing-boundary
 %patch3 -p1 -b .allow-no-recips-and-senders
 %patch4 -p1 -b .bmoted-printable
-%patch5 -p1 -b .strip-header-endspaces
+%patch5 -p1 -b .strip-header-endspaces-and-header-end
 %patch6 -p1 -b .attachfnamelen
 %patch7 -p1 -b .remove-bcc
 %patch8 -p1 -b .mdn-disposition
@@ -97,6 +98,7 @@ to work with the newer version and the n
 %patch26 -p1 -b .threading-remove-static_non-abi-change
 %patch27 -p1 -b .gcc-4.4-support
 %patch28 -p1 -b .plain-bodycopy
+%patch29 -p1 -b .sigset-signal
 
 # Needed to apply branding patch
 libtoolize --force
@@ -141,6 +143,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/vmime07.pc
 
 %changelog
+* Mon Feb 15 2010 Robert Scheck <robert at fedoraproject.org> 0.7.1-2
+- Added a patch with include for sigset_t definition (#565148)
+- Updated a patch to fix end of headers detection at last header
+
 * Sat Sep 05 2009 Robert Scheck <robert at fedoraproject.org> 0.7.1-1
 - Upgrade to 0.7.1
 - Initial spec file for Fedora and Red Hat Enterprise Linux


--- libvmime07-0.7.1-strip-header-endspaces.patch DELETED ---