[SCM] Debian package checker branch, master, updated. 2.2.6-72-gef773e9
The following commit has been merged in the master branch:
commit ef773e92bb48828ea46a60e20d3fbf601f4d3aaf
Author: Russ Allbery <rra@debian.org>
Date: Sun Mar 8 19:18:11 2009 -0700
Allow i386 binaries in amd64 packages
* checks/binaries:
+ [RA] Allow i386 binaries in amd64 packages for right now. Thanks,
Paul Wise. (Closes: #516856)
diff --git a/checks/binaries b/checks/binaries
index e92e55e..d48ba66 100644
--- a/checks/binaries
+++ b/checks/binaries
@@ -206,6 +206,8 @@ foreach my $file (sort keys %{$info->file_info}) {
if ($file =~ m,/lib(\d{2})/, or $file =~ m,/emul/ia(\d{2}),) {
tag "binary-from-other-architecture", $file
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.
} else {
$multiarch = Lintian::Data->new('binaries/multiarch')
unless defined($multiarch);
diff --git a/debian/changelog b/debian/changelog
index a050726..be491d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,8 @@ lintian (2.2.7) UNRELEASED; urgency=low
+ [RA] Report apparently truncated ELF binaries separately from
apparently corrupted ones. The current binutils now distinguishes.
Patch from Raphael Geissert. (Closes: #517778)
+ + [RA] Allow i386 binaries in amd64 packages for right now. Thanks,
+ Paul Wise. (Closes: #516856)
* checks/changelog-file:
+ [RA] Avoid capturing parentheses in regexes due to their minor
performance penalty. Patch from Raphael Geissert.
diff --git a/t/tests/binaries-from-other-arch/debian/debian/dumpobj b/t/tests/binaries-from-other-arch/debian/debian/dumpobj
index ba529d5..e622de4 100644
--- a/t/tests/binaries-from-other-arch/debian/debian/dumpobj
+++ b/t/tests/binaries-from-other-arch/debian/debian/dumpobj
@@ -3,28 +3,23 @@ set -e
DEB_BUILD_GNU_TYPE="$(dpkg-architecture -qDEB_BUILD_GNU_TYPE)"
-if [ "i486-linux-gnu" = "$DEB_BUILD_GNU_TYPE" ]; then
+case $DEB_BUILD_GNU_TYPE in
+i486-linux-gnu|x86_64-linux-gnu)
base64 -d <<DATA
-f0VMRgIBAQAAAAAAAAAAAAIAPgABAAAAIBdAAAAAAABAAAAAAAAAALj1AAAAAAAAAAAAAE
-AAOAAIAEAAHAAbAAYAAAAFAAAAQAAAAAAAAABAAEAAAAAAAEAAQAAAAAAAwAEAAAAAAADA
-AQAAAAAAAAgAAAAAAAAAAwAAAAQAAAAAAgAAAAAAAAACQAAAAAAAAAJAAAAAAAAcAAAAAA
-AAABwAAAAAAAAAAQAAAAAAAAABAAAABQAAAAAAAAAAAAAAAABAAAAAAAAAAEAAAAAAAMLg
-AAAAAAAAwuAAAAAAAAAAACAAAAAAAAEAAAAGAAAAyOAAAAAAAADI4GAAAAAAAMjgYAAAAA
-AACBQAAAAAAACIRgAAAAAAAAAAIAAAAAAAAgAAAAYAAAD44AAAAAAAAPjgYAAAAAAA+OBg
-AAAAAADQAQAAAAAAANABAAAAAAAACAAAAAAAAAAEAAAABAAAABwCAAAAAAAAHAJAAAAAAA
-AcAkAAAAAAACAAAAAAAAAAIAAAAAAAAAAEAAAAAAAAAFDldGQEAAAAENIAAAAAAAAQ0kAA
-AAAAABDSQAAAAAAARAIAAAAAAABEAgAAAAAAAAQAAAAAAAAAUeV0ZAYAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAvbGliNjQvbGQtbGlu
-dXgteDg2LTY0LnNvLjIABAAAABAAAAABAAAAR05VAAAAAAACAAAABgAAAAgAAAAAAAAAJQ
-AAAD0AAAAAAAAANgAAAB4AAAAgAAAAGQAAAAAAAAAmAAAAAAAAADEAAAAoAAAAKwAAADoA
-AAAzAAAAAAAAAA8AAAAtAAAANwAAAAAAAAAHAAAAIQAAADwAAAAMAAAAAAAAAAAAAAAAAA
-AAMAAAACcAAAANAAAAOQAAADIAAAAsAAAALwAAAAIAAAAuAAAACg==
+f0VMRgEBAQAAAAAAAAAAAAIAKAABAAAAMIEAADQAAAA4bwkAAgAABDQAIAAGACgAGwAaAAEAAHDY
+WgkA2NoJANjaCQBQCgAAUAoAAAQAAAAEAAAAAQAAAAAAAAAAgAAAAIAAAKhlCQCoZQkABQAAAACA
+AAABAAAAqGUJAKhlCgCoZQoAIAgAAOwlAAAGAAAAAIAAAAQAAAD0AAAA9IAAAPSAAAAgAAAAIAAA
+AAQAAAAEAAAABwAAAKhlCQCoZQoAqGUKABgAAAAwAAAABAAAAAQAAABR5XRkAAAAAAAAAAAAAAAA
+AAAAAAAAAAAGAAAABAAAAAQAAAAQAAAAAQAAAEdOVQAAAAAAAgAAAAYAAAASAAAABOAt5QTQTeIR
+AADrBNCN4gTgneQe/y/hAAAAACTAn+UAsKDjBBCd5A0goOEEIC3lBAAt5RAAn+UQMJ/lBMAt5dwS
DATA
-else
+ ;;
+*)
base64 -d <<DATA
f0VMRgEBAQAAAAAAAAAAAAIAAwABAAAAIKwECDQAAAAsjgUAAAAAADQAIAAIACgAHAAbAA
YAAAA0AAAANIAECDSABAgAAQAAAAEAAAUAAAAEAAAAAwAAADQBAAA0gQQINIEECBMAAAAT
AAAABAAAAAEAAAABAAAAAAAAAACABAgAgAQI8IYFAPCGBQAFAAAAABAAAAEAAADwhgUA8B
YK
DATA
-fi
+ ;;
+esac
--
Debian package checker
Reply to: