X-Git-Url: https://ruderich.org/simon/gitweb/?p=blhc%2Fblhc.git;a=blobdiff_plain;f=bin%2Fblhc;h=a51c860158608a12116c60a5d5113d182014dbb0;hp=5e8e0181356613dca5de8afe591ce3ab24a5d684;hb=af102498dd22f108a466fe3830648d7705384f28;hpb=f0ae7b1580cd26bcf44dc5b780f1c2e081314479 diff --git a/bin/blhc b/bin/blhc index 5e8e018..a51c860 100755 --- a/bin/blhc +++ b/bin/blhc @@ -24,7 +24,7 @@ use warnings; use Getopt::Long (); use Text::ParseWords (); -our $VERSION = '0.01'; +our $VERSION = '0.02'; # CONSTANTS/VARIABLES @@ -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 @@ -203,11 +202,11 @@ my @flag_refs = ( \@def_ldflags, \@def_ldflags_relro, \@def_ldflags_bindnow, + \@def_ldflags_pie, ); # References to all used flags. my @flag_refs_all = ( @flag_refs, - \@def_ldflags_pie, \@def_ldflags_pic, ); # Renaming rules for the output so the regex parts are not visible. Also @@ -227,6 +226,14 @@ my %exit_code = ( invalid_cmake => 1 << 5, ); +my %buildd_tag = ( + no_compiler_commands => 'I-no-compiler-commands', + non_verbose_build => 'W-compiler-flags-hidden', + flags_missing => 'W-dpkg-buildflags-missing', + hardening_wrapper => 'I-hardening-wrapper-used', + invalid_cmake => 'I-invalid-cmake-used', +); + # Statistics of missing flags and non-verbose build commands. Used for # $option_buildd. my %statistics = ( @@ -257,14 +264,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; @@ -345,8 +352,8 @@ sub is_non_verbose_build { 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 +363,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; } @@ -450,8 +457,7 @@ if (not Getopt::Long::GetOptions( 'color' => \$option_color, 'arch=s' => \$option_arch, 'buildd' => \$option_buildd, - ) - or scalar @ARGV == 0) { + )) { require Pod::Usage; Pod::Usage::pod2usage(2); } @@ -478,6 +484,12 @@ along with this program. If not, see . exit 0; } +# Arguments missing. +if (scalar @ARGV == 0) { + require Pod::Usage; + Pod::Usage::pod2usage(2); +} + # Don't load Term::ANSIColor in buildd mode because Term::ANSIColor is not # installed on Debian's buildds. if (not $option_buildd) { @@ -521,7 +533,7 @@ FILE: foreach my $file (@ARGV) { print "checking '$file'...\n" if scalar @ARGV > 1; - open my $fh, '<', $file or die "$!: $file"; + open my $fh, '<', $file or die $!; # Architecture of this file. my $arch = $option_arch; @@ -576,7 +588,7 @@ foreach my $file (@ARGV) { if (not $option_buildd) { error_invalid_cmake($1); } else { - print "W-invalid-cmake-used $1\n"; + print "$buildd_tag{invalid_cmake} $1\n"; } $exit |= $exit_code{invalid_cmake}; } @@ -588,7 +600,7 @@ foreach my $file (@ARGV) { if (not $option_buildd) { error_hardening_wrapper(); } else { - print "I-hardening-wrapper-used\n"; + print "$buildd_tag{hardening_wrapper}\n"; } $exit |= $exit_code{hardening_wrapper}; next FILE; @@ -644,7 +656,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; @@ -683,9 +695,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; @@ -698,7 +710,7 @@ foreach my $file (@ARGV) { } } - close $fh; + close $fh or die $!; # Ignore arch if requested. if (scalar @option_ignore_arch > 0 and $arch) { @@ -714,7 +726,7 @@ foreach my $file (@ARGV) { if (not $option_buildd) { print "No compiler commands!\n"; } else { - print "W-no-compiler-commands\n"; + print "$buildd_tag{no_compiler_commands}\n"; } $exit |= $exit_code{no_compiler_commands}; next FILE; @@ -941,32 +953,32 @@ 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}; } if (scalar @warning) { local $" = ', '; # array join string - print "W-dpkg-buildflags-missing @warning missing\n"; + print "$buildd_tag{flags_missing} @warning missing\n"; } if ($statistics{commands_nonverbose}) { - printf "W-compiler-flags-hidden %d (of %d) hidden\n", + printf "$buildd_tag{non_verbose_build} %d (of %d) hidden\n", $statistics{commands_nonverbose}, $statistics{commands}, } @@ -1021,17 +1033,17 @@ changes are in effect: =over 2 -=item +=item * Print tags instead of normal warnings, see L for a list of possible tags. -=item +=item * Don't check hardening flags in old log files (if dpkg-dev << 1.16.1 is detected). -=item +=item * Don't require Term::ANSIColor. @@ -1117,17 +1129,13 @@ which is displayed. =over 2 -=item - -B +=item B The package uses hardening-wrapper which intercepts calls to gcc and adds hardening flags. The build log doesn't contain any hardening flags and thus can't be checked by blhc. -=item - -B (summary of hidden lines) +=item B (summary of hidden lines) Build log contains lines which hide the real compiler flags. For example: @@ -1141,19 +1149,20 @@ F fixes builds with hidden compiler flags. Sometimes C<.SILENT> in a F must be removed. And as last resort the F must be patched to remove the C<@>s hiding the real compiler commands. -=item - -B (summary of missing flags) +=item B (summary of missing flags) CPPFLAGS, CFLAGS, CXXFLAGS, LDFLAGS missing. -=item +=item B (version) -B (version) +By default CMake ignores CPPFLAGS thus missing those hardening flags. Debian +patched CMake in versions 2.8.7-1 and 2.8.7-2 to respect CPPFLAGS, but this +patch was rejected by upstream and later reverted in Debian. Thus those two +versions show correct usage of CPPFLAGS even if the package doesn't correctly +handle them (for example by passing them to CFLAGS). To prevent false +negatives just blacklist those two versions. -=item - -B +=item B No compiler commands were detected. Either the log contains none or they were not correctly detected by blhc (please report the bug in this case). @@ -1191,6 +1200,11 @@ Missing hardening flags. Hardening wrapper detected, no tests performed. +=item B<32> + +Invalid CMake version used. See B under L for a detailed explanation. + =back =head1 AUTHOR