From owner-svn-ports-all@freebsd.org Fri Apr 12 20:26:20 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5C26415854E9; Fri, 12 Apr 2019 20:26:20 +0000 (UTC) (envelope-from dim@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) server-signature RSA-PSS (4096 bits) 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 F08998B481; Fri, 12 Apr 2019 20:26:19 +0000 (UTC) (envelope-from dim@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 BDF412673E; Fri, 12 Apr 2019 20:26:19 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x3CKQJdV076360; Fri, 12 Apr 2019 20:26:19 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3CKQJwq076359; Fri, 12 Apr 2019 20:26:19 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201904122026.x3CKQJwq076359@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Fri, 12 Apr 2019 20:26:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r498742 - in branches/2019Q2/www: squid-devel/files squid/files X-SVN-Group: ports-branches X-SVN-Commit-Author: dim X-SVN-Commit-Paths: in branches/2019Q2/www: squid-devel/files squid/files X-SVN-Commit-Revision: 498742 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: F08998B481 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.98 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.98)[-0.983,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 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, 12 Apr 2019 20:26:20 -0000 Author: dim (src committer) Date: Fri Apr 12 20:26:19 2019 New Revision: 498742 URL: https://svnweb.freebsd.org/changeset/ports/498742 Log: MFH: r498377 Fix build of www/squid and www/squid-devel with clang 8 This fixes an error with a defaulted copy constructor: ../../src/security/ServerOptions.h:38:5: error: explicitly defaulted copy constructor is implicitly deleted [-Werror,-Wdefaulted-function-deleted] ServerOptions(const ServerOptions &) = default; ^ ../../src/security/ServerOptions.h:110:29: note: copy constructor of 'ServerOptions' is implicitly deleted because field 'clientCaStack' has a deleted copy constructor X509_NAME_STACK_Pointer clientCaStack; ^ /usr/include/c++/v1/memory:2494:3: note: copy constructor is implicitly deleted because 'unique_ptr' has a user-declared move constructor unique_ptr(unique_ptr&& __u) noexcept ^ The copy constructor can instead be deleted. Approved by: portmgr (joneum) PR: 236210 Added: branches/2019Q2/www/squid-devel/files/patch-src_security_ServerOptions.h - copied unchanged from r498377, head/www/squid-devel/files/patch-src_security_ServerOptions.h branches/2019Q2/www/squid/files/patch-src_security_ServerOptions.h - copied unchanged from r498377, head/www/squid/files/patch-src_security_ServerOptions.h Modified: Directory Properties: branches/2019Q2/ (props changed) Copied: branches/2019Q2/www/squid-devel/files/patch-src_security_ServerOptions.h (from r498377, head/www/squid-devel/files/patch-src_security_ServerOptions.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2019Q2/www/squid-devel/files/patch-src_security_ServerOptions.h Fri Apr 12 20:26:19 2019 (r498742, copy of r498377, head/www/squid-devel/files/patch-src_security_ServerOptions.h) @@ -0,0 +1,11 @@ +--- src/security/ServerOptions.h.orig 2018-06-11 16:30:57 UTC ++++ src/security/ServerOptions.h +@@ -29,7 +29,7 @@ class ServerOptions : public PeerOptions (public) + // is more secure to have only a small set of trusted CA. + flags.tlsDefaultCa.defaultTo(false); + } +- ServerOptions(const ServerOptions &) = default; ++ ServerOptions(const ServerOptions &) = delete; + ServerOptions &operator =(const ServerOptions &); + ServerOptions(ServerOptions &&o) { this->operator =(o); } + ServerOptions &operator =(ServerOptions &&o) { this->operator =(o); return *this; } Copied: branches/2019Q2/www/squid/files/patch-src_security_ServerOptions.h (from r498377, head/www/squid/files/patch-src_security_ServerOptions.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2019Q2/www/squid/files/patch-src_security_ServerOptions.h Fri Apr 12 20:26:19 2019 (r498742, copy of r498377, head/www/squid/files/patch-src_security_ServerOptions.h) @@ -0,0 +1,11 @@ +--- src/security/ServerOptions.h.orig 2019-02-19 02:46:22 UTC ++++ src/security/ServerOptions.h +@@ -35,7 +35,7 @@ class ServerOptions : public PeerOptions (public) + // is more secure to have only a small set of trusted CA. + flags.tlsDefaultCa.defaultTo(false); + } +- ServerOptions(const ServerOptions &) = default; ++ ServerOptions(const ServerOptions &) = delete; + ServerOptions &operator =(const ServerOptions &); + ServerOptions(ServerOptions &&o) { this->operator =(o); } + ServerOptions &operator =(ServerOptions &&o) { this->operator =(o); return *this; }