cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update clamav to 0.93.3. possible SECURITY. since 0.93:

Browse Source 
- fixes DoS with MailFollowURLs (CVE-2008-2713)
- improves handling of PDF, CAB, RTF, OLE2 and HTML files
and includes various bugfixes for 0.93 issues.

"if it works" mbalmer@
This commit is contained in:
sthen 2008-07-08 22:38:12 +00:00
parent c86fa684dc
commit d66238e14d
10 changed files with 47 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
security/clamav/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.37 2008/04/16 19:46:01 mbalmer Exp $ # $OpenBSD: Makefile,v 1.38 2008/07/08 22:38:12 sthen Exp $
COMMENT= virus scanner COMMENT= virus scanner
DISTNAME= clamav-0.93 DISTNAME= clamav-0.93.3
CATEGORIES= security CATEGORIES= security
SHARED_LIBS= clamav 7.0 \ SHARED_LIBS= clamav 8.0 \
clamunrar 0.0 \ clamunrar 0.0 \
clamunrar_iface 0.0 clamunrar_iface 0.0

10
security/clamav/distinfo
View File

@ -1,5 +1,5 @@
MD5 (clamav-0.93.tar.gz) = cu1vRwaFjnLyTdqKWR3w2g== MD5 (clamav-0.93.3.tar.gz) = Bth/vs4GLlwGYe4HcDIIyQ==
RMD160 (clamav-0.93.tar.gz) = ofMBNFmD7QYG4vLhPvYydb00HNQ= RMD160 (clamav-0.93.3.tar.gz) = g3kUh5DMVFyAFwnUa324djT0P2c=
SHA1 (clamav-0.93.tar.gz) = uuX3AzHoWS6cU6BFFwOIkIRdQG0= SHA1 (clamav-0.93.3.tar.gz) = ASQGE7Y5FE+o+mVYJfZYfgRKHBw=
SHA256 (clamav-0.93.tar.gz) = H+3Cu0qFDJYtawk4t3sUSAKXv/pMv2ntlcTuTzW122k= SHA256 (clamav-0.93.3.tar.gz) = eqmHlmcd/j21og4lZpQExORGHSpsd941Lt+Z8smJ5QA=
SIZE (clamav-0.93.tar.gz) = 16134725 SIZE (clamav-0.93.3.tar.gz) = 18242568

8
security/clamav/patches/patch-clamav_milter-clamav_milter_c
View File

