Attachment #171581 for bug #210130

Lines 3-9 Link Here

(-)fetchmail/Makefile (-21 / +14 lines)
3		3
4	PORTNAME= fetchmail	4	PORTNAME= fetchmail
5	PORTVERSION= 6.3.26	5	PORTVERSION= 6.3.26
6	PORTREVISION= 3	6	PORTREVISION= 4
7	CATEGORIES= mail ipv6	7	CATEGORIES= mail ipv6
8	MASTER_SITES= SF/${PORTNAME}/branch_6.3/ \	8	MASTER_SITES= SF/${PORTNAME}/branch_6.3/ \
9	http://mandree.home.pages.de/${PORTNAME}/	9	http://mandree.home.pages.de/${PORTNAME}/
Lines 36-44 Link Here
36		36
37	LDFLAGS+= -L${LOCALBASE}/lib	37	LDFLAGS+= -L${LOCALBASE}/lib
38		38
39	OPTIONS_DEFINE= X11 NLS NTLM GSSAPI POP2 DOCS	39	OPTIONS_DEFINE= X11 NLS NTLM POP2 DOCS
40	OPTIONS_DEFAULT= GSSAPI	40	OPTIONS_SINGLE= GSSAPI
		41	OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
		42	OPTIONS_DEFAULT= GSSAPI_BASE
41	OPTIONS_SUB= yes	43	OPTIONS_SUB= yes
		44
		45	GSSAPI_BASE_USES= gssapi
		46	GSSAPI_BASE_CONFIGURE_ON= --with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
		47	GSSAPI_HEIMDAL_USES= gssapi:heimdal
		48	GSSAPI_HEIMDAL_CONFIGURE_ON= --with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
		49	GSSAPI_MIT_USES= gssapi:mit
		50	GSSAPI_MIT_CONFIGURE_ON= --with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
		51	GSSAPI_NONE_CONFIGURE_ON= --without-gssapi
		52
42	X11_DESC= Python/Tkinter dependencies for ``fetchmailconf''	53	X11_DESC= Python/Tkinter dependencies for ``fetchmailconf''
43	POP2_DESC= POP2 Protocol support[obsolete]	54	POP2_DESC= POP2 Protocol support[obsolete]
44		55
Lines 68-91 Link Here
68	PLIST_SUB+= NOX11=""	79	PLIST_SUB+= NOX11=""
69	.endif	80	.endif
70		81
71	.if ${PORT_OPTIONS:MGSSAPI}
72	.if !defined(KRB5_HOME)
73	.if exists(${LOCALBASE}/lib/libkrb5.a)
74	KRB5_HOME= ${LOCALBASE}
75	.elif exists(/usr/lib/libkrb5.a)
76	KRB5_HOME= /usr
77	.endif
78	.endif
79
80	.if defined(KRB5_HOME) && !exists(${KRB5_HOME}/lib/libkrb5.a)
81	BROKEN= KRB5_HOME is set but doesn\'t provide lib/libkrb5.a
82	.endif
83
84	.if defined(KRB5_HOME) && exists(${KRB5_HOME}/lib/libkrb5.a)
85	CONFIGURE_ARGS+= --with-gssapi=${KRB5_HOME}
86	.endif
87	.endif
88
89	.if ${PORT_OPTIONS:MNTLM}	82	.if ${PORT_OPTIONS:MNTLM}
90	CONFIGURE_ARGS+= --enable-NTLM	83	CONFIGURE_ARGS+= --enable-NTLM
91	PORTDOCS+= README.NTLM	84	PORTDOCS+= README.NTLM




--- fetchmail.c.orig	2013-04-23 20:00:45 UTC
+++ fetchmail.c
@@ -263,6 +263,12 @@ int main(int argc, char **argv)
 #ifdef SSL_ENABLE
 	"+SSL"
 #endif
+#ifdef OPENSSL_NO_SSL2
+	"-SSLv2"
+#endif
+#ifdef OPENSSL_NO_SSL3_METHOD
+	"-SSLv3"
+#endif
 #ifdef OPIE_ENABLE
 	"+OPIE"
 #endif /* OPIE_ENABLE */




--- socket.c.orig	2013-04-23 20:00:45 UTC
+++ socket.c
@@ -907,14 +907,19 @@ int SSLOpen(int sock, char *mycert, char
 	_ssl_context[sock] = NULL;
 	if(myproto) {
 		if(!strcasecmp("ssl2",myproto)) {
-#if HAVE_DECL_SSLV2_CLIENT_METHOD + 0 > 0
+#ifndef OPENSSL_NO_SSL2
 			_ctx[sock] = SSL_CTX_new(SSLv2_client_method());
 #else
-			report(stderr, GT_("Your operating system does not support SSLv2.\n"));
+			report(stderr, GT_("Your OpenSSL version does not support SSLv2.\n"));
 			return -1;
 #endif
 		} else if(!strcasecmp("ssl3",myproto)) {
+#ifndef OPENSSL_NO_SSL3_METHOD
 			_ctx[sock] = SSL_CTX_new(SSLv3_client_method());
+#else
+			report(stderr, GT_("Your OpenSSL version does not support SSLv3.\n"));
+			return -1;
+#endif
 		} else if(!strcasecmp("tls1",myproto)) {
 			_ctx[sock] = SSL_CTX_new(TLSv1_client_method());
 		} else if (!strcasecmp("ssl23",myproto)) {

Return to bug 210130

Line 0 Link Here

(-)fetchmail/files/patch-fetchmail.c (+15 lines)
	1	--- fetchmail.c.orig 2013-04-23 20:00:45 UTC
	2	+++ fetchmail.c
	3	@@ -263,6 +263,12 @@ int main(int argc, char **argv)
	4	#ifdef SSL_ENABLE
	5	"+SSL"
	6	#endif
	7	+#ifdef OPENSSL_NO_SSL2
	8	+ "-SSLv2"
	9	+#endif
	10	+#ifdef OPENSSL_NO_SSL3_METHOD
	11	+ "-SSLv3"
	12	+#endif
	13	#ifdef OPIE_ENABLE
	14	"+OPIE"
	15	#endif /* OPIE_ENABLE */

Line 0 Link Here

(-)fetchmail/files/patch-socket.c (+24 lines)
	1	--- socket.c.orig 2013-04-23 20:00:45 UTC
	2	+++ socket.c
	3	@@ -907,14 +907,19 @@ int SSLOpen(int sock, char *mycert, char
	4	_ssl_context[sock] = NULL;
	5	if(myproto) {
	6	if(!strcasecmp("ssl2",myproto)) {
	7	-#if HAVE_DECL_SSLV2_CLIENT_METHOD + 0 > 0
	8	+#ifndef OPENSSL_NO_SSL2
	9	_ctx[sock] = SSL_CTX_new(SSLv2_client_method());
	10	#else
	11	- report(stderr, GT_("Your operating system does not support SSLv2.\n"));
	12	+ report(stderr, GT_("Your OpenSSL version does not support SSLv2.\n"));
	13	return -1;
	14	#endif
	15	} else if(!strcasecmp("ssl3",myproto)) {
	16	+#ifndef OPENSSL_NO_SSL3_METHOD
	17	_ctx[sock] = SSL_CTX_new(SSLv3_client_method());
	18	+#else
	19	+ report(stderr, GT_("Your OpenSSL version does not support SSLv3.\n"));
	20	+ return -1;
	21	+#endif
	22	} else if(!strcasecmp("tls1",myproto)) {
	23	_ctx[sock] = SSL_CTX_new(TLSv1_client_method());
	24	} else if (!strcasecmp("ssl23",myproto)) {