[SCM] Debian package checker branch, master, updated. 2.5.4-118-g05feee7
The following commit has been merged in the master branch:
commit 05feee726e75d28f6b02f61e15553760e32ec0a8
Author: Niels Thykier <niels@thykier.net>
Date: Sat Jan 28 15:11:43 2012 +0100
Rewrote refresh-archs, auto-generated ldconfig-dirs
Signed-off-by: Niels Thykier <niels@thykier.net>
diff --git a/data/binaries/multiarch-dirs b/data/binaries/multiarch-dirs
index 7cad9bc..e76134d 100644
--- a/data/binaries/multiarch-dirs
+++ b/data/binaries/multiarch-dirs
@@ -1,7 +1,8 @@
-# List of "triplet architecture" relationships as provided by
+# List of "Multiarch dirs" relationships as provided by
# dpkg-architecture - arch -> dir mapping
-# Last updated: 2011-06-12
-# With: Debian dpkg-architecture version 1.16.0.3.
+# Last updated: 2012-01-28
+# With: Debian dpkg-architecture version 1.16.1.2.
+# This file was auto-generated by private/refresh-archs
alpha alpha-linux-gnu
amd64 x86_64-linux-gnu
diff --git a/data/common/architectures b/data/common/architectures
index 9830f39..2c1358b 100644
--- a/data/common/architectures
+++ b/data/common/architectures
@@ -1,7 +1,8 @@
# List of known architectures as provided by dpkg-architecture
# (excluding "all" and "any", which are handled specially)
-# Last updated: 2012-01-08
+# Last updated: 2012-01-28
# With: Debian dpkg-architecture version 1.16.1.2.
+# This file was auto-generated by private/refresh-archs
alpha || linux alpha
amd64 || linux amd64
diff --git a/data/files/triplets b/data/files/triplets
index b5e8fd2..898ce4a 100644
--- a/data/files/triplets
+++ b/data/files/triplets
@@ -1,7 +1,8 @@
# List of "triplet architecture" relationships as provided by
-# dpkg-architecture
-# Last updated: 2011-04-19
-# With: Debian dpkg-architecture version 1.16.0.1.
+# dpkg-architecture'
+# Last updated: 2012-01-28
+# With: Debian dpkg-architecture version 1.16.1.2.
+# This file was auto-generated by private/refresh-archs
alpha-darwin darwin-alpha
alpha-freebsd freebsd-alpha
diff --git a/data/shared-libs/ldconfig-dirs b/data/shared-libs/ldconfig-dirs
index efdc5a4..9d36fb9 100644
--- a/data/shared-libs/ldconfig-dirs
+++ b/data/shared-libs/ldconfig-dirs
@@ -4,48 +4,571 @@
# proper SONAMEs.
#
# Directories listed here must not have leading slashes.
-
-# Standard library directories.
-lib
-usr/lib
-usr/local/lib
-
-# For 32-bit/64-bit multiarch support.
-lib32
-lib64
-usr/lib32
-usr/lib64
-
-# This is now obsolete, but is still in the standard ld.so.conf.
-usr/X11R6/lib
-
-# Multiarch directories. Currently, these aren't used officially by the
-# project but ld.so looks in the ones native to the local platform.
-# Hopefully including the ones not native to the local platform won't
-# hurt.
+#
+# On the topic of multi-arch dirs. Hopefully including the ones not
+# native to the local platform won't hurt.
#
# See Bug#469301 and Bug#464796 for more details.
+#
+# Last updated: 2012-01-28
+# With: Debian dpkg-architecture version 1.16.1.2.
+# This file was auto-generated by private/refresh-archs
+#
+# Lines to always be include
+# Keep: lib
+# Keep: lib32
+# Keep: lib64
+# Keep: usr/lib
+# Keep: usr/lib32
+# Keep: usr/lib64
+# Keep: usr/local/lib
+# Keep: usr/X11R6/lib
+
+lib
+lib/alpha-darwin
+lib/alpha-freebsd
+lib/alpha-gnu
+lib/alpha-kfreebsd-gnu
+lib/alpha-knetbsd-gnu
+lib/alpha-kopensolaris-gnu
+lib/alpha-linux-gnu
+lib/alpha-linux-uclibc
+lib/alpha-netbsd
+lib/alpha-openbsd
+lib/alpha-solaris
+lib/alpha-uclinux-uclibc
+lib/arm-darwin
+lib/arm-freebsd
+lib/arm-gnu
+lib/arm-kfreebsd-gnu
+lib/arm-knetbsd-gnu
+lib/arm-kopensolaris-gnu
lib/arm-linux-gnu
lib/arm-linux-gnueabi
-lib/i386-linux-gnu
-lib/i386-gnu
+lib/arm-linux-gnueabihf
+lib/arm-linux-uclibc
+lib/arm-linux-uclibceabi
+lib/arm-netbsd
+lib/arm-openbsd
+lib/arm-solaris
+lib/arm-uclinux-uclibc
+lib/arm-uclinux-uclibceabi
+lib/armeb-darwin
+lib/armeb-freebsd
+lib/armeb-gnu
+lib/armeb-kfreebsd-gnu
+lib/armeb-knetbsd-gnu
+lib/armeb-kopensolaris-gnu
+lib/armeb-linux-gnu
+lib/armeb-linux-uclibc
+lib/armeb-netbsd
+lib/armeb-openbsd
+lib/armeb-solaris
+lib/armeb-uclinux-uclibc
+lib/avr32-darwin
+lib/avr32-freebsd
+lib/avr32-gnu
+lib/avr32-kfreebsd-gnu
+lib/avr32-knetbsd-gnu
+lib/avr32-kopensolaris-gnu
+lib/avr32-linux-gnu
+lib/avr32-linux-uclibc
+lib/avr32-netbsd
+lib/avr32-openbsd
+lib/avr32-solaris
+lib/avr32-uclinux-uclibc
+lib/hppa-darwin
+lib/hppa-freebsd
+lib/hppa-gnu
+lib/hppa-kfreebsd-gnu
+lib/hppa-knetbsd-gnu
+lib/hppa-kopensolaris-gnu
lib/hppa-linux-gnu
+lib/hppa-linux-uclibc
+lib/hppa-netbsd
+lib/hppa-openbsd
+lib/hppa-solaris
+lib/hppa-uclinux-uclibc
+lib/i386-darwin
+lib/i386-freebsd
+lib/i386-gnu
+lib/i386-kfreebsd-gnu
+lib/i386-knetbsd-gnu
+lib/i386-kopensolaris-gnu
+lib/i386-linux-gnu
+lib/i386-linux-gnulp
+lib/i386-linux-uclibc
+lib/i386-netbsd
+lib/i386-openbsd
+lib/i386-solaris
+lib/i386-uclinux-uclibc
+lib/ia64-darwin
+lib/ia64-freebsd
+lib/ia64-gnu
+lib/ia64-kfreebsd-gnu
+lib/ia64-knetbsd-gnu
+lib/ia64-kopensolaris-gnu
+lib/ia64-linux-gnu
+lib/ia64-linux-uclibc
+lib/ia64-netbsd
+lib/ia64-openbsd
+lib/ia64-solaris
+lib/ia64-uclinux-uclibc
+lib/m32r-darwin
+lib/m32r-freebsd
+lib/m32r-gnu
+lib/m32r-kfreebsd-gnu
+lib/m32r-knetbsd-gnu
+lib/m32r-kopensolaris-gnu
+lib/m32r-linux-gnu
+lib/m32r-linux-uclibc
+lib/m32r-netbsd
+lib/m32r-openbsd
+lib/m32r-solaris
+lib/m32r-uclinux-uclibc
+lib/m68k-darwin
+lib/m68k-freebsd
+lib/m68k-gnu
+lib/m68k-kfreebsd-gnu
+lib/m68k-knetbsd-gnu
+lib/m68k-kopensolaris-gnu
lib/m68k-linux-gnu
+lib/m68k-linux-uclibc
+lib/m68k-netbsd
+lib/m68k-openbsd
+lib/m68k-solaris
+lib/m68k-uclinux-uclibc
+lib/mips-darwin
+lib/mips-freebsd
+lib/mips-gnu
+lib/mips-kfreebsd-gnu
+lib/mips-knetbsd-gnu
+lib/mips-kopensolaris-gnu
lib/mips-linux-gnu
+lib/mips-linux-uclibc
+lib/mips-netbsd
+lib/mips-openbsd
+lib/mips-solaris
+lib/mips-uclinux-uclibc
+lib/mipsel-darwin
+lib/mipsel-freebsd
+lib/mipsel-gnu
+lib/mipsel-kfreebsd-gnu
+lib/mipsel-knetbsd-gnu
+lib/mipsel-kopensolaris-gnu
lib/mipsel-linux-gnu
+lib/mipsel-linux-uclibc
+lib/mipsel-netbsd
+lib/mipsel-openbsd
+lib/mipsel-solaris
+lib/mipsel-uclinux-uclibc
+lib/powerpc-darwin
+lib/powerpc-freebsd
+lib/powerpc-gnu
+lib/powerpc-kfreebsd-gnu
+lib/powerpc-knetbsd-gnu
+lib/powerpc-kopensolaris-gnu
lib/powerpc-linux-gnu
+lib/powerpc-linux-gnuspe
+lib/powerpc-linux-uclibc
+lib/powerpc-netbsd
+lib/powerpc-openbsd
+lib/powerpc-solaris
+lib/powerpc-uclinux-uclibc
+lib/powerpc64-darwin
+lib/powerpc64-freebsd
+lib/powerpc64-gnu
+lib/powerpc64-kfreebsd-gnu
+lib/powerpc64-knetbsd-gnu
+lib/powerpc64-kopensolaris-gnu
+lib/powerpc64-linux-gnu
+lib/powerpc64-linux-uclibc
+lib/powerpc64-netbsd
+lib/powerpc64-openbsd
+lib/powerpc64-solaris
+lib/powerpc64-uclinux-uclibc
+lib/s390-darwin
+lib/s390-freebsd
+lib/s390-gnu
+lib/s390-kfreebsd-gnu
+lib/s390-knetbsd-gnu
+lib/s390-kopensolaris-gnu
lib/s390-linux-gnu
+lib/s390-linux-uclibc
+lib/s390-netbsd
+lib/s390-openbsd
+lib/s390-solaris
+lib/s390-uclinux-uclibc
+lib/s390x-darwin
+lib/s390x-freebsd
+lib/s390x-gnu
+lib/s390x-kfreebsd-gnu
+lib/s390x-knetbsd-gnu
+lib/s390x-kopensolaris-gnu
+lib/s390x-linux-gnu
+lib/s390x-linux-uclibc
+lib/s390x-netbsd
+lib/s390x-openbsd
+lib/s390x-solaris
+lib/s390x-uclinux-uclibc
+lib/sh3-darwin
+lib/sh3-freebsd
+lib/sh3-gnu
+lib/sh3-kfreebsd-gnu
+lib/sh3-knetbsd-gnu
+lib/sh3-kopensolaris-gnu
+lib/sh3-linux-gnu
+lib/sh3-linux-uclibc
+lib/sh3-netbsd
+lib/sh3-openbsd
+lib/sh3-solaris
+lib/sh3-uclinux-uclibc
+lib/sh3eb-darwin
+lib/sh3eb-freebsd
+lib/sh3eb-gnu
+lib/sh3eb-kfreebsd-gnu
+lib/sh3eb-knetbsd-gnu
+lib/sh3eb-kopensolaris-gnu
+lib/sh3eb-linux-gnu
+lib/sh3eb-linux-uclibc
+lib/sh3eb-netbsd
+lib/sh3eb-openbsd
+lib/sh3eb-solaris
+lib/sh3eb-uclinux-uclibc
+lib/sh4-darwin
+lib/sh4-freebsd
+lib/sh4-gnu
+lib/sh4-kfreebsd-gnu
+lib/sh4-knetbsd-gnu
+lib/sh4-kopensolaris-gnu
+lib/sh4-linux-gnu
+lib/sh4-linux-uclibc
+lib/sh4-netbsd
+lib/sh4-openbsd
+lib/sh4-solaris
+lib/sh4-uclinux-uclibc
+lib/sh4eb-darwin
+lib/sh4eb-freebsd
+lib/sh4eb-gnu
+lib/sh4eb-kfreebsd-gnu
+lib/sh4eb-knetbsd-gnu
+lib/sh4eb-kopensolaris-gnu
+lib/sh4eb-linux-gnu
+lib/sh4eb-linux-uclibc
+lib/sh4eb-netbsd
+lib/sh4eb-openbsd
+lib/sh4eb-solaris
+lib/sh4eb-uclinux-uclibc
+lib/sparc-darwin
+lib/sparc-freebsd
+lib/sparc-gnu
+lib/sparc-kfreebsd-gnu
+lib/sparc-knetbsd-gnu
+lib/sparc-kopensolaris-gnu
lib/sparc-linux-gnu
+lib/sparc-linux-uclibc
+lib/sparc-netbsd
+lib/sparc-openbsd
+lib/sparc-solaris
+lib/sparc-uclinux-uclibc
+lib/sparc64-darwin
+lib/sparc64-freebsd
+lib/sparc64-gnu
+lib/sparc64-kfreebsd-gnu
+lib/sparc64-knetbsd-gnu
+lib/sparc64-kopensolaris-gnu
+lib/sparc64-linux-gnu
+lib/sparc64-linux-uclibc
+lib/sparc64-netbsd
+lib/sparc64-openbsd
+lib/sparc64-solaris
+lib/sparc64-uclinux-uclibc
+lib/x86_64-darwin
+lib/x86_64-freebsd
+lib/x86_64-gnu
+lib/x86_64-kfreebsd-gnu
+lib/x86_64-knetbsd-gnu
+lib/x86_64-kopensolaris-gnu
lib/x86_64-linux-gnu
+lib/x86_64-linux-uclibc
+lib/x86_64-netbsd
+lib/x86_64-openbsd
+lib/x86_64-solaris
+lib/x86_64-uclinux-uclibc
+lib32
+lib64
+usr/X11R6/lib
+usr/lib
+usr/lib/alpha-darwin
+usr/lib/alpha-freebsd
+usr/lib/alpha-gnu
+usr/lib/alpha-kfreebsd-gnu
+usr/lib/alpha-knetbsd-gnu
+usr/lib/alpha-kopensolaris-gnu
+usr/lib/alpha-linux-gnu
+usr/lib/alpha-linux-uclibc
+usr/lib/alpha-netbsd
+usr/lib/alpha-openbsd
+usr/lib/alpha-solaris
+usr/lib/alpha-uclinux-uclibc
+usr/lib/arm-darwin
+usr/lib/arm-freebsd
+usr/lib/arm-gnu
+usr/lib/arm-kfreebsd-gnu
+usr/lib/arm-knetbsd-gnu
+usr/lib/arm-kopensolaris-gnu
usr/lib/arm-linux-gnu
usr/lib/arm-linux-gnueabi
-usr/lib/i386-linux-gnu
-usr/lib/i386-gnu
+usr/lib/arm-linux-gnueabihf
+usr/lib/arm-linux-uclibc
+usr/lib/arm-linux-uclibceabi
+usr/lib/arm-netbsd
+usr/lib/arm-openbsd
+usr/lib/arm-solaris
+usr/lib/arm-uclinux-uclibc
+usr/lib/arm-uclinux-uclibceabi
+usr/lib/armeb-darwin
+usr/lib/armeb-freebsd
+usr/lib/armeb-gnu
+usr/lib/armeb-kfreebsd-gnu
+usr/lib/armeb-knetbsd-gnu
+usr/lib/armeb-kopensolaris-gnu
+usr/lib/armeb-linux-gnu
+usr/lib/armeb-linux-uclibc
+usr/lib/armeb-netbsd
+usr/lib/armeb-openbsd
+usr/lib/armeb-solaris
+usr/lib/armeb-uclinux-uclibc
+usr/lib/avr32-darwin
+usr/lib/avr32-freebsd
+usr/lib/avr32-gnu
+usr/lib/avr32-kfreebsd-gnu
+usr/lib/avr32-knetbsd-gnu
+usr/lib/avr32-kopensolaris-gnu
+usr/lib/avr32-linux-gnu
+usr/lib/avr32-linux-uclibc
+usr/lib/avr32-netbsd
+usr/lib/avr32-openbsd
+usr/lib/avr32-solaris
+usr/lib/avr32-uclinux-uclibc
+usr/lib/hppa-darwin
+usr/lib/hppa-freebsd
+usr/lib/hppa-gnu
+usr/lib/hppa-kfreebsd-gnu
+usr/lib/hppa-knetbsd-gnu
+usr/lib/hppa-kopensolaris-gnu
usr/lib/hppa-linux-gnu
+usr/lib/hppa-linux-uclibc
+usr/lib/hppa-netbsd
+usr/lib/hppa-openbsd
+usr/lib/hppa-solaris
+usr/lib/hppa-uclinux-uclibc
+usr/lib/i386-darwin
+usr/lib/i386-freebsd
+usr/lib/i386-gnu
+usr/lib/i386-kfreebsd-gnu
+usr/lib/i386-knetbsd-gnu
+usr/lib/i386-kopensolaris-gnu
+usr/lib/i386-linux-gnu
+usr/lib/i386-linux-gnulp
+usr/lib/i386-linux-uclibc
+usr/lib/i386-netbsd
+usr/lib/i386-openbsd
+usr/lib/i386-solaris
+usr/lib/i386-uclinux-uclibc
+usr/lib/ia64-darwin
+usr/lib/ia64-freebsd
+usr/lib/ia64-gnu
+usr/lib/ia64-kfreebsd-gnu
+usr/lib/ia64-knetbsd-gnu
+usr/lib/ia64-kopensolaris-gnu
+usr/lib/ia64-linux-gnu
+usr/lib/ia64-linux-uclibc
+usr/lib/ia64-netbsd
+usr/lib/ia64-openbsd
+usr/lib/ia64-solaris
+usr/lib/ia64-uclinux-uclibc
+usr/lib/m32r-darwin
+usr/lib/m32r-freebsd
+usr/lib/m32r-gnu
+usr/lib/m32r-kfreebsd-gnu
+usr/lib/m32r-knetbsd-gnu
+usr/lib/m32r-kopensolaris-gnu
+usr/lib/m32r-linux-gnu
+usr/lib/m32r-linux-uclibc
+usr/lib/m32r-netbsd
+usr/lib/m32r-openbsd
+usr/lib/m32r-solaris
+usr/lib/m32r-uclinux-uclibc
+usr/lib/m68k-darwin
+usr/lib/m68k-freebsd
+usr/lib/m68k-gnu
+usr/lib/m68k-kfreebsd-gnu
+usr/lib/m68k-knetbsd-gnu
+usr/lib/m68k-kopensolaris-gnu
usr/lib/m68k-linux-gnu
+usr/lib/m68k-linux-uclibc
+usr/lib/m68k-netbsd
+usr/lib/m68k-openbsd
+usr/lib/m68k-solaris
+usr/lib/m68k-uclinux-uclibc
+usr/lib/mips-darwin
+usr/lib/mips-freebsd
+usr/lib/mips-gnu
+usr/lib/mips-kfreebsd-gnu
+usr/lib/mips-knetbsd-gnu
+usr/lib/mips-kopensolaris-gnu
usr/lib/mips-linux-gnu
+usr/lib/mips-linux-uclibc
+usr/lib/mips-netbsd
+usr/lib/mips-openbsd
+usr/lib/mips-solaris
+usr/lib/mips-uclinux-uclibc
+usr/lib/mipsel-darwin
+usr/lib/mipsel-freebsd
+usr/lib/mipsel-gnu
+usr/lib/mipsel-kfreebsd-gnu
+usr/lib/mipsel-knetbsd-gnu
+usr/lib/mipsel-kopensolaris-gnu
usr/lib/mipsel-linux-gnu
+usr/lib/mipsel-linux-uclibc
+usr/lib/mipsel-netbsd
+usr/lib/mipsel-openbsd
+usr/lib/mipsel-solaris
+usr/lib/mipsel-uclinux-uclibc
+usr/lib/powerpc-darwin
+usr/lib/powerpc-freebsd
+usr/lib/powerpc-gnu
+usr/lib/powerpc-kfreebsd-gnu
+usr/lib/powerpc-knetbsd-gnu
+usr/lib/powerpc-kopensolaris-gnu
usr/lib/powerpc-linux-gnu
+usr/lib/powerpc-linux-gnuspe
+usr/lib/powerpc-linux-uclibc
+usr/lib/powerpc-netbsd
+usr/lib/powerpc-openbsd
+usr/lib/powerpc-solaris
+usr/lib/powerpc-uclinux-uclibc
+usr/lib/powerpc64-darwin
+usr/lib/powerpc64-freebsd
+usr/lib/powerpc64-gnu
+usr/lib/powerpc64-kfreebsd-gnu
+usr/lib/powerpc64-knetbsd-gnu
+usr/lib/powerpc64-kopensolaris-gnu
+usr/lib/powerpc64-linux-gnu
+usr/lib/powerpc64-linux-uclibc
+usr/lib/powerpc64-netbsd
+usr/lib/powerpc64-openbsd
+usr/lib/powerpc64-solaris
+usr/lib/powerpc64-uclinux-uclibc
+usr/lib/s390-darwin
+usr/lib/s390-freebsd
+usr/lib/s390-gnu
+usr/lib/s390-kfreebsd-gnu
+usr/lib/s390-knetbsd-gnu
+usr/lib/s390-kopensolaris-gnu
usr/lib/s390-linux-gnu
+usr/lib/s390-linux-uclibc
+usr/lib/s390-netbsd
+usr/lib/s390-openbsd
+usr/lib/s390-solaris
+usr/lib/s390-uclinux-uclibc
+usr/lib/s390x-darwin
+usr/lib/s390x-freebsd
+usr/lib/s390x-gnu
+usr/lib/s390x-kfreebsd-gnu
+usr/lib/s390x-knetbsd-gnu
+usr/lib/s390x-kopensolaris-gnu
+usr/lib/s390x-linux-gnu
+usr/lib/s390x-linux-uclibc
+usr/lib/s390x-netbsd
+usr/lib/s390x-openbsd
+usr/lib/s390x-solaris
+usr/lib/s390x-uclinux-uclibc
+usr/lib/sh3-darwin
+usr/lib/sh3-freebsd
+usr/lib/sh3-gnu
+usr/lib/sh3-kfreebsd-gnu
+usr/lib/sh3-knetbsd-gnu
+usr/lib/sh3-kopensolaris-gnu
+usr/lib/sh3-linux-gnu
+usr/lib/sh3-linux-uclibc
+usr/lib/sh3-netbsd
+usr/lib/sh3-openbsd
+usr/lib/sh3-solaris
+usr/lib/sh3-uclinux-uclibc
+usr/lib/sh3eb-darwin
+usr/lib/sh3eb-freebsd
+usr/lib/sh3eb-gnu
+usr/lib/sh3eb-kfreebsd-gnu
+usr/lib/sh3eb-knetbsd-gnu
+usr/lib/sh3eb-kopensolaris-gnu
+usr/lib/sh3eb-linux-gnu
+usr/lib/sh3eb-linux-uclibc
+usr/lib/sh3eb-netbsd
+usr/lib/sh3eb-openbsd
+usr/lib/sh3eb-solaris
+usr/lib/sh3eb-uclinux-uclibc
+usr/lib/sh4-darwin
+usr/lib/sh4-freebsd
+usr/lib/sh4-gnu
+usr/lib/sh4-kfreebsd-gnu
+usr/lib/sh4-knetbsd-gnu
+usr/lib/sh4-kopensolaris-gnu
+usr/lib/sh4-linux-gnu
+usr/lib/sh4-linux-uclibc
+usr/lib/sh4-netbsd
+usr/lib/sh4-openbsd
+usr/lib/sh4-solaris
+usr/lib/sh4-uclinux-uclibc
+usr/lib/sh4eb-darwin
+usr/lib/sh4eb-freebsd
+usr/lib/sh4eb-gnu
+usr/lib/sh4eb-kfreebsd-gnu
+usr/lib/sh4eb-knetbsd-gnu
+usr/lib/sh4eb-kopensolaris-gnu
+usr/lib/sh4eb-linux-gnu
+usr/lib/sh4eb-linux-uclibc
+usr/lib/sh4eb-netbsd
+usr/lib/sh4eb-openbsd
+usr/lib/sh4eb-solaris
+usr/lib/sh4eb-uclinux-uclibc
+usr/lib/sparc-darwin
+usr/lib/sparc-freebsd
+usr/lib/sparc-gnu
+usr/lib/sparc-kfreebsd-gnu
+usr/lib/sparc-knetbsd-gnu
+usr/lib/sparc-kopensolaris-gnu
usr/lib/sparc-linux-gnu
+usr/lib/sparc-linux-uclibc
+usr/lib/sparc-netbsd
+usr/lib/sparc-openbsd
+usr/lib/sparc-solaris
+usr/lib/sparc-uclinux-uclibc
+usr/lib/sparc64-darwin
+usr/lib/sparc64-freebsd
+usr/lib/sparc64-gnu
+usr/lib/sparc64-kfreebsd-gnu
+usr/lib/sparc64-knetbsd-gnu
+usr/lib/sparc64-kopensolaris-gnu
+usr/lib/sparc64-linux-gnu
+usr/lib/sparc64-linux-uclibc
+usr/lib/sparc64-netbsd
+usr/lib/sparc64-openbsd
+usr/lib/sparc64-solaris
+usr/lib/sparc64-uclinux-uclibc
+usr/lib/x86_64-darwin
+usr/lib/x86_64-freebsd
+usr/lib/x86_64-gnu
+usr/lib/x86_64-kfreebsd-gnu
+usr/lib/x86_64-knetbsd-gnu
+usr/lib/x86_64-kopensolaris-gnu
usr/lib/x86_64-linux-gnu
+usr/lib/x86_64-linux-uclibc
+usr/lib/x86_64-netbsd
+usr/lib/x86_64-openbsd
+usr/lib/x86_64-solaris
+usr/lib/x86_64-uclinux-uclibc
+usr/lib32
+usr/lib64
+usr/local/lib
diff --git a/debian/changelog b/debian/changelog
index 4871e00..691903a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -130,6 +130,9 @@ lintian (2.5.5) UNRELEASED; urgency=low
* data/fields/archive-sections:
+ [NT] Added new sections. Thanks to Michael Biebl for the
reminder. (Closes: #652123)
+ * data/shared-libs/ldconfig-dirs:
+ + [NT] Auto-generate file with help from dpkg-architecture.
+ (Closes: #653832)
* doc/lintian.xml:
+ [NT] Corrected the runtime estimate for an archive-wide run.
@@ -215,6 +218,9 @@ lintian (2.5.5) UNRELEASED; urgency=low
+ [NT] Removed the notes that some options disable loading of a
profile. Lintian now always loads a profile when doing checks.
+ * private/refresh-archs:
+ + [NT] Rewritten.
+
* reporting/harness:
+ [NT] Removed useless "TODO" message from the log output.
* reporting/html_reports:
diff --git a/private/refresh-archs b/private/refresh-archs
index 5398477..65bd915 100755
--- a/private/refresh-archs
+++ b/private/refresh-archs
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/usr/bin/perl
####################
-# Copyright (C) 2009 by Raphael Geissert <atomo64@gmail.com>
-#
+# Copyright (C) 2012 Niels Thykier <niels@thykier.net>
+# - Based on a shell script by Raphael Geissert <atomo64@gmail.com>
#
# This file is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -18,87 +18,180 @@
# along with this file. If not, see <http://www.gnu.org/licenses/>.
####################
-set -e
-
-if [ -z "$1" ]; then
- printf "Usage: %s path/to/lintian/data\n" \
- "$(basename "$0")"
- exit 0
-fi
-
-export LC_ALL=C
+use strict;
+use warnings;
-dpkg_version="$(dpkg-architecture --version | head -n1)"
+use File::Temp qw(tempfile);
+use POSIX qw (strftime);
-### Architectures list ###
+my $datapath = shift;
+my %archs = ();
+my %files = ();
-f="$(mktemp)"
-
-cat > "$f" <<EOF
-# List of known architectures as provided by dpkg-architecture
-# (excluding "all" and "any", which are handled specially)
-# Last updated: $(date -u +'%Y-%m-%d')
-# With: $dpkg_version
+# Adding data files to be updated by this file is as simple as calling
+# add_data_file and give it a hash of the following:
+#
+# filename => name of the data file in the data dir
+# line-spec => List-ref of line descriptions. Variables from
+# dpkg-architecture can be used via @VAR@. There will be
+# one line in the list-ref times the architectures listed
+# by $(dpkg-architecture -L).
+# header => Optional text header text. Lines should start with "#".
+# The script will add the "Last updated", "With" and a
+# "This file was auto-generated by $0" automatically.
+# keep => If present and a truth value, the file will use
+# "keep:" comments to hard-code some values
+#
+#
+# All lines (except the header) will be sorted before they are written
+# to minimize the diff.
+#
+add_data_file (
+ 'filename' => 'binaries/multiarch-dirs',
+ 'line-spec' => ['@DEB_HOST_ARCH@ @DEB_HOST_MULTIARCH@'],
+ 'header' => <<EOF
+# List of "Multiarch dirs" relationships as provided by
+# dpkg-architecture - arch -> dir mapping
EOF
+);
-{
-# Map an Debian arch (e.g. i386) to the "(OS, CPU)" tuple
-for archstr in $(dpkg-architecture -L); do
- os="$(dpkg-architecture -a"$archstr" -qDEB_HOST_ARCH_OS 2>/dev/null)"
- cpu="$(dpkg-architecture -a"$archstr" -qDEB_HOST_ARCH_CPU 2>/dev/null)"
-
- printf "%s || %s %s\n" "$archstr" "$os" "$cpu"
-done
-} | sort >> "$f"
-
-mv "$f" "$1"/common/architectures
-
-
-### Triplets list ###
-
-f="$(mktemp)"
-
-cat > "$f" <<EOF
+add_data_file (
+ 'filename' => 'files/triplets',
+ 'line-spec' => ['@DEB_HOST_MULTIARCH@ @DEB_HOST_ARCH@'],
+ 'header' => <<EOF
# List of "triplet architecture" relationships as provided by
-# dpkg-architecture
-# Last updated: $(date -u +'%Y-%m-%d')
-# With: $dpkg_version
-
+# dpkg-architecture'
EOF
+);
-{ # run this in a subshell to avoid multiple fd redirections
-for arch in $(dpkg-architecture -L); do
- triplet="$(dpkg-architecture -a"$arch" -qDEB_HOST_MULTIARCH 2>/dev/null)"
- printf "%s %s\n" "$triplet" "$arch"
-done
-} | sort >> "$f"
-
-mv "$f" "$1"/files/triplets
-
-### Multiarch dirs ###
-
-f="$(mktemp)"
-
-cat > "$f" <<EOF
-# List of "Multiarch dirs" relationships as provided by
-# dpkg-architecture - arch -> dir mapping
-# Last updated: $(date -u +'%Y-%m-%d')
-# With: $dpkg_version
-
+add_data_file (
+ 'filename' => 'common/architectures',
+ 'line-spec' => ['@DEB_HOST_ARCH@ || @DEB_HOST_ARCH_OS@ @DEB_HOST_ARCH_CPU@'],
+ 'header' => <<EOF
+# List of known architectures as provided by dpkg-architecture
+# (excluding "all" and "any", which are handled specially)
EOF
+);
+
+add_data_file (
+ 'filename' => 'shared-libs/ldconfig-dirs',
+ 'line-spec' => ['lib/@DEB_HOST_MULTIARCH@',
+ 'usr/lib/@DEB_HOST_MULTIARCH@'],
+ 'keep' => 1,
+ 'header' => <<EOF
+# The list of directories searched by default by the dynamic linker.
+# Packages installing shared libraries into these directories must call
+# ldconfig, must have shlibs files, and must ensure those libraries have
+# proper SONAMEs.
+#
+# Directories listed here must not have leading slashes.
+#
+# On the topic of multi-arch dirs. Hopefully including the ones not
+# native to the local platform won't hurt.
+#
+# See Bug#469301 and Bug#464796 for more details.
+#
+EOF
+);
+
+unless ($datapath) {
+ print STDERR "Usage: $0 path/to/lintian/data\n";
+ exit 1;
+}
+
+$ENV{'LC_ALL'} = 'C';
+
+my $dver = `dpkg-architecture --version | head -n1`;
+chomp $dver;
+
+open my $dlfd, '-|', "dpkg-architecture -L 2>/dev/null" or die "dpkg-architecture -L: $!";
+while ( my $archstr = <$dlfd> ) {
+ chomp $archstr;
+ open my $dafd, '-|', "dpkg-architecture -a$archstr 2>/dev/null" or die "dpkg-architecture -a$archstr: $!";
+ while ( my $var = <$dafd> ) {
+ chomp $var;
+ my ($key, $value) = split /=/, $var, 2;
+ $archs{$archstr}{$key} = $value;
+ }
+ close $dafd;
+}
+close $dlfd;
+
+
+open_data_files($dver);
+foreach my $archstr (sort keys %archs) {
+ my $arch = $archs{$archstr};
+ write_data_line ($arch);
+}
+
+close_and_rename();
+
+exit 0;
+
+sub write_data_line {
+ my ($vars) = @_;
+ foreach my $filename (keys %files) {
+ my $fd = $files{$filename}->{'fd'};
+ foreach my $orig (@{ $files{$filename}->{'line-spec'} }) {
+ my $line = $orig; # copy the template
+ $line =~ s#\@([^@ \t]+)\@#$vars->{$1}//die "Unknown var: $1"#eg;
+ push @{ $files{$filename}->{'lines'} }, $line;
+ }
+ }
+}
+
+sub open_data_files {
+ my ($version) = @_;
+ my $date = strftime '%Y-%m-%d', gmtime;
+ foreach my $filename (keys %files) {
+ my ($fd, $temp) = tempfile();
+ $files{$filename}->{'temp-file'} = $temp;
+ $files{$filename}->{'fd'} = $fd;
+ $files{$filename}->{'lines'} = [];
+ if ($files{$filename}->{'header'}) {
+ print $fd $files{$filename}->{'header'};
+ }
+ print $fd "# Last updated: $date\n";
+ print $fd "# With: $version\n";
+ print $fd "# This file was auto-generated by $0\n";
+ if ($files{$filename}->{'keep'}) {
+ open my $orig, '<', "$datapath/$filename" or die "Opening $datapath/$filename: $!";
+ print $fd "#\n# Lines to always be include\n";
+ while ( my $line = <$orig> ) {
+ next unless $line =~ m/^#\s*Keep:\s*(.*\S)\s*$/io;
+ my $v = $1;
+ print $fd "# Keep: $v\n";
+ push @{ $files{$filename}->{'lines'} } , $v;
+ }
+ close $orig;
+ }
+ print $fd "\n";
+ }
+}
+
+sub add_data_file {
+ my (%data) = @_;
+ my $file = $data{'filename'} or die "Missing filename.\n";
+ @{ $data{'line-spec'} } or die "Missing line spec for $file.\n";
+ $data{'header'} //= '';
+ $data{'keep'} //= 0;
+ $files{$file} = \%data;
+}
+
+sub close_and_rename {
+ foreach my $filename (keys %files) {
+ my $tf = $files{$filename}->{'temp-file'};
+ my $fd = $files{$filename}->{'fd'};
+ foreach my $line (sort @{ $files{$filename}->{'lines'} }) {
+ print $fd "$line\n";
+ }
+ close $files{$filename}->{'fd'} or die "Closing $tf ($filename): $!";
+ }
+ foreach my $filename (keys %files) {
+ my $tf = $files{$filename}->{'temp-file'};
+ my $df = "$datapath/$filename";
+ system ('mv', '-f', $tf, $df) == 0 or die "mv -f $tf $df failed.\n";
+ }
+}
-{ # run this in a subshell to avoid multiple fd redirections
-for arch in $(dpkg-architecture -L); do
- triplet="$(dpkg-architecture -a"$arch" -qDEB_HOST_MULTIARCH 2>/dev/null)"
- printf "%s %s\n" "$arch" "$triplet"
-done
-} | sort >> "$f"
-
-mv "$f" "$1"/binaries/multiarch-dirs
-
-
-# Local Variables:
-# indent-tabs-mode: nil
-# End:
-# vim: syntax=sh sw=4 sts=4 sr et
--
Debian package checker
Reply to: