Fix lynis rootfile

diff --git a/config/rootfiles/packages/lynis b/config/rootfiles/packages/lynis
new file mode 100644 (file)
index 0000000..175a3a3
--- /dev/null
+++ b/config/rootfiles/packages/lynis
@@ -0,0 +1,49 @@
+var/ipfire/lynis-1.2.1
+#var/ipfire/lynis-1.2.1/db
+#var/ipfire/lynis-1.2.1/db/fileperms.db
+#var/ipfire/lynis-1.2.1/db/integrity.db
+#var/ipfire/lynis-1.2.1/db/malware.db
+#var/ipfire/lynis-1.2.1/db/sbl.db
+#var/ipfire/lynis-1.2.1/default.prf
+#var/ipfire/lynis-1.2.1/include
+#var/ipfire/lynis-1.2.1/include/consts
+#var/ipfire/lynis-1.2.1/include/functions
+#var/ipfire/lynis-1.2.1/include/osdetection
+#var/ipfire/lynis-1.2.1/include/parameters
+#var/ipfire/lynis-1.2.1/include/profiles
+#var/ipfire/lynis-1.2.1/include/tests_accounting
+#var/ipfire/lynis-1.2.1/include/tests_authentication
+#var/ipfire/lynis-1.2.1/include/tests_banners
+#var/ipfire/lynis-1.2.1/include/tests_boot_services
+#var/ipfire/lynis-1.2.1/include/tests_crypto
+#var/ipfire/lynis-1.2.1/include/tests_databases
+#var/ipfire/lynis-1.2.1/include/tests_file_integrity
+#var/ipfire/lynis-1.2.1/include/tests_file_permissions
+#var/ipfire/lynis-1.2.1/include/tests_filesystems
+#var/ipfire/lynis-1.2.1/include/tests_firewalls
+#var/ipfire/lynis-1.2.1/include/tests_hardening
+#var/ipfire/lynis-1.2.1/include/tests_homedirs
+#var/ipfire/lynis-1.2.1/include/tests_kernel
+#var/ipfire/lynis-1.2.1/include/tests_ldap
+#var/ipfire/lynis-1.2.1/include/tests_logging
+#var/ipfire/lynis-1.2.1/include/tests_mac_frameworks
+#var/ipfire/lynis-1.2.1/include/tests_mail_messaging
+#var/ipfire/lynis-1.2.1/include/tests_malware
+#var/ipfire/lynis-1.2.1/include/tests_memory_processes
+#var/ipfire/lynis-1.2.1/include/tests_nameserver
+#var/ipfire/lynis-1.2.1/include/tests_networking
+#var/ipfire/lynis-1.2.1/include/tests_php
+#var/ipfire/lynis-1.2.1/include/tests_ports_packages
+#var/ipfire/lynis-1.2.1/include/tests_printers_spools
+#var/ipfire/lynis-1.2.1/include/tests_scheduling
+#var/ipfire/lynis-1.2.1/include/tests_shells
+#var/ipfire/lynis-1.2.1/include/tests_storage
+#var/ipfire/lynis-1.2.1/include/tests_time
+#var/ipfire/lynis-1.2.1/include/tests_virtualization
+#var/ipfire/lynis-1.2.1/include/tests_webservers
+#var/ipfire/lynis-1.2.1/lynis
+#var/ipfire/lynis-1.2.1/lynis.8
+#var/ipfire/lynis-1.2.1/plugins
+#var/ipfire/lynis-1.2.1/plugins/README
+#var/ipfire/lynis-1.2.1/plugins/security_rootkit
+#var/ipfire/lynis-1.2.1/plugins/security_webvuln

