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

[SCM] Debian package checker branch, master, updated. 2.4.2-12-gbba63d6



The following commit has been merged in the master branch:
commit bba63d6a30d6d629d3dfed9eaef8189487a0872d
Author: Raphael Geissert <atomo64@gmail.com>
Date:   Sat Jul 17 20:06:16 2010 -0500

    Also detect copies of expat and libmagic

diff --git a/checks/binaries b/checks/binaries
index 23e5868..c020a35 100644
--- a/checks/binaries
+++ b/checks/binaries
@@ -74,6 +74,8 @@ our %arch_64bit_equivs = (
 
 our %EMBEDDED_LIBRARIES = (
 	'bzip2'		=> qr'(?m)^This is a bug in bzip2',
+	'expat'		=> qr'(?m)^requested feature requires XML_DTD support in Expat',
+	'file'		=> qr'(?m)^could not find any magic files',
 	'libxml2'	=> qr'root and DTD name do not match',
 	'pcre3'		=> qr'this version of PCRE is not compiled with PCRE_UTF8 support',
 	'tiff'		=> qr'No space for PixarLog state block',
diff --git a/debian/changelog b/debian/changelog
index 91c63fc..5805cf3 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,8 @@ lintian (2.4.3) UNRELEASED; urgency=low
       - embedded-library
 
   * checks/binaries{,.desc}:
-    + [RG] Detect embedded copies of libbz2, pcre3, tiff, and libxml2.
+    + [RG] Detect embedded copies of expat, libbz2, libmagic, libxml2,
+      pcre3, and tiff.
     + [RG] Recognise powerpcspe and sh4 ELF objects.
   * checks/files
     + [RG] Detect embedded copies of HTMLPurifier.
diff --git a/t/tests/binaries-embedded-libs/debian/Makefile b/t/tests/binaries-embedded-libs/debian/Makefile
index fc28975..323aeb8 100644
--- a/t/tests/binaries-embedded-libs/debian/Makefile
+++ b/t/tests/binaries-embedded-libs/debian/Makefile
@@ -1,4 +1,5 @@
-BINARIES :=  zlib libpng libjpeg libopenjpeg libtiff libpcre3 libbz2 libxml2
+BINARIES :=  zlib libpng libjpeg libopenjpeg libtiff libpcre3 libbz2 libxml2 \
+		libmagic libexpat
 MANPAGES := $(patsubst %,%.1,$(BINARIES))
 
 all: $(BINARIES) $(MANPAGES)
diff --git a/t/tests/binaries-embedded-libs/debian/libexpat.c b/t/tests/binaries-embedded-libs/debian/libexpat.c
new file mode 100644
index 0000000..707f1d6
--- /dev/null
+++ b/t/tests/binaries-embedded-libs/debian/libexpat.c
@@ -0,0 +1,14 @@
+#include <stdio.h>
+
+/*
+ * The XML_DTD warning string is always present, even if expat was
+ * built with XML_DTD
+ */
+static const char xml_dtd[]
+    = "requested feature requires XML_DTD support in Expat";
+
+int
+main(void)
+{
+    printf("%s\n", xml_dtd);
+}
diff --git a/t/tests/binaries-embedded-libs/debian/libmagic.c b/t/tests/binaries-embedded-libs/debian/libmagic.c
new file mode 100644
index 0000000..8bd0788
--- /dev/null
+++ b/t/tests/binaries-embedded-libs/debian/libmagic.c
@@ -0,0 +1,10 @@
+#include <stdio.h>
+
+static const char no_magic_files[]
+    = "could not find any magic files!";
+
+int
+main(void)
+{
+    printf("%s\n", no_magic_files);
+}
diff --git a/t/tests/binaries-embedded-libs/tags b/t/tests/binaries-embedded-libs/tags
index 53b0dbe..afc98e3 100644
--- a/t/tests/binaries-embedded-libs/tags
+++ b/t/tests/binaries-embedded-libs/tags
@@ -2,6 +2,8 @@ E: binaries-embedded-libs: embedded-libjpeg ./usr/bin/libjpeg
 E: binaries-embedded-libs: embedded-libopenjpeg ./usr/bin/libopenjpeg
 E: binaries-embedded-libs: embedded-libpng ./usr/bin/libpng
 E: binaries-embedded-libs: embedded-library ./usr/bin/libbz2: bzip2
+E: binaries-embedded-libs: embedded-library ./usr/bin/libexpat: expat
+E: binaries-embedded-libs: embedded-library ./usr/bin/libmagic: file
 E: binaries-embedded-libs: embedded-library ./usr/bin/libpcre3: pcre3
 E: binaries-embedded-libs: embedded-library ./usr/bin/libtiff: tiff
 E: binaries-embedded-libs: embedded-library ./usr/bin/libxml2: libxml2

-- 
Debian package checker


Reply to: