diff options
| author | joerg <joerg@pkgsrc.org> | 2020-01-10 21:22:22 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2020-01-10 21:22:22 +0000 |
| commit | 99bf682cd1f2e9282417b160fb2467613cb67c1a (patch) | |
| tree | c51bdfc418c0c1ace53622cfd1aa056e2ea38cce | |
| parent | 36c16b91dc8f72d52d2bf99ee0c3715e3751e0eb (diff) | |
| download | pkgsrc-99bf682cd1f2e9282417b160fb2467613cb67c1a.tar.gz | |
Fix kqueue fallout on NetBSD current.
| -rw-r--r-- | www/squid4/distinfo | 5 | ||||
| -rw-r--r-- | www/squid4/patches/patch-src_comm_ModKqueue.cc | 18 | ||||
| -rw-r--r-- | www/squid4/patches/patch-src_security_ServerOptions.h | 12 |
3 files changed, 29 insertions, 6 deletions
diff --git a/www/squid4/distinfo b/www/squid4/distinfo index 2074cc5c8e9..d04515b0cbd 100644 --- a/www/squid4/distinfo +++ b/www/squid4/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.1 2020/01/04 10:57:18 taca Exp $ +$NetBSD: distinfo,v 1.2 2020/01/10 21:22:22 joerg Exp $ SHA1 (squid-4.9.tar.xz) = 43c90a1a2eb4d1613f1bfc603ad08e8a835be319 RMD160 (squid-4.9.tar.xz) = 164d000671dba370ebd1b1d1e36137b1d9d7df67 @@ -9,6 +9,7 @@ SHA1 (patch-configure) = 1474c9b2a2706b3105ee6ebe9354d33a66deb0c7 SHA1 (patch-errors_Makefile.in) = 84cbf5c836f02ed5fbfff140888c6d3aadeac326 SHA1 (patch-src_Makefile.in) = afc5aefd97c46d1ffab43e97aeaeade3a5a8c648 SHA1 (patch-src_acl_external_kerberos__ldap__group_support__resolv.cc) = 0ea41d55e32d689a16e012391a9eea67631daf3a -SHA1 (patch-src_comm_ModKqueue.cc) = 6ca7596a56c86d2dd9d88387a9e7784f262db319 +SHA1 (patch-src_comm_ModKqueue.cc) = d8c5d235f07a48731275101d60fcbf2e22f77b96 SHA1 (patch-src_fs_ufs_RebuildState.h) = 76ee5c437b3dad05e428ae89cd5af6c052a40e59 +SHA1 (patch-src_security_ServerOptions.h) = 36ed59837040d652ca00ca685970f7c728ff67c3 SHA1 (patch-tools_Makefile.in) = d098c0c9dc4af577f74e562d99f07ed98be5ae01 diff --git a/www/squid4/patches/patch-src_comm_ModKqueue.cc b/www/squid4/patches/patch-src_comm_ModKqueue.cc index 46a63cc41de..6dae3b51f15 100644 --- a/www/squid4/patches/patch-src_comm_ModKqueue.cc +++ b/www/squid4/patches/patch-src_comm_ModKqueue.cc @@ -1,14 +1,24 @@ -$NetBSD: patch-src_comm_ModKqueue.cc,v 1.1 2020/01/04 10:57:18 taca Exp $ +$NetBSD: patch-src_comm_ModKqueue.cc,v 1.2 2020/01/10 21:22:22 joerg Exp $ * Fix kqueue(2) for NetBSD. ---- src/comm/ModKqueue.cc.orig 2019-07-09 19:05:20.000000000 +0000 +--- src/comm/ModKqueue.cc.orig 2019-11-05 19:14:40.000000000 +0000 +++ src/comm/ModKqueue.cc -@@ -109,7 +109,11 @@ kq_update_events(int fd, short filter, P +@@ -43,6 +43,9 @@ + #if HAVE_SYS_EVENT_H + #include <sys/event.h> + #endif ++#if defined(__NetBSD__) ++#include <sys/param.h> ++#endif + + #define KE_LENGTH 128 + +@@ -109,7 +112,11 @@ kq_update_events(int fd, short filter, P kep_flags = EV_DELETE; } -+#ifdef __NetBSD__ ++#if defined(__NetBSD__) && (__NetBSD_Version__ - 0 < 999001500) + EV_SET(kep, (uintptr_t) fd, filter, kep_flags, 0, 0, (intptr_t)0); +#else EV_SET(kep, (uintptr_t) fd, filter, kep_flags, 0, 0, 0); diff --git a/www/squid4/patches/patch-src_security_ServerOptions.h b/www/squid4/patches/patch-src_security_ServerOptions.h new file mode 100644 index 00000000000..599f1eca744 --- /dev/null +++ b/www/squid4/patches/patch-src_security_ServerOptions.h @@ -0,0 +1,12 @@ +$NetBSD: patch-src_security_ServerOptions.h,v 1.1 2020/01/10 21:22:22 joerg Exp $ + +--- src/security/ServerOptions.h.orig 2020-01-09 22:33:01.407843695 +0000 ++++ src/security/ServerOptions.h +@@ -35,7 +35,6 @@ public: + // is more secure to have only a small set of trusted CA. + flags.tlsDefaultCa.defaultTo(false); + } +- ServerOptions(const ServerOptions &) = default; + ServerOptions &operator =(const ServerOptions &); + ServerOptions(ServerOptions &&o) { this->operator =(o); } + ServerOptions &operator =(ServerOptions &&o) { this->operator =(o); return *this; } |