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

[SCM] Debian package checker branch, master, updated. 1.24.3-27-g2c578ef



The following commit has been merged in the master branch:
commit 2c578efa4eb1e6e851fbf755b6d653891dc4bb34
Author: Adam D. Barratt <adam@adam-barratt.org.uk>
Date:   Tue Aug 12 23:43:55 2008 +0100

    Correctly parse a readelf symbol version block containing the definition of a single symbol.
    
    When there are (2^x)+1 symbols, the final line will not contain any trailing spaces and hence would not match the
    regular expression being used to match symbol version lines; fix the expression to also match such lines.

diff --git a/collection/objdump-info b/collection/objdump-info
index 0e00763..f3a474f 100755
--- a/collection/objdump-info
+++ b/collection/objdump-info
@@ -149,7 +149,7 @@ while (<FILES>) {
 
 			$value =~ s/^(?:Shared library|Library soname): \[(.*)\]/$1/;
 			print OUT "  $type   $value\n";
-		    } elsif (m/^\s*[0-9A-F]+:\s*(\S+)\s*\((\S+)\)\s/i
+		    } elsif (m/^\s*[0-9A-F]+:\s*(\S+)\s*\((\S+)\)(\s|\Z)/i
 			     and $section eq 'VS') {
 			while (m/\s(\S+)\s*\((\S+)\)(\s|\Z)/gc) {
 			    my ($vernum, $verstring) = ($1, $2);
diff --git a/debian/changelog b/debian/changelog
index 08e2776..7fe8ea2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,10 @@ lintian (1.24.4) UNRELEASED; urgency=low
     + [RA] Clarify that shlibs-declares-dependency-on-other-package can be
       issued for a version mismatch.  (Closes: #494400)
   
+  * collection/objdump-info:
+    + [ADB] Correctly parse a readelf symbol version block containing the
+      definition of a single symbol.
+
   * frontend/lintian:
     + [FL] Do not try to use fail() before the lintian libraries are
       loaded.

-- 
Debian package checker


Reply to: