Merge remote-tracking branch 'origin/topic/etyp/copying-2025'

* origin/topic/etyp/copying-2025:
  Update COPYING date to now and fix some [skip CI]

.clang-format

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2023 by the Zeek Project. See LICENSE for details.
+# See the file "COPYING" in the main distribution directory for copyright.
 
 ---
 Language:        Cpp

.pre-commit-config.yaml

@@ -8,10 +8,9 @@ repos:
     name: Check for license headers
     entry: ./ci/license-header.py
     language: python
-    types_or:
+    files: '\.(h|c|cpp|cc|spicy|evt)$'
-      - "c"
+    types: [file]
-      - "c++"
+    exclude: '^(testing/btest/(Baseline|plugins|spicy|scripts)/.*|testing/builtin-plugins/.*)$'
-    exclude: '^(testing/btest/plugins/.*|testing/builtin-plugins/.*)$'
 
 - repo: https://github.com/pre-commit/mirrors-clang-format
   rev: 'v19.1.4'

CHANGES

@@ -1,3 +1,7 @@
+7.2.0-dev.50 | 2025-01-09 16:26:00 +0100
+
+  * Update COPYING date to now and fix some [skip CI] (Evan Typanski, Corelight)
+
 7.2.0-dev.48 | 2025-01-08 21:44:21 -0800
 
   * Try to be more careful with `--help` printing (Evan Typanski, Corelight)

COPYING

@@ -1,4 +1,4 @@
-Copyright (c) 1995-2023, The Regents of the University of California
+Copyright (c) 1995-now, The Regents of the University of California
 through the Lawrence Berkeley National Laboratory and the
 International Computer Science Institute. All rights reserved.
 

VERSION

@@ -1 +1 @@
-7.2.0-dev.48
+7.2.0-dev.50

ci/license-header.py

@@ -5,18 +5,13 @@ import sys
 
 exit_code = 0
 
