X-Git-Url: https://ruderich.org/simon/gitweb/?p=blhc%2Fblhc.git;a=blobdiff_plain;f=bin%2Fblhc;h=12b7eab8832d965c3d84053f62b21cf153513f59;hp=1d35e0ba489008f5c2eee8bab499256e0445d2b3;hb=2d45d7a5feaaaf28b0ab42be148e675835759c11;hpb=d6333e474554290abc21a27bbd1de7e0be1a4e10 diff --git a/bin/blhc b/bin/blhc index 1d35e0b..12b7eab 100755 --- a/bin/blhc +++ b/bin/blhc @@ -43,7 +43,7 @@ my $cc_regex_full = qr/ $cc_regex /x; # Regex to catch (GCC) compiler warnings. -my $warning_regex = qr/^(.+?):([0-9]+):[0-9]+: warning: (.+?) \[(.+?)\]$/; +my $warning_regex = qr/^(.+?):(\d+):\d+: warning: (.+?) \[(.+?)\]$/; # List of source file extensions which require preprocessing. my @source_preprocess_compile_cpp = ( @@ -153,8 +153,7 @@ my @def_cflags = ( ); my @def_cflags_format = ( '-Wformat', - '-Wformat-security', - '-Werror=format-security', + '-Werror=format-security', # implies -Wformat-security ); my @def_cflags_fortify = ( # fortify needs at least -O1, but -O2 is recommended anyway @@ -257,14 +256,14 @@ sub error_flags { } @{$missing_flags_ref}; my $flags = join ' ', @missing_flags; - printf "%s (%s)%s %s", + printf '%s (%s)%s %s', error_color($message, 'red'), $flags, error_color(':', 'yellow'), $line; } sub error_non_verbose_build { my ($line) = @_; - printf "%s%s %s", + printf '%s%s %s', error_color('NONVERBOSE BUILD', 'red'), error_color(':', 'yellow'), $line; @@ -343,10 +342,10 @@ sub pic_pie_conflict { sub is_non_verbose_build { my ($line, $next_line, $skip_ref) = @_; - if (not ($line =~ /^checking if you want to see long compiling messages\.\.\. no/ + if (not (index($line, 'checking if you want to see long compiling messages... no') == 0 or $line =~ /^\s*\[?(?:CC|CCLD|C\+\+|CXX|CXXLD|LD|LINK)\]?\s+(.+?)$/ - or $line =~ /^\s*(?:C|c)ompiling\s+(.+?)(?:\.\.\.)?$/ - or $line =~ /^\s*(?:B|b)uilding (?:program|shared library)\s+(.+?)$/ + or $line =~ /^\s*[Cc]ompiling\s+(.+?)(?:\.\.\.)?$/ + or $line =~ /^\s*[Bb]uilding (?:program|shared library)\s+(.+?)$/ or $line =~ /^\s*\[[\d ]+%\] Building (?:C|CXX) object (.+?)$/)) { return 0; } @@ -356,7 +355,7 @@ sub is_non_verbose_build { # C++ compiler setting. return 0 if $line =~ /^\s*C\+\+.+?:\s+(?:yes|no)\s*$/; # "Compiling" with no file name. - if ($line =~ /^\s*(?:C|c)ompiling\s+(.+?)(?:\.\.\.)?$/) { + if ($line =~ /^\s*[Cc]ompiling\s+(.+?)(?:\.\.\.)?$/) { # $file_extension_regex may need spaces around the filename. return 0 if not " $1 " =~ /$file_extension_regex/o; } @@ -378,7 +377,7 @@ sub is_non_verbose_build { $file =~ m{/([^/\s]+)$}; $file = $1; - if ($next_line =~ /\Q$file\E/ and $next_line =~ /$cc_regex/o) { + if (index($next_line, $file) != -1 and $next_line =~ /$cc_regex/o) { # We still have to skip the current line as it doesn't contain any # compiler commands. ${$skip_ref} = 1; @@ -428,6 +427,7 @@ my $option_help = 0; my $option_version = 0; my $option_pie = 0; my $option_bindnow = 0; +my @option_ignore_arch = (); my @option_ignore_flag = (); my @option_ignore_line = (); my $option_all = 0; @@ -442,6 +442,7 @@ if (not Getopt::Long::GetOptions( 'bindnow' => \$option_bindnow, 'all' => \$option_all, # Ignore. + 'ignore-arch=s' => \@option_ignore_arch, 'ignore-flag=s' => \@option_ignore_flag, 'ignore-line=s' => \@option_ignore_line, # Misc. @@ -533,15 +534,25 @@ foreach my $file (@ARGV) { my $harden_pie = $option_pie; # defaults to 0 while (my $line = <$fh>) { + # Detect architecture automatically unless overridden. For buildd logs + # only, doesn't use the dpkg-buildpackage header. Necessary to ignore + # build logs which aren't built (wrong architecture, build error, + # etc.). + if (not $arch + and $line =~ /^Architecture: (.+)$/) { + $arch = $1; + } + # dpkg-buildflags only provides hardening flags since 1.16.1, don't # check for hardening flags in buildd mode if an older dpkg-dev is # used. Default flags (-g -O2) are still checked. # # Packages which were built before 1.16.1 but used their own hardening # flags are not checked. - if ($option_buildd and $line =~ /^Toolchain package versions: /) { + if ($option_buildd + and index($line, 'Toolchain package versions: ') == 0) { require Dpkg::Version; - if ($line !~ /\bdpkg-dev_(\S+)/ + if (not $line =~ /\bdpkg-dev_(\S+)/ or Dpkg::Version::version_compare($1, '1.16.1') < 0) { $harden_format = 0; $harden_fortify = 0; @@ -558,7 +569,7 @@ foreach my $file (@ARGV) { # enabled, even though they may be not correctly set and are missing # when build with later CMake versions. Thanks to Aron Xu for letting # me know. - if ($line =~ /^Package versions: / + if (index($line, 'Package versions: ') == 0 and $line =~ /\bcmake_(\S+)/ and ($1 eq '2.8.7-1' or $1 eq '2.8.7-2')) { if (not $option_buildd) { @@ -571,7 +582,8 @@ foreach my $file (@ARGV) { # If hardening wrapper is used (wraps calls to gcc and adds hardening # flags automatically) we can't perform any checks, abort. - if ($line =~ /^Build-Depends: .*\bhardening-wrapper\b/) { + if (index($line, 'Build-Depends: ') == 0 + and $line =~ /\bhardening-wrapper\b/) { if (not $option_buildd) { error_hardening_wrapper(); } else { @@ -583,7 +595,7 @@ foreach my $file (@ARGV) { # We skip over unimportant lines at the beginning of the log to # prevent false positives. - last if $line =~ /^dpkg-buildpackage:/; + last if index($line, 'dpkg-buildpackage: ') == 0; } # Input lines, contain only the lines with compiler commands. @@ -606,7 +618,7 @@ foreach my $file (@ARGV) { # Ignore compiler warnings for now. next if $line =~ /$warning_regex/o; - if (not $option_buildd and $line =~ /\033/) { # esc + if (not $option_buildd and index($line, "\033") != -1) { # esc # Remove all ANSI color sequences which are sometimes used in # non-verbose builds. $line = Term::ANSIColor::colorstrip($line); @@ -623,7 +635,7 @@ foreach my $file (@ARGV) { # One line may contain multiple commands (";"). Treat each one as # single line. parse_line() is slow, only use it when necessary. - my @line = (not $line =~ /;/) + my @line = (index($line, ';') == -1) ? ($line) : map { # Ensure newline at the line end - necessary for @@ -631,7 +643,7 @@ foreach my $file (@ARGV) { $_ =~ s/\s+$//; $_ .= "\n"; } Text::ParseWords::parse_line(';', 1, $line); - foreach $line (@line) { + foreach my $line (@line) { if ($continuation) { $continuation = 0; @@ -641,7 +653,7 @@ foreach my $file (@ARGV) { $complete_line .= ' ' . $line; } # Line continuation, line ends with "\". - if ($line =~ /\\\s*$/) { + if ($line =~ /\\$/) { $continuation = 1; # Start line continuation. if (not defined $complete_line) { @@ -670,9 +682,9 @@ foreach my $file (@ARGV) { # # `./configure` output. next if not $non_verbose - and $line =~ /^(?:checking|(?:C|c)onfigure:) /; + and $line =~ /^(?:checking|[Cc]onfigure:) /; next if $line =~ /^\s*(?:Host\s+)?(?:C(?:\+\+)?\s+)? - (?:C|c)ompiler[\s.]*:?\s+ + [Cc]ompiler[\s.]*:?\s+ /xo; next if $line =~ /^\s*(?:- )?(?:HOST_)?(?:CC|CXX)\s*=\s*$cc_regex_full\s*$/o; @@ -685,7 +697,17 @@ foreach my $file (@ARGV) { } } - close $fh; + close $fh or die $!; + + # Ignore arch if requested. + if (scalar @option_ignore_arch > 0 and $arch) { + foreach my $ignore (@option_ignore_arch) { + if ($arch eq $ignore) { + print "ignoring architecture '$arch'\n"; + next FILE; + } + } + } if (scalar @input == 0) { if (not $option_buildd) { @@ -867,7 +889,7 @@ LINE: # are missing. and not pic_pie_conflict($line, $harden_pie, \@missing, @def_cflags_pie) # Assume dpkg-buildflags returns the correct flags. - and not $line =~ /`dpkg-buildflags --get CFLAGS`/) { + and index($line, '`dpkg-buildflags --get CFLAGS`') == -1) { if (not $option_buildd) { error_flags('CFLAGS missing', \@missing, \%flag_renames, $input[$i]); } else { @@ -880,7 +902,7 @@ LINE: # are missing. and not pic_pie_conflict($line, $harden_pie, \@missing, @def_cflags_pie) # Assume dpkg-buildflags returns the correct flags. - and not $line =~ /`dpkg-buildflags --get CXXFLAGS`/) { + and index($line, '`dpkg-buildflags --get CXXFLAGS`') == -1) { if (not $option_buildd) { error_flags('CXXFLAGS missing', \@missing, \%flag_renames, $input[$i]); } else { @@ -890,7 +912,7 @@ LINE: } if ($preprocess and not all_flags_used($line, \@missing, @cppflags) # Assume dpkg-buildflags returns the correct flags. - and not $line =~ /`dpkg-buildflags --get CPPFLAGS`/) { + and index($line, '`dpkg-buildflags --get CPPFLAGS`') == -1) { if (not $option_buildd) { error_flags('CPPFLAGS missing', \@missing, \%flag_renames, $input[$i]); } else { @@ -902,7 +924,7 @@ LINE: # Same here, -fPIC conflicts with -fPIE. and not pic_pie_conflict($line, $harden_pie, \@missing, @def_ldflags_pie) # Assume dpkg-buildflags returns the correct flags. - and not $line =~ /`dpkg-buildflags --get LDFLAGS`/) { + and index($line, '`dpkg-buildflags --get LDFLAGS`') == -1) { if (not $option_buildd) { error_flags('LDFLAGS missing', \@missing, \%flag_renames, $input[$i]); } else { @@ -918,22 +940,22 @@ if ($option_buildd) { my @warning; if ($statistics{preprocess_missing}) { - push @warning, sprintf "CPPFLAGS %d (of %d)", + push @warning, sprintf 'CPPFLAGS %d (of %d)', $statistics{preprocess_missing}, $statistics{preprocess}; } if ($statistics{compile_missing}) { - push @warning, sprintf "CFLAGS %d (of %d)", + push @warning, sprintf 'CFLAGS %d (of %d)', $statistics{compile_missing}, $statistics{compile}; } if ($statistics{compile_cpp_missing}) { - push @warning, sprintf "CXXFLAGS %d (of %d)", + push @warning, sprintf 'CXXFLAGS %d (of %d)', $statistics{compile_cpp_missing}, $statistics{compile_cpp}; } if ($statistics{link_missing}) { - push @warning, sprintf "LDFLAGS %d (of %d)", + push @warning, sprintf 'LDFLAGS %d (of %d)', $statistics{link_missing}, $statistics{link}; } @@ -1018,6 +1040,12 @@ Don't require Term::ANSIColor. Use colored (ANSI) output for warning messages. +=item B<--ignore-arch> I + +Ignore build logs from architectures matching I. I is a string. + +Used to prevent false positives. This option can be specified multiple times. + =item B<--ignore-flag> I Don't print an error when the specific flag is missing in a compiler line.