[SCM] Debian package checker branch, infra-513663, updated. 2.4.3-177-g13d94df
The following commit has been merged in the infra-513663 branch:
commit 0f51486d6ec148dbcae636a0ad822fe2de4a0e68
Author: Niels Thykier <niels@thykier.net>
Date: Tue Jan 18 01:50:08 2011 +0100
Removing ./ prefix from binaries check output
diff --git a/checks/binaries b/checks/binaries
index de894cb..85e018c 100644
--- a/checks/binaries
+++ b/checks/binaries
@@ -104,7 +104,6 @@ $arch = $info->field('architecture');
foreach my $file (sort keys %{$info->objdump_info}) {
my $objdump = $info->objdump_info->{$file};
- $file = './' . $file;
if (defined $objdump->{SONAME}) {
foreach my $soname (@{$objdump->{SONAME}}) {
@@ -133,7 +132,7 @@ foreach my $file (sort keys %{$info->objdump_info}) {
} elsif ($_ eq 'Packed with UPX') {
tag "binary-file-compressed-with-upx", "$file";
} elsif ($_ eq 'Invalid operation') {
- tag "binary-with-bad-dynamic-table", "$file" unless $file =~ m%^\./usr/lib/debug/%;
+ tag "binary-with-bad-dynamic-table", "$file" unless $file =~ m%^usr/lib/debug/%;
}
}
}
@@ -199,8 +198,6 @@ foreach my $file (@{$info->sorted_file_info}) {
my $fileinfo = $info->file_info->{$file};
my $objdump = $info->objdump_info->{$file};
- $file = './' . $file;
-
# binary or object file?
next unless ($fileinfo =~ m/^[^,]*\bELF\b/) or ($fileinfo =~ m/\bcurrent ar archive\b/);
@@ -208,7 +205,7 @@ foreach my $file (@{$info->sorted_file_info}) {
# only if those libraries aren't installed in a multiarch directory. The
# package may be a support package for cross-compiles.
if ($arch eq 'all') {
- my ($arch) = ($file =~ m,^\./(?:usr/)?lib/([^/]+)/,);
+ my ($arch) = ($file =~ m,^(?:usr/)?lib/([^/]+)/,);
$multiarch = Lintian::Data->new('binaries/multiarch')
unless defined($multiarch);
unless ($arch and $multiarch->known($arch)) {
@@ -219,11 +216,11 @@ foreach my $file (@{$info->sorted_file_info}) {
# ELF?
next unless $fileinfo =~ m/^[^,]*\bELF\b/o;
- if ($file =~ m,^\./etc/,) {
+ if ($file =~ m,^etc/,) {
tag "binary-in-etc", "$file";
}
- if ($file =~ m,^\./usr/share/,) {
+ if ($file =~ m,^usr/share/,) {
tag "arch-dependent-file-in-usr-share", "$file";
}
@@ -325,24 +322,24 @@ foreach my $file (@{$info->sorted_file_info}) {
next if $type eq 'udeb';
# Perl library?
- if ($file =~ m,^\./usr/lib/perl5/.*\.so$,) {
+ if ($file =~ m,^usr/lib/perl5/.*\.so$,) {
$has_perl_lib = 1;
}
# PHP extension?
- if ($file =~ m,^\./usr/lib/php\d/.*\.so$,) {
+ if ($file =~ m,^usr/lib/php\d/.*\.so$,) {
$has_php_ext = 1;
}
# Something other than detached debugging symbols in /usr/lib/debug paths.
- if ($file =~ m,^\./usr/lib/debug/(?:lib\d*|s?bin|usr|opt|dev|emul)/,) {
+ if ($file =~ m,^usr/lib/debug/(?:lib\d*|s?bin|usr|opt|dev|emul)/,) {
if (exists($objdump->{NEEDED})) {
tag "debug-file-should-use-detached-symbols", $file;
}
}
# Detached debugging symbols directly in /usr/lib/debug.
- if ($file =~ m,^\./usr/lib/debug/[^/]+$,) {
+ if ($file =~ m,^usr/lib/debug/[^/]+$,) {
unless (exists($objdump->{NEEDED})
|| $fileinfo =~ m/statically linked/) {
tag "debug-symbols-directly-in-usr-lib-debug", $file;
@@ -354,21 +351,21 @@ foreach my $file (@{$info->sorted_file_info}) {
if ($fileinfo =~ m/shared object/o) {
# Some exceptions: detached debugging information and the dynamic
# loader (which itself has no dependencies).
- next if ($file =~ m%^\./usr/lib/debug/%);
- next if ($file =~ m%^\./lib(?:|32|64)/(?:[\w/]+/)?ld-[\d.]+\.so$%);
+ next if ($file =~ m%^usr/lib/debug/%);
+ next if ($file =~ m%^lib(?:|32|64)/(?:[\w/]+/)?ld-[\d.]+\.so$%);
tag "shared-lib-without-dependency-information", "$file";
} else {
# Some exceptions: files in /boot, /usr/lib/debug/*, named *-static or
# *.static, or *-static as package-name.
- next if ($file =~ m%^./boot/%);
+ next if ($file =~ m%^boot/%);
next if ($file =~ /(?:\.|-)static$/);
next if ($pkg =~ /-static$/);
# klibc binaries appear to be static.
next if ($objdump->{KLIBC});
# Location of debugging symbols.
- next if ($file =~ m%^./usr/lib/debug/%);
+ next if ($file =~ m%^usr/lib/debug/%);
# ldconfig must be static.
- next if ($file eq './sbin/ldconfig');
+ next if ($file eq 'sbin/ldconfig');
tag "statically-linked-binary", "$file";
}
} else {
diff --git a/t/tests/binaries-embedded-libs/tags b/t/tests/binaries-embedded-libs/tags
index afc98e3..8d03637 100644
--- a/t/tests/binaries-embedded-libs/tags
+++ b/t/tests/binaries-embedded-libs/tags
@@ -1,10 +1,10 @@
-E: binaries-embedded-libs: embedded-libjpeg ./usr/bin/libjpeg
-E: binaries-embedded-libs: embedded-libopenjpeg ./usr/bin/libopenjpeg
-E: binaries-embedded-libs: embedded-libpng ./usr/bin/libpng
-E: binaries-embedded-libs: embedded-library ./usr/bin/libbz2: bzip2
-E: binaries-embedded-libs: embedded-library ./usr/bin/libexpat: expat
-E: binaries-embedded-libs: embedded-library ./usr/bin/libmagic: file
-E: binaries-embedded-libs: embedded-library ./usr/bin/libpcre3: pcre3
-E: binaries-embedded-libs: embedded-library ./usr/bin/libtiff: tiff
-E: binaries-embedded-libs: embedded-library ./usr/bin/libxml2: libxml2
-E: binaries-embedded-libs: embedded-zlib ./usr/bin/zlib
+E: binaries-embedded-libs: embedded-libjpeg usr/bin/libjpeg
+E: binaries-embedded-libs: embedded-libopenjpeg usr/bin/libopenjpeg
+E: binaries-embedded-libs: embedded-libpng usr/bin/libpng
+E: binaries-embedded-libs: embedded-library usr/bin/libbz2: bzip2
+E: binaries-embedded-libs: embedded-library usr/bin/libexpat: expat
+E: binaries-embedded-libs: embedded-library usr/bin/libmagic: file
+E: binaries-embedded-libs: embedded-library usr/bin/libpcre3: pcre3
+E: binaries-embedded-libs: embedded-library usr/bin/libtiff: tiff
+E: binaries-embedded-libs: embedded-library usr/bin/libxml2: libxml2
+E: binaries-embedded-libs: embedded-zlib usr/bin/zlib
diff --git a/t/tests/binaries-from-other-arch/tags b/t/tests/binaries-from-other-arch/tags
index e6749bd..bf69c46 100644
--- a/t/tests/binaries-from-other-arch/tags
+++ b/t/tests/binaries-from-other-arch/tags
@@ -1,4 +1,4 @@
-E: binaries-from-other-arch: binary-from-other-architecture ./usr/bin/elfobject
-E: binaries-from-other-arch: statically-linked-binary ./usr/bin/elfobject
-W: binaries-from-other-arch: apparently-truncated-elf-binary ./usr/bin/elfobject
+E: binaries-from-other-arch: binary-from-other-architecture usr/bin/elfobject
+E: binaries-from-other-arch: statically-linked-binary usr/bin/elfobject
+W: binaries-from-other-arch: apparently-truncated-elf-binary usr/bin/elfobject
W: binaries-from-other-arch: binary-without-manpage usr/bin/elfobject
diff --git a/t/tests/binaries-general/tags b/t/tests/binaries-general/tags
index c61dcf9..f090942 100644
--- a/t/tests/binaries-general/tags
+++ b/t/tests/binaries-general/tags
@@ -1,7 +1,7 @@
-E: binaries-general: arch-dependent-file-in-usr-share ./usr/share/foo/basic
-E: binaries-general: binary-or-shlib-defines-rpath ./usr/lib/foo/basiclibrpath /usr/lib
-E: binaries-general: binary-or-shlib-defines-rpath ./usr/share/foo/basic /usr/local/lib
-E: binaries-general: debug-symbols-directly-in-usr-lib-debug ./usr/lib/debug/basic
-E: binaries-general: library-in-debug-or-profile-should-not-be-stripped ./usr/lib/debug/usr/share/foo/basic
-W: binaries-general: binary-compiled-with-profiling-enabled ./usr/share/foo/basic
+E: binaries-general: arch-dependent-file-in-usr-share usr/share/foo/basic
+E: binaries-general: binary-or-shlib-defines-rpath usr/lib/foo/basiclibrpath /usr/lib
+E: binaries-general: binary-or-shlib-defines-rpath usr/share/foo/basic /usr/local/lib
+E: binaries-general: debug-symbols-directly-in-usr-lib-debug usr/lib/debug/basic
+E: binaries-general: library-in-debug-or-profile-should-not-be-stripped usr/lib/debug/usr/share/foo/basic
+W: binaries-general: binary-compiled-with-profiling-enabled usr/share/foo/basic
W: binaries-general: debug-package-should-be-named-dbg usr/lib/debug/basic
diff --git a/t/tests/binaries-misplaced/tags b/t/tests/binaries-misplaced/tags
index ca65c7d..6e4d962 100644
--- a/t/tests/binaries-misplaced/tags
+++ b/t/tests/binaries-misplaced/tags
@@ -1,2 +1,2 @@
-E: binaries-misplaced: arch-independent-package-contains-binary-or-object ./etc/foo
-E: binaries-misplaced: binary-in-etc ./etc/foo
+E: binaries-misplaced: arch-independent-package-contains-binary-or-object etc/foo
+E: binaries-misplaced: binary-in-etc etc/foo
diff --git a/t/tests/binaries-spelling/tags b/t/tests/binaries-spelling/tags
index 2eb64a3..e55fe90 100644
--- a/t/tests/binaries-spelling/tags
+++ b/t/tests/binaries-spelling/tags
@@ -1,3 +1,3 @@
-I: binaries-spelling: spelling-error-in-binary ./usr/bin/basic exprimental experimental
-I: binaries-spelling: spelling-error-in-binary ./usr/bin/basic speling spelling
+I: binaries-spelling: spelling-error-in-binary usr/bin/basic exprimental experimental
+I: binaries-spelling: spelling-error-in-binary usr/bin/basic speling spelling
W: binaries-spelling: binary-without-manpage usr/bin/basic
diff --git a/testset/tags.binary b/testset/tags.binary
index 27be48a..86c1486 100644
--- a/testset/tags.binary
+++ b/testset/tags.binary
@@ -40,20 +40,20 @@ E: binary: non-wm-module-in-wm-modules-menu-section wm /usr/share/menu/binary:22
E: binary: possible-gpl-code-linked-with-openssl
E: binary: postinst-does-not-call-updatemenus usr/share/menu/binary
E: binary: postrm-does-not-call-updatemenus etc/menu-methods/lintian
-E: binary: statically-linked-binary ./usr/bin/static-hello
+E: binary: statically-linked-binary usr/bin/static-hello
E: binary: su-wrapper-without--c /usr/lib/menu/binary:2 su-to-root
E: binary: su-wrapper-without--c /usr/lib/menu/binary:3 sux
E: binary: su-wrapper-without--c /usr/share/menu/binary:2 su-to-root
E: binary: su-wrapper-without--c /usr/share/menu/binary:3 sux
E: binary: suidregister-used-in-maintainer-script postinst
E: binary: symlink-contains-spurious-segments usr/share/doc/binary/html/ch2.html ../html/./ch1.html
-E: binary: unstripped-binary-or-object ./usr/bin/hello
+E: binary: unstripped-binary-or-object usr/bin/hello
I: binary source: binary-control-field-duplicates-source field "vcs-svn" in package binary
I: binary source: missing-debian-source-format
I: binary source: xs-vcs-header-in-debian-control xs-vcs-browser
I: binary-data: capitalization-error-in-description subversion Subversion
I: binary: arch-dep-package-has-big-usr-share
-I: binary: binary-has-unneeded-section ./usr/bin/hello-static .comment
+I: binary: binary-has-unneeded-section usr/bin/hello-static .comment
I: binary: capitalization-error-in-description debian Debian
I: binary: desktop-entry-contains-encoding-key /usr/share/applications/goodbye.desktop:11 Encoding
I: binary: desktop-entry-contains-encoding-key /usr/share/applications/hello.desktop:13 Encoding
diff --git a/testset/tags.debug b/testset/tags.debug
index c98d2f3..8f4ee1d 100644
--- a/testset/tags.debug
+++ b/testset/tags.debug
@@ -2,10 +2,10 @@ E: debug source: build-depends-indep-without-arch-indep
E: debug source: version-substvar-for-external-package libhello0-dbg -> libhello
E: hello-dbg: changelog-file-missing-in-native-package
E: hello: pkg-has-symbols-control-file-but-no-shared-libs
-E: hello: statically-linked-binary ./usr/bin/hello.dbg
-E: hello: unstripped-binary-or-object ./usr/bin/hello.dbg
-E: libhello0-dbg: binary-with-bad-dynamic-table ./usr/lib/libhello.so.dbg
-E: libhello0-dbg: missing-dependency-on-libc needed by ./usr/lib/debug/lib/libhello.so.0.0 and 1 others
+E: hello: statically-linked-binary usr/bin/hello.dbg
+E: hello: unstripped-binary-or-object usr/bin/hello.dbg
+E: libhello0-dbg: binary-with-bad-dynamic-table usr/lib/libhello.so.dbg
+E: libhello0-dbg: missing-dependency-on-libc needed by usr/lib/debug/lib/libhello.so.0.0 and 1 others
E: libhello0-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libhello.so.dbg
E: libhello0: duplicate-entry-in-symbols-control-file libhello 0
E: libhello0: invalid-template-id-in-symbols-file 12
@@ -34,9 +34,9 @@ W: hello: binary-without-manpage usr/bin/hello
W: hello: binary-without-manpage usr/bin/hello.dbg
W: hello: latest-debian-changelog-entry-without-new-version
W: hi-dbg: latest-debian-changelog-entry-without-new-version
-W: libhello0-dbg: debug-file-should-use-detached-symbols ./usr/lib/debug/lib/libhello.so.0.0
+W: libhello0-dbg: debug-file-should-use-detached-symbols usr/lib/debug/lib/libhello.so.0.0
W: libhello0-dbg: latest-debian-changelog-entry-without-new-version
-W: libhello0-dbg: shared-lib-without-dependency-information ./usr/lib/libhello.so.dbg
+W: libhello0-dbg: shared-lib-without-dependency-information usr/lib/libhello.so.dbg
W: libhello0: latest-debian-changelog-entry-without-new-version
W: libhello0: symbols-declares-dependency-on-other-package foobar (= 1.2)
W: libhello0: symbols-declares-dependency-on-other-package hello-dbg
diff --git a/testset/tags.libbaz b/testset/tags.libbaz
index 63c4bc1..ea6e01c 100644
--- a/testset/tags.libbaz
+++ b/testset/tags.libbaz
@@ -1,6 +1,6 @@
E: libbaz source: not-binnmuable-any-depends-any libbaz1-dev -> libbaz1
E: libbaz source: weak-library-dev-dependency libbaz1-dev on libbaz1 (= ${source:Version})
-E: libbaz1-dev: missing-dependency-on-libc needed by ./usr/lib/perl5/auto/Foo/Foo.so
+E: libbaz1-dev: missing-dependency-on-libc needed by usr/lib/perl5/auto/Foo/Foo.so
E: libbaz1: control-file-has-bad-permissions shlibs 0755 != 0644
E: libbaz1: control-file-has-bad-permissions symbols 0755 != 0644
E: libbaz1: debian-changelog-file-missing-or-wrong-name
@@ -18,19 +18,19 @@ E: libbaz1: shlib-with-executable-bit usr/lib/libfoo2.so.1.0.3b 0755
E: libbaz1: shlib-with-non-pic-code usr/lib/libbaz3.so.1.0.3b
E: libbaz1: symbols-declared-but-not-shlib libbaz 2
E: libbaz1: symbols-file-contains-current-version-with-debian-revision on symbol pw
-E: libbaz1: unstripped-binary-or-object ./usr/lib/libbaz1.so.1.0.3b
-E: libbaz1: unstripped-binary-or-object ./usr/lib/libbaz3.so.1.0.3b
-E: libbaz1: unstripped-binary-or-object ./usr/lib/libfoo2.so.1.0.3b
+E: libbaz1: unstripped-binary-or-object usr/lib/libbaz1.so.1.0.3b
+E: libbaz1: unstripped-binary-or-object usr/lib/libbaz3.so.1.0.3b
+E: libbaz1: unstripped-binary-or-object usr/lib/libfoo2.so.1.0.3b
E: libbaz2-dbg: debian-changelog-file-missing
E: libbaz2-dev: changelog-file-not-compressed changelog
E: libbaz2-dev: debian-changelog-file-missing-or-wrong-name
E: libbaz2: debian-changelog-file-missing-or-wrong-name
I: ia32-libbaz2: no-symbols-control-file usr/lib/i486-linux-gnu/libbaz2.so.1.0.3b
I: libbaz source: missing-debian-source-format
-I: libbaz1-dev: binary-has-unneeded-section ./usr/lib/perl5/auto/Foo/Foo.so .comment
+I: libbaz1-dev: binary-has-unneeded-section usr/lib/perl5/auto/Foo/Foo.so .comment
I: libbaz1-dev: no-md5sums-control-file
I: libbaz1-dev: package-contains-empty-directory usr/include/
-I: libbaz1: binary-has-unneeded-section ./usr/lib/perl5/auto/Foo/Foo.so .comment
+I: libbaz1: binary-has-unneeded-section usr/lib/perl5/auto/Foo/Foo.so .comment
I: libbaz1: no-md5sums-control-file
I: libbaz2-dbg: no-md5sums-control-file
I: libbaz2-dev: no-md5sums-control-file
--
Debian package checker
Reply to: