[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] Debian package checker branch, master, updated. 2.5.3-81-gb0bcf79



The following commit has been merged in the master branch:
commit b0bcf79629f0f3ca0b4a2d31e5233ea7407f0cf0
Author: Jakub Wilk <jwilk@debian.org>
Date:   Thu Oct 27 17:13:40 2011 +0200

    Allow /usr/lib/$multiarch/(games/)$pkgname in RPATHs
    
    Acked-by: Niels Thykier <niels@thykier.net>

diff --git a/checks/binaries b/checks/binaries
index c7201ef..b731878 100644
--- a/checks/binaries
+++ b/checks/binaries
@@ -314,7 +314,7 @@ foreach my $file (@{$info->sorted_file_info}) {
     # rpath is disallowed, except in private directories
     if (exists $objdump->{RPATH}) {
         foreach my $rpath (map {File::Spec->canonpath($_)} keys %{$objdump->{RPATH}}) {
-            next if $rpath =~ m,^/usr/lib/(?:games/)?(?:\Q$pkg\E|\Q$srcpkg\E)(?:/|\z),;
+            next if $rpath =~ m,^/usr/lib/(?:$madir/)?(?:games/)?(?:\Q$pkg\E|\Q$srcpkg\E)(?:/|\z),;
             next if $rpath =~ m,^\$\{?ORIGIN\}?,;
             next if $directories{$rpath} and $rpath !~ m,^(?:/usr)?/lib(?:/$madir)?/?\z,;
             tag 'binary-or-shlib-defines-rpath', "$file $rpath";
diff --git a/debian/changelog b/debian/changelog
index 08bfa74..031e6a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,8 @@ lintian (2.5.4) UNRELEASED; urgency=low
   * checks/binaries:
     + [JW] Allow binaries to use "/usr/lib/$srcpkg/" in RPATHs.
       (Closes: #642092)
+    + [JW] Fixed a false-positive when using the multiarch dir in
+      RPATH.  (Closes: #646817)
   * checks/changes-file.desc:
     + [NT] Added the "precise" to the list of Ubuntu distributions.
       Thanks to Loïc Minier for the patch.

-- 
Debian package checker


Reply to: