diff --git a/.cvsignore b/.cvsignore index 713a9ec..70ab275 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,8 +1,2 @@ -fetchmail-6.3.7.tar.bz2 -fetchmail-6.3.7.tar.bz2.asc -fetchmail-6.3.8.tar.bz2 -fetchmail-6.3.8.tar.bz2.asc -fetchmail-6.3.9.tar.bz2 -fetchmail-6.3.9.tar.bz2.asc -fetchmail-6.3.11.tar.bz2 -fetchmail-6.3.11.tar.bz2.asc +fetchmail-6.3.12.tar.bz2 +fetchmail-6.3.12.tar.bz2.asc diff --git a/fetchmail-6.3.11-regression.patch b/fetchmail-6.3.11-regression.patch deleted file mode 100644 index a850ca8..0000000 --- a/fetchmail-6.3.11-regression.patch +++ /dev/null @@ -1,16 +0,0 @@ -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 1853805..cb7692a 100644 --- a/fetchmail.spec +++ b/fetchmail.spec @@ -3,14 +3,11 @@ Summary: A remote mail retrieval and forwarding utility Name: fetchmail -Version: 6.3.11 -Release: 3%{?dist} +Version: 6.3.12 +Release: 1%{?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 @@ -48,7 +45,6 @@ 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 \ @@ -87,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Wed Oct 7 2009 Vitezslav Crhonek - 6.3.12-1 +- Update to fetchmail-6.3.12 + * Fri Aug 21 2009 Tomas Mraz - 6.3.11-3 - rebuilt with new openssl diff --git a/sources b/sources index da3edb8..b851394 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -43b28f296cc0024d3c727319eacae324 fetchmail-6.3.11.tar.bz2 -347a29dbce620e82ad48572a337715ed fetchmail-6.3.11.tar.bz2.asc +f7486d230ec6a2870650f3b7cf5671ac fetchmail-6.3.12.tar.bz2 +1b4bfc5c59fa153f96559e2197fd747d fetchmail-6.3.12.tar.bz2.asc