View | Details | Raw Unified | Return to bug 169462
Collapse All | Expand All

(-)./files/patch-fix_clamav_0.93 (-11 / +32 lines)
Lines 1-23 Link Here
1
--- configure	2007-10-29 10:14:25.000000000 -0400
1
--- ./configure.orig	2007-10-29 09:14:25.000000000 -0500
2
+++ configure	2008-05-02 15:31:51.000000000 -0400
2
+++ ./configure	2012-06-26 14:20:22.000000000 -0500
3
@@ -4686,6 +4686,14 @@
3
@@ -4682,13 +4682,26 @@
4
           then
4
         clamavdb=""
5
             clamavdb=$f
5
         for f in "$CLAMAV_DB" /usr/local/share/clamav /var/lib/clamav
6
             break
6
         do
7
+          elif test -f "$f/daily.cld"
7
-          if test -f "$f/daily.cvd"
8
+          if test -f "$f/daily.cvd" || test -d "$f/daily.inc"
8
+          then
9
+          then
9
+            clamavdb=$f
10
+            clamavdb=$f
10
+            break
11
+            break
11
+          elif test -f "$f/daily.inc/daily.info"
12
+          elif test -f "$f/daily.cld"
12
+          then
13
+          then
13
+            clamavdb=$f
14
+            clamavdb=$f
14
+            break
15
+            break
16
+          elif test -f "$f/daily.inc/daily.info"
17
           then
18
             clamavdb=$f
19
             break
15
           fi
20
           fi
16
         done
21
         done
17
 
22
 
18
--- configure.in	2007-10-29 10:13:40.000000000 -0400
23
+	# Default to $f/daily.cld
19
+++ configure.in	2008-05-02 15:31:32.000000000 -0400
24
+	if test "$clamavdb" = ""; then
20
@@ -622,6 +622,14 @@
25
+		clamavdb="$f/daily.cld"
26
+	fi
27
+
28
         if test "$clamavdb" = ""
29
         then
30
           echo "$as_me:$LINENO: result: no" >&5
31
--- ./configure.in.orig	2007-10-29 09:13:40.000000000 -0500
32
+++ ./configure.in	2012-06-26 14:20:02.000000000 -0500
33
@@ -622,9 +622,22 @@
21
           then
34
           then
22
             clamavdb=$f
35
             clamavdb=$f
23
             break
36
             break
Lines 32-37 Link Here
32
           fi
45
           fi
33
         done
46
         done
34
 
47
 
48
+	# Default to $f/daily.cld
49
+	if test "$clamavdb" = ""; then
50
+		clamavdb="$f/daily.cld"
51
+	fi
52
+
53
         if test "$clamavdb" = ""
54
         then
55
           AC_MSG_RESULT(no)
35
--- simscanmk.c	2006-10-10 19:15:17.000000000 -0400
56
--- simscanmk.c	2006-10-10 19:15:17.000000000 -0400
36
+++ simscanmk.c	2008-07-07 14:21:46.000000000 -0400
57
+++ simscanmk.c	2008-07-07 14:21:46.000000000 -0400
37
@@ -123,6 +123,7 @@
58
@@ -123,6 +123,7 @@

Return to bug 169462