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

security update to 0.88.4

Browse Source 
ok pvalchev
This commit is contained in:
mbalmer 2006-08-15 18:48:22 +00:00
parent a8e6381177
commit c1909e4a9e
9 changed files with 50 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
security/clamav/Makefile
View File

@ -1,11 +1,9 @@
# $OpenBSD: Makefile,v 1.17 2006/08/03 23:28:11 espie Exp $
# $OpenBSD: Makefile,v 1.18 2006/08/15 18:48:22 mbalmer Exp $
COMMENT= "virus scanner"
DISTNAME= clamav-0.88.2
DISTNAME= clamav-0.88.4
CATEGORIES= security
SHARED_LIBS= clamav 1.19
MODGNU_SHARED_LIBS= clamav ''
LIBclamav_ALIAS= realclamav
SHARED_LIBS= clamav 1.20
HOMEPAGE= http://www.clamav.net/

8
security/clamav/distinfo
View File

@ -1,4 +1,4 @@
MD5 (clamav-0.88.2.tar.gz) = f0a1c610a1fb70bd748a08bea69c736c
RMD160 (clamav-0.88.2.tar.gz) = db6960b315d7c0aec289e3820363f0a6f9c41daf
SHA1 (clamav-0.88.2.tar.gz) = 6164a253b10c46ee93a821ce1fe86a167bd83cf5
SIZE (clamav-0.88.2.tar.gz) = 6016832
MD5 (clamav-0.88.4.tar.gz) = 7759784aa4506b314e6543e0f2a8587b
RMD160 (clamav-0.88.4.tar.gz) = efa419598c7d6deae53bf9c0f40a4c2912433228
SHA1 (clamav-0.88.4.tar.gz) = efc343e833c0bc1c77540bdb4e8dc21cedee70fa
SIZE (clamav-0.88.4.tar.gz) = 7632947

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

@ -1,7 +1,7 @@
$OpenBSD: patch-clamd_Makefile_in,v 1.2 2005/06/29 10:12:09 mbalmer Exp $
--- clamd/Makefile.in.orig Thu Jun 23 22:03:05 2005
+++ clamd/Makefile.in Wed Jun 29 11:00:23 2005
@@ -148,7 +148,9 @@ INSTALL_DATA = @INSTALL_DATA@
$OpenBSD: patch-clamd_Makefile_in,v 1.3 2006/08/15 18:48:22 mbalmer Exp $
--- clamd/Makefile.in.orig Sat Jul 1 06:12:55 2006
+++ clamd/Makefile.in Fri Jul 28 02:28:02 2006
@@ -147,7 +147,9 @@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@

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

