aboutsummaryrefslogtreecommitdiff
path: root/www/squid
diff options
context:
space:
mode:
authorDimitry Andric <dim@FreeBSD.org>2019-04-08 14:40:17 +0000
committerDimitry Andric <dim@FreeBSD.org>2019-04-08 14:40:17 +0000
commitad35b3f8ee0593e1cbe6fdd244c4e9f7dc9e2639 (patch)
tree70f57f8b95bc3a08c606d6c097e5bf53c4712738 /www/squid
parent4b95e46d254867de91f83fd07457bb780d37cfc6 (diff)
downloadports-ad35b3f8ee0593e1cbe6fdd244c4e9f7dc9e2639.tar.gz
ports-ad35b3f8ee0593e1cbe6fdd244c4e9f7dc9e2639.zip
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
Notes
Notes: svn path=/head/; revision=498377
Diffstat (limited to 'www/squid')
-rw-r--r--www/squid/files/patch-src_security_ServerOptions.h11
1 files changed, 11 insertions, 0 deletions
diff --git a/www/squid/files/patch-src_security_ServerOptions.h b/www/squid/files/patch-src_security_ServerOptions.h
new file mode 100644
index 000000000000..a27e97695434
--- /dev/null
+++ b/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; }