[patch] patch and ebuild patch

bah (text/plain), 1.67 KB, created by Weedy on 2007-12-03 07:18:08 UTC

diff -urN /usr/portage/net-mail/fetchmail/fetchmail-6.3.8-r1.ebuild /usr/local/portage/net-mail/fetchmail/fetchmail-6.3.8-r1.ebuild
--- /usr/portage/net-mail/fetchmail/fetchmail-6.3.8-r1.ebuild	2007-09-03 10:31:41.000000000 -0400
+++ /usr/local/portage/net-mail/fetchmail/fetchmail-6.3.8-r1.ebuild	2007-12-03 01:19:10.000000000 -0500
@@ -30,6 +30,10 @@
 
 	# this patch fixes bug #34788 ([e-mail] 2004-09-03)
 	epatch "${FILESDIR}"/${PN}-6.2.5-broken-headers.patch
+
+	# this patch fixes Invalid SSL protocol '' specified, using default (SSLv23).
+	# even if you have set it.
+	epatch "${FILESDIR}"/${P}-fix-empty-sslproto.patch
 }
 
 src_compile() {
diff -urN /usr/portage/net-mail/fetchmail/files/fetchmail-6.3.8-fix-empty-sslproto.patch /usr/local/portage/net-mail/fetchmail/files/fetchmail-6.3.8-fix-empty-sslproto.patch
--- /usr/portage/net-mail/fetchmail/files/fetchmail-6.3.8-fix-empty-sslproto.patch	1969-12-31 19:00:00.000000000 -0500
+++ /usr/local/portage/net-mail/fetchmail/files/fetchmail-6.3.8-fix-empty-sslproto.patch	2007-12-03 01:14:55.000000000 -0500
@@ -0,0 +1,22 @@
+Index: pop3.c
+===================================================================
+--- pop3.c	(Revision 5108)
++++ pop3.c	(Revision 5109)
+@@ -449,7 +449,7 @@
+ 			report(stderr, GT_("TLS is mandatory for this session, but server refused CAPA command.\n"));
+ 			report(stderr, GT_("The CAPA command is however necessary for TLS.\n"));
+ 			return ok;
+-		    } else {
++		    } else if (maybe_tls(ctl)) {
+ 			/* defeat opportunistic STLS */
+ 			xfree(ctl->sslproto);
+ 			ctl->sslproto = xstrdup("");
+@@ -526,7 +526,7 @@
+ 		   }
+ 	       }
+ 	   }
+-	}
++	} /* maybe_tls() */
+ #endif /* SSL_ENABLE */
+ 
+ 	/*