Attachment #162445 for bug #202677




# Created by: Matthias Andree <matthias.andree@gmx.de>
# $FreeBSD$

PORTNAME=	cone
PORTVERSION=	0.92
PORTREVISION=	4
CATEGORIES=	mail
# This is for beta versions, leave it in please:
#MASTER_SITES=	http://www.courier-mta.org/beta/${PORTNAME}/ \
#		http://www.lerctr.org/~ler/
# This is for release versions, leave it in please:
MASTER_SITES=	SF/courier/${PORTNAME}/${PORTVERSION}

MAINTAINER=	uffe@uffe.org


LICENSE=	GPLv3

LIB_DEPENDS=	libaspell.so:${PORTSDIR}/textproc/aspell \
				libcourier-unicode.so:${PORTSDIR}/devel/courier-unicode
BUILD_DEPENDS=	gpgv:${PORTSDIR}/security/gnupg1
RUN_DEPENDS:=	${BUILD_DEPENDS}

USES=		fam gettext gmake iconv ncurses perl5 shebangfix tar:bzip2
USE_GNOME=	libxml2
USE_GCC=	yes

SHEBANG_FILES=	sysconftool

CPPFLAGS+=	-I${LOCALBASE}/include \
		-D_XOPEN_SOURCE_EXTENDED
		-I${WRKDIR} -D_XOPEN_SOURCE_EXTENDED
LDFLAGS+=	-L${LOCALBASE}/lib
GNU_CONFIGURE=	yes
CONFIGURE_ARGS+=	--with-certdb=${PREFIX}/share/cone/rootcerts --exec-prefix=${PREFIX}
CONFIGURE_ENV=	REHASH="${PERL} ${SCRIPTDIR}/c_rehash"

INSTALL_TARGET=	install-strip

OPTIONS_DEFINE=	DOCS

post-extract:
		@${MKDIR} ${WRKDIR}/ncursesw
		${LN} -s ${LOCALBASE}/include/ncurses/ncurses.h ${WRKDIR}/ncursesw/curses.h

