root@UnicoNET:~/tmp/patches# diff simscan-1.4.0-clamav.patch new-simscan-1.4.0.patch
1,3c1,48
< --- simscan-1.3.1-factory/configure 2006-11-09 19:16:26.000000000 -0500
< +++ simscan-1.3.1-patched/configure 2007-08-14 12:03:25.000000000 -0400
< @@ -4686,6 +4686,10 @@
---
> --- ChangeLog.orig 2007-10-29 12:15:32.000000000 -0200
> +++ ChangeLog 2008-04-08 15:48:01.000000000 -0300
> @@ -189,7 +189,7 @@
> - new options for --enable-received option
> --enable-spamassassin-path=PATH Path to the spamassassin binary
> --enable-clamavdb-path=PATH Directory where the clamav
> - master.cvd and daily.cvd files are saved
> + master.cvd and main.cvd files are saved
> --enable-sigtool-path=PATH Path to the sigtool binary
> --enable-trophie-path=PATH (if trophie is used)
> These are used to build the version database information
> --- README.orig 2006-10-10 20:15:14.000000000 -0300
> +++ README 2008-04-08 15:48:01.000000000 -0300
> @@ -98,7 +98,7 @@
>
> --enable-spamassassin-path=PATH Path to the spamassassin binary
> --enable-clamavdb-path=PATH Directory where the clamav master.cvd and
> - daily.cvd files are saved
> + main.cvd files are saved
> --enable-sigtool-path=PATH Path to the sigtool binary
>
>
> @@ -210,7 +210,7 @@
> is only necessary if the received line option (--enable-received) is chosen.
>
> --enable-clamavdb-path=PATH
> - This option defines the full path to clamav master.cvd and daily.cvd files.
> + This option defines the full path to clamav master.cvd and main.cvd files.
> This option is only necessary if the received line option (--enable-received)
> is chosen.
>
> --- autom4te.cache/output.0.orig 2007-10-29 12:14:24.000000000 -0200
> +++ autom4te.cache/output.0 2008-04-08 15:48:01.000000000 -0300
> @@ -879,7 +879,7 @@
> --enable-ripmime=PATH Full path to ripmime program.
> --enable-received=y|n Add a Received: line to the message, showing the runned scanners and some stats
> --enable-spamassassin-path=PATH Path to the spamassassin binary
> - --enable-clamavdb-path=PATH Directory where the clamav master.cvd and daily.cvd files are saved
> + --enable-clamavdb-path=PATH Directory where the clamav master.cvd and main.cvd files are saved
> --enable-sigtool-path=PATH Path to the sigtool binary
> --enable-regex=y|n enables regex scanner
>
> @@ -4682,7 +4682,7 @@
> clamavdb=""
> for f in "$CLAMAV_DB" /usr/local/share/clamav /var/lib/clamav
> do
> - if test -f "$f/daily.cvd"
> + if test -f "$f/main.cvd"
7c52,67
< + elif test -f "$f/daily.inc/daily.info"
---
> --- configure.in.orig 2007-10-29 12:13:40.000000000 -0200
> +++ configure.in 2008-04-08 15:52:25.000000000 -0300
> @@ -611,14 +611,18 @@
> if test $ENABLE_CLAMAV -eq 1; then
> CLAMAV_DB=""
> AC_MSG_CHECKING(whether we can locate the clamav db path)
> - AC_ARG_ENABLE(clamavdb-path, [ --enable-clamavdb-path=PATH Directory where the clamav master.cvd and daily.cvd files are saved],
> + AC_ARG_ENABLE(clamavdb-path, [ --enable-clamavdb-path=PATH Directory where the clamav master.cvd and main.cvd files are saved],
> [
> CLAMAV_DB="$enableval"
> ])
> clamavdb=""
> for f in "$CLAMAV_DB" /usr/local/share/clamav /var/lib/clamav
> do
> - if test -f "$f/daily.cvd"
> + if test -f "$f/main.cvd"
11,17c71
< fi
< done
<
< diff -ruN simscan-1.3.1-factory/configure.in simscan-1.3.1-patched/configure.in
< --- simscan-1.3.1-factory/configure.in 2006-11-09 19:15:39.000000000 -0500
< +++ simscan-1.3.1-patched/configure.in 2007-08-14 11:49:29.000000000 -0400
< @@ -622,6 +622,10 @@
---
> + elif test -f "$f/daily.inc/daily.info"
21c75,91
< + elif test -f "$f/daily.inc/daily.info"
---
> --- configure.orig 2007-10-29 12:14:25.000000000 -0200
> +++ configure 2008-04-08 15:51:36.000000000 -0300
> @@ -879,7 +879,7 @@
> --enable-ripmime=PATH Full path to ripmime program.
> --enable-received=y|n Add a Received: line to the message, showing the runned scanners and some stats
> --enable-spamassassin-path=PATH Path to the spamassassin binary
> - --enable-clamavdb-path=PATH Directory where the clamav master.cvd and daily.cvd files are saved
> + --enable-clamavdb-path=PATH Directory where the clamav master.cvd and main.cvd files are saved
> --enable-sigtool-path=PATH Path to the sigtool binary
> --enable-regex=y|n enables regex scanner
>
> @@ -4682,7 +4682,11 @@
> clamavdb=""
> for f in "$CLAMAV_DB" /usr/local/share/clamav /var/lib/clamav
> do
> - if test -f "$f/daily.cvd"
> + if test -f "$f/main.cvd"
25,30c95,100
< fi
< done
<
< diff -ruN simscan-1.3.1-factory/simscanmk.c simscan-1.3.1-patched/simscanmk.c
< --- simscan-1.3.1-factory/simscanmk.c 2006-10-10 19:15:17.000000000 -0400
< +++ simscan-1.3.1-patched/simscanmk.c 2007-08-14 12:02:48.000000000 -0400
---
> + elif test -f "$f/daily.inc/daily.info"
> then
> clamavdb=$f
> break
> --- simscanmk.c.orig 2006-10-10 20:15:17.000000000 -0300
> +++ simscanmk.c 2008-04-08 16:02:50.000000000 -0300
56c126
< + strncat(dbpath,"/daily.cvd",(MAX_LINE-sizeof(CLAMAVDBPATH)-1));
---
> + strncat(dbpath,"/main.cvd",(MAX_LINE-sizeof(CLAMAVDBPATH)-1));
root@UnicoNET:~/tmp/patches#