diff -aur clamav.orig/Makefile clamav/Makefile --- clamav.orig/Makefile Fri Aug 4 01:28:11 2006 +++ clamav/Makefile Mon Aug 14 10:30:12 2006 @@ -1,7 +1,7 @@ # $OpenBSD: Makefile,v 1.17 2006/08/03 23:28:11 espie 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 '' diff -aur clamav.orig/distinfo clamav/distinfo --- clamav.orig/distinfo Sun Apr 30 08:38:25 2006 +++ clamav/distinfo Mon Aug 14 10:32:48 2006 @@ -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 diff -aur clamav.orig/patches/patch-clamav_milter-clamav_milter_c clamav/patches/patch-clamav_milter-clamav_milter_c --- clamav.orig/patches/patch-clamav_milter-clamav_milter_c Wed Jun 29 12:12:09 2005 +++ clamav/patches/patch-clamav_milter-clamav_milter_c Mon Aug 14 10:59:56 2006 @@ -1,6 +1,6 @@ ---- clamav-milter/clamav-milter.c.orig Thu Jun 23 22:03:06 2005 -+++ clamav-milter/clamav-milter.c Wed Jun 29 11:00:23 2005 -@@ -886,7 +886,7 @@ main(int argc, char **argv) +--- clamav-milter/clamav-milter.c Sat Apr 29 21:14:28 2006 ++++ clamav-milter/clamav-milter.c.new Mon Aug 14 10:40:51 2006 +@@ -886,7 +886,7 @@ * uid == 0 for that */ on = 1; @@ -9,7 +9,7 @@ perror("setsockopt"); return EX_UNAVAILABLE; } -@@ -908,7 +908,7 @@ main(int argc, char **argv) +@@ -908,7 +908,7 @@ memset(&ifr, '\0', sizeof(struct ifreq)); strncpy(ifr.ifr_name, iface, sizeof(ifr.ifr_name) - 1); diff -aur clamav.orig/patches/patch-clamd_Makefile_in clamav/patches/patch-clamd_Makefile_in --- clamav.orig/patches/patch-clamd_Makefile_in Wed Jun 29 12:12:09 2005 +++ clamav/patches/patch-clamd_Makefile_in Mon Aug 14 10:59:47 2006 @@ -1,7 +1,6 @@ -$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@ +--- clamd/Makefile.in.orig Mon Aug 14 10:43:35 2006 ++++ clamd/Makefile.in Mon Aug 14 10:43:46 2006 +@@ -147,7 +147,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ diff -aur clamav.orig/patches/patch-clamdscan_client_c clamav/patches/patch-clamdscan_client_c --- clamav.orig/patches/patch-clamdscan_client_c Thu May 12 16:55:21 2005 +++ clamav/patches/patch-clamdscan_client_c Mon Aug 14 10:59:42 2006 @@ -1,6 +1,5 @@ -$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 +--- clamdscan/client.c.orig Mon Aug 14 10:45:03 2006 ++++ clamdscan/client.c Mon Aug 14 10:46:24 2006 @@ -26,6 +26,7 @@ #include #include @@ -9,7 +8,7 @@ #include #include #include -@@ -283,18 +284,18 @@ int dsstream(int sockd, const struct opt +@@ -294,18 +295,18 @@ char *abpath(const char *filename) { struct stat foo; diff -aur clamav.orig/patches/patch-configure clamav/patches/patch-configure --- clamav.orig/patches/patch-configure Thu Sep 22 23:14:55 2005 +++ clamav/patches/patch-configure Mon Aug 14 10:59:37 2006 @@ -1,29 +1,29 @@ ---- configure.orig Fri Sep 16 01:34:05 2005 -+++ configure Mon Sep 19 20:06:08 2005 -@@ -10549,11 +10549,11 @@ extern "C" +--- configure.orig Mon Aug 14 10:34:11 2006 ++++ configure Mon Aug 14 10:38:35 2006 +@@ -11828,11 +11828,11 @@ + #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 +@@ -11912,6 +11912,8 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default +#include +#include - #include + #include _ACEOF rm -f conftest.$ac_objext -@@ -11856,13 +11858,9 @@ _ACEOF +@@ -13293,13 +13295,9 @@ openbsd*) if test "$have_pthreads" = "yes"; then LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -pthread" @@ -40,11 +40,10 @@ TH_SAFE="-thread-safe" cat >>confdefs.h <<\_ACEOF -@@ -12996,6 +12994,8 @@ cat confdefs.h >>conftest.$ac_ext +@@ -14497,6 +14495,7 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -+#include +#include #include int allow_severity = 0; diff -aur clamav.orig/patches/patch-etc-clamd_conf clamav/patches/patch-etc-clamd_conf --- clamav.orig/patches/patch-etc-clamd_conf Sun Jan 9 18:07:52 2005 +++ clamav/patches/patch-etc-clamd_conf Mon Aug 14 10:48:38 2006 @@ -1,6 +1,6 @@ ---- etc/clamd.conf.orig Mon Oct 11 03:14:30 2004 -+++ etc/clamd.conf Tue Dec 21 16:37:52 2004 -@@ -11,7 +11,7 @@ Example +--- etc/clamd.conf.orig Mon Aug 14 10:47:29 2006 ++++ etc/clamd.conf Mon Aug 14 10:48:07 2006 +@@ -11,7 +11,7 @@ # LogFile must be writable for the user running daemon. # A full path is required. # Default: disabled @@ -8,8 +8,8 @@ +#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 -@@ -62,7 +62,7 @@ Example + # running clamd multiple times (if you want to run another clamd instance, +@@ -62,7 +62,7 @@ # Path to the database directory. # Default: hardcoded (depends on installation options) diff -aur clamav.orig/patches/patch-etc-freshclam_conf clamav/patches/patch-etc-freshclam_conf --- clamav.orig/patches/patch-etc-freshclam_conf Thu May 12 16:55:21 2005 +++ clamav/patches/patch-etc-freshclam_conf Mon Aug 14 10:59:29 2006 @@ -1,6 +1,6 @@ ---- 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 +--- etc/freshclam.conf.orig Mon Aug 14 10:48:49 2006 ++++ etc/freshclam.conf Mon Aug 14 10:49:11 2006 +@@ -11,7 +11,7 @@ # Path to the database directory. # WARNING: It must match clamd.conf's directive! # Default: hardcoded (depends on installation options) @@ -9,7 +9,7 @@ # Path to the log file (make sure it has proper permissions) # Default: disabled -@@ -37,7 +37,7 @@ Example +@@ -37,7 +37,7 @@ # By default when started freshclam drops privileges and switches to the # "clamav" user. This directive allows you to change the database owner. # Default: clamav (may depend on installation options) diff -aur clamav.orig/patches/patch-libclamav_Makefile_am clamav/patches/patch-libclamav_Makefile_am --- clamav.orig/patches/patch-libclamav_Makefile_am Sat Dec 24 21:52:58 2005 +++ clamav/patches/patch-libclamav_Makefile_am Mon Aug 14 10:50:45 2006 @@ -1,7 +1,6 @@ -$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 -@@ -20,7 +20,7 @@ INCLUDES = -I$(top_srcdir) -I@srcdir@/zz +--- libclamav/Makefile.am.orig Mon Aug 14 10:49:55 2006 ++++ libclamav/Makefile.am Mon Aug 14 10:50:15 2006 +@@ -20,7 +20,7 @@ libclamav_la_LIBADD = @LIBCLAMAV_LIBS@ diff -aur clamav.orig/patches/patch-libclamav_Makefile_in clamav/patches/patch-libclamav_Makefile_in --- clamav.orig/patches/patch-libclamav_Makefile_in Sun Dec 25 11:40:27 2005 +++ clamav/patches/patch-libclamav_Makefile_in Mon Aug 14 10:51:48 2006 @@ -1,7 +1,6 @@ -$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@ +--- libclamav/Makefile.in.orig Mon Aug 14 10:51:02 2006 ++++ libclamav/Makefile.in Mon Aug 14 10:51:22 2006 +@@ -220,7 +220,7 @@ target_vendor = @target_vendor@ INCLUDES = -I$(top_srcdir) -I@srcdir@/zziplib -I@srcdir@/mspack libclamav_la_LIBADD = @LIBCLAMAV_LIBS@ diff -aur clamav.orig/patches/patch-libclamav_mbox_c clamav/patches/patch-libclamav_mbox_c --- clamav.orig/patches/patch-libclamav_mbox_c Thu May 12 16:55:21 2005 +++ clamav/patches/patch-libclamav_mbox_c Mon Aug 14 10:59:22 2006 @@ -1,6 +1,6 @@ ---- 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 +--- libclamav/mbox.c.orig Mon Aug 14 10:52:02 2006 ++++ libclamav/mbox.c Mon Aug 14 10:52:16 2006 +@@ -25,12 +25,6 @@ #define NDEBUG /* map CLAMAV debug onto standard */ #endif @@ -9,6 +9,7 @@ -#define _REENTRANT /* for Solaris 2.8 */ -#endif -#endif - +- #include #include + #include diff -aur clamav.orig/patches/patch-libclamav_ole2_extract_c clamav/patches/patch-libclamav_ole2_extract_c --- clamav.orig/patches/patch-libclamav_ole2_extract_c Sat Dec 24 21:52:58 2005 +++ clamav/patches/patch-libclamav_ole2_extract_c Mon Aug 14 10:59:16 2006 @@ -1,7 +1,6 @@ -$OpenBSD: patch-libclamav_ole2_extract_c,v 1.2 2005/12/24 20:52:58 sturm Exp $ ---- libclamav/ole2_extract.c.orig Wed Oct 26 00:49:11 2005 -+++ libclamav/ole2_extract.c Sat Dec 24 19:26:20 2005 -@@ -142,7 +142,7 @@ typedef struct property_tag +--- libclamav/ole2_extract.c.orig Mon Aug 14 10:53:14 2006 ++++ libclamav/ole2_extract.c Mon Aug 14 10:53:36 2006 +@@ -142,7 +142,7 @@ unsigned char magic_id[] = { 0xd0, 0xcf, 0x11, 0xe0, 0xa1, 0xb1, 0x1a, 0xe1}; Only in clamav.orig/patches: patch-libclamav_scanner_c diff -aur clamav.orig/patches/patch-libclamav_str_c clamav/patches/patch-libclamav_str_c --- clamav.orig/patches/patch-libclamav_str_c Wed Jun 29 12:12:09 2005 +++ clamav/patches/patch-libclamav_str_c Mon Aug 14 10:57:58 2006 @@ -1,7 +1,6 @@ -$OpenBSD: patch-libclamav_str_c,v 1.1 2005/06/29 10:12:09 mbalmer Exp $ ---- libclamav/str.c.orig Wed Jun 29 11:31:49 2005 -+++ libclamav/str.c Wed Jun 29 11:32:23 2005 -@@ -92,8 +92,8 @@ short int *cli_hex2si(const char *hex) +--- libclamav/str.c.orig Mon Aug 14 10:56:05 2006 ++++ libclamav/str.c Mon Aug 14 10:57:31 2006 +@@ -92,10 +92,9 @@ char *cli_hex2str(const char *hex) { @@ -10,9 +9,11 @@ + char *str, *ptr, val; + int c, i, len; - +- len = strlen(hex); -@@ -111,9 +111,9 @@ char *cli_hex2str(const char *hex) + + if(len % 2 != 0) { +@@ -111,9 +110,9 @@ for(i = 0; i < len; i += 2) { if((c = cli_hex2int(hex[i])) >= 0) { diff -aur clamav.orig/patches/patch-libclamav_vba_extract_c clamav/patches/patch-libclamav_vba_extract_c --- clamav.orig/patches/patch-libclamav_vba_extract_c Wed Jun 29 12:12:09 2005 +++ clamav/patches/patch-libclamav_vba_extract_c Mon Aug 14 10:59:08 2006 @@ -1,7 +1,6 @@ -$OpenBSD: patch-libclamav_vba_extract_c,v 1.1 2005/06/29 10:12:09 mbalmer Exp $ ---- libclamav/vba_extract.c.orig Wed Jun 29 11:36:26 2005 -+++ libclamav/vba_extract.c Wed Jun 29 11:36:48 2005 -@@ -117,7 +117,7 @@ vba_version_t vba_version[] = { +--- libclamav/vba_extract.c.orig Mon Aug 14 10:58:13 2006 ++++ libclamav/vba_extract.c Mon Aug 14 10:58:34 2006 +@@ -117,7 +117,7 @@ 2 + /* type1 record count */ \ 2) /* unknown */