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

Update to ClamAV version 0.85

Browse Source
This commit is contained in:
mbalmer 2005-05-12 14:55:21 +00:00
parent 7fcba0b83f
commit 76994161a4
12 changed files with 53 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
security/clamav/Makefile
View File

@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.3 2005/02/21 09:36:29 mbalmer Exp $
# $OpenBSD: Makefile,v 1.4 2005/05/12 14:55:21 mbalmer Exp $
COMMENT= "free virus scanner"
DISTNAME= clamav-0.83
DISTNAME= clamav-0.85
CATEGORIES= security
HOMEPAGE= http://www.clamav.net/

8
security/clamav/distinfo
View File

@ -1,4 +1,4 @@
MD5 (clamav-0.83.tar.gz) = e3a1b6bbda8095c5aae4eb7bc753804c
RMD160 (clamav-0.83.tar.gz) = 8fcecf6a94e9d873e797c350b50d3a7080696ff5
SHA1 (clamav-0.83.tar.gz) = a8264834ee494b44d99db5b3a9e16599cb4e9026
SIZE (clamav-0.83.tar.gz) = 3653658
MD5 (clamav-0.85.tar.gz) = b6bf9b04d69b4e9cf917beca99d8169a
RMD160 (clamav-0.85.tar.gz) = c4281baa4a15fa8aed9729da7c737c06e75cdd2e
SHA1 (clamav-0.85.tar.gz) = dcf92b71f85baad2d1ab7619f78ee2626d538d51
SIZE (clamav-0.85.tar.gz) = 4047244

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

@ -1,6 +1,6 @@
--- clamav-milter/clamav-milter.c.orig Mon Oct 11 02:59:12 2004
+++ clamav-milter/clamav-milter.c Tue Dec 21 16:37:12 2004
@@ -1138,7 +1138,7 @@ main(int argc, char **argv)
--- clamav-milter/clamav-milter.c.orig Thu Apr 7 19:50:14 2005
+++ clamav-milter/clamav-milter.c Sun Apr 10 10:00:25 2005
@@ -875,7 +875,7 @@ main(int argc, char **argv)
* uid == 0 for that
*/
on = 1;
@ -9,7 +9,7 @@
perror("setsockopt");
return EX_UNAVAILABLE;
}
@@ -1155,7 +1155,7 @@ main(int argc, char **argv)
@@ -892,7 +892,7 @@ main(int argc, char **argv)
memset(&ifr, '\0', sizeof(struct ifreq));
strncpy(ifr.ifr_name, iface, sizeof(ifr.ifr_name) - 1);

14
security/clamav/patches/patch-clamd_Makefile_in Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-clamd_Makefile_in,v 1.1 2005/05/12 14:55:21 mbalmer Exp $
--- clamd/Makefile.in.orig Sun Apr 10 10:17:28 2005
+++ clamd/Makefile.in Sun Apr 10 10:17:46 2005
@@ -157,7 +157,9 @@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
+# Do not generate "LDFLAGS = -L/usr/local/lib" to build on systems that have
+# have an older libclamav installed.
+# LDFLAGS = @LDFLAGS@
LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@
LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
LIBOBJS = @LIBOBJS@

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

@ -1,15 +1,15 @@
$OpenBSD: patch-clamdscan_client_c,v 1.2 2005/01/27 19:47:47 mbalmer Exp $
--- clamdscan/client.c.orig Sun Jan 9 12:24:58 2005
+++ clamdscan/client.c Sun Jan 9 12:27:44 2005
@@ -25,6 +25,7 @@
$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
@@ -26,6 +26,7 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
#include <sys/socket.h>
+#include <sys/param.h>
#include <sys/un.h>
#include <netinet/in.h>
#include <arpa/inet.h>
@@ -186,18 +187,18 @@ int dsstream(int sockd)
@@ -283,18 +284,18 @@ int dsstream(int sockd, const struct opt
char *abpath(const char *filename)
{
struct stat foo;

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

@ -1,6 +1,6 @@
--- configure.orig Sun Oct 17 18:37:47 2004
+++ configure Sun Jan 9 12:24:10 2005
@@ -10339,11 +10339,11 @@ extern "C"
--- configure.orig Thu Apr 7 19:59:55 2005
+++ configure Sun Apr 10 10:00:25 2005
@@ -10533,11 +10533,11 @@ 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. */
@ -14,7 +14,7 @@
;
return 0;
}
@@ -10704,6 +10704,8 @@ cat confdefs.h >>conftest.$ac_ext
@@ -10898,6 +10898,8 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@ -23,7 +23,7 @@
#include <resolv.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -11527,6 +11529,7 @@ _ACEOF
@@ -11704,6 +11706,7 @@ _ACEOF
openbsd*)
if test "$have_pthreads" = "yes"; then
LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -pthread"
@ -31,7 +31,7 @@
if test "$disable_cr" = "yes"; then
CLAMD_LIBS="$CLAMD_LIBS -pthread"
CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -pthread"
@@ -12405,6 +12408,7 @@ cat confdefs.h >>conftest.$ac_ext
@@ -12889,6 +12892,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@ -39,7 +39,7 @@
#include <tcpd.h>
int allow_severity = 0;
int deny_severity = 0;
@@ -12460,6 +12464,7 @@ cat confdefs.h >>conftest.$ac_ext
@@ -12944,6 +12948,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */

