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

[SCM] Debian package checker branch, master, updated. 2.2.8-15-g265f75e



The following commit has been merged in the master branch:
commit 265f75edf54037a0afd60b4b8589063c63f5212a
Author: Russ Allbery <rra@debian.org>
Date:   Sat Mar 28 19:19:50 2009 -0700

    Handle SONAMEs in symbols files that contain regex metacharacters
    
    * checks/shared-libs:
      + [RA] Correctly handle SONAMEs in symbols files that contain regex
        metacharacters like +.  Thanks, Daniel Kobras.  (Closes: #521621)

diff --git a/checks/shared-libs b/checks/shared-libs
index 486992b..3f129a6 100644
--- a/checks/shared-libs
+++ b/checks/shared-libs
@@ -379,11 +379,11 @@ if ($#shlibs == -1 and not %unversioned_shlibs) {
 	chomp;
 	next if m/^\s*$/ or /^#/;
 
-	if (m/^([^\s|*]\S+)\s\S+\s*(?:\(\S+\s+\S+\)|#MINVER#)?/) {
+	if (m/^([^\s|*]\S+)\s\S+\s*(?:\(\S+\s+\S+\)|\#MINVER\#)?/) {
 	    # soname, main dependency template
 
 	    $soname = $1;
-	    s/^$soname\s*//;
+	    s/^\Q$soname\E\s*//;
 	    $soname = format_soname($soname);
 
 	    if ($symbols_control{$soname}) {
diff --git a/debian/changelog b/debian/changelog
index 6cf791f..717f6a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,6 +30,9 @@ lintian (2.2.9) UNRELEASED; urgency=low
     + [RA] Fix a hash collision that could suppress a correct
       remove-of-unknown-diversion tag if the diversion was removed in
       multiple maintainer scripts including postrm.
+  * checks/shared-libs:
+    + [RA] Correctly handle SONAMEs in symbols files that contain regex
+      metacharacters like +.  Thanks, Daniel Kobras.  (Closes: #521621)
 
   * collection/file-info:
     + [RA] Use chomp instead of chop to remove newlines.

-- 
Debian package checker


Reply to: