5 files changed, 45 insertions, 8 deletions

diff --git a/security/clamav/Makefile b/security/clamav/Makefile
index 0f6180633c1e..2eedf83eae5c 100644
--- a/security/clamav/Makefile
+++ b/security/clamav/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	clamav
-PORTVERSION=	0.95.2
+PORTVERSION=	0.95.3
 CATEGORIES=	security
 MASTER_SITES=	SF
 
diff --git a/security/clamav/distinfo b/security/clamav/distinfo
index 4050226cb5f8..9fd00764bf4f 100644
--- a/security/clamav/distinfo
+++ b/security/clamav/distinfo
@@ -1,3 +1,3 @@
-MD5 (clamav-0.95.2.tar.gz) = 930362397d30e01ba81b5f24c1046d48
-SHA256 (clamav-0.95.2.tar.gz) = f5f2a5a9984fd1ade69a7c2cc78da2f5dc0c505f94ab58fb2aa6613399ab1c56
-SIZE (clamav-0.95.2.tar.gz) = 25137010
+MD5 (clamav-0.95.3.tar.gz) = eaf9fccc3cc3567605a9732313652967
+SHA256 (clamav-0.95.3.tar.gz) = 003e7a570932fdffbd19fa7a7996274fbfc93f890d26c3066a36eb824c906250
+SIZE (clamav-0.95.3.tar.gz) = 26919541
diff --git a/security/clamav/files/patch-etc_Makefile.in b/security/clamav/files/patch-etc_Makefile.in
index 336f5667c3e3..7316f142ce06 100644
--- a/security/clamav/files/patch-etc_Makefile.in
+++ b/security/clamav/files/patch-etc_Makefile.in
@@ -1,6 +1,6 @@
---- etc/Makefile.in.orig	2009-02-17 22:43:14.000000000 -0300
-+++ etc/Makefile.in	2009-02-18 08:14:54.000000000 -0300
-@@ -393,12 +393,9 @@
+--- etc/Makefile.in.orig	2009-10-28 13:54:51.000000000 -0200
++++ etc/Makefile.in	2009-10-28 15:24:27.000000000 -0200
+@@ -419,12 +419,9 @@
  
  install-data-local:
  	$(mkinstalldirs) $(DESTDIR)$(CFGINST)
@@ -13,6 +13,6 @@
 +	$(INSTALL_DATA) $(srcdir)/clamd.conf $(DESTDIR)$(CFGINST)/clamd.conf.default
 +	$(INSTALL_DATA) $(srcdir)/freshclam.conf $(DESTDIR)$(CFGINST)/freshclam.conf.default
 +@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@	$(INSTALL_DATA) $(srcdir)/clamav-milter.conf $(DESTDIR)$(CFGINST)/clamav-milter.conf.default
+ 
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
diff --git a/security/clamav/files/patch-libclamav_Makefile.in b/security/clamav/files/patch-libclamav_Makefile.in
new file mode 100644
index 000000000000..075327c81003
--- /dev/null
+++ b/security/clamav/files/patch-libclamav_Makefile.in
@@ -0,0 +1,27 @@
+--- libclamav/Makefile.am
++++ libclamav/Makefile.am
+@@ -346,8 +346,8 @@ version.h: version.h.tmp
+ version.h.tmp:
+ 	@test -f version.h || touch version.h;\
+ 	rm -f $@;\
+-	REVISION="$$(LANG=C cd "$(top_srcdir)"; git describe --always 2>/dev/null)";\
+-	if test $$? -ne 0; then\
++	REVISION="$$(LANG=C cd "$(top_srcdir)"; git describe --always 2>/dev/null || echo "exported")";\
++	if test "$$REVISION" = "exported"; then\
+ 	   REVISION="r$$(LANG=C svnversion "$(top_srcdir)" 2>/dev/null || echo exported)";\
+ 	   if test "$$REVISION" = "rexported"; then\
+ 	    REVISION="";\
+--- libclamav/Makefile.in
++++ libclamav/Makefile.in
+@@ -2028,8 +2028,8 @@ version.h: version.h.tmp
+ version.h.tmp:
+ 	@test -f version.h || touch version.h;\
+ 	rm -f $@;\
+-	REVISION="$$(LANG=C cd "$(top_srcdir)"; git describe --always 2>/dev/null)";\
+-	if test $$? -ne 0; then\
++	REVISION="$$(LANG=C cd "$(top_srcdir)"; git describe --always 2>/dev/null || echo "exported")";\
++	if test "$$REVISION" = "exported"; then\
+ 	   REVISION="r$$(LANG=C svnversion "$(top_srcdir)" 2>/dev/null || echo exported)";\
+ 	   if test "$$REVISION" = "rexported"; then\
+ 	    REVISION="";\
+
diff --git a/security/clamav/files/patch-libclamav_others.h b/security/clamav/files/patch-libclamav_others.h
new file mode 100644
index 000000000000..2b5623361676
--- /dev/null
+++ b/security/clamav/files/patch-libclamav_others.h
@@ -0,0 +1,10 @@
+--- libclamav/others.h.orig	2009-10-29 08:11:34.000000000 -0200
++++ libclamav/others.h	2009-10-29 08:11:45.000000000 -0200
+@@ -29,6 +29,7 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <unistd.h>
+ #include "cltypes.h"
+ 
+ #include "clamav.h"