From be14284a6ea55c39d54dee330fc7e7aedfad1d73 Mon Sep 17 00:00:00 2001
From: vcrhonek <vcrhonek@fedoraproject.org>
Date: Aug 18 2009 10:37:37 +0000
Subject: Regression bug fix for fetchmail 6.3.11


---

diff --git a/fetchmail-6.3.11-regression.patch b/fetchmail-6.3.11-regression.patch
new file mode 100644
index 0000000..a850ca8
--- /dev/null
+++ b/fetchmail-6.3.11-regression.patch
@@ -0,0 +1,16 @@
+diff -up fetchmail-6.3.11/socket.c_old fetchmail-6.3.11/socket.c
+--- fetchmail-6.3.11/socket.c_old	2009-08-18 11:56:15.000000000 +0200
++++ fetchmail-6.3.11/socket.c	2009-08-18 11:58:17.000000000 +0200
+@@ -628,9 +628,10 @@ static int SSL_verify_callback( int ok_r
+ 				report(stdout, GT_("Unknown Issuer CommonName\n"));
+ 		}
+ 		if ((i = X509_NAME_get_text_by_NID(subj, NID_commonName, buf, sizeof(buf))) != -1) {
+-			if (outlevel >= O_VERBOSE)
++			if (outlevel >= O_VERBOSE) {
+ 				report(stdout, GT_("Server CommonName: %s\n"), (tt = sdump(buf, i)));
+-			xfree(tt);
++				xfree(tt);
++			}
+ 			if ((size_t)i >= sizeof(buf) - 1) {
+ 				/* Possible truncation. In this case, this is a DNS name, so this
+ 				 * is really bad. We do not tolerate this even in the non-strict case. */
diff --git a/fetchmail.spec b/fetchmail.spec
index eb86454..716e546 100644
--- a/fetchmail.spec
+++ b/fetchmail.spec
@@ -4,10 +4,13 @@
 Summary: A remote mail retrieval and forwarding utility
 Name: fetchmail
 Version: 6.3.11
-Release: 1%{?dist}
+Release: 2%{?dist}
 Requires: procmail
 Source0: http://download.berlios.de/fetchmail/fetchmail-%{version}.tar.bz2
 Source1: http://download.berlios.de/fetchmail/fetchmail-%{version}.tar.bz2.asc
+# See http://bugs.gentoo.org/show_bug.cgi?id=280760
+# Upstream has commited this in fetchmail SVN repository already
+Patch0: fetchmail-6.3.11-regression.patch
 URL: http://fetchmail.berlios.de/
 # For a breakdown of the licensing, see COPYING
 License: GPL+ and Public Domain
@@ -45,6 +48,7 @@ need to have Python and Tk installed in order to use fetchmailconf.
 
 %prep
 %setup -q
+%patch0 -p1 -b .regression
 
 %build
 %configure --enable-POP3 --enable-IMAP --with-ssl --with-hesiod \
@@ -83,6 +87,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Tue Aug 18 2009 Vitezslav Crhonek <vcrhonek@redhat.com> - 6.3.11-2
+- Regression bug fix for fetchmail 6.3.11
+
 * Thu Aug  6 2009 Vitezslav Crhonek <vcrhonek@redhat.com> - 6.3.11-1
 - Update to fetchmail-6.3.11
 - Remove addrconf patch (upstream now)