3 files changed, 89 insertions, 3 deletions

diff --git a/security/clamav/Makefile b/security/clamav/Makefile
index bb6b8c3d91ba..282948dce027 100644
--- a/security/clamav/Makefile
+++ b/security/clamav/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	clamav
 PORTVERSION=	0.98.5
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	SF
 
@@ -167,6 +168,7 @@ CFLAGS+=	-march=i486
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g' \
+			  -e 's|LC_REVISION=22|LC_REVISION=24|' \
 		${WRKSRC}/${CONFIGURE_SCRIPT}
 	@${REINPLACE_CMD} -e 's,^\(pkgconfigdir = \).*$$,\1$$\(prefix\)/libdata/pkgconfig,g' \
 		${WRKSRC}/Makefile.in
diff --git a/security/clamav/files/patch-fix-11194 b/security/clamav/files/patch-fix-11194
new file mode 100644
index 000000000000..43f46869735f
--- /dev/null
+++ b/security/clamav/files/patch-fix-11194
@@ -0,0 +1,84 @@
+diff -ruN ../clamav-0.98.5.orig/clamav-milter/Makefile.in ./clamav-milter/Makefile.in
+--- ../clamav-0.98.5.orig/clamav-milter/Makefile.in	2014-11-21 14:24:08.000000000 -0200
++++ ./clamav-milter/Makefile.in	2014-11-21 14:27:37.000000000 -0200
+@@ -504,7 +504,7 @@
+ 
+ @BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@man_MANS = $(top_builddir)/docs/man/clamav-milter.8
+ @BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@AM_CFLAGS = @WERR_CFLAGS_MILTER@
+-AM_CPPFLAGS = @SSL_CPPFLAGS@ -I$(top_srcdir)/clamd -I$(top_srcdir)/libclamav -I$(top_srcdir)/shared -I$(top_srcdir) @JSON_CPPFLAGS@
++AM_CPPFLAGS = -I$(top_srcdir)/clamd -I$(top_srcdir)/libclamav -I$(top_srcdir)/shared -I$(top_srcdir) @SSL_CPPFLAGS@ @JSON_CPPFLAGS@
+ CLEANFILES = *.gcda *.gcno
+ all: all-am
+ 
+diff -ruN ../clamav-0.98.5.orig/clamd/Makefile.in ./clamd/Makefile.in
+--- ../clamav-0.98.5.orig/clamd/Makefile.in	2014-11-21 14:24:08.000000000 -0200
++++ ./clamd/Makefile.in	2014-11-21 14:27:58.000000000 -0200
+@@ -479,7 +479,7 @@
+ @BUILD_CLAMD_TRUE@    fan.h
+ 
+ @BUILD_CLAMD_TRUE@AM_CFLAGS = @WERR_CFLAGS@
+-AM_CPPFLAGS = @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav
++AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @SSL_CPPFLAGS@ @JSON_CPPFLAGS@
+ 
+ # it does support --help and --version but with the default config file
+ # it outputs an error message which tells us to edit the config files
+diff -ruN ../clamav-0.98.5.orig/clamdscan/Makefile.in ./clamdscan/Makefile.in
+--- ../clamav-0.98.5.orig/clamdscan/Makefile.in	2014-11-21 14:24:08.000000000 -0200
++++ ./clamdscan/Makefile.in	2014-11-21 14:28:39.000000000 -0200
+@@ -468,7 +468,7 @@
+ @BUILD_CLAMD_TRUE@    client.h
+ 
+ @BUILD_CLAMD_TRUE@AM_CFLAGS = @WERR_CFLAGS@
+-AM_CPPFLAGS = @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/clamscan -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @CLAMDSCAN_CPPFLAGS@
++AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/clamscan -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ @CLAMDSCAN_CPPFLAGS@
+ AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = clamdscan$(EXEEXT)
+ CLEANFILES = *.gcda *.gcno
+ all: all-am
+diff -ruN ../clamav-0.98.5.orig/clamscan/Makefile.in ./clamscan/Makefile.in
+--- ../clamav-0.98.5.orig/clamscan/Makefile.in	2014-11-21 14:24:08.000000000 -0200
++++ ./clamscan/Makefile.in	2014-11-21 14:30:29.000000000 -0200
+@@ -456,7 +456,7 @@
+     manager.h
+ 
+ AM_CFLAGS = @WERR_CFLAGS@
+-AM_CPPFLAGS = @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @CLAMSCAN_CPPFLAGS@
++AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @CLAMSCAN_CPPFLAGS@ @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ @CLAMSCAN_CPPFLAGS@
+ CLEANFILES = *.gcda *.gcno
+ all: all-am
+ 
+diff -ruN ../clamav-0.98.5.orig/clamsubmit/Makefile.in ./clamsubmit/Makefile.in
+--- ../clamav-0.98.5.orig/clamsubmit/Makefile.in	2014-11-21 14:24:08.000000000 -0200
++++ ./clamsubmit/Makefile.in	2014-11-21 14:30:45.000000000 -0200
+@@ -449,7 +449,7 @@
+ 	clamsubmit.c
+ 
+ AM_CFLAGS = @WERR_CFLAGS@ @CLAMSUBMIT_CFLAGS@
+-AM_CPPFLAGS = @JSON_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav
++AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @JSON_CPPFLAGS@
+ AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = clamsubmit$(EXEEXT)
+ CLEANFILES = *.gcda *.gcno
+ all: all-am
+diff -ruN ../clamav-0.98.5.orig/freshclam/Makefile.in ./freshclam/Makefile.in
+--- ../clamav-0.98.5.orig/freshclam/Makefile.in	2014-11-21 14:24:08.000000000 -0200
++++ ./freshclam/Makefile.in	2014-11-21 14:31:23.000000000 -0200
+@@ -472,7 +472,7 @@
+     mirman.h
+ 
+ AM_CFLAGS = @WERR_CFLAGS@
+-AM_CPPFLAGS = @SSL_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @FRESHCLAM_CPPFLAGS@  @JSON_CPPFLAGS@
++AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @FRESHCLAM_CPPFLAGS@  @JSON_CPPFLAGS@ @SSL_CPPFLAGS@
+ AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = freshclam$(EXEEXT)
+ CLEANFILES = *.gcda *.gcno
+ all: all-am
+diff -ruN ../clamav-0.98.5.orig/sigtool/Makefile.in ./sigtool/Makefile.in
+--- ../clamav-0.98.5.orig/sigtool/Makefile.in	2014-11-21 14:24:08.000000000 -0200
++++ ./sigtool/Makefile.in	2014-11-21 14:32:01.000000000 -0200
+@@ -456,7 +456,7 @@
+     sigtool.c
+ 
+ AM_CFLAGS = @WERR_CFLAGS@
+-AM_CPPFLAGS = @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @SIGTOOL_CPPFLAGS@
++AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ @SIGTOOL_CPPFLAGS@
+ CLEANFILES = *.gcda *.gcno
+ all: all-am
+ 
diff --git a/security/clamav/pkg-plist b/security/clamav/pkg-plist
index a89a39224ddb..607151aef5d1 100644
--- a/security/clamav/pkg-plist
+++ b/security/clamav/pkg-plist
@@ -13,13 +13,13 @@ include/clamav.h
 include/clamav-config.h
 lib/libclamav.so
 lib/libclamav.so.6
-lib/libclamav.so.6.1.22
+lib/libclamav.so.6.1.24
 %%UNRAR%%lib/libclamunrar.so
 %%UNRAR%%lib/libclamunrar.so.6
-%%UNRAR%%lib/libclamunrar.so.6.1.22
+%%UNRAR%%lib/libclamunrar.so.6.1.24
 %%UNRAR%%lib/libclamunrar_iface.so
 %%UNRAR%%lib/libclamunrar_iface.so.6
-%%UNRAR%%lib/libclamunrar_iface.so.6.1.22
+%%UNRAR%%lib/libclamunrar_iface.so.6.1.24
 libdata/pkgconfig/libclamav.pc
 man/man1/clambc.1.gz
 man/man1/clamconf.1.gz