Attachment 162445 Details for Bug 202677 – svn diff for mail/cone

[patch] svn diff for mail/cone

patch-mail_cone-0.92+NoSSLv3 (text/plain), 7.87 KB, created by Bernard Spil on 2015-10-25 14:39:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bernard Spil

Created: 2015-10-25 14:39:26 UTC

Size: 7.87 KB

patch

obsolete

>Index: mail/cone/Makefile
>===================================================================
>--- mail/cone/Makefile	(revision 400116)
>+++ mail/cone/Makefile	(working copy)
>@@ -1,14 +1,8 @@
>-# Created by: Matthias Andree <matthias.andree@gmx.de>
> # $FreeBSD$
> 
> PORTNAME=	cone
>-PORTVERSION=	0.90
>-PORTREVISION=	4
>+PORTVERSION=	0.92
> 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
>@@ -16,33 +10,28 @@
> 
> LICENSE=	GPLv3
> 
>-LIB_DEPENDS=	libaspell.so:${PORTSDIR}/textproc/aspell
>+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
>+		-D_XOPEN_SOURCE_EXTENDED
> LDFLAGS+=	-L${LOCALBASE}/lib
> GNU_CONFIGURE=	yes
>-CONFIGURE_ARGS+=	-C --without-db --with-certdb=${PREFIX}/share/cone/rootcerts --exec-prefix=${PREFIX}
>-CONFIGURE_ENV=	REHASH="${PERL} ${SCRIPTDIR}/c_rehash"
>+CONFIGURE_ARGS+=	--with-certdb=${PREFIX}/share/cone/rootcerts --exec-prefix=${PREFIX}
> 
>-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}
>Index: mail/cone/distinfo
>===================================================================
>--- mail/cone/distinfo	(revision 400116)
>+++ mail/cone/distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (cone-0.90.tar.bz2) = b03edfbf3392fb7b8d93574dad2bc4c7cbfca8890afabac8b99b21a9f46d8733
>-SIZE (cone-0.90.tar.bz2) = 3906323
>+SHA256 (cone-0.92.tar.bz2) = bfc1170565d931ac9b8a674410f44cb2472c7b755b5bb97e9915d37fdfe9d631
>+SIZE (cone-0.92.tar.bz2) = 3774451
>Index: mail/cone/files/patch-cone_cursesmessage.C
>===================================================================
>--- mail/cone/files/patch-cone_cursesmessage.C	(revision 0)
>+++ mail/cone/files/patch-cone_cursesmessage.C	(working copy)
>@@ -0,0 +1,15 @@
>+--- 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;
>
>Property changes on: mail/cone/files/patch-cone_cursesmessage.C
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: svn:keywords
>## -0,0 +1 ##
>+FreeBSD=%H
>\ No newline at end of property
>Index: mail/cone/files/patch-libmail_envelope.H
>===================================================================
>--- mail/cone/files/patch-libmail_envelope.H	(revision 0)
>+++ mail/cone/files/patch-libmail_envelope.H	(working copy)
>@@ -0,0 +1,10 @@
>+--- libmail/envelope.H.orig	2014-01-06 19:37:10 UTC
>++++ libmail/envelope.H
>+@@ -8,6 +8,7 @@
>+ 
>+ #include <vector>
>+ #include <string>
>++#include <time.h>
>+ 
>+ #include "namespace.H"
>+ 
>
>Property changes on: mail/cone/files/patch-libmail_envelope.H
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: svn:keywords
>## -0,0 +1 ##
>+FreeBSD=%H
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Index: mail/cone/files/patch-libs_tcpd_libcouriertls.c
>===================================================================
>--- mail/cone/files/patch-libs_tcpd_libcouriertls.c	(revision 0)
>+++ mail/cone/files/patch-libs_tcpd_libcouriertls.c	(working copy)
>@@ -0,0 +1,18 @@
>+--- 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 },
>
>Property changes on: mail/cone/files/patch-libs_tcpd_libcouriertls.c
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: svn:keywords
>## -0,0 +1 ##
>+FreeBSD=%H
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Index: mail/cone/pkg-plist
>===================================================================
>--- mail/cone/pkg-plist	(revision 400116)
>+++ mail/cone/pkg-plist	(working copy)
>@@ -1,16 +1,19 @@
> bin/cone
> bin/leaf
> bin/mailtool
>-sbin/cone-sysconftool
>-etc/cone.dist
>+%%ETCDIR%%.dist
> libexec/cone
> man/man1/cone.1.gz
>+man/man1/leaf.1.gz
> man/man1/mailtool.1.gz
>-man/man1/leaf.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
>@@ -71,7 +74,6 @@
> %%DATADIR%%/cppnamespace.html
> %%DATADIR%%/emailaddress.html
> %%DATADIR%%/envelope.html
>-%%DATADIR%%/FAQ.html
> %%DATADIR%%/folder-addmessage.html
> %%DATADIR%%/folder-clone.html
> %%DATADIR%%/folder-create.html
>@@ -97,9 +99,10 @@
> %%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
>@@ -148,12 +151,11 @@
> %%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
>@@ -160,6 +162,4 @@
> %%DATADIR%%/smapusingfolders.html
> %%DATADIR%%/store.html
> %%DATADIR%%/synchronous.html
>-%%DATADIR%%/http.handler
>-%%DATADIR%%/https.handler
> %%PORTDOCS%%%%DOCSDIR%%/ChangeLog

Actions: View | Diff

Attachments on bug 202677: 160381 | 162123 | 162445