[ssmtp/el5: 36/37] Merge branch 'master' into el5

[wolfy]

commit 1bcd2ebf1a3f0083e214a47359fa4351195e0de4
Merge: d2093f1 080c0a4
Author: Manuel Wolfshant <wolfy at fedoraproject.org>
Date:   Sat Jun 30 03:08:22 2012 +0300

    Merge branch 'master' into el5
    
    Conflicts:
    	ssmtp.spec

 ssmtp-garbage_writes.patch |   19 +++++++++++++++++++
 ssmtp.spec                 |   25 ++++++++++++++++++++++++-
 2 files changed, 43 insertions(+), 1 deletions(-)
---
diff --cc ssmtp.spec
index b106f48,fdc8702..915c7a6
--- a/ssmtp.spec
+++ b/ssmtp.spec
@@@ -1,6 -1,6 +1,10 @@@
  Name:		ssmtp
  Version:	2.61
++<<<<<<< HEAD
 +Release:	15%{?dist}
++=======
+ Release:	18%{?dist}
++>>>>>>> master
  Summary:	Extremely simple MTA to get mail off the system to a Mailhub
  Group:		Applications/Internet
  License:	GPLv2+
@@@ -21,7 -20,7 +24,11 @@@ Patch8:		%{name}-authpass.patc
  Patch9:		%{name}-aliases.patch
  Patch10:	%{name}-default-cert-path.patch
  Patch11:	%{name}-standardise.patch
++<<<<<<< HEAD
 +
++=======
+ Patch12:        %{name}-garbage_writes.patch
++>>>>>>> master
  BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  #hack around wrong requires for mutt and mdadm
  %if 0%{?rhel}
@@@ -61,6 -60,7 +68,10 @@@ or manage a queue. That belongs on a ma
  %patch9 -p1
  %patch10 -p1
  %patch11 -p1
++<<<<<<< HEAD
++=======
+ %patch12 -p1
++>>>>>>> master
  
  #add missing libs in orderto fix FTBFS due to changes in implicit DSO linking
  %if "0%{?dist}" >= "0.fc13" 
@@@ -153,6 -153,15 +164,18 @@@ f
  
  
  %changelog
++<<<<<<< HEAD
++=======
+ * 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
+ 
+ * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.61-16
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+ 
++>>>>>>> master
  * Tue Jul 27 2010 Manuel "lonely wolf" Wolfshant <wolfy at fedoraproject.org> - 2.61-15
  - fix regression created by the patch for standardise() -- Buffer overflow