Fri Jan 10 21:22:22 2020 UTC ()
Fix kqueue fallout on NetBSD current.


(joerg)
diff -r1.1 -r1.2 pkgsrc/www/squid4/distinfo
diff -r1.1 -r1.2 pkgsrc/www/squid4/patches/patch-src_comm_ModKqueue.cc
diff -r0 -r1.1 pkgsrc/www/squid4/patches/patch-src_security_ServerOptions.h
cvs diff -r1.1 -r1.2 pkgsrc/www/squid4/distinfo (expand / switch to unified diff)

--- pkgsrc/www/squid4/distinfo 2020/01/04 10:57:18 1.1
+++ pkgsrc/www/squid4/distinfo 2020/01/10 21:22:22 1.2
@@ -1,14 +1,15 @@ @@ -1,14 +1,15 @@
1$NetBSD: distinfo,v 1.1 2020/01/04 10:57:18 taca Exp $ 1$NetBSD: distinfo,v 1.2 2020/01/10 21:22:22 joerg Exp $
2 2
3SHA1 (squid-4.9.tar.xz) = 43c90a1a2eb4d1613f1bfc603ad08e8a835be319 3SHA1 (squid-4.9.tar.xz) = 43c90a1a2eb4d1613f1bfc603ad08e8a835be319
4RMD160 (squid-4.9.tar.xz) = 164d000671dba370ebd1b1d1e36137b1d9d7df67 4RMD160 (squid-4.9.tar.xz) = 164d000671dba370ebd1b1d1e36137b1d9d7df67
5SHA512 (squid-4.9.tar.xz) = ca3db39379ea0582ff28297dde21899d02916ea499fb9c0f86aa60301829b7c601bb21ee274f841555047bc911e878717b38670b8796e5d717862b7a285ef84f 5SHA512 (squid-4.9.tar.xz) = ca3db39379ea0582ff28297dde21899d02916ea499fb9c0f86aa60301829b7c601bb21ee274f841555047bc911e878717b38670b8796e5d717862b7a285ef84f
6Size (squid-4.9.tar.xz) = 2444664 bytes 6Size (squid-4.9.tar.xz) = 2444664 bytes
7SHA1 (patch-compat_compat.h) = 839381a5e1f46e7d9b822bbb53d82a53c996ddc0 7SHA1 (patch-compat_compat.h) = 839381a5e1f46e7d9b822bbb53d82a53c996ddc0
8SHA1 (patch-configure) = 1474c9b2a2706b3105ee6ebe9354d33a66deb0c7 8SHA1 (patch-configure) = 1474c9b2a2706b3105ee6ebe9354d33a66deb0c7
9SHA1 (patch-errors_Makefile.in) = 84cbf5c836f02ed5fbfff140888c6d3aadeac326 9SHA1 (patch-errors_Makefile.in) = 84cbf5c836f02ed5fbfff140888c6d3aadeac326
10SHA1 (patch-src_Makefile.in) = afc5aefd97c46d1ffab43e97aeaeade3a5a8c648 10SHA1 (patch-src_Makefile.in) = afc5aefd97c46d1ffab43e97aeaeade3a5a8c648
11SHA1 (patch-src_acl_external_kerberos__ldap__group_support__resolv.cc) = 0ea41d55e32d689a16e012391a9eea67631daf3a 11SHA1 (patch-src_acl_external_kerberos__ldap__group_support__resolv.cc) = 0ea41d55e32d689a16e012391a9eea67631daf3a
12SHA1 (patch-src_comm_ModKqueue.cc) = 6ca7596a56c86d2dd9d88387a9e7784f262db319 12SHA1 (patch-src_comm_ModKqueue.cc) = d8c5d235f07a48731275101d60fcbf2e22f77b96
13SHA1 (patch-src_fs_ufs_RebuildState.h) = 76ee5c437b3dad05e428ae89cd5af6c052a40e59 13SHA1 (patch-src_fs_ufs_RebuildState.h) = 76ee5c437b3dad05e428ae89cd5af6c052a40e59
 14SHA1 (patch-src_security_ServerOptions.h) = 36ed59837040d652ca00ca685970f7c728ff67c3
14SHA1 (patch-tools_Makefile.in) = d098c0c9dc4af577f74e562d99f07ed98be5ae01 15SHA1 (patch-tools_Makefile.in) = d098c0c9dc4af577f74e562d99f07ed98be5ae01
cvs diff -r1.1 -r1.2 pkgsrc/www/squid4/patches/patch-src_comm_ModKqueue.cc (expand / switch to unified diff)

--- pkgsrc/www/squid4/patches/patch-src_comm_ModKqueue.cc 2020/01/04 10:57:18 1.1
+++ pkgsrc/www/squid4/patches/patch-src_comm_ModKqueue.cc 2020/01/10 21:22:22 1.2
@@ -1,18 +1,28 @@ @@ -1,18 +1,28 @@
1$NetBSD: patch-src_comm_ModKqueue.cc,v 1.1 2020/01/04 10:57:18 taca Exp $ 1$NetBSD: patch-src_comm_ModKqueue.cc,v 1.2 2020/01/10 21:22:22 joerg Exp $
2 2
3* Fix kqueue(2) for NetBSD. 3* Fix kqueue(2) for NetBSD.
4 4
5--- src/comm/ModKqueue.cc.orig 2019-07-09 19:05:20.000000000 +0000 5--- src/comm/ModKqueue.cc.orig 2019-11-05 19:14:40.000000000 +0000
6+++ src/comm/ModKqueue.cc 6+++ src/comm/ModKqueue.cc
7@@ -109,7 +109,11 @@ kq_update_events(int fd, short filter, P 7@@ -43,6 +43,9 @@
 8 #if HAVE_SYS_EVENT_H
 9 #include <sys/event.h>
 10 #endif
 11+#if defined(__NetBSD__)
 12+#include <sys/param.h>
 13+#endif
 14
 15 #define KE_LENGTH 128
 16
 17@@ -109,7 +112,11 @@ kq_update_events(int fd, short filter, P
8 kep_flags = EV_DELETE; 18 kep_flags = EV_DELETE;
9 } 19 }
10  20
11+#ifdef __NetBSD__ 21+#if defined(__NetBSD__) && (__NetBSD_Version__ - 0 < 999001500)
12+ EV_SET(kep, (uintptr_t) fd, filter, kep_flags, 0, 0, (intptr_t)0); 22+ EV_SET(kep, (uintptr_t) fd, filter, kep_flags, 0, 0, (intptr_t)0);
13+#else 23+#else
14 EV_SET(kep, (uintptr_t) fd, filter, kep_flags, 0, 0, 0); 24 EV_SET(kep, (uintptr_t) fd, filter, kep_flags, 0, 0, 0);
15+#endif 25+#endif
16  26
17 /* Check if we've used the last one. If we have then submit them all */ 27 /* Check if we've used the last one. If we have then submit them all */
18 if (kqoff == kqmax - 1) { 28 if (kqoff == kqmax - 1) {
File Added: pkgsrc/www/squid4/patches/Attic/patch-src_security_ServerOptions.h
$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; }