From owner-svn-ports-all@freebsd.org Fri Jul 3 15:44:35 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id DB2483516C4; Fri, 3 Jul 2020 15:44:35 +0000 (UTC) (envelope-from ehaupt@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49yzmM5VFMz4Q7l; Fri, 3 Jul 2020 15:44:35 +0000 (UTC) (envelope-from ehaupt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A062DDD3F; Fri, 3 Jul 2020 15:44:35 +0000 (UTC) (envelope-from ehaupt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 063FiZvl080022; Fri, 3 Jul 2020 15:44:35 GMT (envelope-from ehaupt@FreeBSD.org) Received: (from ehaupt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 063FiZx9080021; Fri, 3 Jul 2020 15:44:35 GMT (envelope-from ehaupt@FreeBSD.org) Message-Id: <202007031544.063FiZx9080021@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ehaupt set sender to ehaupt@FreeBSD.org using -f From: Emanuel Haupt Date: Fri, 3 Jul 2020 15:44:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r541118 - in head/mail/sylpheed: . files X-SVN-Group: ports-head X-SVN-Commit-Author: ehaupt X-SVN-Commit-Paths: in head/mail/sylpheed: . files X-SVN-Commit-Revision: 541118 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Jul 2020 15:44:35 -0000 Author: ehaupt Date: Fri Jul 3 15:44:34 2020 New Revision: 541118 URL: https://svnweb.freebsd.org/changeset/ports/541118 Log: Provide a patch to support SNI. This has been discussed upstream: https://sylpheed.sraoss.jp/redmine/issues/306 While here: - remove extra space after URL - use options helpers Obtained from: OpenBSD Added: head/mail/sylpheed/files/patch-libsylph_ssl.c (contents, props changed) Modified: head/mail/sylpheed/Makefile Modified: head/mail/sylpheed/Makefile ============================================================================== --- head/mail/sylpheed/Makefile Fri Jul 3 15:40:06 2020 (r541117) +++ head/mail/sylpheed/Makefile Fri Jul 3 15:44:34 2020 (r541118) @@ -3,9 +3,9 @@ PORTNAME= sylpheed PORTVERSION= 3.7.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= mail -MASTER_SITES= http://sylpheed.sraoss.jp/sylpheed/v${PORTVERSION:C/\.[^\.]*$//}/ \ +MASTER_SITES= http://sylpheed.sraoss.jp/sylpheed/v${PORTVERSION:C/\.[^\.]*$//}/ \ LOCAL/ehaupt MAINTAINER= ehaupt@FreeBSD.org @@ -95,16 +95,16 @@ post-patch: @${REINPLACE_CMD} -e 's|^\(DEFS.*\.\.\)$$|\1 -I../libsylph|' \ ${WRKSRC}/src/Makefile.in -.if empty(PORT_OPTIONS:MDOCS) +post-patch-DOCS-off: @${REINPLACE_CMD} -e '/^SUBDIRS = /s/manual faq//' \ ${WRKSRC}/Makefile.in -.else + +post-patch-DOCS-on: .for i in ${MAKEFILES} @${REINPLACE_CMD} -e 's|^faqdir = @faqdir@$$|faqdir = ${DOCSDIR}/faq|g; \ s|^manualdir = @manualdir@$$|manualdir = ${DOCSDIR}/manual|g' \ ${WRKSRC}/${i} .endfor -.endif post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} Added: head/mail/sylpheed/files/patch-libsylph_ssl.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/sylpheed/files/patch-libsylph_ssl.c Fri Jul 3 15:44:34 2020 (r541118) @@ -0,0 +1,16 @@ +--- libsylph/ssl.c.orig 2017-02-02 08:02:49 UTC ++++ libsylph/ssl.c +@@ -258,6 +258,13 @@ gboolean ssl_init_socket_with_method(SockInfo *sockinf + return FALSE; + } + ++#ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME ++ if (!SSL_set_tlsext_host_name(sockinfo->ssl, sockinfo->hostname)) { ++ g_warning("Error setting servername extension\n"); ++ return FALSE; ++ } ++#endif ++ + SSL_set_fd(sockinfo->ssl, sockinfo->sock); + while ((ret = SSL_connect(sockinfo->ssl)) != 1) { + err = SSL_get_error(sockinfo->ssl, ret);