diff options
| author | dim <dim@FreeBSD.org> | 2019-04-08 22:40:17 +0800 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2019-04-08 22:40:17 +0800 |
| commit | c72141e8dcd8db0cf03cd4f58897d624ec1d9025 (patch) | |
| tree | 70f57f8b95bc3a08c606d6c097e5bf53c4712738 /www | |
| parent | 4fecc56367a07701be500126e679447cb4aaeaec (diff) | |
| download | freebsd-ports-gnome-c72141e8dcd8db0cf03cd4f58897d624ec1d9025.tar.gz freebsd-ports-gnome-c72141e8dcd8db0cf03cd4f58897d624ec1d9025.tar.zst freebsd-ports-gnome-c72141e8dcd8db0cf03cd4f58897d624ec1d9025.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
Diffstat (limited to 'www')
| -rw-r--r-- | www/squid-devel/files/patch-src_security_ServerOptions.h | 11 | ||||
| -rw-r--r-- | www/squid/files/patch-src_security_ServerOptions.h | 11 |
2 files changed, 22 insertions, 0 deletions
diff --git a/www/squid-devel/files/patch-src_security_ServerOptions.h b/www/squid-devel/files/patch-src_security_ServerOptions.h new file mode 100644 index 000000000000..bd40ec4feafe --- /dev/null +++ b/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; } 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; } |