[Midnightbsd-cvs] mports: security/clamav: update to 0.94.
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Wed Sep 24 09:47:07 EDT 2008
Log Message:
-----------
update to 0.94. This fixes a denial of service attack
Modified Files:
--------------
mports/security/clamav:
Makefile (r1.14 -> r1.15)
distinfo (r1.12 -> r1.13)
pkg-plist (r1.6 -> r1.7)
mports/security/clamav/files:
clamav-milter.in (r1.4 -> r1.5)
patch-configure (r1.2 -> r1.3)
-------------- next part --------------
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/security/clamav/pkg-plist,v
retrieving revision 1.6
retrieving revision 1.7
diff -L security/clamav/pkg-plist -L security/clamav/pkg-plist -u -r1.6 -r1.7
--- security/clamav/pkg-plist
+++ security/clamav/pkg-plist
@@ -1,4 +1,4 @@
- at comment $FreeBSD: ports/security/clamav/pkg-plist,v 1.35 2008/04/16 16:05:54 garga Exp $
+ at comment $MidnightBSD$
bin/clamav-config
bin/clamconf
bin/clamscan
@@ -9,15 +9,15 @@
sbin/clamd
include/clamav.h
include/clamav-config.h
-lib/libclamav.so.4
+lib/libclamav.so.5
lib/libclamav.so
lib/libclamav.a
lib/libclamav.la
-%%UNRAR%%lib/libclamunrar.so.4
+%%UNRAR%%lib/libclamunrar.so.5
%%UNRAR%%lib/libclamunrar.so
%%UNRAR%%lib/libclamunrar.la
%%UNRAR%%lib/libclamunrar.a
-%%UNRAR%%lib/libclamunrar_iface.so.4
+%%UNRAR%%lib/libclamunrar_iface.so.5
%%UNRAR%%lib/libclamunrar_iface.so
%%UNRAR%%lib/libclamunrar_iface.la
%%UNRAR%%lib/libclamunrar_iface.a
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/security/clamav/Makefile,v
retrieving revision 1.14
retrieving revision 1.15
diff -L security/clamav/Makefile -L security/clamav/Makefile -u -r1.14 -r1.15
--- security/clamav/Makefile
+++ security/clamav/Makefile
@@ -7,7 +7,7 @@
#
PORTNAME= clamav
-PORTVERSION= 0.93.3
+PORTVERSION= 0.94
CATEGORIES= security
MASTER_SITES= SF
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/security/clamav/distinfo,v
retrieving revision 1.12
retrieving revision 1.13
diff -L security/clamav/distinfo -L security/clamav/distinfo -u -r1.12 -r1.13
--- security/clamav/distinfo
+++ security/clamav/distinfo
@@ -1,3 +1,3 @@
-MD5 (clamav-0.93.3.tar.gz) = 06d87fbece062e5c0661ee07703208c9
-SHA256 (clamav-0.93.3.tar.gz) = 7aa98796671dfe3db5a20e25669404c4e4461d2a6c77de352edf99f2c989e500
-SIZE (clamav-0.93.3.tar.gz) = 18242568
+MD5 (clamav-0.94.tar.gz) = d3f6d5fff2db81950491749166ab0ffa
+SHA256 (clamav-0.94.tar.gz) = ae188c18936ea9154eb6a85ea553c29f4349ee3e95457055fae5fe1b981af602
+SIZE (clamav-0.94.tar.gz) = 20509228
Index: clamav-milter.in
===================================================================
RCS file: /home/cvs/mports/security/clamav/files/clamav-milter.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -L security/clamav/files/clamav-milter.in -L security/clamav/files/clamav-milter.in -u -r1.4 -r1.5
--- security/clamav/files/clamav-milter.in
+++ security/clamav/files/clamav-milter.in
@@ -1,7 +1,7 @@
#!/bin/sh
#
-# $FreeBSD: ports/security/clamav/files/clamav-milter.in,v 1.4 2007/06/05 14:22:46 garga Exp $
# $MidnightBSD$
+# $FreeBSD: ports/security/clamav/files/clamav-milter.in,v 1.10 2008/08/18 18:44:19 garga Exp $
#
# PROVIDE: clamav-milter
@@ -28,6 +28,7 @@
required_files=%%PREFIX%%/etc/clamd.conf
start_precmd=start_precmd
+start_postcmd=start_postcmd
start_precmd()
{
@@ -36,8 +37,12 @@
rm "$clamav_milter_socket"
fi
rc_flags="--pidfile ${pidfile} ${flags:-$clamav_milter_flags} $clamav_milter_socket"
+
+ clamav_clamd_socket_prefix=${clamav_clamd_socket%:*}
+ # We can have inet or inet6, try to remove 6
+ clamav_clamd_socket_prefix=${clamav_clamd_socket_prefix%6}
- if checkyesno clamav_clamd_enable && [ "x$clamav_clamd_socket" != "x" ]; then
+ if checkyesno clamav_clamd_enable && [ "x$clamav_clamd_socket" != "x" -a "${clamav_clamd_socket_prefix}" != "inet" ]; then
echo -n "Waiting for clamd socket.. "
i=${clamav_milter_socktimeout}
while [ $i -ne 0 ]
@@ -57,12 +62,43 @@
fi
}
+start_postcmd()
+{
+ clamav_milter_socket_prefix=${clamav_milter_socket%:*}
+ # We can have inet or inet6, try to remove 6
+ clamav_milter_socket_prefix=${clamav_milter_socket_prefix%6}
+
+ if [ "x$clamav_milter_socket" != "x" -a "${clamav_milter_socket_prefix}" != "inet" ]; then
+ echo -n "Waiting for clamav-milter socket.. "
+ i=${clamav_milter_socktimeout}
+ while [ $i -ne 0 ]
+ do
+ [ -S "$clamav_milter_socket" ] && break
+ if [ `expr $i % 10` -eq 0 ]; then
+ echo -n "${i}.. "
+ fi
+ sleep 1
+ i=$(($i-1))
+ done
+ echo
+ if [ $i -eq 0 ]; then
+ echo "There is no clamav-milter socket (${clamav_milter_socket})!"
+ exit 1
+ fi
+ /bin/chmod ${clamav_milter_socket_mode} ${clamav_milter_socket}
+ /usr/sbin/chown ${clamav_milter_socket_user}:${clamav_milter_socket_group} ${clamav_milter_socket}
+ fi
+}
+
# read settings, set default values
load_rc_config $name
: ${clamav_milter_enable="NO"}
: ${clamav_milter_socket="%%CLAMAV_MILTER_SOCKET%%"}
: ${clamav_milter_flags="--postmaster-only --local --outgoing --timeout=0 --max-children=50"}
: ${clamav_milter_socktimeout="60"}
+: ${clamav_milter_socket_mode="755"}
+: ${clamav_milter_socket_user="%%CLAMAVUSER%%"}
+: ${clamav_milter_socket_group="%%CLAMAVGROUP%%"}
: ${clamav_clamd_socket="%%CLAMAV_CLAMD_SOCKET%%"}
: ${clamav_clamd_enable="NO"}
Index: patch-configure
===================================================================
RCS file: /home/cvs/mports/security/clamav/files/patch-configure,v
retrieving revision 1.2
retrieving revision 1.3
diff -L security/clamav/files/patch-configure -L security/clamav/files/patch-configure -u -r1.2 -r1.3
--- security/clamav/files/patch-configure
+++ security/clamav/files/patch-configure
@@ -1,6 +1,24 @@
---- configure.orig Thu Mar 1 20:46:19 2007
-+++ configure Tue Mar 13 10:28:27 2007
-@@ -22431,19 +22431,25 @@
+--- configure.orig 2008-09-01 15:41:18.000000000 -0300
++++ configure 2008-09-05 08:57:53.000000000 -0300
+@@ -16571,7 +16571,7 @@
+ ;;
+ freebsd*)
+ if test "$have_pthreads" = "yes"; then
+- THREAD_LIBS="-lthr"
++ THREAD_LIBS="%%PTHREAD_LIBS%%"
+ TH_SAFE="-thread-safe"
+
+ cat >>confdefs.h <<\_ACEOF
+@@ -16931,7 +16931,7 @@
+ if test "$have_milter" = "yes"; then
+
+ save_LDFLAGS="$LDFLAGS"
+- CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread"
++ CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS $THREAD_LIBS"
+ if test -d /usr/lib/libmilter ; then
+ CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -L/usr/lib/libmilter"
+ fi
+@@ -17468,19 +17468,25 @@
sendmailver_c=`echo $sendmailver | awk -F. '{printf $3}'`
@@ -25,22 +43,4 @@
+fi
fi
- fi
-@@ -23087,7 +23093,7 @@
- ;;
- freebsd*)
- if test "$have_pthreads" = "yes"; then
-- THREAD_LIBS="-pthread -lc_r"
-+ THREAD_LIBS="%%PTHREAD_LIBS%%"
- TH_SAFE="-thread-safe"
-
- cat >>confdefs.h <<\_ACEOF
-@@ -23427,7 +23433,7 @@
- if test "$have_milter" = "yes"; then
-
- save_LDFLAGS="$LDFLAGS"
-- CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread"
-+ CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS %%PTHREAD_LIBS%%"
- if test -d /usr/lib/libmilter ; then
- CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -L/usr/lib/libmilter"
- fi
+ if test "x$ac_cv_have_lresolv_r" != "xyes"; then
More information about the Midnightbsd-cvs
mailing list