-pat1 = re.compile(
+copyright_pat = re.compile(
     r"See the file \"COPYING\" in the main distribution directory for copyright."
 )
 
-# This is the copyright line used within Spicy plugin and popular in
-# Spicy analyzers.
-pat2 = re.compile(r"Copyright \(c\) 2... by the Zeek Project. See COPYING for details.")
-
 
 def match_line(line):
-    for pat in [pat1, pat2]:
+    m = copyright_pat.search(line)
-        m = pat.search(line)
     if m is not None:
         return True
 

scripts/base/protocols/ldap/main.zeek

@@ -1,4 +1,4 @@
-# Copyright (c) 2021 by the Zeek Project. See LICENSE for details.
+# See the file "COPYING" in the main distribution directory for copyright.
 
 @load base/frameworks/reporter
 @load base/protocols/conn/removal-hooks

scripts/spicy/zeek.spicy

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 by the Zeek Project. See LICENSE for details.
+# See the file "COPYING" in the main distribution directory for copyright.
 
 module zeek;
 

scripts/spicy/zeek_file.spicy

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 by the Zeek Project. See LICENSE for details.
+# See the file "COPYING" in the main distribution directory for copyright.
 #
 # TODO: This code would ideally just be a part of zeek.spicy, but that would
 # come with compilation overhead currently even if not used, see

src/analyzer/protocol/finger/finger.evt

@@ -1,4 +1,4 @@
-# Copyright (c) 2022 by the Zeek Project. See LICENSE for details.
+# See the file "COPYING" in the main distribution directory for copyright.
 
 %doc-id= Zeek::Finger;
 %doc-description = "Finger analyzer";

src/analyzer/protocol/finger/finger.spicy

@@ -1,4 +1,4 @@
-# Copyright (c) 2022 by the Zeek Project. See LICENSE for details.
+# See the file "COPYING" in the main distribution directory for copyright.
 #
 # Giving the rare number of instances of this protocol these days, we err on the side of
 # rejecting sessions if they don't parse well.

src/analyzer/protocol/ldap/asn1.spicy

@@ -1,4 +1,4 @@
-# Copyright (c) 2021 by the Zeek Project. See LICENSE for details.
+# See the file "COPYING" in the main distribution directory for copyright.
 
 module ASN1;
 

src/analyzer/protocol/ldap/ldap.evt

@@ -1,4 +1,4 @@
-# Copyright (c) 2021 by the Zeek Project. See LICENSE for details.
+# See the file "COPYING" in the main distribution directory for copyright.
 
 %doc-id = Zeek::LDAP;
 %doc-description = "LDAP analyzer";

src/analyzer/protocol/ldap/ldap.spicy

@@ -1,4 +1,4 @@
-# Copyright (c) 2021 by the Zeek Project. See LICENSE for details.
+# See the file "COPYING" in the main distribution directory for copyright.
 
 module LDAP;
 

src/analyzer/protocol/ldap/ldap_zeek.spicy

@@ -1,3 +1,5 @@
+# See the file "COPYING" in the main distribution directory for copyright.
+
 module LDAP_Zeek;
 
 import LDAP;

src/analyzer/protocol/postgresql/postgresql.evt

@@ -1,3 +1,5 @@
+# See the file "COPYING" in the main distribution directory for copyright.
+
 import PostgreSQL;
 import PostgreSQL_Zeek;
 

src/analyzer/protocol/postgresql/postgresql.spicy

@@ -1,3 +1,5 @@
+# See the file "COPYING" in the main distribution directory for copyright.
+#
 # A PostgreSQL analyzer.
 #
 # https://www.postgresql.org/docs/current/protocol.html

src/analyzer/protocol/postgresql/postgresql_zeek.spicy

@@ -1,3 +1,5 @@
+# See the file "COPYING" in the main distribution directory for copyright.
+#
 # Set up protocol confirmation/rejection for analyzers, as well as any further
 # Zeek-specific analysis.
 

src/analyzer/protocol/quic/QUIC.evt

@@ -1,5 +1,5 @@
+# See the file "COPYING" in the main distribution directory for copyright.
 # Copyright (c) 2023, NCC Group / Fox-IT. See COPYING for details.
-# Copyright (c) 2023 by the Zeek Project. See COPYING for details.
 
 %doc-id = Zeek::QUIC;
 %doc-description = "QUIC analyzer";

src/analyzer/protocol/quic/QUIC.spicy

@@ -1,5 +1,5 @@
+# See the file "COPYING" in the main distribution directory for copyright.
 # Copyright (c) 2023, NCC Group / Fox-IT. See COPYING for details.
-# Copyright (c) 2023 by the Zeek Project. See COPYING for details.
 
 module QUIC;
 

src/analyzer/protocol/quic/decrypt_crypto.cc

@@ -1,5 +1,5 @@
+// See the file "COPYING" in the main distribution directory for copyright.
 // Copyright (c) 2023, NCC Group / Fox-IT. See COPYING for details.
-// Copyright (c) 2023 by the Zeek Project. See COPYING for details.
 
 /*
 WARNING: THIS CODE IS NOT SAFE IN MULTI-THREADED ENVIRONMENTS:

src/analyzer/protocol/ssl/spicy/SSL.evt

@@ -1,4 +1,4 @@
-# Copyright (c) 2024 by the Zeek Project. See LICENSE for details.
+# See the file "COPYING" in the main distribution directory for copyright.
 
 protocol analyzer SSL over TCP:
 	parse with SSL::Message;

src/analyzer/protocol/ssl/spicy/SSL.spicy

@@ -1,4 +1,4 @@
-# Copyright (c) 2024 by the Zeek Project. See LICENSE for details.
+# See the file "COPYING" in the main distribution directory for copyright.
 
 module SSL;
 

src/analyzer/protocol/ssl/spicy/support.cc

@@ -1,4 +1,4 @@
-// Copyright (c) 2023 by the Zeek Project. See COPYING for details.
+// See the file "COPYING" in the main distribution directory for copyright.
 
 #include <hilti/rt/libhilti.h>
 #include <cassert>

src/analyzer/protocol/syslog/syslog.evt

@@ -1,4 +1,4 @@
-# Copyright (c) 2022 by the Zeek Project. See LICENSE for details.
+# See the file "COPYING" in the main distribution directory for copyright.
 
 %doc-id= Zeek::Syslog;
 %doc-description = "Syslog analyzer UDP-only";

src/analyzer/protocol/syslog/syslog.spicy

@@ -1,4 +1,4 @@
-# Copyright (c) 2022 by the Zeek Project. See LICENSE for details.
+# See the file "COPYING" in the main distribution directory for copyright.
 
 module Syslog;
 

src/analyzer/protocol/websocket/unmask.cc

@@ -1,4 +1,4 @@
-// Copyright (c) 2024 by the Zeek Project. See COPYING for details.
+// See the file "COPYING" in the main distribution directory for copyright.
 
 #include <hilti/rt/libhilti.h>
 

src/analyzer/protocol/websocket/websocket.evt

@@ -1,4 +1,4 @@
-# Copyright (c) 2024 by the Zeek Project. See LICENSE for details.
+# See the file "COPYING" in the main distribution directory for copyright.
 
 %doc-id= Zeek::WebSocket;
 %doc-description = "webSocket analyzer";

src/analyzer/protocol/websocket/websocket.spicy

@@ -1,4 +1,4 @@
-# Copyright (c) 2024 by the Zeek Project. See LICENSE for details.
+# See the file "COPYING" in the main distribution directory for copyright.
 
 module WebSocket;