[SCM] Debian package checker branch, master, updated. 2.5.6-132-gb102917
The following commit has been merged in the master branch:
commit b102917019632da73c1337fc60011a1104a97d22
Author: Niels Thykier <niels@thykier.net>
Date: Sun May 13 18:39:01 2012 +0200
c/binaries: Move arch-64bit-equiv table to a data file
Signed-off-by: Niels Thykier <niels@thykier.net>
diff --git a/checks/binaries b/checks/binaries
index f8820c6..db87d59 100644
--- a/checks/binaries
+++ b/checks/binaries
@@ -68,16 +68,7 @@ our %ARCH_REGEX = (
# 'sparcv9b' => qr'ELF 32-bit MSB .* SPARC.* V8\+',
'sparc64' => qr'ELF 64-bit MSB .* SPARC');
-our %ARCH_64BIT_EQUIVS = (
- 'hppa' => 'hppa64',
- 'i386' => 'amd64',
- 'kfreebsd-i386' => 'kfreebsd-amd64',
- 'mips' => 'mips64',
- 'mipsel' => 'mipsel64',
- 'powerpc' => 'ppc64',
- 's390' => 's390x',
- 'sparc' => 'sparc64',
-);
+my $ARCH_64BIT_EQUIVS = Lintian::Data->new ('binaries/arch-64bit-equivs', qr/\s*\=\>\s*/);
sub _embedded_libs {
my ($key, $val, undef) = @_;
@@ -300,8 +291,8 @@ foreach my $file (@{$info->sorted_index}) {
unless ($fileinfo =~ m/$ARCH_REGEX{$1}/);
} elsif ($arch eq 'amd64' and $fileinfo =~ m/$ARCH_REGEX{i386}/) {
# Ignore i386 binaries in amd64 packages for right now.
- } elsif (exists $ARCH_64BIT_EQUIVS{$arch}
- and $fileinfo =~ m/$ARCH_REGEX{$ARCH_64BIT_EQUIVS{$arch}}/
+ } elsif ($ARCH_64BIT_EQUIVS->known ($arch)
+ and $fileinfo =~ m/$ARCH_REGEX{$ARCH_64BIT_EQUIVS->value ($arch)}/
and $file =~ m,^lib/modules/,) {
# Allow amd64 kernel modules to be installed on i386.
} else {
diff --git a/debian/changelog b/debian/changelog
index 8803bf0..8358a46 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -58,6 +58,7 @@ lintian (2.5.7) UNRELEASED; urgency=low
+ [NT] Move embedded library data to a data file.
+ [NT] Add ELF hardening checks. Thanks to Kees Cook for
report and the patches. (Closes: 650536)
+ + [NT] Replace arch-64bit-equivs with a data file.
* checks/changelog-file:
+ [NT] Output the correct line number for the "line-too-long"
tag. Thanks to Arno Töll for the report. (Closes: #657402)
@@ -165,12 +166,12 @@ lintian (2.5.7) UNRELEASED; urgency=low
* data:
+ [NT] Move to vendors/debian/ftp-master-auto-reject and replace
it with a symlink.
+ * data/binaries/{arch-64bit-equivs,hardening-tags}:
+ + [NT] New file.
* data/binaries/embedded-libs:
+ [NT] New file.
+ [NT] Add libav libraries. Thanks to Andres Mejia for the
suggestion and the suggested patch. (Closes: #666765)
- * data/binaries/hardening-tags:
- + [NT] New file.
* data/changes-file/{debian-dists -> known-dists}:
+ [NT] Renamed file.
* data/menu-format/menu-sections:
diff --git a/vendors/debian/ftp-master-auto-reject/data/binaries/arch-64bit-equivs b/vendors/debian/ftp-master-auto-reject/data/binaries/arch-64bit-equivs
new file mode 100644
index 0000000..e349014
--- /dev/null
+++ b/vendors/debian/ftp-master-auto-reject/data/binaries/arch-64bit-equivs
@@ -0,0 +1,13 @@
+# Manually maintained table mapping 32bit archs to the
+# name of their 64bit counter part.
+#
+# Please keep this sorted by "key" (i.e. 32bit arch)
+
+hppa => hppa64
+i386 => amd64
+kfreebsd-i386 => kfreebsd-amd64
+mips => mips64
+mipsel => mipsel64
+powerpc => ppc64
+s390 => s390x
+sparc => sparc64
--
Debian package checker
Reply to: