[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. 99ae9353f6834da0cb73f59f4b32d1f0ae1263fa
Stephen Gran
steve at lobefin.net
Thu Sep 4 12:36:32 UTC 2008
The following commit has been merged in the debian/unstable branch:
commit 7d4eeed55438077f19d85b0bddfddf700d770378
Author: Stephen Gran <steve at lobefin.net>
Date: Thu Sep 4 13:25:02 2008 +0100
Revert "Remove debian/patches - I forgot it was there when I switched into git,"
This reverts commit 6e0c140e4d46798dfe2f0276365747b8bb41d38f.
diff --git a/debian/patches/00list b/debian/patches/00list
new file mode 100644
index 0000000..8900407
--- /dev/null
+++ b/debian/patches/00list
@@ -0,0 +1,5 @@
+02_milter_sendmail_version_patch
+03_etc_files_patch
+19_freshclam-manpage-info.dpatch
+24_nullmailer_ftbfs.dpatch
+25_skip_sendmail.cf.dpatch
diff --git a/debian/patches/02_milter_sendmail_version_patch b/debian/patches/02_milter_sendmail_version_patch
new file mode 100755
index 0000000..73b0220
--- /dev/null
+++ b/debian/patches/02_milter_sendmail_version_patch
@@ -0,0 +1,26 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_milter_sendmail_version_patch.dpatch by <sgran at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Patch to set sendmail version on buildds
+
+ at DPATCH@
+Index: clamav-milter/clamav-milter.c
+===================================================================
+--- a/clamav-milter/clamav-milter.c (revision 590)
++++ b/clamav-milter/clamav-milter.c (working copy)
+@@ -144,6 +144,14 @@
+ #define _GNU_SOURCE
+ #include <getopt.h>
+
++#ifndef SENDMAIL_VERSION_A
++#define SENDMAIL_VERSION_A 8
++#endif
++
++#ifndef SENDMAIL_VERSION_B
++#define SENDMAIL_VERSION_B 13
++#endif
++
+ #ifndef SENDMAIL_BIN
+ #define SENDMAIL_BIN "/usr/lib/sendmail"
+ #endif
diff --git a/debian/patches/03_etc_files_patch b/debian/patches/03_etc_files_patch
new file mode 100755
index 0000000..9040328
--- /dev/null
+++ b/debian/patches/03_etc_files_patch
@@ -0,0 +1,60 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03_etc_files_patch.dpatch by <sgran at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Patch to fix up defaults
+
+ at DPATCH@
+Index: etc/clamd.conf
+===================================================================
+--- a/etc/clamd.conf (revision 590)
++++ b/etc/clamd.conf (working copy)
+@@ -11,7 +11,7 @@
+ # LogFile must be writable for the user running daemon.
+ # A full path is required.
+ # Default: disabled
+-#LogFile /tmp/clamd.log
++#LogFile /var/log/clamav/clamd.log
+
+ # By default the log file is locked for writing - the lock protects against
+ # running clamd multiple times (if want to run another clamd, please
+@@ -54,7 +54,7 @@
+ # This option allows you to save a process identifier of the listening
+ # daemon (main thread).
+ # Default: disabled
+-#PidFile /var/run/clamd.pid
++#PidFile /var/run/clamav/clamd.pid
+
+ # Optional path to the global temporary directory.
+ # Default: system specific (usually /tmp or /var/tmp).
+@@ -69,7 +69,7 @@
+
+ # Path to a local socket file the daemon will listen on.
+ # Default: disabled (must be specified by a user)
+-LocalSocket /tmp/clamd.socket
++LocalSocket /var/run/clamav/clamd
+
+ # Remove stale socket after unclean shutdown.
+ # Default: yes
+Index: etc/freshclam.conf
+===================================================================
+--- a/etc/freshclam.conf (revision 590)
++++ b/etc/freshclam.conf (working copy)
+@@ -14,7 +14,7 @@
+
+ # Path to the log file (make sure it has proper permissions)
+ # Default: disabled
+-#UpdateLogFile /var/log/freshclam.log
++#UpdateLogFile /var/log/clamav/freshclam.log
+
+ # Maximum size of the log file.
+ # Value of 0 disables the limit.
+@@ -43,7 +43,7 @@
+
+ # This option allows you to save the process identifier of the daemon
+ # Default: disabled
+-#PidFile /var/run/freshclam.pid
++#PidFile /var/run/clamav/freshclam.pid
+
+ # By default when started freshclam drops privileges and switches to the
+ # "clamav" user. This directive allows you to change the database owner.
diff --git a/debian/patches/19_freshclam-manpage-info.dpatch b/debian/patches/19_freshclam-manpage-info.dpatch
new file mode 100755
index 0000000..c817e04
--- /dev/null
+++ b/debian/patches/19_freshclam-manpage-info.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## freshclam-manpage-info.dpatch by <sgran at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Grammatical error.
+
+ at DPATCH@
+
+--- tmp/docs/man/freshclam.1.in 2006-04-30 08:33:15.000000000 -0400
++++ tmp/docs/man/freshclam.1.in 2006-06-30 09:55:52.000000000 -0400
+@@ -19,7 +19,7 @@
+ Print version number and exit.
+ .TP
+ \fB\-v, \-\-verbose\fR
+-Be verbose. This option causes freshclam to print many additional informations.
++Be verbose. This option causes freshclam to print much additional information.
+ .TP
+ \fB\-\-quiet\fR
+ Be quiet \- output only error messages.
diff --git a/debian/patches/24_nullmailer_ftbfs.dpatch b/debian/patches/24_nullmailer_ftbfs.dpatch
new file mode 100755
index 0000000..36fce3e
--- /dev/null
+++ b/debian/patches/24_nullmailer_ftbfs.dpatch
@@ -0,0 +1,92 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## nullmailer_ftbfs.dpatch by <sgran at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix FTBFS with nullmailer
+
+ at DPATCH@
+Index: configure
+===================================================================
+--- a/configure (revision 488)
++++ b/configure (working copy)
+@@ -14758,21 +14758,42 @@
+ sendmailver_b=`echo $sendmailver | awk -F. '{printf $2}'`
+ sendmailver_c=`echo $sendmailver | awk -F. '{printf $3}'`
+
++ case "$sendmailver_a" in
++ [[:digit:]]*) ;;
++ *) sendmailver_a= ;;
++ esac
++
++ case "$sendmailver_b" in
++ [[:digit:]]*) ;;
++ *) sendmailver_b= ;;
++ esac
++
++ case "$sendmailver_c" in
++ [[:digit:]]*) ;;
++ *) sendmailver_c= ;;
++ esac
++
++ if test -n "$sendmailver_a"; then
+
+ cat >>confdefs.h <<_ACEOF
+ #define SENDMAIL_VERSION_A $sendmailver_a
+ _ACEOF
+
++ fi
++ if test -n "$sendmailver_b"; then
+
+ cat >>confdefs.h <<_ACEOF
+ #define SENDMAIL_VERSION_B $sendmailver_b
+ _ACEOF
+
++ fi
++ if test -n "$sendmailver_c"; then
+
+ cat >>confdefs.h <<_ACEOF
+ #define SENDMAIL_VERSION_C $sendmailver_c
+ _ACEOF
+
++ fi
+ fi
+ fi
+
+Index: configure.in
+===================================================================
+--- a/configure.in (revision 488)
++++ b/configure.in (working copy)
+@@ -468,9 +468,30 @@
+ sendmailver_b=`echo $sendmailver | awk -F. '{printf $2}'`
+ sendmailver_c=`echo $sendmailver | awk -F. '{printf $3}'`
+
+- AC_DEFINE_UNQUOTED([SENDMAIL_VERSION_A], $sendmailver_a, [major version of Sendmail])
+- AC_DEFINE_UNQUOTED([SENDMAIL_VERSION_B], $sendmailver_b, [minor version of Sendmail])
+- AC_DEFINE_UNQUOTED([SENDMAIL_VERSION_C], $sendmailver_c, [subversion of Sendmail])
++ case "$sendmailver_a" in
++ [[[:digit:]]]*) ;;
++ *) sendmailver_a= ;;
++ esac
++
++ case "$sendmailver_b" in
++ [[[:digit:]]]*) ;;
++ *) sendmailver_b= ;;
++ esac
++
++ case "$sendmailver_c" in
++ [[[:digit:]]]*) ;;
++ *) sendmailver_c= ;;
++ esac
++
++ if test -n "$sendmailver_a"; then
++ AC_DEFINE_UNQUOTED(SENDMAIL_VERSION_A, $sendmailver_a, [major version of Sendmail])
++ fi
++ if test -n "$sendmailver_b"; then
++ AC_DEFINE_UNQUOTED(SENDMAIL_VERSION_B, $sendmailver_b, [minor version of Sendmail])
++ fi
++ if test -n "$sendmailver_c"; then
++ AC_DEFINE_UNQUOTED(SENDMAIL_VERSION_C, $sendmailver_c, [subversion of Sendmail])
++ fi
+ fi
+ fi
+
diff --git a/debian/patches/25_skip_sendmail.cf.dpatch b/debian/patches/25_skip_sendmail.cf.dpatch
new file mode 100755
index 0000000..f54bf97
--- /dev/null
+++ b/debian/patches/25_skip_sendmail.cf.dpatch
@@ -0,0 +1,71 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## skip_sendmail.cf.dpatch by <sgran at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Stop checking sendmail.cf - we ship the milter config in a seperate file
+
+ at DPATCH@
+Index: clamav-milter/clamav-milter.c
+===================================================================
+--- a/clamav-milter/clamav-milter.c (revision 595)
++++ b/clamav-milter/clamav-milter.c (working copy)
+@@ -534,6 +534,7 @@
+ */
+ static const char *sendmailCF; /* location of sendmail.cf to verify */
+ static const char *pidfile;
++static int nocheckCF = 0;
+ static int black_hole_mode; /*
+ * Since sendmail calls its milters before it
+ * looks in /etc/aliases we can spend time
+@@ -629,6 +630,7 @@
+ puts(_("\t--quarantine-dir=DIR\t-U DIR\tDirectory to store infected emails."));
+ puts(_("\t--server=SERVER\t\t-s SERVER\tHostname/IP address of server(s) running clamd (when using TCPsocket)."));
+ puts(_("\t--sendmail-cf=FILE\t\tLocation of the sendmail.cf file to verify"));
++ puts(_("\t--no-check-cf\t\tSkip verification of sendmail.cf"));
+ puts(_("\t--sign\t\t\t-S\tAdd a hard-coded signature to each scanned message."));
+ puts(_("\t--signature-file=FILE\t-F FILE\tLocation of signature file."));
+ puts(_("\t--template-file=FILE\t-t FILE\tLocation of e-mail template file."));
+@@ -832,6 +834,9 @@
+ "freshclam-monitor", 1, NULL, 'M'
+ },
+ {
++ "no-check-cf", 0, NULL, 'z'
++ },
++ {
+ "sendmail-cf", 1, NULL, '0'
+ },
+ {
+@@ -1037,6 +1042,9 @@
+ debug_level = atoi(optarg);
+ break;
+ #endif
++ case 'z':
++ nocheckCF = 1;
++ break;
+ default:
+ #ifdef CL_DEBUG
+ fprintf(stderr, "Usage: %s [-b] [-c FILE] [-F FILE] [--max-children=num] [-e] [-l] [-o] [-p address] [-P] [-q] [-Q USER] [-s SERVER] [-S] [-x#] [-U PATH] [-M#] socket-addr\n", argv[0]);
+@@ -5937,6 +5945,9 @@
+ */
+ return 1;
+
++ if (nocheckCF)
++ return 1;
++
+ if(sendmailCF)
+ fd = open(sendmailCF, O_RDONLY);
+ else {
+Index: docs/man/clamav-milter.8.in
+===================================================================
+--- a/docs/man/clamav-milter.8.in (revision 590)
++++ b/docs/man/clamav-milter.8.in (working copy)
+@@ -296,6 +296,9 @@
+ file, usually in /etc/sendmail.cf or /etc/mail/sendmail.cf. This directive
+ tells clamav\-milter where to find the sendmail.cf file.
+ .TP
++\fB\-\-no\-check\-cf\fR
++Skip the above check.
++.TP
+ \fB\-\-black-hole-mode\fR
+ Since \fIsendmail\fR calls its milters before it looks in its alias and virtuser
+ tables, clamav-milter can spend time looking for malware that's going to be
--
Debian repository for ClamAV
More information about the Pkg-clamav-commits
mailing list