From owner-svn-ports-branches@freebsd.org Sun Jul 12 19:20:30 2020 Return-Path: Delivered-To: svn-ports-branches@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 D190D36C100; Sun, 12 Jul 2020 19:20:30 +0000 (UTC) (envelope-from ashish@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 4B4c7L50LBz3dsq; Sun, 12 Jul 2020 19:20:30 +0000 (UTC) (envelope-from ashish@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 8AA269331; Sun, 12 Jul 2020 19:20:30 +0000 (UTC) (envelope-from ashish@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 06CJKU4G072281; Sun, 12 Jul 2020 19:20:30 GMT (envelope-from ashish@FreeBSD.org) Received: (from ashish@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 06CJKUqq072279; Sun, 12 Jul 2020 19:20:30 GMT (envelope-from ashish@FreeBSD.org) Message-Id: <202007121920.06CJKUqq072279@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ashish set sender to ashish@FreeBSD.org using -f From: Ashish SHUKLA Date: Sun, 12 Jul 2020 19:20:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r542091 - in branches/2020Q3/net-im/libmesode: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: ashish X-SVN-Commit-Paths: in branches/2020Q3/net-im/libmesode: . files X-SVN-Commit-Revision: 542091 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Jul 2020 19:20:30 -0000 Author: ashish Date: Sun Jul 12 19:20:29 2020 New Revision: 542091 URL: https://svnweb.freebsd.org/changeset/ports/542091 Log: MFH: r542090 - Import a patch from upstream to fix bug related to SSL certificate verification in Profanity PR: 247871 Approved by: arved (maintainer) Approved by: portmgr (reliability fix blanket) Added: branches/2020Q3/net-im/libmesode/files/patch-src_tls__openssl.c - copied unchanged from r542090, head/net-im/libmesode/files/patch-src_tls__openssl.c Modified: branches/2020Q3/net-im/libmesode/Makefile Directory Properties: branches/2020Q3/ (props changed) Modified: branches/2020Q3/net-im/libmesode/Makefile ============================================================================== --- branches/2020Q3/net-im/libmesode/Makefile Sun Jul 12 19:16:02 2020 (r542090) +++ branches/2020Q3/net-im/libmesode/Makefile Sun Jul 12 19:20:29 2020 (r542091) @@ -2,6 +2,7 @@ PORTNAME= libmesode PORTVERSION= 0.9.3 +PORTREVISION= 1 CATEGORIES= net-im MAINTAINER= arved@FreeBSD.org Copied: branches/2020Q3/net-im/libmesode/files/patch-src_tls__openssl.c (from r542090, head/net-im/libmesode/files/patch-src_tls__openssl.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q3/net-im/libmesode/files/patch-src_tls__openssl.c Sun Jul 12 19:20:29 2020 (r542091, copy of r542090, head/net-im/libmesode/files/patch-src_tls__openssl.c) @@ -0,0 +1,14 @@ +Patch from: + + https://github.com/profanity-im/libmesode/commit/532ed1e9d3e71e5bea0752e03dbacd4139d750d1 + +--- src/tls_openssl.c.orig 2019-10-11 19:08:58 UTC ++++ src/tls_openssl.c +@@ -320,6 +320,7 @@ tls_t *tls_new(xmpp_conn_t *conn) + SSL_CTX_set_client_cert_cb(tls->ssl_ctx, NULL); + SSL_CTX_set_mode(tls->ssl_ctx, SSL_MODE_ENABLE_PARTIAL_WRITE); + SSL_CTX_set_verify(tls->ssl_ctx, SSL_VERIFY_PEER, verify_callback); ++ SSL_CTX_set_default_verify_paths(tls->ssl_ctx); + if (conn->tls_cert_path) { + SSL_CTX_load_verify_locations(tls->ssl_ctx, NULL, conn->tls_cert_path); + }