Attachment #171620 for bug #210130





PORTNAME=	fetchmail
PORTVERSION=	6.3.26
PORTREVISION=	4
CATEGORIES=	mail ipv6
MASTER_SITES=	SF/${PORTNAME}/branch_6.3/ \
		http://mandree.home.pages.de/${PORTNAME}/


RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss

# Note USERS can only contain a single word as parts below rely on that.
USERS=		${PORTNAME}
GROUPS=		${USERS}


SHEBANG_FILES=	fetchmailconf.py

USE_RC_SUBR=	fetchmail
SUB_FILES=	pkg-message
SUB_LIST+=	USERS=${USERS} GROUPS=${GROUPS} PORTNAME=${PORTNAME}

GNU_CONFIGURE=	yes
USE_OPENSSL=	yes


LDFLAGS+=	-L${LOCALBASE}/lib

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]

NLS_USES=	gettext
NLS_CONFIGURE_ENABLE=	nls
NLS_CONFIGURE_ON=	--enable-nls
NLS_CONFIGURE_OFF=	--disable-nls

NTLM_CONFIGURE_ENABLE=	NTLM
NTLM_PORTDOCS=		README.NTLM

# POP2 is obsolete
POP2_CONFIGURE_ENABLE=	POP2

X11_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>=0:x11-toolkits/py-tkinter
X11_USES=	python
X11_CONFIGURE_OFF=	PYTHON=:
X11_SUB_FILES_OFF=	fetchmailconf

PORTDOCS=	FAQ FEATURES NEWS NOTES README README.SSL \
		design-notes.html fetchmail-FAQ.html fetchmail-features.html \
		esrs-design-notes.html

#.include <bsd.port.options.mk>

# Pop2 is obsolete
.if ${PORT_OPTIONS:MPOP2}
CONFIGURE_ARGS+=	--enable-POP2
.endif

.if ${PORT_OPTIONS:MX11}
USES+=		python
RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}tkinter>=0:x11-toolkits/py-tkinter
PLIST_SUB+=	NOX11="@comment "
.else
CONFIGURE_ARGS+=	PYTHON=:
SUB_FILES+=	fetchmailconf
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
.endif

post-patch:
.if !exists(/usr/lib/libcom_err.so)
	@${REINPLACE_CMD} -e "s,-lcom_err,,g" ${WRKSRC}/configure

post-build:
	@${MAKE_CMD} -C ${WRKSRC} check

post-stage:
	${INSTALL} -d ${STAGEDIR}/var/run/fetchmail
	${INSTALL_DATA} ${FILESDIR}/fetchmailrc.sample \
		${STAGEDIR}${PREFIX}/etc/fetchmailrc.sample





--- 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 */