@ -1,5 +1,5 @@
--- clamav-milter/clamav-milter.c.orig Wed Apr 9 17:39:18 2008 --- clamav-milter/clamav-milter.c.orig Tue May 27 04:40:29 2008
+++ clamav-milter/clamav-milter.c Mon Apr 14 18:41:12 2008 +++ clamav-milter/clamav-milter.c Thu Jun 12 17:31:16 2008
@@ -1134,7 +1134,7 @@ main(int argc, char **argv) @@ -1134,7 +1134,7 @@ main(int argc, char **argv)
* uid == 0 for that * uid == 0 for that
*/ */
@ -9,10 +9,10 @@
perror("setsockopt"); perror("setsockopt");
return EX_UNAVAILABLE; return EX_UNAVAILABLE;
} }
@@ -1156,7 +1156,7 @@ main(int argc, char **argv) @@ -1157,7 +1157,7 @@ main(int argc, char **argv)
memset(&ifr, '\0', sizeof(struct ifreq)); memset(&ifr, '\0', sizeof(struct ifreq));
strncpy(ifr.ifr_name, iface, sizeof(ifr.ifr_name) - 1); strncpy(ifr.ifr_name, iface, sizeof(ifr.ifr_name) - 1);
ifr.ifr_name[sizeof(ifr.ifr_name)-1]='\0';
- if(setsockopt(broadcastSock, SOL_SOCKET, SO_BINDTODEVICE, &ifr, sizeof(ifr)) < 0) { - if(setsockopt(broadcastSock, SOL_SOCKET, SO_BINDTODEVICE, &ifr, sizeof(ifr)) < 0) {
+ if(setsockopt(broadcastSock, SOL_SOCKET, 0, &ifr, sizeof(ifr)) < 0) { + if(setsockopt(broadcastSock, SOL_SOCKET, 0, &ifr, sizeof(ifr)) < 0) {
perror(iface); perror(iface);

26
security/clamav/patches/patch-configure
View File

@ -1,21 +1,7 @@
$OpenBSD: patch-configure,v 1.12 2008/04/16 19:46:01 mbalmer Exp $ $OpenBSD: patch-configure,v 1.13 2008/07/08 22:38:12 sthen Exp $
--- configure.orig Mon Apr 14 18:49:25 2008 --- configure.orig Wed Jun 4 06:16:09 2008
+++ configure Mon Apr 14 18:52:34 2008 +++ configure Thu Jun 12 17:30:58 2008
@@ -14112,11 +14112,11 @@ cat >>conftest.$ac_ext <<_ACEOF @@ -16139,11 +16139,9 @@ _ACEOF
#ifdef __cplusplus
extern "C"
#endif
-char bzReadOpen ();
+char BZ2_bzReadOpen ();
int
main ()
{
-return bzReadOpen ();
+return BZ2_bzReadOpen ();
;
return 0;
}
@@ -15989,11 +15989,9 @@ _ACEOF
;; ;;
openbsd*) openbsd*)
if test "$have_pthreads" = "yes"; then if test "$have_pthreads" = "yes"; then
@ -30,7 +16,7 @@ $OpenBSD: patch-configure,v 1.12 2008/04/16 19:46:01 mbalmer Exp $
TH_SAFE="-thread-safe" TH_SAFE="-thread-safe"
cat >>confdefs.h <<\_ACEOF cat >>confdefs.h <<\_ACEOF
@@ -17121,6 +17119,7 @@ cat confdefs.h >>conftest.$ac_ext @@ -17271,6 +17269,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */ /* end confdefs.h. */
@ -38,7 +24,7 @@ $OpenBSD: patch-configure,v 1.12 2008/04/16 19:46:01 mbalmer Exp $
#include <tcpd.h> #include <tcpd.h>
int allow_severity = 0; int allow_severity = 0;
int deny_severity = 0; int deny_severity = 0;
@@ -17173,6 +17172,7 @@ cat confdefs.h >>conftest.$ac_ext @@ -17323,6 +17322,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */ /* end confdefs.h. */

8
security/clamav/patches/patch-libclamav_Makefile_am
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-libclamav_Makefile_am,v 1.6 2008/04/16 19:46:02 mbalmer Exp $ $OpenBSD: patch-libclamav_Makefile_am,v 1.7 2008/07/08 22:38:12 sthen Exp $
--- libclamav/Makefile.am.orig Thu Mar 6 19:41:07 2008 --- libclamav/Makefile.am.orig Mon May 5 07:37:53 2008
+++ libclamav/Makefile.am Mon Apr 14 18:41:12 2008 +++ libclamav/Makefile.am Thu Jun 12 17:30:58 2008
@@ -26,7 +26,7 @@ else @@ -26,7 +26,7 @@ else
libclamav_la_LIBADD = @LIBCLAMAV_LIBS@ @THREAD_LIBS@ lzma/liblzma.la libclamav_la_LIBADD = lzma/liblzma.la @LIBCLAMAV_LIBS@ @THREAD_LIBS@
endif endif
-libclamav_la_LDFLAGS = @TH_SAFE@ -version-info @LIBCLAMAV_VERSION@ -no-undefined -libclamav_la_LDFLAGS = @TH_SAFE@ -version-info @LIBCLAMAV_VERSION@ -no-undefined

10
security/clamav/patches/patch-libclamav_Makefile_in
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-libclamav_Makefile_in,v 1.6 2008/04/16 19:46:02 mbalmer Exp $ $OpenBSD: patch-libclamav_Makefile_in,v 1.7 2008/07/08 22:38:12 sthen Exp $
--- libclamav/Makefile.in.orig Wed Apr 9 17:55:30 2008 --- libclamav/Makefile.in.orig Mon May 12 09:48:31 2008
+++ libclamav/Makefile.in Mon Apr 14 18:46:29 2008 +++ libclamav/Makefile.in Thu Jun 12 17:31:46 2008
@@ -265,7 +265,7 @@ SUBDIRS = lzma . @@ -265,7 +265,7 @@ SUBDIRS = lzma .
AM_CPPFLAGS = -I$(top_srcdir) -I@srcdir@/nsis -I@srcdir@/lzma AM_CPPFLAGS = -I$(top_srcdir) -I@srcdir@/nsis -I@srcdir@/lzma
@ENABLE_UNRAR_FALSE@libclamav_la_LIBADD = @LIBCLAMAV_LIBS@ @THREAD_LIBS@ lzma/liblzma.la @ENABLE_UNRAR_FALSE@libclamav_la_LIBADD = lzma/liblzma.la @LIBCLAMAV_LIBS@ @THREAD_LIBS@
@ENABLE_UNRAR_TRUE@libclamav_la_LIBADD = @LIBCLAMAV_LIBS@ @THREAD_LIBS@ lzma/liblzma.la $(top_builddir)/libclamunrar_iface/libclamunrar_iface.la @ENABLE_UNRAR_TRUE@libclamav_la_LIBADD = $(top_builddir)/libclamunrar_iface/libclamunrar_iface.la lzma/liblzma.la @LIBCLAMAV_LIBS@ @THREAD_LIBS@
-libclamav_la_LDFLAGS = @TH_SAFE@ -version-info @LIBCLAMAV_VERSION@ \ -libclamav_la_LDFLAGS = @TH_SAFE@ -version-info @LIBCLAMAV_VERSION@ \
+libclamav_la_LDFLAGS = @TH_SAFE@ $(LIBclamav_LTVERSION) @LIBCLAMAV_VERSION@ \ +libclamav_la_LDFLAGS = @TH_SAFE@ $(LIBclamav_LTVERSION) @LIBCLAMAV_VERSION@ \
-no-undefined $(am__append_1) -no-undefined $(am__append_1)

14
security/clamav/patches/patch-libclamav_ole2_extract_c
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-libclamav_ole2_extract_c,v 1.6 2008/04/16 19:46:02 mbalmer Exp $ $OpenBSD: patch-libclamav_ole2_extract_c,v 1.7 2008/07/08 22:38:12 sthen Exp $
--- libclamav/ole2_extract.c.orig Wed Apr 2 22:17:28 2008 --- libclamav/ole2_extract.c.orig Tue Jun 3 11:47:19 2008
+++ libclamav/ole2_extract.c Mon Apr 14 18:41:12 2008 +++ libclamav/ole2_extract.c Thu Jun 12 17:32:13 2008
@@ -136,7 +136,7 @@ typedef struct property_tag @@ -142,7 +142,7 @@ typedef struct property_tag
static unsigned char magic_id[] = { 0xd0, 0xcf, 0x11, 0xe0, 0xa1, 0xb1, 0x1a, 0xe1}; static unsigned char magic_id[] = { 0xd0, 0xcf, 0x11, 0xe0, 0xa1, 0xb1, 0x1a, 0xe1};
-static char *get_property_name(char *name, int size)
+static char *get_property_name(signed char *name, int size) -static char *get_property_name2(char *name, int size)
+static char *get_property_name2(signed char *name, int size)
{ {
int i, j; int i, j;
char *newname; char *newname;

23
security/clamav/patches/patch-libclamav_scanner_c
View File

@ -1,23 +0,0 @@
--- libclamav/scanners.c.orig Wed Apr 2 22:53:44 2008
+++ libclamav/scanners.c Mon Apr 14 18:41:12 2008
@@ -529,11 +529,6 @@ static int cli_scangzip(int desc, cli_ctx *ctx)
#ifdef HAVE_BZLIB_H
-#ifdef NOBZ2PREFIX
-#define BZ2_bzReadOpen bzReadOpen
-#define BZ2_bzReadClose bzReadClose
-#define BZ2_bzRead bzRead
-#endif
static int cli_scanbzip(int desc, cli_ctx *ctx)
{
@@ -555,7 +550,7 @@ static int cli_scanbzip(int desc, cli_ctx *ctx)
if(ctx->limits->archivememlim)
memlim = 1;
- if((bfd = BZ2_bzReadOpen(&bzerror, fs, 0, memlim, NULL, 0)) == NULL) {
+ if((bfd = (BZFILE *)BZ2_bzReadOpen(&bzerror, fs, 0, memlim, NULL, 0)) == NULL) {
cli_dbgmsg("Bzip: Can't initialize bzip2 library (descriptor: %d).\n", desc);
fclose(fs);
return CL_EBZIP;

10
security/clamav/patches/patch-libclamav_vba_extract_c
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-libclamav_vba_extract_c,v 1.4 2008/04/16 19:46:02 mbalmer Exp $ $OpenBSD: patch-libclamav_vba_extract_c,v 1.5 2008/07/08 22:38:12 sthen Exp $
--- libclamav/vba_extract.c.orig Wed Apr 2 22:17:28 2008 --- libclamav/vba_extract.c.orig Tue May 27 05:44:35 2008
+++ libclamav/vba_extract.c Mon Apr 14 18:47:15 2008 +++ libclamav/vba_extract.c Thu Jun 12 17:30:58 2008
@@ -115,7 +115,7 @@ vba_endian_convert_32(uint32_t value, int big_endian) @@ -99,7 +99,7 @@ vba_endian_convert_32(uint32_t value, int big_endian)
}
static char * static char *
-get_unicode_name(const char *name, int size, int big_endian) -get_unicode_name(const char *name, int size, int big_endian)

16
security/clamav/pkg/PLIST
View File

@ -1,12 +1,12 @@
@comment $OpenBSD: PLIST,v 1.10 2008/04/16 19:46:02 mbalmer Exp $ @comment $OpenBSD: PLIST,v 1.11 2008/07/08 22:38:12 sthen Exp $
@newgroup _clamav:539 @newgroup _clamav:539
@newuser _clamav:539:539:daemon:Clam AntiVirus:/nonexistent:/sbin/nologin @newuser _clamav:539:539:daemon:Clam AntiVirus:/nonexistent:/sbin/nologin
bin/clamav-config bin/clamav-config
bin/clamconf @bin bin/clamconf
bin/clamdscan @bin bin/clamdscan
bin/clamscan @bin bin/clamscan
bin/freshclam @bin bin/freshclam
bin/sigtool @bin bin/sigtool
include/clamav.h include/clamav.h
lib/libclamav.a lib/libclamav.a
lib/libclamav.la lib/libclamav.la
@ -25,8 +25,8 @@ lib/pkgconfig/libclamav.pc
@man man/man5/freshclam.conf.5 @man man/man5/freshclam.conf.5
@man man/man8/clamav-milter.8 @man man/man8/clamav-milter.8
@man man/man8/clamd.8 @man man/man8/clamd.8
sbin/clamav-milter @bin sbin/clamav-milter
sbin/clamd @bin sbin/clamd
share/doc/clamav/ share/doc/clamav/
share/doc/clamav/clamav-mirror-howto.pdf share/doc/clamav/clamav-mirror-howto.pdf
share/doc/clamav/clamdoc.pdf share/doc/clamav/clamdoc.pdf