svn commit: r498742 - in branches/2019Q2/www: squid-devel/files squid/files
Dimitry Andric
dim at FreeBSD.org
Fri Apr 12 20:26:20 UTC 2019
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<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: 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; }
More information about the svn-ports-all
mailing list