--- 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)) {




#!/bin/sh

if [ x$2 != xPOST-DEINSTALL ]; then
  exit
fi

if [ -f /var/run/%%PORTNAME%%/fetchmail.pid ] ; then
  /bin/rm -f /var/run/%%PORTNAME%%/fetchmail.pid
fi

/bin/rmdir /var/run/%%PORTNAME%%

exit




#!/bin/sh

if [ x$2 != xPOST-INSTALL ]; then
  exit
fi

/bin/mkdir -m 0755 -p /var/run/%%PORTNAME%%
/usr/sbin/chown "%%USERS%%:%%GROUPS%%" /var/run/%%PORTNAME%%
/usr/sbin/chown "%%USERS%%:%%GROUPS%%" %%PREFIX%%/etc/fetchmailrc*
/bin/chmod 0600 %%PREFIX%%/etc/fetchmailrc
/bin/chmod 0644 %%PREFIX%%/etc/fetchmailrc.sample

exit

Lines 2-8 Link Here

(-)pkg-plist (-2 / +3 lines)
2	bin/fetchmailconf	2	bin/fetchmailconf
3	man/man1/fetchmail.1.gz	3	man/man1/fetchmail.1.gz
4	man/man1/fetchmailconf.1.gz	4	man/man1/fetchmailconf.1.gz
5	%%NOX11%%libexec/fetchmailconf.py	5	%%X11%%libexec/fetchmailconf.py
6	%%NLS%%share/locale/ca/LC_MESSAGES/fetchmail.mo	6	%%NLS%%share/locale/ca/LC_MESSAGES/fetchmail.mo
7	%%NLS%%share/locale/cs/LC_MESSAGES/fetchmail.mo	7	%%NLS%%share/locale/cs/LC_MESSAGES/fetchmail.mo
8	%%NLS%%share/locale/da/LC_MESSAGES/fetchmail.mo	8	%%NLS%%share/locale/da/LC_MESSAGES/fetchmail.mo
Lines 30-33 Link Here
30	%%X11%%%%PYTHON_SITELIBDIR%%/fetchmailconf.py	30	%%X11%%%%PYTHON_SITELIBDIR%%/fetchmailconf.py
31	%%X11%%%%PYTHON_SITELIBDIR%%/fetchmailconf.pyc	31	%%X11%%%%PYTHON_SITELIBDIR%%/fetchmailconf.pyc
32	%%X11%%%%PYTHON_SITELIBDIR%%/fetchmailconf.pyo	32	%%X11%%%%PYTHON_SITELIBDIR%%/fetchmailconf.pyo
33	@sample etc/fetchmailrc.sample	33	@sample(fetchmail,fetchmail,600) etc/fetchmailrc.sample
		34	@dir(fetchmail,fetchmail,755) /var/run/fetchmail

Return to bug 210130

Lines 3-9 Link Here

(-)Makefile (-48 / +29 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 16-22 Link Here
16		16
17	RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss	17	RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
18		18
19	# Note USERS can only contain a single word as parts below rely on that.
20	USERS= ${PORTNAME}	19	USERS= ${PORTNAME}
21	GROUPS= ${USERS}	20	GROUPS= ${USERS}
22		21
Lines 24-31 Link Here
24	SHEBANG_FILES= fetchmailconf.py	23	SHEBANG_FILES= fetchmailconf.py
25		24
26	USE_RC_SUBR= fetchmail	25	USE_RC_SUBR= fetchmail
27	SUB_FILES= pkg-message pkg-install pkg-deinstall	26	SUB_FILES= pkg-message
28	SUB_LIST+= USERS=${USERS} GROUPS=${GROUPS} PORTNAME=${PORTNAME}
29		27
30	GNU_CONFIGURE= yes	28	GNU_CONFIGURE= yes
31	USE_OPENSSL= yes	29	USE_OPENSSL= yes
Lines 36-96 Link Here
36		34
37	LDFLAGS+= -L${LOCALBASE}/lib	35	LDFLAGS+= -L${LOCALBASE}/lib
38		36
39	OPTIONS_DEFINE= X11 NLS NTLM GSSAPI POP2 DOCS	37	OPTIONS_DEFINE= X11 NLS NTLM POP2 DOCS
40	OPTIONS_DEFAULT= GSSAPI	38	OPTIONS_SINGLE= GSSAPI
		39	OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
		40	OPTIONS_DEFAULT= GSSAPI_BASE
41	OPTIONS_SUB= yes	41	OPTIONS_SUB= yes
		42
		43	GSSAPI_BASE_USES= gssapi
		44	GSSAPI_BASE_CONFIGURE_ON= --with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
		45	GSSAPI_HEIMDAL_USES= gssapi:heimdal
		46	GSSAPI_HEIMDAL_CONFIGURE_ON= --with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
		47	GSSAPI_MIT_USES= gssapi:mit
		48	GSSAPI_MIT_CONFIGURE_ON= --with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
		49	GSSAPI_NONE_CONFIGURE_ON= --without-gssapi
		50
42	X11_DESC= Python/Tkinter dependencies for ``fetchmailconf''	51	X11_DESC= Python/Tkinter dependencies for ``fetchmailconf''
43	POP2_DESC= POP2 Protocol support[obsolete]	52	POP2_DESC= POP2 Protocol support[obsolete]
44		53
45	NLS_USES= gettext	54	NLS_USES= gettext
46	NLS_CONFIGURE_ENABLE= nls	55	NLS_CONFIGURE_ENABLE= nls
47	NLS_CONFIGURE_ON= --enable-nls
48	NLS_CONFIGURE_OFF= --disable-nls
49		56
		57	NTLM_CONFIGURE_ENABLE= NTLM
		58	NTLM_PORTDOCS= README.NTLM
		59
		60	# POP2 is obsolete
		61	POP2_CONFIGURE_ENABLE= POP2
		62
		63	X11_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>=0:x11-toolkits/py-tkinter
		64	X11_USES= python
		65	X11_CONFIGURE_OFF= PYTHON=:
		66	X11_SUB_FILES_OFF= fetchmailconf
		67
50	PORTDOCS= FAQ FEATURES NEWS NOTES README README.SSL \	68	PORTDOCS= FAQ FEATURES NEWS NOTES README README.SSL \
51	design-notes.html fetchmail-FAQ.html fetchmail-features.html \	69	design-notes.html fetchmail-FAQ.html fetchmail-features.html \
52	esrs-design-notes.html	70	esrs-design-notes.html
53		71
54	.include <bsd.port.options.mk>	72	#.include <bsd.port.options.mk>
55		73
56	# Pop2 is obsolete
57	.if ${PORT_OPTIONS:MPOP2}
58	CONFIGURE_ARGS+= --enable-POP2
59	.endif
60
61	.if ${PORT_OPTIONS:MX11}
62	USES+= python
63	RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}tkinter>=0:x11-toolkits/py-tkinter
64	PLIST_SUB+= NOX11="@comment "
65	.else
66	CONFIGURE_ARGS+= PYTHON=:
67	SUB_FILES+= fetchmailconf
68	PLIST_SUB+= NOX11=""
69	.endif
70
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}
90	CONFIGURE_ARGS+= --enable-NTLM
91	PORTDOCS+= README.NTLM
92	.endif
93
94	post-patch:	74	post-patch:
95	.if !exists(/usr/lib/libcom_err.so)	75	.if !exists(/usr/lib/libcom_err.so)
96	@${REINPLACE_CMD} -e "s,-lcom_err,,g" ${WRKSRC}/configure	76	@${REINPLACE_CMD} -e "s,-lcom_err,,g" ${WRKSRC}/configure
Lines 99-105 Link Here
99	post-build:	79	post-build:
100	@${MAKE_CMD} -C ${WRKSRC} check	80	@${MAKE_CMD} -C ${WRKSRC} check
101		81
102	post-install:	82	post-stage:
		83	${INSTALL} -d ${STAGEDIR}/var/run/fetchmail
103	${INSTALL_DATA} ${FILESDIR}/fetchmailrc.sample \	84	${INSTALL_DATA} ${FILESDIR}/fetchmailrc.sample \
104	${STAGEDIR}${PREFIX}/etc/fetchmailrc.sample	85	${STAGEDIR}${PREFIX}/etc/fetchmailrc.sample
105		86

Line 0 Link Here

(-)files/patch-fetchmail.c (+26 lines)
	1	--- fetchmail.c.orig 2013-04-23 20:00:45 UTC
	2	+++ fetchmail.c
	3	@@ -50,6 +50,10 @@
	4	#include <arpa/nameser.h>
	5	#include <resolv.h>
	6
	7	+#ifdef SSL_ENABLE
	8	+#include <openssl/ssl.h>
	9	+#endif
	10	+
	11	#ifndef ENETUNREACH
	12	#define ENETUNREACH 128 /* Interactive doesn't know this */
	13	#endif /* ENETUNREACH */
	14	@@ -263,6 +267,12 @@ int main(int argc, char **argv)
	15	#ifdef SSL_ENABLE
	16	"+SSL"
	17	#endif
	18	+#ifdef OPENSSL_NO_SSL2
	19	+ "-SSLv2"
	20	+#endif
	21	+#ifdef OPENSSL_NO_SSL3_METHOD
	22	+ "-SSLv3"
	23	+#endif
	24	#ifdef OPIE_ENABLE
	25	"+OPIE"
	26	#endif /* OPIE_ENABLE */

Line 0 Link Here

(-)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)) {

Lines 1-13 Link Here

(-)files/pkg-deinstall.in (-13 lines)
1	#!/bin/sh
2
3	if [ x$2 != xPOST-DEINSTALL ]; then
4	exit
5	fi
6
7	if [ -f /var/run/%%PORTNAME%%/fetchmail.pid ] ; then
8	/bin/rm -f /var/run/%%PORTNAME%%/fetchmail.pid
9	fi
10
11	/bin/rmdir /var/run/%%PORTNAME%%
12
13	exit

Lines 1-13 Link Here

(-)files/pkg-install.in (-13 lines)
1	#!/bin/sh
2
3	if [ x$2 != xPOST-INSTALL ]; then
4	exit
5	fi
6
7	/bin/mkdir -m 0755 -p /var/run/%%PORTNAME%%
8	/usr/sbin/chown "%%USERS%%:%%GROUPS%%" /var/run/%%PORTNAME%%
9	/usr/sbin/chown "%%USERS%%:%%GROUPS%%" %%PREFIX%%/etc/fetchmailrc*
10	/bin/chmod 0600 %%PREFIX%%/etc/fetchmailrc
11	/bin/chmod 0644 %%PREFIX%%/etc/fetchmailrc.sample
12
13	exit