[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.94.dfsg.1-1-4-ge620490

[Michael Tautschnig]

The following commit has been merged in the debian/unstable branch:
commit e620490f23c6db950314c3e35e4dad6f5729d0f9
Author: Michael Tautschnig <mt at debian.org>
Date:   Sat Nov 22 18:46:11 2008 -0800

    No specific README.Debian in clamav-milter anymore
    
    - Resolves the duplicate README.Debian issue as discussed on pkg-clamav-devel
      (see
      http://lists.alioth.debian.org/pipermail/pkg-clamav-devel/2008-November/000199.html)
    - Moved contents of clamav-milter.README.Debian (with minor cleanup) to
      README.Debian
    - Updated the internal referencing in README.Debian to match that
    
    Signed-off-by: Michael Tautschnig <mt at debian.org>

diff --git a/debian/README.Debian b/debian/README.Debian
index 3cb9721..5ba515c 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -95,7 +95,7 @@ CLAMAV-DAEMON
    So long as sendmail can write to clamav-milter's socket, the rest
    of the communication is handled between the milter and clamd, and
    permissions are not a problem.  apt-get install clamav-milter, and
-   follow the instructions in /usr/share/doc/clamav-milter/README.Debian.
+   see the configuration instructions for CLAMAV-MILTER found below.
 
    EXIM4
 
@@ -221,3 +221,45 @@ CLAMAV-FRESHCLAM
   
   OnUpdateExecute /bin/run-parts --lsbsysinit /etc/clamav/onupdateexecute.d/
   OnErrorExecute /bin/run-parts --lsbsysinit /etc/clamav/onerrorexecute.d/
+
+CLAMAV-MILTER
+  
+  Configuration instructions:
+
+  Installations for Debian:
+  New option, contributed by Elrond <elrond+bugs.debian.org at samba-tng.org>:
+
+  Add to /etc/mail/sendmail.mc:
+  include(`/etc/mail/m4/clamav-milter.m4')dnl
+
+  and run sendmailconfig.
+
+  Otherwise:
+
+  Add to /etc/mail/sendmail.mc:
+  INPUT_MAIL_FILTER(`clamav', `S=local:/var/run/clamav/clamav-milter.ctl, F=, T=S:4m;R:4m')dnl
+  define(`confINPUT_MAIL_FILTERS', `clamav')
+
+  Check entry in /etc/clamav/clamd.conf of the form:
+  LocalSocket /var/run/clamav/clamd.ctl
+
+  If you already have a filter (such as spamassassin-milter from
+  http://savannah.nongnu.org/projects/spamass-milt) add it thus:
+  INPUT_MAIL_FILTER(`clamav', `S=local:/var/run/clamav/clamav-milter.ctl, F=, T=S:4m;R:4m')dnl
+  INPUT_MAIL_FILTER(`spamassassin', `S=local:/var/run/spamass.sock, F=, T=C:15m;S:4m;R:4m;E:10m')
+  define(`confINPUT_MAIL_FILTERS', `spamassassin,clamav')dnl
+
+  and run sendmailconfig.
+
+  You may find INPUT_MAIL_FILTERS is not needed on your machine, however it
+  is recommended by the Sendmail documentation and I recommend going along
+  with that.
+
+  I suggest putting SpamAssassin first since you're more likely to get spam
+  than a virus/worm sent to you.
+
+  Add to /etc/default/clamav-milter
+     OPTIONS="--max-children=2"
+  or if clamd is on a different machine
+     OPTIONS="--max-children=2 --server=192.168.1.9"
+
diff --git a/debian/changelog b/debian/changelog
index bf6374d..08649d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ clamav (0.94.dfsg.1-2) unstable; urgency=low
   * Removed --unzip from clampipe script (closes: #506055)
   * Wait before starting clamav-milter when clamav-daemon is being upgraded
     (closes: #309067)
+  * Moved clamav-milter specific stuff from its specific README.Debian to
+    clamav-global one.
 
  -- Michael Meskes <meskes at debian.org>  Sat, 22 Nov 2008 17:47:27 -0800
 
diff --git a/debian/clamav-milter.README.Debian b/debian/clamav-milter.README.Debian
deleted file mode 100644
index c5efe71..0000000
--- a/debian/clamav-milter.README.Debian
+++ /dev/null
@@ -1,47 +0,0 @@
-Configuration instructions:
-
-Installations for Debian:
-New option, contributed by Elrond <elrond+bugs.debian.org at samba-tng.org>:
-
-Add to /etc/mail/sendmail.mc:
-include(`/etc/mail/m4/clamav-milter.m4')dnl
-
-and run sendmailconfig.
-
-Otherwise:
-
-Add to /etc/mail/sendmail.mc:
-INPUT_MAIL_FILTER(`clamav', `S=local:/var/run/clamav/clamav-milter.ctl, F=, T=S:4m;R:4m')dnl
-define(`confINPUT_MAIL_FILTERS', `clamav')
-
-Check entry in /etc/clamav/clamd.conf of the form:
-LocalSocket /var/run/clamav/clamd.ctl
-
-If you already have a filter (such as spamassassin-milter from
-http://savannah.nongnu.org/projects/spamass-milt) add it thus:
-INPUT_MAIL_FILTER(`clamav', `S=local:/var/run/clamav/clamav-milter.ctl, F=, T=S:4m;R:4m')dnl
-INPUT_MAIL_FILTER(`spamassassin', `S=local:/var/run/spamass.sock, F=, T=C:15m;S:4m;R:4m;E:10m')
-define(`confINPUT_MAIL_FILTERS', `spamassassin,clamav')dnl
-
-and run sendmailconfig.
-
-You may find INPUT_MAIL_FILTERS is not needed on your machine, however it
-is recommended by the Sendmail documentation and I recommend going along
-with that.
-
-I suggest putting SpamAssassin first since you're more likely to get spam
-than a virus/worm sent to you.
-
-Add to /etc/default/clamav-milter
-   OPTIONS="--max-children=2"
-or if clamd is on a different machine
-   OPTIONS="--max-children=2 --server=192.168.1.9"
-
-BUG REPORTS
-
-Please send bug reports and/or comments to Nigel Horne <njh at despammed.com>
-
-TODO
-
-There are several ideas marked as TODO in the source code. If anyone has
-any other suggestions please feel free to contact me.

-- 
Debian repository for ClamAV