ports/www/squid/files/patch-src_security_ServerOptions.h
Dimitry Andric ad35b3f8ee 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
2019-04-08 14:40:17 +00:00

11 lines
595 B
C

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