Fix stunnel usage with TLS1 encryption.

From https://lists.berlios.de/pipermail/fetchmail-users/2007-December/001396.html
via Dieter Rauschenberger. Thank you!

Regen PLIST and drop maintainership. I don't use it anymore.
This commit is contained in:
bernd 2009-02-02 11:42:13 +00:00
parent b0f34b5bfb
commit 457b898d2a
3 changed files with 20 additions and 6 deletions

View File

@ -1,16 +1,14 @@
# $OpenBSD: Makefile,v 1.114 2008/10/30 15:33:59 bernd Exp $
# $OpenBSD: Makefile,v 1.115 2009/02/02 11:42:13 bernd Exp $
COMMENT= mail retrieval utility for POP2, POP3, KPOP, IMAP and more
DISTNAME= fetchmail-6.3.8
PKGNAME= ${DISTNAME}p2
PKGNAME= ${DISTNAME}p3
CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_BERLIOS:=fetchmail/}
HOMEPAGE= http://fetchmail.berlios.de/
MAINTAINER= Bernd Ahlers <bernd@openbsd.org>
# GPL
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes

View File

@ -0,0 +1,16 @@
$OpenBSD: patch-pop3_c,v 1.1 2009/02/02 11:42:13 bernd Exp $
Fix stunnel usage with TLS1 encryption.
https://lists.berlios.de/pipermail/fetchmail-users/2007-December/001396.html
--- pop3.c.orig Sun Mar 18 02:13:45 2007
+++ pop3.c Mon Feb 2 12:37:35 2009
@@ -449,7 +449,7 @@ static int pop3_getauth(int sock, struct query *ctl, c
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("");

View File

@ -1,5 +1,5 @@
@comment $OpenBSD: PLIST,v 1.16 2007/01/09 10:35:42 bernd Exp $
bin/fetchmail
@comment $OpenBSD: PLIST,v 1.17 2009/02/02 11:42:13 bernd Exp $
@bin bin/fetchmail
bin/fetchmailconf
libexec/fetchmailconf.bin
@man man/man1/fetchmail.1