diff --git a/config/rootfiles/packages/lynis-1.2.1 b/config/rootfiles/packages/lynis-1.2.1
deleted file mode 100644 (file)
index da7d16d..0000000
--- a/config/rootfiles/packages/lynis-1.2.1
+++ /dev/null
@@ -1,49 +0,0 @@
-var/ipfire/lynis-1.2.1
-var/ipfire/lynis-1.2.1/db
-var/ipfire/lynis-1.2.1/db/fileperms.db
-var/ipfire/lynis-1.2.1/db/integrity.db
-var/ipfire/lynis-1.2.1/db/malware.db
-var/ipfire/lynis-1.2.1/db/sbl.db
-var/ipfire/lynis-1.2.1/default.prf
-var/ipfire/lynis-1.2.1/include
-var/ipfire/lynis-1.2.1/include/consts
-var/ipfire/lynis-1.2.1/include/functions
-var/ipfire/lynis-1.2.1/include/osdetection
-var/ipfire/lynis-1.2.1/include/parameters
-var/ipfire/lynis-1.2.1/include/profiles
-var/ipfire/lynis-1.2.1/include/tests_accounting
-var/ipfire/lynis-1.2.1/include/tests_authentication
-var/ipfire/lynis-1.2.1/include/tests_banners
-var/ipfire/lynis-1.2.1/include/tests_boot_services
-var/ipfire/lynis-1.2.1/include/tests_crypto
-var/ipfire/lynis-1.2.1/include/tests_databases
-var/ipfire/lynis-1.2.1/include/tests_file_integrity
-var/ipfire/lynis-1.2.1/include/tests_file_permissions
-var/ipfire/lynis-1.2.1/include/tests_filesystems
-var/ipfire/lynis-1.2.1/include/tests_firewalls
-var/ipfire/lynis-1.2.1/include/tests_hardening
-var/ipfire/lynis-1.2.1/include/tests_homedirs
-var/ipfire/lynis-1.2.1/include/tests_kernel
-var/ipfire/lynis-1.2.1/include/tests_ldap
-var/ipfire/lynis-1.2.1/include/tests_logging
-var/ipfire/lynis-1.2.1/include/tests_mac_frameworks
-var/ipfire/lynis-1.2.1/include/tests_mail_messaging
-var/ipfire/lynis-1.2.1/include/tests_malware
-var/ipfire/lynis-1.2.1/include/tests_memory_processes
-var/ipfire/lynis-1.2.1/include/tests_nameserver
-var/ipfire/lynis-1.2.1/include/tests_networking
-var/ipfire/lynis-1.2.1/include/tests_php
-var/ipfire/lynis-1.2.1/include/tests_ports_packages
-var/ipfire/lynis-1.2.1/include/tests_printers_spools
-var/ipfire/lynis-1.2.1/include/tests_scheduling
-var/ipfire/lynis-1.2.1/include/tests_shells
-var/ipfire/lynis-1.2.1/include/tests_storage
-var/ipfire/lynis-1.2.1/include/tests_time
-var/ipfire/lynis-1.2.1/include/tests_virtualization
-var/ipfire/lynis-1.2.1/include/tests_webservers
-var/ipfire/lynis-1.2.1/lynis
-var/ipfire/lynis-1.2.1/lynis.8
-var/ipfire/lynis-1.2.1/plugins
-var/ipfire/lynis-1.2.1/plugins/README
-var/ipfire/lynis-1.2.1/plugins/security_rootkit
-var/ipfire/lynis-1.2.1/plugins/security_webvuln

diff --git a/tools/checknewlog.pl b/tools/checknewlog.pl
index 5c9bae94c0e84e6b9dc90dfe19a2229e67af8704..126235e9b640591e9df27cf33436cfbf8bdcc012 100755 (executable)
--- a/tools/checknewlog.pl
+++ b/tools/checknewlog.pl
@@ -28,7 +28,7 @@ foreach(@FILES) {
 #      print $_."\n";
        my $Found = 0;
 
 #      print $_."\n";
        my $Found = 0;
 

-       if ( $_ =~ /$\.log/ || $_ =~ /^\.+/  || $_=~ /-install/ || $_=~ /-tools/ || $_=~ /-config/ || $_=~ /-kmod-/){
+       if ( $_ =~ /$\.log/ || $_ =~ /^\.+/  || $_=~ /-install/ || $_=~ /-tools/ || $_=~ /-config/ || $_=~ /-kmod-/ || $_ eq 'FILES' ){

                next;
        } elsif ( $_=~ /missing_rootfile/ ){
                print "Rootfile for $_ missing!\n";
                next;
        } elsif ( $_=~ /missing_rootfile/ ){
                print "Rootfile for $_ missing!\n";