8
security/clamav/patches/patch-etc-freshclam_conf
View File

@ -1,5 +1,5 @@
--- etc/freshclam.conf.orig Mon Sep 27 22:35:01 2004
+++ etc/freshclam.conf Tue Dec 21 16:40:33 2004
--- etc/freshclam.conf.orig Thu Apr 7 19:55:34 2005
+++ etc/freshclam.conf Sun Apr 10 10:00:25 2005
@@ -11,7 +11,7 @@ Example
# Path to the database directory.
# WARNING: It must match clamd.conf's directive!
@ -16,5 +16,5 @@
-#DatabaseOwner clamav
+#DatabaseOwner _clamav
# Use DNS to verify virus database version. Freshclam uses DNS TXT records
# to verify database and software versions. We highly recommend enabling
# Initialize supplementary group access (freshclam must be started by root).
# Default: disabled

6
security/clamav/patches/patch-libclamav_mbox_c
View File

@ -1,6 +1,6 @@
--- libclamav/mbox.c.orig Sun Oct 17 15:25:31 2004
+++ libclamav/mbox.c Tue Dec 21 16:37:12 2004
@@ -472,11 +472,6 @@ static char const rcsid[] = "$Id: mbox.c
--- libclamav/mbox.c.orig Thu Apr 7 19:50:25 2005
+++ libclamav/mbox.c Sun Apr 10 10:00:25 2005
@@ -25,11 +25,6 @@ static char const rcsid[] = "$Id: mbox.c
#define NDEBUG /* map CLAMAV debug onto standard */
#endif

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

@ -1,6 +1,6 @@
--- libclamav/scanners.c.orig Sun Oct 17 01:24:48 2004
+++ libclamav/scanners.c Tue Dec 21 16:37:12 2004
@@ -494,11 +494,6 @@ static int cli_scangzip(int desc, const
--- libclamav/scanners.c.orig Thu Apr 7 00:45:28 2005
+++ libclamav/scanners.c Sun Apr 10 10:00:25 2005
@@ -632,11 +632,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, int *arec, int *mrec)
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)
{
@@ -519,7 +514,7 @@ static int cli_scanbzip(int desc, const
@@ -657,7 +652,7 @@ static int cli_scanbzip(int desc, const
if(limits->archivememlim)
memlim = 1;

2
security/clamav/patches/patch-ltmain_sh
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-ltmain_sh,v 1.3 2005/02/21 09:36:29 mbalmer Exp $
$OpenBSD: patch-ltmain_sh,v 1.4 2005/05/12 14:55:21 mbalmer Exp $
--- ltmain.sh.orig Tue Jun 24 00:48:14 2003
+++ ltmain.sh Tue Jun 24 00:50:20 2003
@@ -1035,39 +1035,45 @@ compiler."

4
security/clamav/pkg/PFRAG.shared
View File

@ -1,2 +1,2 @@
@comment $OpenBSD: PFRAG.shared,v 1.3 2005/02/21 09:36:29 mbalmer Exp $
@lib lib/libclamav.so.1.8
@comment $OpenBSD: PFRAG.shared,v 1.4 2005/05/12 14:55:21 mbalmer Exp $
@lib lib/libclamav.so.1.11

2
security/clamav/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.3 2005/02/21 09:36:29 mbalmer Exp $
@comment $OpenBSD: PLIST,v 1.4 2005/05/12 14:55:21 mbalmer Exp $
@newgroup _clamav:539
@newuser _clamav:539:539:daemon:Clam AntiVirus:/nonexistent:/sbin/nologin
bin/clamav-config