copyright: simplify policy check

Signed-off-by: László Várady <[email protected]>

Author: MrAnno

tests/Makefile.am

@@ -3,10 +3,8 @@ EXTRA_DIST += \
 	tests/commits/check.sh \
 	tests/copyright/check.sh \
 	tests/copyright/policy \
-	tests/copyright/license.text.GPLv2+.txt \
-	tests/copyright/license.text.GPLv2+_SSL.txt \
-	tests/copyright/license.text.LGPLv2.1+.txt \
-	tests/copyright/license.text.LGPLv2.1+_SSL.txt \
+	tests/copyright/license.text.GPLv3+.txt \
+	tests/copyright/license.text.GPLv3+_SSL.txt \
 	tests/valgrind/unit-test-leak.supp	\
 	tests/build-log-cflags-propagation.sh	\
 	tests/CMakeLists.txt

tests/copyright/check.sh

@@ -2,6 +2,7 @@
 #############################################################################
 # Copyright (c) 2022 One Identity LLC.
 # Copyright (c) 2016 Balabit
+# Copyright (c) 2025 Axoflow
 #
 # This program is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 2 as published
@@ -263,30 +264,17 @@ got_both_holder_and_license() {
 }
 
 compare_expected_detected() {
-    if is_balabit_copyright "$HOLDER"
-    then
-     local LICTEXTMATCHB="$LICTEXTMATCH"
-    else
-     local LICTEXTMATCHB="$LICTEXTMATCH,non-balabit"
-    fi
+    local LICTEXTMATCHB="$LICTEXTMATCH"
     if [ "$PATHMATCH" = "$LICTEXTMATCHB" ]; then
      if [ "0$COPYRIGHTVERBOSITY" -ge 3 ]; then
       echo "debug: match $FILE expected $PATHMATCH = detected $LICTEXTMATCHB" >&2
      fi
     else
-     if
-      is_license_compatible "$PATHMATCH" "$LICTEXTMATCHB"
-     then
-      if [ 0$COPYRIGHTVERBOSITY -ge 1 ]; then
-       printf "%s\n" "warning: compatible $FILE expected:$PATHMATCH detected:$LICTEXTMATCHB" >&2
-      fi
-     else
       printf "%s" "error: mismatch $FILE" >&2
       if [ 0$COPYRIGHTVERBOSITY -ge 1 ]; then
        printf " expected:$PATHMATCH detected:$LICTEXTMATCHB" >&2
       fi
       printf "\n" >&2
-     fi
     fi
 }
 
@@ -373,17 +361,6 @@ t success
 "
 }
 
-is_balabit_copyright() {
- echo "$@" |
- grep --quiet --extended-regexp "\
-^\
-(Copyright \(c\) ([0-9, -]+) [^ <][^<]*<br>)*\
-Copyright \(c\) ([0-9, -]+) (Bala[bB]it)|((One Identity)( LLC\.)?)<br>\
-(Copyright \(c\) ([0-9, -]+) [^ <][^<]*<br>)*\
-$"
- return $?
-}
-
 parse_expected_licenses() {
  generate_known_licenses || return 1
 
@@ -408,7 +385,7 @@ parse_expected_licenses() {
     local LICENSE="`
      echo "$LINE" |
      sed -rn "
-      s~^(ignore|((GPLv2\+|LGPLv2\.1\+)(_SSL)?|4-BSD)(,non-balabit)?)$~&~
+      s~^(ignore|((GPLv3\+)(_SSL)?|4-BSD))$~&~
       T e
       p
       :e
@@ -444,23 +421,6 @@ parse_expected_licenses() {
  }
 }
 
-is_license_compatible() {
- local EXPECTED="$1"
- local SUBMITTED="$2"
-
- if [ "$EXPECTED" = "$SUBMITTED" ]; then
-  return 0
- fi
-
- case "$EXPECTED" in
-  GPLv2+_SSL)
-   [ "$SUBMITTED" = "LGPLv2.1+_SSL" ]
-   ;;
-  *)
-   false
- esac
-}
-
 generate_known_licenses() {
  for FILE in "$DATADIR"/license.text.*.txt; do
   local NAME="`basename "$FILE"`"

tests/copyright/license.text.GPLv2+.txt

@@ -0,0 +1,12 @@
+This program is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <https://www.gnu.org/licenses/>.

tests/copyright/license.text.GPLv3+.txt

@@ -1,15 +1,15 @@
-This program is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License version 2 as published
-by the Free Software Foundation, or (at your option) any later version.
+This program is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 As an additional exemption you are allowed to compile & link against the
 OpenSSL libraries as published by the OpenSSL project. See the file

tests/copyright/license.text.GPLv2+_SSL.txt renamed to tests/copyright/license.text.GPLv3+_SSL.txt

@@ -74,11 +74,9 @@ docker/.*$
 tests/light/functional_tests/filterx/cache_json_file\.json
 
 ###########################################################################
-# These files are LGPLd and are external contributions _without_ a Balabit
-# related copyright statement.
+# These files are GPLd contributions.
 ###########################################################################
-                                                 LGPLv2.1+_SSL,non-balabit
-
+                                                 GPLv3+_SSL
 cmake/Modules/FindLIBBPF\.cmake
 lib/timeutils/zonecache.[ch]$
 modules/secure-logging
@@ -149,12 +147,6 @@ lib/logproto/logproto-auto-server\.[ch]
 lib/transport/transport-factory-haproxy\.[ch]
 lib/transport/tests/test_transport\.c
 lib/perf/.*\.[chS]
-
-###########################################################################
-# These tests are GPLd even though they reside under lib/ and are excluded
-# from the LGPL declaration of lib/ below.
-###########################################################################
-                                                 GPLv2+_SSL
 lib/tests/test_clone_logmsg\.c
 lib/tests/test_dnscache\.c
 lib/tests/test_findcrlf\.c
@@ -166,11 +158,6 @@ lib/tests/test_ringbuffer\.c
 lib/tests/test_serialize\.c
 lib/tests/test_thread_wakeup\.c
 lib/tests/test_zone\.c
-
-###########################################################################
-# These files are LGPLd, they are intended to be reusable.
-###########################################################################
-                                                 LGPLv2.1+_SSL
 autogen\.sh$
 autotools/sub-configure\.sh$
 configure\.ac$
@@ -191,11 +178,6 @@ modules/python-modules/syslogng/persist\.py
 modules/python-modules/syslogng/source\.py
 modules/python/python-startup.(c|h)$
 modules/python/python-global.(c|h)$
-
-###########################################################################
-# These files are GPLd and non-balabit contributions.
-###########################################################################
-                                                 GPLv2+_SSL,non-balabit
 modules/diskq/tests/test_diskq_counters\.c
 modules/http/http-plugin\.[ch]
 modules/http/http-parser.h
@@ -337,12 +319,6 @@ modules/cef/filterx-func-parse-leef.[ch]
 modules/cef/tests/test-filterx-function-parse-cef.c
 modules/cef/tests/test-filterx-function-parse-leef.c
 modules/cef/tests/test_helpers.[ch]
-
-###########################################################################
-# These files are GPLd with Balabit origin.
-###########################################################################
-                                                 GPLv2+_SSL
-
 news/create-newsfile.py
 news/next-pr-id.py
 scripts/plugin-skeleton-creator/create_plugin.sh