Tom Hunze
1e4eae9424
Both patches are from unmerged PRs and the commit corresponding to the second patch has already been garbage-collected, causing the build of debian-devscripts to fail. The first vendored patch corresponds to https://github.com/Debian/devscripts/commit/c6a018e0ef50a1b0cb4962a2f96dae7c6f21f1d4.patch from https://github.com/Debian/devscripts/pull/2. The second vendored patch corresponds to https://salsa.debian.org/debian/devscripts/-/merge_requests/637.patch from https://salsa.debian.org/debian/devscripts/-/merge_requests/637. Hydra: https://hydra.nixos.org/build/329270098
73 lines
2.4 KiB
Diff
73 lines
2.4 KiB
Diff
From c6a018e0ef50a1b0cb4962a2f96dae7c6f21f1d4 Mon Sep 17 00:00:00 2001
|
|
From: Robert Scott <code@humanleg.org.uk>
|
|
Date: Sun, 12 Feb 2023 23:04:15 +0000
|
|
Subject: [PATCH] hardening-check: obey READELF, LDD & OBJDUMP env vars for
|
|
tool names
|
|
|
|
this is useful on e.g. cross-build systems where the desired
|
|
tools may have platform-denoting prefixes
|
|
---
|
|
scripts/hardening-check.pl | 17 ++++++++++-------
|
|
1 file changed, 10 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/scripts/hardening-check.pl b/scripts/hardening-check.pl
|
|
index ad7f4e43..d4b1f79e 100755
|
|
--- a/scripts/hardening-check.pl
|
|
+++ b/scripts/hardening-check.pl
|
|
@@ -47,6 +47,9 @@
|
|
pod2usage(1) if $help;
|
|
pod2usage(-exitstatus => 0, -verbose => 2, -noperldoc => 1) if $man;
|
|
|
|
+my $ldd = $ENV{'LDD'} || "ldd";
|
|
+my $objdump = $ENV{'OBJDUMP'} || "objdump";
|
|
+my $readelf = $ENV{'READELF'} || "readelf";
|
|
my $overall = 0;
|
|
my $rc = 0;
|
|
my $report = "";
|
|
@@ -220,8 +223,8 @@ (@)
|
|
# Find the libc used in this executable, if any.
|
|
sub find_libc($) {
|
|
my ($file) = @_;
|
|
- my $ldd = output("ldd", $file);
|
|
- $ldd =~ /^\s*libc\.so\.\S+\s+\S+\s+(\S+)/m;
|
|
+ my $ldd_out = output($ldd, $file);
|
|
+ $ldd_out =~ /^\s*libc\.so\.\S+\s+\S+\s+(\S+)/m;
|
|
return $1 || "";
|
|
}
|
|
|
|
@@ -232,7 +235,7 @@ ($$)
|
|
# Catch "NOTYPE" for object archives.
|
|
my $func_regex = " (I?FUNC|NOTYPE) ";
|
|
|
|
- my $relocs = output("readelf", "-sW", $file);
|
|
+ my $relocs = output($readelf, "-sW", $file);
|
|
for my $line (split("\n", $relocs)) {
|
|
next if ($line !~ /$func_regex/);
|
|
next if ($undefined && $line !~ /$func_regex.* UND /);
|
|
@@ -271,21 +274,21 @@ ($$)
|
|
@tags = ();
|
|
|
|
# Get program headers.
|
|
- my $PROG_REPORT = output("readelf", "-lW", $file);
|
|
+ my $PROG_REPORT = output($readelf, "-lW", $file);
|
|
if (length($PROG_REPORT) == 0) {
|
|
$overall = 1;
|
|
next;
|
|
}
|
|
|
|
# Get ELF headers.
|
|
- my $DYN_REPORT = output("readelf", "-dW", $file);
|
|
+ my $DYN_REPORT = output($readelf, "-dW", $file);
|
|
|
|
# Get disassembly
|
|
my $DISASM
|
|
- = output("objdump", "-d", "--no-show-raw-insn", "-M", "intel", $file);
|
|
+ = output($objdump, "-d", "--no-show-raw-insn", "-M", "intel", $file);
|
|
|
|
# Get notes
|
|
- my $NOTES = output("readelf", "-n", $file);
|
|
+ my $NOTES = output($readelf, "-n", $file);
|
|
|
|
# Get list of all symbols needing external resolution.
|
|
my $functions = find_functions($file, 1);
|