[SCM] Debian package checker branch, master, updated. 2.5.3-23-gee4daba
The following commit has been merged in the master branch:
commit ee4dabacf60afed62ffcda3789f40ed286c0da1e
Author: Jakub Wilk <jwilk@debian.org>
Date: Mon Sep 19 15:32:28 2011 +0200
Allow binaries to use "/usr/lib/$srcpkg/" in RPATHs
Acked-by: Niels Thykier <niels@thykier.net>
diff --git a/checks/binaries b/checks/binaries
index fa2079b..0cf3e1b 100644
--- a/checks/binaries
+++ b/checks/binaries
@@ -140,6 +140,7 @@ my $has_php_ext = 0;
my %SONAME;
$arch = $info->field('architecture')//'';
+my $srcpkg = $proc->pkg_src()//'';
foreach my $file (sort keys %{$info->objdump_info}) {
my $objdump = $info->objdump_info->{$file};
@@ -313,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(?:/|\z),;
+ next if $rpath =~ m,^/usr/lib/(?: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 ddc1884..e76e26e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
lintian (2.5.4) UNRELEASED; urgency=low
+ * checks/binaries:
+ + [JW] Allow binaries to use "/usr/lib/$srcpkg/" in RPATHs.
+ (Closes: #642092)
* checks/cruft:
+ [NT] Escape path when using them in regexes.
* checks/dehelper:
--
Debian package checker
Reply to: