cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFH: r498377

Browse Source 
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
This commit is contained in:
Dimitry Andric 2019-04-12 20:26:19 +00:00
parent f758635887
commit bef1ed3bc3
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/branches/2019Q2/; revision=498742
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
www/squid-devel/files/patch-src_security_ServerOptions.h Normal file
View File

@ -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; }

11
www/squid/files/patch-src_security_ServerOptions.h Normal file
View File

@ -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; }