[SCM] Debian package checker branch, master, updated. 2.5.11-77-g573506a
The following commit has been merged in the master branch:
commit 573506a9a37ecc1723dfc382ee58756bb627161c
Author: Niels Thykier <niels@thykier.net>
Date: Fri Jan 18 15:25:49 2013 +0100
coll/hardening-info-helper: Remove work around for #677530
The fixed version of hardening-includes is already in stable-bpo, so
replace the work around with a bumped versioned dependency.
Signed-off-by: Niels Thykier <niels@thykier.net>
diff --git a/collection/hardening-info-helper b/collection/hardening-info-helper
index ee5159c..756a6c7 100755
--- a/collection/hardening-info-helper
+++ b/collection/hardening-info-helper
@@ -53,9 +53,6 @@ my ($in, $out);
my ($cread, $cwrite);
my $cpid;
my @recheck = ();
-# Work around bug in hardening-check when it proceses multiple binaries
-# with --lintian (see #677530).
-my %seen = ();
my %whitelisted_funcs = (
'memcpy' => 1,
'memset' => 1,
@@ -80,8 +77,6 @@ if ($cpid) {
while (my $line = <$in>) {
chomp $line;
if ($cpid) {
- # The parent filters the duplicate tags (#677530)
- next if $seen{$line}++;
if ($line =~ m/^no-fortify-functions:(.*)$/o) {
my $bin = $1;
push @recheck, $bin;
@@ -94,7 +89,6 @@ while (my $line = <$in>) {
print $out "$line\n";
}
-undef %seen;
if (not $cpid) {
# child's second pass
diff --git a/debian/control b/debian/control
index d6d6ba4..e2bad92 100644
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,7 @@ Build-Depends: binutils,
fakeroot,
file,
gettext,
- hardening-includes (>= 2.0),
+ hardening-includes (>= 2.2~),
intltool-debian,
javahelper (>= 0.32~),
libapt-pkg-perl,
@@ -68,7 +68,7 @@ Depends: binutils,
diffstat,
file,
gettext,
- hardening-includes (>= 2.0),
+ hardening-includes (>= 2.2~),
intltool-debian,
libapt-pkg-perl,
libarchive-zip-perl,
--
Debian package checker
Reply to: