[SCM] Debian package checker branch, master, updated. 2.5.11-61-gbb86e1a
The following commit has been merged in the master branch:
commit 18e4ed24ab0643f9efba70bb1497e11dffd80ce8
Author: Niels Thykier <niels@thykier.net>
Date: Mon Jan 14 22:38:19 2013 +0100
Add some missing x32 info and consider it a bi-arch
It use currently used in gcc (e.g. libx32<LIB> packages).
Signed-off-by: Niels Thykier <niels@thykier.net>
diff --git a/checks/binaries b/checks/binaries
index 2c0158c..dca565f 100644
--- a/checks/binaries
+++ b/checks/binaries
@@ -244,10 +244,10 @@ foreach my $file ($info->sorted_index) {
if ($fileinfo =~ m/$archre/) {
# If it matches the architecture regex, it is good
$bad = 0;
- } elsif ($file =~ m,(?:^|/)lib(\d{2})/, or $file =~ m,^emul/ia(\d{2}),) {
+ } elsif ($file =~ m,(?:^|/)lib(x?\d{2})/, or $file =~ m,^emul/ia(\d{2}),) {
my $bitre = $ARCH_REGEX-> value($1);
# Special case - "old" multi-arch dirs
- $bad = 0 if $fileinfo =~ m/$bitre/
+ $bad = 0 if $bitre and $fileinfo =~ m/$bitre/
} elsif ($ARCH_64BIT_EQUIVS->known ($arch) && $file =~ m,^lib/modules/,) {
my $arch64re = $ARCH_REGEX->value ($ARCH_64BIT_EQUIVS->value ($arch));
# Allow amd64 kernel modules to be installed on i386.
diff --git a/checks/files b/checks/files
index 01a3ac0..f3b605a 100644
--- a/checks/files
+++ b/checks/files
@@ -569,7 +569,7 @@ foreach my $file ($info->sorted_index) {
# FHS dirs
elsif ($file !~ m,^usr/(?:X11R6|X386|
bin|games|include|
- lib|lib32|lib64|
+ lib|libx?32|lib64|
local|sbin|share|
src|spool|tmp)/,x) {
tag 'non-standard-dir-in-usr', $file;
@@ -674,7 +674,7 @@ foreach my $file ($info->sorted_index) {
}
# ---------------- FHS directory?
elsif ($file =~ m,^[^/]+/$,o and
- $file !~ m,^(?:bin|boot|dev|etc|home|lib(?:64|32)?|mnt|opt|root|run|sbin|selinux|srv|sys|tmp|usr|var)/,o) {
+ $file !~ m,^(?:bin|boot|dev|etc|home|lib(?:64|x?32)?|mnt|opt|root|run|sbin|selinux|srv|sys|tmp|usr|var)/,o) {
# Make an exception for the base-files package here and other similar
# packages because they install a slew of top-level directories for
# setting up the base system. (Specifically, /cdrom, /floppy,
@@ -706,9 +706,9 @@ foreach my $file ($info->sorted_index) {
if (not $index_info->is_dir) {
unless ($type eq 'udeb'
or $file =~ m,^usr/(?:bin|dict|doc|games|
- include|info|lib(?:32|64)?|
+ include|info|lib(?:x?32|64)?|
man|sbin|share|src|X11R6)/,x
- or $file =~ m,^lib(?:32|64)?/(?:modules/|libc5-compat/)?,
+ or $file =~ m,^lib(?:x?32|64)?/(?:modules/|libc5-compat/)?,
or $file =~ m,^var/(?:games|lib|www|named)/,
or $file =~ m,^(?:bin|boot|dev|etc|sbin)/,
# non-FHS, but still usual
diff --git a/data/binaries/arch-regex b/data/binaries/arch-regex
index 76e420b..5eab480 100644
--- a/data/binaries/arch-regex
+++ b/data/binaries/arch-regex
@@ -49,4 +49,4 @@ sh4 ~~ELF 32-bit LSB .* Renesas SH
sparc ~~ELF 32-bit MSB .* SPARC
#sparcv9b ~~ELF 32-bit MSB .* SPARC.* V8\+
sparc64 ~~ELF 64-bit MSB .* SPARC
-
+x32 ~~ELF 32-bit LSB .* x86-64
diff --git a/data/shared-libs/ldconfig-dirs b/data/shared-libs/ldconfig-dirs
index 9cee608..92ee466 100644
--- a/data/shared-libs/ldconfig-dirs
+++ b/data/shared-libs/ldconfig-dirs
@@ -18,9 +18,11 @@
# Keep: lib
# Keep: lib32
# Keep: lib64
+# Keep: libx32
# Keep: usr/lib
# Keep: usr/lib32
# Keep: usr/lib64
+# Keep: usr/libx32
# Keep: usr/local/lib
lib
@@ -310,6 +312,7 @@ lib/x86_64-solaris
lib/x86_64-uclinux-uclibc
lib32
lib64
+libx32
usr/lib
usr/lib/aarch64-darwin
usr/lib/aarch64-freebsd
@@ -597,4 +600,5 @@ usr/lib/x86_64-solaris
usr/lib/x86_64-uclinux-uclibc
usr/lib32
usr/lib64
+usr/libx32
usr/local/lib
diff --git a/debian/changelog b/debian/changelog
index c2f9fb1..7feb142 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ lintian (2.5.12) UNRELEASED; urgency=low
- dir-or-file-in-home
- license-problem-gfdl-invariants
+ * checks/binaries:
+ + [NT] Accept libx32 as a bi-arch directory.
* checks/cruft:
+ [NT] Do not emit the license-problem-json-evil tag for
non-free packages.
@@ -19,6 +21,7 @@ lintian (2.5.12) UNRELEASED; urgency=low
+ [NT] Do not suggest the use of "virtual package" as a way
to suppress empty-binary-package. Lintian will still
accept it the phrase for now.
+ + [NT] Accept libx32 as an bi-arch directory.
* checks/menu-format{,.desc}:
+ [NT] Apply patch from Bastien Roucariès to detect missing
"Keywords" in desktop files. Thanks to Jeremy Bicha for
@@ -29,11 +32,16 @@ lintian (2.5.12) UNRELEASED; urgency=low
* collection/strings:
+ [NT] Fix a regression in filtering out "debug" ELF binaries.
+ * data/binaries/arch-regex:
+ + [NT] Recognise x32 as an ELF32 binary.
* data/fields/obsolete-packages:
+ [NT] Apply patch from Guillem Jover to add fuse-utils as an
obsolete package. (Closes: #697534)
* data/files/locale-codes:
+ [NT] Refresh against sid data files.
+ * data/shared-libs/ldconfig-dirs:
+ + [NT] Add libx32 and usr/libx32 used by some gcc x32 bi-arch
+ packages.
* data/menu-format/add-categories:
+ [NT] Apply patch from Matthias Klumpp to add missing
subcategories.
--
Debian package checker
Reply to: