Attachment 171583 Details for Bug 210130 – Proposed patch v3

[patch] Proposed patch v3

fm_update.patch (text/plain), 3.65 KB, created by Corey Halpin on 2016-06-19 22:07:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Corey Halpin

Created: 2016-06-19 22:07:24 UTC

Size: 3.65 KB

patch

obsolete

>diff -ruN fetchmail.old/Makefile fetchmail/Makefile
>--- fetchmail.old/Makefile	2016-06-19 14:18:13.491754400 -0500
>+++ fetchmail/Makefile	2016-06-19 14:10:41.040785570 -0500
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	fetchmail
> PORTVERSION=	6.3.26
>-PORTREVISION=	3
>+PORTREVISION=	4
> CATEGORIES=	mail ipv6
> MASTER_SITES=	SF/${PORTNAME}/branch_6.3/ \
> 		http://mandree.home.pages.de/${PORTNAME}/
>@@ -36,9 +36,20 @@
> 
> LDFLAGS+=	-L${LOCALBASE}/lib
> 
>-OPTIONS_DEFINE=	X11 NLS NTLM GSSAPI POP2 DOCS
>-OPTIONS_DEFAULT=	GSSAPI
>+OPTIONS_DEFINE=	X11 NLS NTLM POP2 DOCS
>+OPTIONS_SINGLE= GSSAPI
>+OPTIONS_SINGLE_GSSAPI=  GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
>+OPTIONS_DEFAULT= GSSAPI_BASE
> OPTIONS_SUB=	yes
>+
>+GSSAPI_BASE_USES= gssapi
>+GSSAPI_BASE_CONFIGURE_ON= --with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
>+GSSAPI_HEIMDAL_USES=  gssapi:heimdal
>+GSSAPI_HEIMDAL_CONFIGURE_ON=  --with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
>+GSSAPI_MIT_USES=  gssapi:mit
>+GSSAPI_MIT_CONFIGURE_ON=  --with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
>+GSSAPI_NONE_CONFIGURE_ON= --without-gssapi
>+
> X11_DESC=	Python/Tkinter dependencies for ``fetchmailconf''
> POP2_DESC=	POP2 Protocol support[obsolete]
> 
>@@ -68,24 +79,6 @@
> PLIST_SUB+=	NOX11=""
> .endif
> 
>-.if ${PORT_OPTIONS:MGSSAPI}
>-.if !defined(KRB5_HOME)
>-.if exists(${LOCALBASE}/lib/libkrb5.a)
>-KRB5_HOME=	${LOCALBASE}
>-.elif exists(/usr/lib/libkrb5.a)
>-KRB5_HOME=	/usr
>-.endif
>-.endif
>-
>-.if defined(KRB5_HOME) && !exists(${KRB5_HOME}/lib/libkrb5.a)
>-BROKEN=	KRB5_HOME is set but doesn\'t provide lib/libkrb5.a
>-.endif
>-
>-.if defined(KRB5_HOME) && exists(${KRB5_HOME}/lib/libkrb5.a)
>-CONFIGURE_ARGS+=	--with-gssapi=${KRB5_HOME}
>-.endif
>-.endif
>-
> .if ${PORT_OPTIONS:MNTLM}
> CONFIGURE_ARGS+=	--enable-NTLM
> PORTDOCS+=	README.NTLM
>diff -ruN fetchmail.old/files/patch-fetchmail.c fetchmail/files/patch-fetchmail.c
>--- fetchmail.old/files/patch-fetchmail.c	1969-12-31 18:00:00.000000000 -0600
>+++ fetchmail/files/patch-fetchmail.c	2016-06-19 16:57:29.531097239 -0500
>@@ -0,0 +1,26 @@
>+--- fetchmail.c.orig	2013-04-23 20:00:45 UTC
>++++ fetchmail.c
>+@@ -50,6 +50,10 @@
>+ #include <arpa/nameser.h>
>+ #include <resolv.h>
>+ 
>++#ifdef SSL_ENABLE
>++#include <openssl/ssl.h>
>++#endif
>++
>+ #ifndef ENETUNREACH
>+ #define ENETUNREACH   128       /* Interactive doesn't know this */
>+ #endif /* ENETUNREACH */
>+@@ -263,6 +267,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 */
>diff -ruN fetchmail.old/files/patch-socket.c fetchmail/files/patch-socket.c
>--- fetchmail.old/files/patch-socket.c	1969-12-31 18:00:00.000000000 -0600
>+++ fetchmail/files/patch-socket.c	2016-06-19 16:57:29.535095699 -0500
>@@ -0,0 +1,24 @@
>+--- 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)) {

Flags:

chalpin: maintainer-approval+

Actions: View | Diff

Attachments on bug 210130: 171272 | 171273 | 171580 | 171581 | 171583 | 171620