[ssmtp] Apply patch to fix addition of garbage at end of attachments

wolfy wolfy at fedoraproject.org
Fri Jun 29 23:42:02 UTC 2012


commit 080c0a44fad7834b47f2303ddd72c146183fd34f
Author: Manuel Wolfshant <wolfy at fedoraproject.org>
Date:   Sat Jun 30 02:41:49 2012 +0300

    Apply patch to fix addition of garbage at end of attachments

 ssmtp-garbage_writes.patch |   19 +++++++++++++++++++
 ssmtp.spec                 |    9 ++++++---
 2 files changed, 25 insertions(+), 3 deletions(-)
---
diff --git a/ssmtp-garbage_writes.patch b/ssmtp-garbage_writes.patch
new file mode 100644
index 0000000..7c0ee05
--- /dev/null
+++ b/ssmtp-garbage_writes.patch
@@ -0,0 +1,19 @@
+diff -Nupr ssmtp-2.61.orig/ssmtp.c ssmtp-2.61/ssmtp.c
+--- ssmtp-2.61.orig/ssmtp.c	2012-06-30 02:18:30.744733188 +0300
++++ ssmtp-2.61/ssmtp.c	2012-06-30 02:21:42.180185189 +0300
+@@ -1708,12 +1708,12 @@ int ssmtp(char *argv[])
+                        outbytes += smtp_write(sock, "%s", leadingdot ? b : buf);
+                } else {
+                        if (log_level > 0) {
+-                               log_event(LOG_INFO, "Sent a very long line in chunks");
++                               log_event(LOG_INFO, "Sending a partial line");
+                        }
+                        if (leadingdot) {
+-                               outbytes += fd_puts(sock, b, sizeof(b));
++                               outbytes += fd_puts(sock, b, strlen(b));
+                        } else {
+-                               outbytes += fd_puts(sock, buf, bufsize);
++                               outbytes += fd_puts(sock, buf, strlen(buf));
+                        }
+                }
+ 
diff --git a/ssmtp.spec b/ssmtp.spec
index ed9e504..fdc8702 100644
--- a/ssmtp.spec
+++ b/ssmtp.spec
@@ -1,12 +1,11 @@
 Name:		ssmtp
 Version:	2.61
-Release:	17%{?dist}
+Release:	18%{?dist}
 Summary:	Extremely simple MTA to get mail off the system to a Mailhub
 Group:		Applications/Internet
 License:	GPLv2+
 URL:		http://packages.debian.org/stable/mail/ssmtp
 Source0:	ftp://ftp.debian.org/debian/pool/main/s/%{name}/%{name}_%{version}.orig.tar.gz
-#Patch0		http://ftp.debian.org/debian/pool/main/s/ssmtp/ssmtp_2.61-9.diff.gz
 Patch0:		%{name}-%{version}.6.patch
 Patch1:		%{name}-2.50.3-maxsysuid.patch
 Patch2:		%{name}-defaultvalues.patch
@@ -21,7 +20,7 @@ Patch8:		%{name}-authpass.patch
 Patch9:		%{name}-aliases.patch
 Patch10:	%{name}-default-cert-path.patch
 Patch11:	%{name}-standardise.patch
-
+Patch12:        %{name}-garbage_writes.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 #hack around wrong requires for mutt and mdadm
 %if 0%{?rhel}
@@ -61,6 +60,7 @@ or manage a queue. That belongs on a mail hub with a system administrator.
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
+%patch12 -p1
 
 #add missing libs in orderto fix FTBFS due to changes in implicit DSO linking
 %if "0%{?dist}" >= "0.fc13" 
@@ -153,6 +153,9 @@ fi
 
 
 %changelog
+* Sat Jun 30 2012 Manuel "lonely wolf" Wolfshant <wolfy at fedoraproject.org> - 2.61-18
+- Apply patch to fix addition of garbage at end of attachments
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.61-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 


More information about the scm-commits mailing list