Date: Mon, 8 Apr 2019 14:40:18 +0000 (UTC) From: Dimitry Andric <dim@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r498377 - in head/www: squid-devel/files squid/files Message-ID: <201904081440.x38EeI5g031807@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dim (src committer) Date: Mon Apr 8 14:40:17 2019 New Revision: 498377 URL: https://svnweb.freebsd.org/changeset/ports/498377 Log: 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<stack_st_X509_NAME, Security::ServerOptions::sk_X509_NAME_free_wrapper>' has a user-declared move constructor unique_ptr(unique_ptr&& __u) noexcept ^ The copy constructor can instead be deleted. Approved by: timp87@gmail.com (maintainer) PR: 236210 MFH: 2019Q2 Added: head/www/squid-devel/files/patch-src_security_ServerOptions.h (contents, props changed) head/www/squid/files/patch-src_security_ServerOptions.h (contents, props changed) Added: head/www/squid-devel/files/patch-src_security_ServerOptions.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/squid-devel/files/patch-src_security_ServerOptions.h Mon Apr 8 14:40:17 2019 (r498377) @@ -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; } Added: head/www/squid/files/patch-src_security_ServerOptions.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/squid/files/patch-src_security_ServerOptions.h Mon Apr 8 14:40:17 2019 (r498377) @@ -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; }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201904081440.x38EeI5g031807>