From b0d94331c095ad63967637c94410c2c68fd205fb Mon Sep 17 00:00:00 2001 From: "Todd C. Miller" Date: Tue, 11 Feb 2025 08:42:57 -0700 Subject: [PATCH] No longer need to define NSIG for cppcheck. There is now a configure check that defines it as needed. --- Makefile.in | 2 +- lib/eventlog/Makefile.in | 2 +- lib/fuzzstub/Makefile.in | 2 +- lib/iolog/Makefile.in | 2 +- lib/logsrv/Makefile.in | 2 +- lib/protobuf-c/Makefile.in | 2 +- lib/ssl_compat/Makefile.in | 2 +- lib/util/Makefile.in | 2 +- logsrvd/Makefile.in | 2 +- plugins/audit_json/Makefile.in | 2 +- plugins/group_file/Makefile.in | 2 +- plugins/python/Makefile.in | 2 +- plugins/sample/Makefile.in | 2 +- plugins/sample_approval/Makefile.in | 2 +- plugins/sudoers/Makefile.in | 2 +- plugins/system_group/Makefile.in | 2 +- src/Makefile.in | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Makefile.in b/Makefile.in index 9c2694f2b..9251385d2 100644 --- a/Makefile.in +++ b/Makefile.in @@ -96,7 +96,7 @@ XGETTEXT_OPTS = -F -k_ -kN_ -kU_ --copyright-holder="Todd C. Miller" \ --flag sudo_lbuf_append_quoted:3:c-format --foreign-user # Default cppcheck options when run from the top-level Makefile -CPPCHECK_OPTS = -q --enable=warning,performance,portability --suppress=constStatement --suppress=compareBoolExpressionWithInt --error-exitcode=1 --inline-suppr -Dva_copy=va_copy -U__cplusplus -UQUAD_MAX -UQUAD_MIN -UUQUAD_MAX -U_POSIX_PATH_MAX -U__NBBY -DNSIG=64 +CPPCHECK_OPTS = -q --enable=warning,performance,portability --suppress=constStatement --suppress=compareBoolExpressionWithInt --error-exitcode=1 --inline-suppr -Dva_copy=va_copy -U__cplusplus -UQUAD_MAX -UQUAD_MIN -UUQUAD_MAX -U_POSIX_PATH_MAX -U__NBBY # Default splint options when run from the top-level Makefile SPLINT_OPTS = -D__restrict= -checks diff --git a/lib/eventlog/Makefile.in b/lib/eventlog/Makefile.in index c45e77c98..6770fae23 100644 --- a/lib/eventlog/Makefile.in +++ b/lib/eventlog/Makefile.in @@ -67,7 +67,7 @@ HARDENING_CFLAGS = @HARDENING_CFLAGS@ HARDENING_LDFLAGS = @HARDENING_LDFLAGS@ # cppcheck options, usually set in the top-level Makefile -CPPCHECK_OPTS = -q --enable=warning,performance,portability --suppress=constStatement --suppress=compareBoolExpressionWithInt --error-exitcode=1 --inline-suppr -Dva_copy=va_copy -U__cplusplus -UQUAD_MAX -UQUAD_MIN -UUQUAD_MAX -U_POSIX_PATH_MAX -U__NBBY -DNSIG=64 +CPPCHECK_OPTS = -q --enable=warning,performance,portability --suppress=constStatement --suppress=compareBoolExpressionWithInt --error-exitcode=1 --inline-suppr -Dva_copy=va_copy -U__cplusplus -UQUAD_MAX -UQUAD_MIN -UUQUAD_MAX -U_POSIX_PATH_MAX -U__NBBY # splint options, usually set in the top-level Makefile SPLINT_OPTS = -D__restrict= -checks diff --git a/lib/fuzzstub/Makefile.in b/lib/fuzzstub/Makefile.in index 485ded6b7..332aef1e2 100644 --- a/lib/fuzzstub/Makefile.in +++ b/lib/fuzzstub/Makefile.in @@ -64,7 +64,7 @@ HARDENING_CFLAGS = @HARDENING_CFLAGS@ HARDENING_LDFLAGS = @HARDENING_LDFLAGS@ # cppcheck options, usually set in the top-level Makefile -CPPCHECK_OPTS = -q --enable=warning,performance,portability --suppress=constStatement --suppress=compareBoolExpressionWithInt --error-exitcode=1 --inline-suppr -Dva_copy=va_copy -U__cplusplus -UQUAD_MAX -UQUAD_MIN -UUQUAD_MAX -U_POSIX_PATH_MAX -U__NBBY -DNSIG=64 +CPPCHECK_OPTS = -q --enable=warning,performance,portability --suppress=constStatement --suppress=compareBoolExpressionWithInt --error-exitcode=1 --inline-suppr -Dva_copy=va_copy -U__cplusplus -UQUAD_MAX -UQUAD_MIN -UUQUAD_MAX -U_POSIX_PATH_MAX -U__NBBY # splint options, usually set in the top-level Makefile SPLINT_OPTS = -D__restrict= -checks diff --git a/lib/iolog/Makefile.in b/lib/iolog/Makefile.in index 0d4ea2d50..0df8ce152 100644 --- a/lib/iolog/Makefile.in +++ b/lib/iolog/Makefile.in @@ -71,7 +71,7 @@ HARDENING_CFLAGS = @HARDENING_CFLAGS@ HARDENING_LDFLAGS = @HARDENING_LDFLAGS@ # cppcheck options, usually set in the top-level Makefile -CPPCHECK_OPTS = -q --enable=warning,performance,portability --suppress=constStatement --suppress=compareBoolExpressionWithInt --error-exitcode=1 --inline-suppr -Dva_copy=va_copy -U__cplusplus -UQUAD_MAX -UQUAD_MIN -UUQUAD_MAX -U_POSIX_PATH_MAX -U__NBBY -DNSIG=64 +CPPCHECK_OPTS = -q --enable=warning,performance,portability --suppress=constStatement --suppress=compareBoolExpressionWithInt --error-exitcode=1 --inline-suppr -Dva_copy=va_copy -U__cplusplus -UQUAD_MAX -UQUAD_MIN -UUQUAD_MAX -U_POSIX_PATH_MAX -U__NBBY # splint options, usually set in the top-level Makefile SPLINT_OPTS = -D__restrict= -checks diff --git a/lib/logsrv/Makefile.in b/lib/logsrv/Makefile.in index 5afbb166e..f4e29af7c 100644 --- a/lib/logsrv/Makefile.in +++ b/lib/logsrv/Makefile.in @@ -60,7 +60,7 @@ HARDENING_CFLAGS = @HARDENING_CFLAGS@ HARDENING_LDFLAGS = @HARDENING_LDFLAGS@ # cppcheck options, usually set in the top-level Makefile -CPPCHECK_OPTS = -q --enable=warning,performance,portability --suppress=constStatement --suppress=compareBoolExpressionWithInt --error-exitcode=1 --inline-suppr -Dva_copy=va_copy -U__cplusplus -UQUAD_MAX -UQUAD_MIN -UUQUAD_MAX -U_POSIX_PATH_MAX -U__NBBY -DNSIG=64 +CPPCHECK_OPTS = -q --enable=warning,performance,portability --suppress=constStatement --suppress=compareBoolExpressionWithInt --error-exitcode=1 --inline-suppr -Dva_copy=va_copy -U__cplusplus -UQUAD_MAX -UQUAD_MIN -UUQUAD_MAX -U_POSIX_PATH_MAX -U__NBBY # splint options, usually set in the top-level Makefile SPLINT_OPTS = -D__restrict= -checks diff --git a/lib/protobuf-c/Makefile.in b/lib/protobuf-c/Makefile.in index 6de3bbe79..82a9e2896 100644 --- a/lib/protobuf-c/Makefile.in +++ b/lib/protobuf-c/Makefile.in @@ -57,7 +57,7 @@ HARDENING_CFLAGS = @HARDENING_CFLAGS@ HARDENING_LDFLAGS = @HARDENING_LDFLAGS@ # cppcheck options, usually set in the top-level Makefile -CPPCHECK_OPTS = -q --enable=warning,performance,portability --suppress=constStatement --suppress=compareBoolExpressionWithInt --error-exitcode=1 --inline-suppr -Dva_copy=va_copy -U__cplusplus -UQUAD_MAX -UQUAD_MIN -UUQUAD_MAX -U_POSIX_PATH_MAX -U__NBBY -DNSIG=64 +CPPCHECK_OPTS = -q --enable=warning,performance,portability --suppress=constStatement --suppress=compareBoolExpressionWithInt --error-exitcode=1 --inline-suppr -Dva_copy=va_copy -U__cplusplus -UQUAD_MAX -UQUAD_MIN -UUQUAD_MAX -U_POSIX_PATH_MAX -U__NBBY # splint options, usually set in the top-level Makefile SPLINT_OPTS = -D__restrict= -checks diff --git a/lib/ssl_compat/Makefile.in b/lib/ssl_compat/Makefile.in index 1f5eadae1..7cc7dd083 100644 --- a/lib/ssl_compat/Makefile.in +++ b/lib/ssl_compat/Makefile.in @@ -60,7 +60,7 @@ HARDENING_CFLAGS = @HARDENING_CFLAGS@ HARDENING_LDFLAGS = @HARDENING_LDFLAGS@ # cppcheck options, usually set in the top-level Makefile -CPPCHECK_OPTS = -q --enable=warning,performance,portability --suppress=constStatement --suppress=compareBoolExpressionWithInt --error-exitcode=1 --inline-suppr -Dva_copy=va_copy -U__cplusplus -UQUAD_MAX -UQUAD_MIN -UUQUAD_MAX -U_POSIX_PATH_MAX -U__NBBY -DNSIG=64 +CPPCHECK_OPTS = -q --enable=warning,performance,portability --suppress=constStatement --suppress=compareBoolExpressionWithInt --error-exitcode=1 --inline-suppr -Dva_copy=va_copy -U__cplusplus -UQUAD_MAX -UQUAD_MIN -UUQUAD_MAX -U_POSIX_PATH_MAX -U__NBBY # splint options, usually set in the top-level Makefile SPLINT_OPTS = -D__restrict= -checks diff --git a/lib/util/Makefile.in b/lib/util/Makefile.in index c176ac688..b36266940 100644 --- a/lib/util/Makefile.in +++ b/lib/util/Makefile.in @@ -101,7 +101,7 @@ HARDENING_LDFLAGS = @HARDENING_LDFLAGS@ SHLIB_VERSION = 0:0:0 # cppcheck options, usually set in the top-level Makefile -CPPCHECK_OPTS = -q --enable=warning,performance,portability --suppress=constStatement --suppress=compareBoolExpressionWithInt --error-exitcode=1 --inline-suppr -Dva_copy=va_copy -U__cplusplus -UQUAD_MAX -UQUAD_MIN -UUQUAD_MAX -U_POSIX_PATH_MAX -U__NBBY -DNSIG=64 +CPPCHECK_OPTS = -q --enable=warning,performance,portability --suppress=constStatement --suppress=compareBoolExpressionWithInt --error-exitcode=1 --inline-suppr -Dva_copy=va_copy -U__cplusplus -UQUAD_MAX -UQUAD_MIN -UUQUAD_MAX -U_POSIX_PATH_MAX -U__NBBY # splint options, usually set in the top-level Makefile SPLINT_OPTS = -D__restrict= -checks diff --git a/logsrvd/Makefile.in b/logsrvd/Makefile.in index 182654c2e..c0f519ab6 100644 --- a/logsrvd/Makefile.in +++ b/logsrvd/Makefile.in @@ -83,7 +83,7 @@ HARDENING_CFLAGS = @HARDENING_CFLAGS@ HARDENING_LDFLAGS = @HARDENING_LDFLAGS@ # cppcheck options, usually set in the top-level Makefile -CPPCHECK_OPTS = -q --enable=warning,performance,portability --suppress=constStatement --suppress=compareBoolExpressionWithInt --error-exitcode=1 --inline-suppr -Dva_copy=va_copy -U__cplusplus -UQUAD_MAX -UQUAD_MIN -UUQUAD_MAX -U_POSIX_PATH_MAX -U__NBBY -DNSIG=64 +CPPCHECK_OPTS = -q --enable=warning,performance,portability --suppress=constStatement --suppress=compareBoolExpressionWithInt --error-exitcode=1 --inline-suppr -Dva_copy=va_copy -U__cplusplus -UQUAD_MAX -UQUAD_MIN -UUQUAD_MAX -U_POSIX_PATH_MAX -U__NBBY # splint options, usually set in the top-level Makefile SPLINT_OPTS = -D__restrict= -checks diff --git a/plugins/audit_json/Makefile.in b/plugins/audit_json/Makefile.in index caaf147d7..2e0b99883 100644 --- a/plugins/audit_json/Makefile.in +++ b/plugins/audit_json/Makefile.in @@ -71,7 +71,7 @@ HARDENING_CFLAGS = @HARDENING_CFLAGS@ HARDENING_LDFLAGS = @HARDENING_LDFLAGS@ # cppcheck options, usually set in the top-level Makefile -CPPCHECK_OPTS = -q --enable=warning,performance,portability --suppress=constStatement --suppress=compareBoolExpressionWithInt --error-exitcode=1 --inline-suppr -Dva_copy=va_copy -U__cplusplus -UQUAD_MAX -UQUAD_MIN -UUQUAD_MAX -U_POSIX_PATH_MAX -U__NBBY -DNSIG=64 +CPPCHECK_OPTS = -q --enable=warning,performance,portability --suppress=constStatement --suppress=compareBoolExpressionWithInt --error-exitcode=1 --inline-suppr -Dva_copy=va_copy -U__cplusplus -UQUAD_MAX -UQUAD_MIN -UUQUAD_MAX -U_POSIX_PATH_MAX -U__NBBY # splint options, usually set in the top-level Makefile SPLINT_OPTS = -D__restrict= -checks diff --git a/plugins/group_file/Makefile.in b/plugins/group_file/Makefile.in index 1fb23f2cd..b8c936071 100644 --- a/plugins/group_file/Makefile.in +++ b/plugins/group_file/Makefile.in @@ -73,7 +73,7 @@ HARDENING_CFLAGS = @HARDENING_CFLAGS@ HARDENING_LDFLAGS = @HARDENING_LDFLAGS@ # cppcheck options, usually set in the top-level Makefile -CPPCHECK_OPTS = -q --enable=warning,performance,portability --suppress=constStatement --suppress=compareBoolExpressionWithInt --error-exitcode=1 --inline-suppr -Dva_copy=va_copy -U__cplusplus -UQUAD_MAX -UQUAD_MIN -UUQUAD_MAX -U_POSIX_PATH_MAX -U__NBBY -DNSIG=64 +CPPCHECK_OPTS = -q --enable=warning,performance,portability --suppress=constStatement --suppress=compareBoolExpressionWithInt --error-exitcode=1 --inline-suppr -Dva_copy=va_copy -U__cplusplus -UQUAD_MAX -UQUAD_MIN -UUQUAD_MAX -U_POSIX_PATH_MAX -U__NBBY # splint options, usually set in the top-level Makefile SPLINT_OPTS = -D__restrict= -checks diff --git a/plugins/python/Makefile.in b/plugins/python/Makefile.in index 1283998bf..07b72d930 100644 --- a/plugins/python/Makefile.in +++ b/plugins/python/Makefile.in @@ -78,7 +78,7 @@ HARDENING_CFLAGS = @HARDENING_CFLAGS@ HARDENING_LDFLAGS = @HARDENING_LDFLAGS@ # cppcheck options, usually set in the top-level Makefile -CPPCHECK_OPTS = -q --enable=warning,performance,portability --suppress=constStatement --suppress=compareBoolExpressionWithInt --error-exitcode=1 --inline-suppr -Dva_copy=va_copy -U__cplusplus -UQUAD_MAX -UQUAD_MIN -UUQUAD_MAX -U_POSIX_PATH_MAX -U__NBBY -DNSIG=64 +CPPCHECK_OPTS = -q --enable=warning,performance,portability --suppress=constStatement --suppress=compareBoolExpressionWithInt --error-exitcode=1 --inline-suppr -Dva_copy=va_copy -U__cplusplus -UQUAD_MAX -UQUAD_MIN -UUQUAD_MAX -U_POSIX_PATH_MAX -U__NBBY # splint options, usually set in the top-level Makefile SPLINT_OPTS = -D__restrict= -checks diff --git a/plugins/sample/Makefile.in b/plugins/sample/Makefile.in index 6df011ded..932f21064 100644 --- a/plugins/sample/Makefile.in +++ b/plugins/sample/Makefile.in @@ -72,7 +72,7 @@ HARDENING_CFLAGS = @HARDENING_CFLAGS@ HARDENING_LDFLAGS = @HARDENING_LDFLAGS@ # cppcheck options, usually set in the top-level Makefile -CPPCHECK_OPTS = -q --enable=warning,performance,portability --suppress=constStatement --suppress=compareBoolExpressionWithInt --error-exitcode=1 --inline-suppr -Dva_copy=va_copy -U__cplusplus -UQUAD_MAX -UQUAD_MIN -UUQUAD_MAX -U_POSIX_PATH_MAX -U__NBBY -DNSIG=64 +CPPCHECK_OPTS = -q --enable=warning,performance,portability --suppress=constStatement --suppress=compareBoolExpressionWithInt --error-exitcode=1 --inline-suppr -Dva_copy=va_copy -U__cplusplus -UQUAD_MAX -UQUAD_MIN -UUQUAD_MAX -U_POSIX_PATH_MAX -U__NBBY # splint options, usually set in the top-level Makefile SPLINT_OPTS = -D__restrict= -checks diff --git a/plugins/sample_approval/Makefile.in b/plugins/sample_approval/Makefile.in index 4fbf1e74f..c76346821 100644 --- a/plugins/sample_approval/Makefile.in +++ b/plugins/sample_approval/Makefile.in @@ -71,7 +71,7 @@ HARDENING_CFLAGS = @HARDENING_CFLAGS@ HARDENING_LDFLAGS = @HARDENING_LDFLAGS@ # cppcheck options, usually set in the top-level Makefile -CPPCHECK_OPTS = -q --enable=warning,performance,portability --suppress=constStatement --suppress=compareBoolExpressionWithInt --error-exitcode=1 --inline-suppr -Dva_copy=va_copy -U__cplusplus -UQUAD_MAX -UQUAD_MIN -UUQUAD_MAX -U_POSIX_PATH_MAX -U__NBBY -DNSIG=64 +CPPCHECK_OPTS = -q --enable=warning,performance,portability --suppress=constStatement --suppress=compareBoolExpressionWithInt --error-exitcode=1 --inline-suppr -Dva_copy=va_copy -U__cplusplus -UQUAD_MAX -UQUAD_MIN -UUQUAD_MAX -U_POSIX_PATH_MAX -U__NBBY # splint options, usually set in the top-level Makefile SPLINT_OPTS = -D__restrict= -checks diff --git a/plugins/sudoers/Makefile.in b/plugins/sudoers/Makefile.in index 95be404b2..40fe0870f 100644 --- a/plugins/sudoers/Makefile.in +++ b/plugins/sudoers/Makefile.in @@ -105,7 +105,7 @@ HARDENING_CFLAGS = @HARDENING_CFLAGS@ HARDENING_LDFLAGS = @HARDENING_LDFLAGS@ # cppcheck options, usually set in the top-level Makefile -CPPCHECK_OPTS = -q --enable=warning,performance,portability --suppress=constStatement --suppress=compareBoolExpressionWithInt --error-exitcode=1 --inline-suppr -Dva_copy=va_copy -U__cplusplus -UQUAD_MAX -UQUAD_MIN -UUQUAD_MAX -U_POSIX_PATH_MAX -U__NBBY -DNSIG=64 +CPPCHECK_OPTS = -q --enable=warning,performance,portability --suppress=constStatement --suppress=compareBoolExpressionWithInt --error-exitcode=1 --inline-suppr -Dva_copy=va_copy -U__cplusplus -UQUAD_MAX -UQUAD_MIN -UUQUAD_MAX -U_POSIX_PATH_MAX -U__NBBY # splint options, usually set in the top-level Makefile SPLINT_OPTS = -D__restrict= -checks diff --git a/plugins/system_group/Makefile.in b/plugins/system_group/Makefile.in index 23cf6e277..05583a400 100644 --- a/plugins/system_group/Makefile.in +++ b/plugins/system_group/Makefile.in @@ -73,7 +73,7 @@ HARDENING_CFLAGS = @HARDENING_CFLAGS@ HARDENING_LDFLAGS = @HARDENING_LDFLAGS@ # cppcheck options, usually set in the top-level Makefile -CPPCHECK_OPTS = -q --enable=warning,performance,portability --suppress=constStatement --suppress=compareBoolExpressionWithInt --error-exitcode=1 --inline-suppr -Dva_copy=va_copy -U__cplusplus -UQUAD_MAX -UQUAD_MIN -UUQUAD_MAX -U_POSIX_PATH_MAX -U__NBBY -DNSIG=64 +CPPCHECK_OPTS = -q --enable=warning,performance,portability --suppress=constStatement --suppress=compareBoolExpressionWithInt --error-exitcode=1 --inline-suppr -Dva_copy=va_copy -U__cplusplus -UQUAD_MAX -UQUAD_MIN -UUQUAD_MAX -U_POSIX_PATH_MAX -U__NBBY # splint options, usually set in the top-level Makefile SPLINT_OPTS = -D__restrict= -checks diff --git a/src/Makefile.in b/src/Makefile.in index d62ba4532..bc1ac461f 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -87,7 +87,7 @@ HARDENING_CFLAGS = @HARDENING_CFLAGS@ HARDENING_LDFLAGS = @HARDENING_LDFLAGS@ # cppcheck options, usually set in the top-level Makefile -CPPCHECK_OPTS = -q --enable=warning,performance,portability --suppress=constStatement --suppress=compareBoolExpressionWithInt --error-exitcode=1 --inline-suppr -Dva_copy=va_copy -U__cplusplus -UQUAD_MAX -UQUAD_MIN -UUQUAD_MAX -U_POSIX_PATH_MAX -U__NBBY -DNSIG=64 +CPPCHECK_OPTS = -q --enable=warning,performance,portability --suppress=constStatement --suppress=compareBoolExpressionWithInt --error-exitcode=1 --inline-suppr -Dva_copy=va_copy -U__cplusplus -UQUAD_MAX -UQUAD_MIN -UUQUAD_MAX -U_POSIX_PATH_MAX -U__NBBY # splint options, usually set in the top-level Makefile SPLINT_OPTS = -D__restrict= -checks