tags 410834 + patch thanks Hi,
Attached is the diff for my dansguardian 2.8.0.6-antivirus-6.4.4.1-1.1 NMU. I plan to upload this in the next day or two, unless you have any objections. Thanks, -- ----------------------------------------------------------------- | ,''`. Stephen Gran | | : :' : [EMAIL PROTECTED] | | `. `' Debian user, admin, and developer | | `- http://www.debian.org | -----------------------------------------------------------------
diff -u dansguardian-2.8.0.6-antivirus-6.4.4.1/debian/patches/00list dansguardian-2.8.0.6-antivirus-6.4.4.1/debian/patches/00list
--- dansguardian-2.8.0.6-antivirus-6.4.4.1/debian/patches/00list
+++ dansguardian-2.8.0.6-antivirus-6.4.4.1/debian/patches/00list
@@ -3,0 +4 @@
+04_clamav-0.90-API.dpatch
diff -u dansguardian-2.8.0.6-antivirus-6.4.4.1/debian/changelog dansguardian-2.8.0.6-antivirus-6.4.4.1/debian/changelog
--- dansguardian-2.8.0.6-antivirus-6.4.4.1/debian/changelog
+++ dansguardian-2.8.0.6-antivirus-6.4.4.1/debian/changelog
@@ -1,3 +1,10 @@
+dansguardian (2.8.0.6-antivirus-6.4.4.1-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix FTBFS with clamav (closes: #410834)
+
+ -- Stephen Gran <[EMAIL PROTECTED]> Wed, 28 Feb 2007 13:44:42 +0000
+
dansguardian (2.8.0.6-antivirus-6.4.4.1-1) unstable; urgency=medium
* Updated antivirus plugin
only in patch2:
unchanged:
--- dansguardian-2.8.0.6-antivirus-6.4.4.1.orig/debian/patches/04_clamav-0.90-API.dpatch
+++ dansguardian-2.8.0.6-antivirus-6.4.4.1/debian/patches/04_clamav-0.90-API.dpatch
@@ -0,0 +1,35 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 04_clamav-0.90-API by Stephen Gran <[EMAIL PROTECTED]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
[EMAIL PROTECTED]@
+--- dansguardian-2.8.0.6-antivirus-6.4.4.1.orig/ClamAV.cpp
++++ dansguardian-2.8.0.6-antivirus-6.4.4.1/ClamAV.cpp
+@@ -54,9 +54,10 @@
+ #endif
+ root = NULL;
+ }
+- if ((ret = cl_loaddbdir (dbdir, &root, &no)))
++
++ if ((ret = cl_load (dbdir, &root, &no, CL_DB_STDOPT)))
+ {
+- syslog (LOG_ERR, "Error loading ClamAV DB: %s", cl_perror (ret));
++ syslog (LOG_ERR, "Error loading ClamAV DB: %s", cl_strerror (ret));
+ return ret;
+ }
+ else
+only in patch2:
+unchanged:
+--- dansguardian-2.8.0.6-antivirus-6.4.4.1.orig/ClamAV.hpp
++++ dansguardian-2.8.0.6-antivirus-6.4.4.1/ClamAV.hpp
+@@ -39,7 +39,7 @@
+ private:
+ const char *virname;
+ const char *err_str;
+- struct cl_node *root;
++ struct cl_engine *root;
+ struct cl_limits limits;
+ struct cl_stat dbstat;
+
signature.asc
Description: Digital signature