post-install:
		${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/leaf
		${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/mailtool
		${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/cone
		${INSTALL_SCRIPT} ${WRKSRC}/sysconftool ${STAGEDIR}${PREFIX}/sbin/cone-sysconftool
		${RM} -f ${STAGEDIR}${PREFIX}/share/cone/rootcerts/.0
		@${MKDIR} ${STAGEDIR}${DOCSDIR}

Lines 1-2 Link Here

(-)mail/cone/distinfo (-2 / +2 lines)
1	SHA256 (cone-0.90.tar.bz2) = b03edfbf3392fb7b8d93574dad2bc4c7cbfca8890afabac8b99b21a9f46d8733	1	SHA256 (cone-0.92.tar.bz2) = bfc1170565d931ac9b8a674410f44cb2472c7b755b5bb97e9915d37fdfe9d631
2	SIZE (cone-0.90.tar.bz2) = 3906323	2	SIZE (cone-0.92.tar.bz2) = 3774451




--- cone/cursesmessage.C.orig	2014-01-06 19:51:56 UTC
+++ cone/cursesmessage.C
@@ -3761,10 +3761,10 @@ bool CursesMessage::decrypt(std::string 
 			gi.passphrase_fd=passphrase_fd.c_str();
 		}
 
-		gi.input_func= &tempSaveText.input_func;
+		gi.input_func= &CursesMessage::DecryptSaveText::input_func;
 		gi.input_func_arg= &tempSaveText;
 
-		gi.output_func= &tempSaveText.output_func;
+		gi.output_func= &CursesMessage::DecryptSaveText::output_func; 
 		gi.output_func_arg= &tempSaveText;
 
 		gi.errhandler_func= &tempSaveText.err_func;

Line 0 Link Here

(-)mail/cone/files/patch-libmail_envelope.H (+10 lines)
	1	--- libmail/envelope.H.orig 2014-01-06 19:37:10 UTC
	2	+++ libmail/envelope.H
	3	@@ -8,6 +8,7 @@
	4
	5	#include <vector>
	6	#include <string>
	7	+#include <time.h>
	8
	9	#include "namespace.H"
	10




--- libs/tcpd/libcouriertls.c.orig	2014-10-22 08:00:04 UTC
+++ libs/tcpd/libcouriertls.c
@@ -74,7 +74,15 @@ struct proto_ops op_list[] =
     { "TLSv1",     &TLSv1_method,   SSL_OP_ALL },
     { "TLS1",      &TLSv1_method,   SSL_OP_ALL },
     { "SSL3+",     &SSLv23_method,  SSL_OP_ALL|SSL_OP_NO_SSLv2 },
+#ifndef OPENSSL_NO_SSL3
     { "SSL3",      &SSLv3_method,   SSL_OP_ALL },
+#else
+    { "SSL3",      &SSLv23_method,   SSL_OP_ALL|SSL_OP_NO_SSLv2|SSL_OP_NO_TLSv1 
+#ifdef HAVE_TLSV1_1_METHOD
+      |SSL_OP_NO_TLSv1_1|SSL_OP_NO_TLSv1_2
+#endif /* SSL_OP_NO_TLSv1 */
+    },
+#endif /* OPENSSL_NO_SSL3 */
     { "SSL23",     &SSLv23_method,  SSL_OP_ALL },
     { "",          &SSLv23_method,  SSL_OP_ALL|SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3 },
     { NULL,        &SSLv23_method,  SSL_OP_ALL|SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3 },




bin/cone
bin/leaf
bin/mailtool
%%ETCDIR%%.dist
etc/cone.dist
libexec/cone
man/man1/cone.1.gz
man/man1/leaf.1.gz
man/man1/mailtool.1.gz
sbin/cone-sysconftool
%%DATADIR%%/APPLICATION.PDF.filter
%%DATADIR%%/FAQ.html
%%DATADIR%%/IMAGE.GIF.filter
%%DATADIR%%/IMAGE.JPEG.filter
%%DATADIR%%/IMAGE.PNG.filter
%%DATADIR%%/INSTALL.html
%%DATADIR%%/README.html
%%DATADIR%%/account-checknewmail.html
%%DATADIR%%/account-copymessagesto.html
%%DATADIR%%/account-createfolder.html

%%DATADIR%%/cppnamespace.html
%%DATADIR%%/emailaddress.html
%%DATADIR%%/envelope.html
%%DATADIR%%/FAQ.html
%%DATADIR%%/folder-addmessage.html
%%DATADIR%%/folder-clone.html
%%DATADIR%%/folder-create.html

%%DATADIR%%/header-list.html
%%DATADIR%%/header-mime.html
%%DATADIR%%/header-plain.html
%%DATADIR%%/http.handler
%%DATADIR%%/https.handler
%%DATADIR%%/icon.gif
%%DATADIR%%/index.html
%%DATADIR%%/icon.gif
%%DATADIR%%/INSTALL.html
%%DATADIR%%/leaf.html
%%DATADIR%%/libmail-folder.html
%%DATADIR%%/libmail-misc.html

%%DATADIR%%/misc.html
%%DATADIR%%/moredocs.html
%%DATADIR%%/native.html
%%DATADIR%%/README.html
%%DATADIR%%/search.html
%%DATADIR%%/smap1.html
%%DATADIR%%/smapconcurrency.html
%%DATADIR%%/smapcopymovemessages.html
%%DATADIR%%/smapfolders.html
%%DATADIR%%/smapcopymovemessages.html
%%DATADIR%%/smaplogout.html
%%DATADIR%%/smapmessagecontents.html
%%DATADIR%%/smapsyntax.html

%%DATADIR%%/smapusingfolders.html
%%DATADIR%%/store.html
%%DATADIR%%/synchronous.html
%%DATADIR%%/http.handler
%%DATADIR%%/https.handler
%%PORTDOCS%%%%DOCSDIR%%/ChangeLog

Return to bug 202677

Lines 1-14 Link Here

(-)mail/cone/Makefile (-19 / +8 lines)
1	# Created by: Matthias Andree <matthias.andree@gmx.de>
2	# $FreeBSD$	1	# $FreeBSD$
3		2
4	PORTNAME= cone	3	PORTNAME= cone
5	PORTVERSION= 0.90	4	PORTVERSION= 0.92
6	PORTREVISION= 4
7	CATEGORIES= mail	5	CATEGORIES= mail
8	# This is for beta versions, leave it in please:
9	#MASTER_SITES= http://www.courier-mta.org/beta/${PORTNAME}/ \
10	# http://www.lerctr.org/~ler/
11	# This is for release versions, leave it in please:
12	MASTER_SITES= SF/courier/${PORTNAME}/${PORTVERSION}	6	MASTER_SITES= SF/courier/${PORTNAME}/${PORTVERSION}
13		7
14	MAINTAINER= uffe@uffe.org	8	MAINTAINER= uffe@uffe.org
Lines 16-48 Link Here
16		10
17	LICENSE= GPLv3	11	LICENSE= GPLv3
18		12
19	LIB_DEPENDS= libaspell.so:${PORTSDIR}/textproc/aspell	13	LIB_DEPENDS= libaspell.so:${PORTSDIR}/textproc/aspell \
		14	libcourier-unicode.so:${PORTSDIR}/devel/courier-unicode
20	BUILD_DEPENDS= gpgv:${PORTSDIR}/security/gnupg1	15	BUILD_DEPENDS= gpgv:${PORTSDIR}/security/gnupg1
21	RUN_DEPENDS:= ${BUILD_DEPENDS}	16	RUN_DEPENDS:= ${BUILD_DEPENDS}
22		17
23	USES= fam gettext gmake iconv ncurses perl5 shebangfix tar:bzip2	18	USES= fam gettext gmake iconv ncurses perl5 shebangfix tar:bzip2
24	USE_GNOME= libxml2	19	USE_GNOME= libxml2
25	USE_GCC= yes
26		20
27	SHEBANG_FILES= sysconftool	21	SHEBANG_FILES= sysconftool
28		22
29	CPPFLAGS+= -I${LOCALBASE}/include \	23	CPPFLAGS+= -I${LOCALBASE}/include \
30	-D_XOPEN_SOURCE_EXTENDED \	24	-D_XOPEN_SOURCE_EXTENDED
31	-I${WRKDIR} -D_XOPEN_SOURCE_EXTENDED
32	LDFLAGS+= -L${LOCALBASE}/lib	25	LDFLAGS+= -L${LOCALBASE}/lib
33	GNU_CONFIGURE= yes	26	GNU_CONFIGURE= yes
34	CONFIGURE_ARGS+= -C --without-db --with-certdb=${PREFIX}/share/cone/rootcerts --exec-prefix=${PREFIX}	27	CONFIGURE_ARGS+= --with-certdb=${PREFIX}/share/cone/rootcerts --exec-prefix=${PREFIX}
35	CONFIGURE_ENV= REHASH="${PERL} ${SCRIPTDIR}/c_rehash"
36		28
37	INSTALL_TARGET= install-strip
38
39	OPTIONS_DEFINE= DOCS	29	OPTIONS_DEFINE= DOCS
40		30
41	post-extract:
42	@${MKDIR} ${WRKDIR}/ncursesw
43	${LN} -s ${LOCALBASE}/include/ncurses/ncurses.h ${WRKDIR}/ncursesw/curses.h
44
45	post-install:	31	post-install:
		32	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/leaf
		33	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/mailtool
		34	${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/cone
46	${INSTALL_SCRIPT} ${WRKSRC}/sysconftool ${STAGEDIR}${PREFIX}/sbin/cone-sysconftool	35	${INSTALL_SCRIPT} ${WRKSRC}/sysconftool ${STAGEDIR}${PREFIX}/sbin/cone-sysconftool
47	${RM} -f ${STAGEDIR}${PREFIX}/share/cone/rootcerts/.0	36	${RM} -f ${STAGEDIR}${PREFIX}/share/cone/rootcerts/.0
48	@${MKDIR} ${STAGEDIR}${DOCSDIR}	37	@${MKDIR} ${STAGEDIR}${DOCSDIR}

Line 0 Link Here

(-)mail/cone/files/patch-cone_cursesmessage.C (+15 lines)
	1	--- cone/cursesmessage.C.orig 2014-01-06 19:51:56 UTC
	2	+++ cone/cursesmessage.C
	3	@@ -3761,10 +3761,10 @@ bool CursesMessage::decrypt(std::string
	4	gi.passphrase_fd=passphrase_fd.c_str();
	5	}
	6
	7	- gi.input_func= &tempSaveText.input_func;
	8	+ gi.input_func= &CursesMessage::DecryptSaveText::input_func;
	9	gi.input_func_arg= &tempSaveText;
	10
	11	- gi.output_func= &tempSaveText.output_func;
	12	+ gi.output_func= &CursesMessage::DecryptSaveText::output_func;
	13	gi.output_func_arg= &tempSaveText;
	14
	15	gi.errhandler_func= &tempSaveText.err_func;

Line 0 Link Here

(-)mail/cone/files/patch-libs_tcpd_libcouriertls.c (+18 lines)
	1	--- libs/tcpd/libcouriertls.c.orig 2014-10-22 08:00:04 UTC
	2	+++ libs/tcpd/libcouriertls.c
	3	@@ -74,7 +74,15 @@ struct proto_ops op_list[] =
	4	{ "TLSv1", &TLSv1_method, SSL_OP_ALL },
	5	{ "TLS1", &TLSv1_method, SSL_OP_ALL },
	6	{ "SSL3+", &SSLv23_method, SSL_OP_ALL\|SSL_OP_NO_SSLv2 },
	7	+#ifndef OPENSSL_NO_SSL3
	8	{ "SSL3", &SSLv3_method, SSL_OP_ALL },
	9	+#else
	10	+ { "SSL3", &SSLv23_method, SSL_OP_ALL\|SSL_OP_NO_SSLv2\|SSL_OP_NO_TLSv1
	11	+#ifdef HAVE_TLSV1_1_METHOD
	12	+ \|SSL_OP_NO_TLSv1_1\|SSL_OP_NO_TLSv1_2
	13	+#endif /* SSL_OP_NO_TLSv1 */
	14	+ },
	15	+#endif /* OPENSSL_NO_SSL3 */
	16	{ "SSL23", &SSLv23_method, SSL_OP_ALL },
	17	{ "", &SSLv23_method, SSL_OP_ALL\|SSL_OP_NO_SSLv2\|SSL_OP_NO_SSLv3 },
	18	{ NULL, &SSLv23_method, SSL_OP_ALL\|SSL_OP_NO_SSLv2\|SSL_OP_NO_SSLv3 },

Lines 1-16 Link Here

(-)mail/cone/pkg-plist (-10 / +10 lines)
1	bin/cone	1	bin/cone
2	bin/leaf	2	bin/leaf
3	bin/mailtool	3	bin/mailtool
4	sbin/cone-sysconftool	4	%%ETCDIR%%.dist
5	etc/cone.dist
6	libexec/cone	5	libexec/cone
7	man/man1/cone.1.gz	6	man/man1/cone.1.gz
		7	man/man1/leaf.1.gz
8	man/man1/mailtool.1.gz	8	man/man1/mailtool.1.gz
9	man/man1/leaf.1.gz	9	sbin/cone-sysconftool
10	%%DATADIR%%/APPLICATION.PDF.filter	10	%%DATADIR%%/APPLICATION.PDF.filter
		11	%%DATADIR%%/FAQ.html
11	%%DATADIR%%/IMAGE.GIF.filter	12	%%DATADIR%%/IMAGE.GIF.filter
12	%%DATADIR%%/IMAGE.JPEG.filter	13	%%DATADIR%%/IMAGE.JPEG.filter
13	%%DATADIR%%/IMAGE.PNG.filter	14	%%DATADIR%%/IMAGE.PNG.filter
		15	%%DATADIR%%/INSTALL.html
		16	%%DATADIR%%/README.html
14	%%DATADIR%%/account-checknewmail.html	17	%%DATADIR%%/account-checknewmail.html
15	%%DATADIR%%/account-copymessagesto.html	18	%%DATADIR%%/account-copymessagesto.html
16	%%DATADIR%%/account-createfolder.html	19	%%DATADIR%%/account-createfolder.html
Lines 71-77 Link Here
71	%%DATADIR%%/cppnamespace.html	74	%%DATADIR%%/cppnamespace.html
72	%%DATADIR%%/emailaddress.html	75	%%DATADIR%%/emailaddress.html
73	%%DATADIR%%/envelope.html	76	%%DATADIR%%/envelope.html
74	%%DATADIR%%/FAQ.html
75	%%DATADIR%%/folder-addmessage.html	77	%%DATADIR%%/folder-addmessage.html
76	%%DATADIR%%/folder-clone.html	78	%%DATADIR%%/folder-clone.html
77	%%DATADIR%%/folder-create.html	79	%%DATADIR%%/folder-create.html
Lines 97-105 Link Here
97	%%DATADIR%%/header-list.html	99	%%DATADIR%%/header-list.html
98	%%DATADIR%%/header-mime.html	100	%%DATADIR%%/header-mime.html
99	%%DATADIR%%/header-plain.html	101	%%DATADIR%%/header-plain.html
		102	%%DATADIR%%/http.handler
		103	%%DATADIR%%/https.handler
		104	%%DATADIR%%/icon.gif
100	%%DATADIR%%/index.html	105	%%DATADIR%%/index.html
101	%%DATADIR%%/icon.gif
102	%%DATADIR%%/INSTALL.html
103	%%DATADIR%%/leaf.html	106	%%DATADIR%%/leaf.html
104	%%DATADIR%%/libmail-folder.html	107	%%DATADIR%%/libmail-folder.html
105	%%DATADIR%%/libmail-misc.html	108	%%DATADIR%%/libmail-misc.html
Lines 148-159 Link Here
148	%%DATADIR%%/misc.html	151	%%DATADIR%%/misc.html
149	%%DATADIR%%/moredocs.html	152	%%DATADIR%%/moredocs.html
150	%%DATADIR%%/native.html	153	%%DATADIR%%/native.html
151	%%DATADIR%%/README.html
152	%%DATADIR%%/search.html	154	%%DATADIR%%/search.html
153	%%DATADIR%%/smap1.html	155	%%DATADIR%%/smap1.html
154	%%DATADIR%%/smapconcurrency.html	156	%%DATADIR%%/smapconcurrency.html
		157	%%DATADIR%%/smapcopymovemessages.html
155	%%DATADIR%%/smapfolders.html	158	%%DATADIR%%/smapfolders.html
156	%%DATADIR%%/smapcopymovemessages.html
157	%%DATADIR%%/smaplogout.html	159	%%DATADIR%%/smaplogout.html
158	%%DATADIR%%/smapmessagecontents.html	160	%%DATADIR%%/smapmessagecontents.html
159	%%DATADIR%%/smapsyntax.html	161	%%DATADIR%%/smapsyntax.html
Lines 160-165 Link Here
160	%%DATADIR%%/smapusingfolders.html	162	%%DATADIR%%/smapusingfolders.html
161	%%DATADIR%%/store.html	163	%%DATADIR%%/store.html
162	%%DATADIR%%/synchronous.html	164	%%DATADIR%%/synchronous.html
163	%%DATADIR%%/http.handler
164	%%DATADIR%%/https.handler
165	%%PORTDOCS%%%%DOCSDIR%%/ChangeLog	165	%%PORTDOCS%%%%DOCSDIR%%/ChangeLog