Date: Wed, 28 Oct 2015 17:26:41 +0000 (UTC) From: Guido Falsi <madpilot@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r400403 - in branches/2015Q4/mail/cone: . files Message-ID: <201510281726.t9SHQfQY044112@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: madpilot Date: Wed Oct 28 17:26:41 2015 New Revision: 400403 URL: https://svnweb.freebsd.org/changeset/ports/400403 Log: MFH: r400398 - Update to 0.92 [1] - Fix build without SSLv3 [2] Thanks ro brnrd for providing an updated patch. PR: 202677 [1], 203697 [2] Submitted by: yamagi at yamagi.org [1] Submitted by: cpbsdmail at gmail.com [2] Approved by: ports-secteam (feld) Added: branches/2015Q4/mail/cone/files/patch-cone_cursesmessage.C - copied unchanged from r400398, head/mail/cone/files/patch-cone_cursesmessage.C branches/2015Q4/mail/cone/files/patch-libmail_envelope.H - copied unchanged from r400398, head/mail/cone/files/patch-libmail_envelope.H branches/2015Q4/mail/cone/files/patch-libs_tcpd_libcouriertls.c - copied unchanged from r400398, head/mail/cone/files/patch-libs_tcpd_libcouriertls.c Deleted: branches/2015Q4/mail/cone/files/patch-curses-cursescontainer-C.diff branches/2015Q4/mail/cone/files/patch-libmail-envelope-h.diff Modified: branches/2015Q4/mail/cone/Makefile branches/2015Q4/mail/cone/distinfo branches/2015Q4/mail/cone/pkg-plist Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/mail/cone/Makefile ============================================================================== --- branches/2015Q4/mail/cone/Makefile Wed Oct 28 17:04:09 2015 (r400402) +++ branches/2015Q4/mail/cone/Makefile Wed Oct 28 17:26:41 2015 (r400403) @@ -2,8 +2,7 @@ # $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}/ \ @@ -16,33 +15,29 @@ COMMENT= Console based mail client with 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} Modified: branches/2015Q4/mail/cone/distinfo ============================================================================== --- branches/2015Q4/mail/cone/distinfo Wed Oct 28 17:04:09 2015 (r400402) +++ branches/2015Q4/mail/cone/distinfo Wed Oct 28 17:26:41 2015 (r400403) @@ -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 Copied: branches/2015Q4/mail/cone/files/patch-cone_cursesmessage.C (from r400398, head/mail/cone/files/patch-cone_cursesmessage.C) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q4/mail/cone/files/patch-cone_cursesmessage.C Wed Oct 28 17:26:41 2015 (r400403, copy of r400398, head/mail/cone/files/patch-cone_cursesmessage.C) @@ -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; Copied: branches/2015Q4/mail/cone/files/patch-libmail_envelope.H (from r400398, head/mail/cone/files/patch-libmail_envelope.H) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q4/mail/cone/files/patch-libmail_envelope.H Wed Oct 28 17:26:41 2015 (r400403, copy of r400398, head/mail/cone/files/patch-libmail_envelope.H) @@ -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" + Copied: branches/2015Q4/mail/cone/files/patch-libs_tcpd_libcouriertls.c (from r400398, head/mail/cone/files/patch-libs_tcpd_libcouriertls.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q4/mail/cone/files/patch-libs_tcpd_libcouriertls.c Wed Oct 28 17:26:41 2015 (r400403, copy of r400398, head/mail/cone/files/patch-libs_tcpd_libcouriertls.c) @@ -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 }, Modified: branches/2015Q4/mail/cone/pkg-plist ============================================================================== --- branches/2015Q4/mail/cone/pkg-plist Wed Oct 28 17:04:09 2015 (r400402) +++ branches/2015Q4/mail/cone/pkg-plist Wed Oct 28 17:26:41 2015 (r400403) @@ -1,16 +1,19 @@ bin/cone bin/leaf bin/mailtool -sbin/cone-sysconftool -etc/cone.dist +@sample etc/cone.dist etc/cone libexec/cone man/man1/cone.1.gz -man/man1/mailtool.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 @@ -71,7 +74,6 @@ man/man1/leaf.1.gz %%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 @@ man/man1/leaf.1.gz %%DATADIR%%/header-list.html %%DATADIR%%/header-mime.html %%DATADIR%%/header-plain.html -%%DATADIR%%/index.html +%%DATADIR%%/http.handler +%%DATADIR%%/https.handler %%DATADIR%%/icon.gif -%%DATADIR%%/INSTALL.html +%%DATADIR%%/index.html %%DATADIR%%/leaf.html %%DATADIR%%/libmail-folder.html %%DATADIR%%/libmail-misc.html @@ -148,18 +151,15 @@ man/man1/leaf.1.gz %%DATADIR%%/misc.html %%DATADIR%%/moredocs.html %%DATADIR%%/native.html -%%DATADIR%%/README.html %%DATADIR%%/search.html %%DATADIR%%/smap1.html %%DATADIR%%/smapconcurrency.html -%%DATADIR%%/smapfolders.html %%DATADIR%%/smapcopymovemessages.html +%%DATADIR%%/smapfolders.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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201510281726.t9SHQfQY044112>