@ -1,6 +1,6 @@
$OpenBSD: patch-clamdscan_client_c,v 1.3 2005/05/12 14:55:21 mbalmer Exp $
--- clamdscan/client.c.orig Sun Feb 6 20:28:03 2005
+++ clamdscan/client.c Sun Apr 10 10:00:25 2005
$OpenBSD: patch-clamdscan_client_c,v 1.4 2006/08/15 18:48:22 mbalmer Exp $
--- clamdscan/client.c.orig Thu Apr 20 10:52:19 2006
+++ clamdscan/client.c Fri Jul 28 02:28:02 2006
@@ -26,6 +26,7 @@
#include <sys/types.h>
#include <sys/stat.h>
@ -9,7 +9,7 @@ $OpenBSD: patch-clamdscan_client_c,v 1.3 2005/05/12 14:55:21 mbalmer Exp $
#include <sys/un.h>
#include <netinet/in.h>
#include <arpa/inet.h>
@@ -283,18 +284,18 @@ int dsstream(int sockd, const struct opt
@@ -294,18 +295,18 @@ int dsstream(int sockd, const struct opt
char *abpath(const char *filename)
{
struct stat foo;

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

@ -1,20 +1,21 @@
--- configure.orig Fri Sep 16 01:34:05 2005
+++ configure Mon Sep 19 20:06:08 2005
@@ -10549,11 +10549,11 @@ extern "C"
$OpenBSD: patch-configure,v 1.5 2006/08/15 18:48:22 mbalmer Exp $
--- configure.orig Sat Jul 1 13:12:52 2006
+++ configure Mon Jul 31 20:02:42 2006
@@ -11828,11 +11828,11 @@ cat >>conftest.$ac_ext <<_ACEOF
#ifdef __cplusplus
extern "C"
#endif
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
-char bzReadOpen ();
+char BZ2_bzReadOpen ();
int
main ()
{
-bzReadOpen ();
+BZ2_bzReadOpen ();
-return bzReadOpen ();
+return BZ2_bzReadOpen ();
;
return 0;
}
@@ -10914,6 +10914,8 @@ cat confdefs.h >>conftest.$ac_ext
@@ -12248,6 +12248,8 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@ -23,7 +24,7 @@
#include <resolv.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -11856,13 +11858,9 @@ _ACEOF
@@ -13293,13 +13295,9 @@ _ACEOF
openbsd*)
if test "$have_pthreads" = "yes"; then
LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -pthread"
@ -40,11 +41,18 @@
TH_SAFE="-thread-safe"
cat >>confdefs.h <<\_ACEOF
@@ -12996,6 +12994,8 @@ cat confdefs.h >>conftest.$ac_ext
@@ -14497,6 +14495,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
+#include <sys/types.h>
#include <tcpd.h>
int allow_severity = 0;
int deny_severity = 0;
@@ -14565,6 +14564,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
+#include <sys/types.h>
#include <tcpd.h>
int allow_severity = 0;

6
security/clamav/patches/patch-etc-clamd_conf
View File

@ -1,5 +1,5 @@
--- etc/clamd.conf.orig Mon Oct 11 03:14:30 2004
+++ etc/clamd.conf Tue Dec 21 16:37:52 2004
--- etc/clamd.conf.orig Wed Mar 29 07:01:45 2006
+++ etc/clamd.conf Fri Jul 28 02:28:02 2006
@@ -11,7 +11,7 @@ Example
# LogFile must be writable for the user running daemon.
# A full path is required.
@ -8,7 +8,7 @@
+#LogFile /var/log/clamd.log
# By default the log file is locked for writing - the lock protects against
# running clamd multiple times (if want to run another clamd, please
# running clamd multiple times (if you want to run another clamd instance,
@@ -62,7 +62,7 @@ Example
# Path to the database directory.

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

@ -1,12 +1,12 @@
$OpenBSD: patch-libclamav_Makefile_am,v 1.1 2005/12/24 20:52:58 sturm Exp $
--- libclamav/Makefile.am.orig Sat Dec 24 19:26:40 2005
+++ libclamav/Makefile.am Sat Dec 24 19:27:59 2005
$OpenBSD: patch-libclamav_Makefile_am,v 1.2 2006/08/15 18:48:22 mbalmer Exp $
--- libclamav/Makefile.am.orig Sun Mar 26 13:04:57 2006
+++ libclamav/Makefile.am Mon Jul 31 00:09:11 2006
@@ -20,7 +20,7 @@ INCLUDES = -I$(top_srcdir) -I@srcdir@/zz
libclamav_la_LIBADD = @LIBCLAMAV_LIBS@
-libclamav_la_LDFLAGS = @TH_SAFE@ -version-info @LIBCLAMAV_VERSION@ -no-undefined
+libclamav_la_LDFLAGS = @TH_SAFE@ ${librealclamav_la_LDFLAGS} -no-undefined
+libclamav_la_LDFLAGS = @TH_SAFE@ $(LIBclamav_LTVERSION) -no-undefined
include_HEADERS = clamav.h

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

@ -1,12 +1,12 @@
$OpenBSD: patch-libclamav_Makefile_in,v 1.1 2005/12/25 10:40:27 sturm Exp $
--- libclamav/Makefile.in.orig Sun Dec 25 11:13:22 2005
+++ libclamav/Makefile.in Sun Dec 25 11:13:45 2005
@@ -216,7 +216,7 @@ target_os = @target_os@
$OpenBSD: patch-libclamav_Makefile_in,v 1.2 2006/08/15 18:48:22 mbalmer Exp $
--- libclamav/Makefile.in.orig Sat Jul 1 06:12:56 2006
+++ libclamav/Makefile.in Mon Jul 31 00:10:52 2006
@@ -220,7 +220,7 @@ target_os = @target_os@
target_vendor = @target_vendor@
INCLUDES = -I$(top_srcdir) -I@srcdir@/zziplib -I@srcdir@/mspack
libclamav_la_LIBADD = @LIBCLAMAV_LIBS@
-libclamav_la_LDFLAGS = @TH_SAFE@ -version-info @LIBCLAMAV_VERSION@ -no-undefined
+libclamav_la_LDFLAGS = @TH_SAFE@ ${librealclamav_la_LDFLAGS} -no-undefined
+libclamav_la_LDFLAGS = @TH_SAFE@ $(LIBclamav_LTVERSION) -no-undefined
include_HEADERS = clamav.h
libclamav_la_SOURCES = \
clamav.h \

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

@ -1,6 +1,6 @@
--- libclamav/scanners.c.orig Thu Jun 23 22:03:12 2005
+++ libclamav/scanners.c Wed Jun 29 11:00:23 2005
@@ -642,11 +642,6 @@ static int cli_scangzip(int desc, const
--- libclamav/scanners.c.orig Sat Jul 1 05:58:56 2006
+++ libclamav/scanners.c Fri Jul 28 02:28:02 2006
@@ -643,11 +643,6 @@ static int cli_scangzip(int desc, const
#ifdef HAVE_BZLIB_H
@ -10,9 +10,9 @@
-#define BZ2_bzRead bzRead
-#endif
static int cli_scanbzip(int desc, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, unsigned int options, unsigned int arec, unsigned int mrec)
static int cli_scanbzip(int desc, const char **virname, unsigned long int *scanned, const struct cl_node *root, const struct cl_limits *limits, unsigned int options, unsigned int arec, unsigned int mrec)
{
@@ -667,7 +662,7 @@ static int cli_scanbzip(int desc, const
@@ -668,7 +663,7 @@ static int cli_scanbzip(int desc, const
if(limits->archivememlim)
memlim = 1;