mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-19 19:59:43 +00:00
Code Issues Releases Activity

Fix configure script when clamav DB is not already downloaded.

Browse Source 
PR:		ports/169462
Submitted by:	"Bryan Drewery" <bryan@shatow.net>
This commit is contained in:
Felippe de Meirelles Motta 2012-09-06 22:46:59 +00:00
parent c6c1a05f54
commit 06674a4201
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=303795
1 changed files with 41 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
mail/simscan/files/patch-fix_clamav_0.93
View File

@ -1,23 +1,36 @@
--- configure 2007-10-29 10:14:25.000000000 -0400
+++ configure 2008-05-02 15:31:51.000000000 -0400
@@ -4686,6 +4686,14 @@
then
clamavdb=$f
break
+ elif test -f "$f/daily.cld"
+ then
+ clamavdb=$f
+ break
+ elif test -f "$f/daily.inc/daily.info"
+ then
+ clamavdb=$f
+ break
fi
done
--- configure.in 2007-10-29 10:13:40.000000000 -0400
+++ configure.in 2008-05-02 15:31:32.000000000 -0400
@@ -622,6 +622,14 @@
--- ./configure.orig 2007-10-29 09:14:25.000000000 -0500
+++ ./configure 2012-06-26 14:20:22.000000000 -0500
@@ -4682,13 +4682,26 @@
clamavdb=""
for f in "$CLAMAV_DB" /usr/local/share/clamav /var/lib/clamav
do
- if test -f "$f/daily.cvd"
+ if test -f "$f/daily.cvd" || test -d "$f/daily.inc"
+ then
+ clamavdb=$f
+ break
+ elif test -f "$f/daily.cld"
+ then
+ clamavdb=$f
+ break
+ elif test -f "$f/daily.inc/daily.info"
then
clamavdb=$f
break
fi
done
+ # Default to $f/daily.cld
+ if test "$clamavdb" = ""; then
+ clamavdb="$f/daily.cld"
+ fi
+
if test "$clamavdb" = ""
then
echo "$as_me:$LINENO: result: no" >&5
--- ./configure.in.orig 2007-10-29 09:13:40.000000000 -0500
+++ ./configure.in 2012-06-26 14:20:02.000000000 -0500
@@ -622,9 +622,22 @@
then
clamavdb=$f
break
@ -32,6 +45,14 @@
fi
done
+ # Default to $f/daily.cld
+ if test "$clamavdb" = ""; then
+ clamavdb="$f/daily.cld"
+ fi
+
if test "$clamavdb" = ""
then
AC_MSG_RESULT(no)
--- simscanmk.c 2006-10-10 19:15:17.000000000 -0400
+++ simscanmk.c 2008-07-07 14:21:46.000000000 -0400
@@ -123,6 +123,7 @@