rpms/dbmail/F-11 dbmail-forward-doublepoint.patch, NONE, 1.1 dbmail.spec, 1.29, 1.30

[Bernard Johnson]

Author: bjohnson

Update of /cvs/pkgs/rpms/dbmail/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24812/F-11

Modified Files:
	dbmail.spec 
Added Files:
	dbmail-forward-doublepoint.patch 
Log Message:
- add patch to keep from mangling mime parts (bz #527690)


dbmail-forward-doublepoint.patch:
 pipe.c |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

--- NEW FILE dbmail-forward-doublepoint.patch ---
>From 2897e657c5fd1378cea5f2339e335acf4c6070e9 Mon Sep 17 00:00:00 2001
From: Paul J Stevens <paul at nfg.nl>
Date: Wed, 07 Oct 2009 13:15:18 +0000
Subject: fix sendmail option for dot handling

---
diff --git a/pipe.c b/pipe.c
index 63b4a23..a6b7479 100644
--- a/pipe.c
+++ b/pipe.c
@@ -130,7 +130,7 @@ static int send_mail(struct DbmailMessage *message,
 			TRACE(TRACE_MESSAGE, "could not prepare 'from' address.");
 			return 1;
 		}
-		sendmail_command = g_strconcat(sendmail, " -f ", escaped_from, " ", escaped_to, NULL);
+		sendmail_command = g_strconcat(sendmail, " -i -f ", escaped_from, " ", escaped_to, NULL);
 		g_free(escaped_to);
 		g_free(escaped_from);
 		if (!sendmail_command) {
@@ -156,9 +156,7 @@ static int send_mail(struct DbmailMessage *message,
 		// This is a hack so forwards can give a From line.
 		if (preoutput)
 			fprintf(mailpipe, "%s\n", preoutput);
-		// This function will dot-stuff the message.
-		db_send_message_lines(mailpipe, message->id, -2, 1);
-		break;
+		// fall-through
 	case SENDMESSAGE:
 		message_string = dbmail_message_to_string(message);
 		fprintf(mailpipe, "%s", message_string);
--
cgit v0.8.2.1-10-g45e7


Index: dbmail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dbmail/F-11/dbmail.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- dbmail.spec	6 Jul 2009 06:06:07 -0000	1.29
+++ dbmail.spec	7 Oct 2009 16:05:51 -0000	1.30
@@ -10,7 +10,7 @@
 
 Name:           dbmail
 Version:        2.2.11
-Release:        7%{?dist}
+Release:        9%{?dist}
 Summary:        A database backed mail storage system
 
 Group:          System Environment/Daemons
@@ -27,6 +27,7 @@ Source6:        dbmail.logrotate
 Source7:        README.fedora
 
 Patch0:         0001-backport-fix-to-prevent-showing-mailboxes-more-than.patch
+Patch1:         dbmail-forward-doublepoint.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -69,6 +70,7 @@ installation and configuration in Fedora
 %setup -q
 
 %patch0 -p 1 -b .duplicate-email-boxes
+%patch1 -p 1 -b .dbmail-forward-doublepoint
 
 # we don't need README.solaris and we don't want it caught up in the %%doc
 # README* wildcard - but we do want our shiny new README.fedora file to be
@@ -229,6 +231,15 @@ This is the postgresql libraries for dbm
 %{_libdir}/dbmail/libpgsql*
 
 %changelog
+* Wed Oct 07 2009 Bernard Johnson <bjohnson at symetrix.com> - 2.2.11-10
+- add patch to keep from mangling mime parts (bz #527690)
+
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.2.11-9
+- rebuilt with new openssl
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.11-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Jul 06 2009 Bernard Johnson <bjohnson at symetrix.com> - 2.2.11-7
 - fix left out ? in comparison