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

[SCM] Debian package checker branch, master, updated. 2.3.4-109-g491439d



The following commit has been merged in the master branch:
commit 491439d83db98686c9c69922be7dad45c2b8dbea
Author: Russ Allbery <rra@debian.org>
Date:   Tue Apr 13 14:38:55 2010 -0700

    Suppress embedded-zlib for the Pascal version
    
    * checks/binaries
      + [RA] Suppress embedded-zlib if the zlib implementation is the Pascal
        version.  FPC doesn't support dynamic linking at this time, and this
        isn't the problem the tag was designed to catch.

diff --git a/checks/binaries b/checks/binaries
index 48d4371..3e7e463 100644
--- a/checks/binaries
+++ b/checks/binaries
@@ -273,8 +273,12 @@ foreach my $file (sort keys %{$info->file_info}) {
 	}
     }
 
+    # We exclude version strings starting with "4 " since that's a mark of the
+    # Pascal implementation, which is not what this tag is designed to detect.
+    # (The "4" is actually the string length (52 characters) in the Pascal
+    # counted string format.)
     if ($info->field('source') ne 'zlib' and $info->field('source') ne 'klibc'
-	and $strings =~ /(?:in|de)flate (?:\d[ \w.\-]{1,20}[\w.\-])/m) {
+	and $strings =~ /(?<!4 )(?:in|de)flate (?:\d[ \w.\-]{1,20}[\w.\-])/m) {
 	tag "embedded-zlib", $file;
     }
 
diff --git a/debian/changelog b/debian/changelog
index 7fe1a74..06be9fc 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,9 @@ lintian (2.4.0) UNRELEASED; urgency=low
   * checks/binaries{,.desc}:
     + [ADB] Use Lintian::Check::check_spelling()
     + [RG] Detect embedded copies of libpng, lib{,open}jpeg.
+    + [RA] Suppress embedded-zlib if the zlib implementation is the Pascal
+      version.  FPC doesn't support dynamic linking at this time, and this
+      isn't the problem the tag was designed to catch.
   * checks/changelog-file:
     + [ADB] Use Lintian::Check::check_spelling()
   * checks/changes-file{,.desc}:

-- 
Debian package checker


Reply to: