From dbfe38ace21aab38221d7ad9dda3b3b529da6dd6 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Sat, 26 Oct 2024 11:12:12 +0000 Subject: [PATCH] linter: Don't try to lint firmware files Signed-off-by: Michael Tremer --- src/libpakfire/file.c | 7 ------- src/libpakfire/include/pakfire/file.h | 1 - src/libpakfire/linter-file.c | 12 ++++++++++++ 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/libpakfire/file.c b/src/libpakfire/file.c index b26242ae9..9f590f76a 100644 --- a/src/libpakfire/file.c +++ b/src/libpakfire/file.c @@ -1407,9 +1407,6 @@ static const struct pattern { { "**.la", PAKFIRE_FILE_LIBTOOL_ARCHIVE }, { "**.pm", PAKFIRE_FILE_PERL }, { "**.pc", PAKFIRE_FILE_PKGCONFIG }, - { "/usr/lib/firmware/**", PAKFIRE_FILE_FIRMWARE }, - { "/usr/lib/grub/**", PAKFIRE_FILE_FIRMWARE }, - { "/usr/lib/valgrind/*", PAKFIRE_FILE_FIRMWARE }, { "/usr/lib*/ld-*.so*", PAKFIRE_FILE_RUNTIME_LINKER }, { NULL }, }; @@ -2718,10 +2715,6 @@ int pakfire_file_check(struct pakfire_file* file, int* issues) { if (r) return r; - // Do not perform the following checks on firmware - if (pakfire_file_matches_class(file, PAKFIRE_FILE_FIRMWARE)) - goto DONE; - // Run these checks only for ELF files if (pakfire_file_matches_class(file, PAKFIRE_FILE_ELF)) { switch (pakfire_file_get_elf_type(file)) { diff --git a/src/libpakfire/include/pakfire/file.h b/src/libpakfire/include/pakfire/file.h index d60b8f259..66f15c920 100644 --- a/src/libpakfire/include/pakfire/file.h +++ b/src/libpakfire/include/pakfire/file.h @@ -128,7 +128,6 @@ enum pakfire_file_classes { PAKFIRE_FILE_PERL = (1 << 10), PAKFIRE_FILE_STATIC_LIBRARY = (1 << 11), PAKFIRE_FILE_LIBTOOL_ARCHIVE = (1 << 12), - PAKFIRE_FILE_FIRMWARE = (1 << 13), PAKFIRE_FILE_RUNTIME_LINKER = (1 << 14), }; diff --git a/src/libpakfire/linter-file.c b/src/libpakfire/linter-file.c index cbd908153..5b4fe29bd 100644 --- a/src/libpakfire/linter-file.c +++ b/src/libpakfire/linter-file.c @@ -367,6 +367,18 @@ static int pakfire_linter_file_check_ssp(struct pakfire_linter_file* lfile) { int pakfire_linter_file_lint(struct pakfire_linter_file* lfile) { int r = 0; + // Skip firmware files + if (pakfire_file_matches(lfile->file, "/usr/lib/firmware/**")) + return 0; + + // Skip GRUB files + else if (pakfire_file_matches(lfile->file, "/usr/lib/grub/**")) + return 0; + + // Skip valgrind files + else if (pakfire_file_matches(lfile->file, "/usr/lib/valgrind/*")) + return 0; + // ELF Checks if (pakfire_linter_file_is_elf(lfile)) { // Check PIE -- 2.39.5