diff -uNr clamav.orig/Makefile clamav/Makefile
--- clamav.orig/Makefile Wed Apr 16 21:46:01 2008
+++ clamav/Makefile Thu Jul 3 09:40:38 2008
@@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.37 2008/04/16 19:46:01 mbalmer Exp $
COMMENT= virus scanner
-DISTNAME= clamav-0.93
+DISTNAME= clamav-0.93.1
CATEGORIES= security
SHARED_LIBS= clamav 7.0 \
clamunrar 0.0 \
diff -uNr clamav.orig/distinfo clamav/distinfo
--- clamav.orig/distinfo Wed Apr 16 21:46:01 2008
+++ clamav/distinfo Thu Jul 3 09:53:28 2008
@@ -1,5 +1,5 @@
-MD5 (clamav-0.93.tar.gz) = cu1vRwaFjnLyTdqKWR3w2g==
-RMD160 (clamav-0.93.tar.gz) = ofMBNFmD7QYG4vLhPvYydb00HNQ=
-SHA1 (clamav-0.93.tar.gz) = uuX3AzHoWS6cU6BFFwOIkIRdQG0=
-SHA256 (clamav-0.93.tar.gz) = H+3Cu0qFDJYtawk4t3sUSAKXv/pMv2ntlcTuTzW122k=
-SIZE (clamav-0.93.tar.gz) = 16134725
+MD5 (clamav-0.93.1.tar.gz) = ZEaOVGJOUZlOFxp/dubCQw==
+RMD160 (clamav-0.93.1.tar.gz) = IilkAbPOlqJo8NsiTnLDHmkJCJU=
+SHA1 (clamav-0.93.1.tar.gz) = MwbzzSiarDeTliyYNM0b1QCr+ww=
+SHA256 (clamav-0.93.1.tar.gz) = yaOZEQfdN3pjz+eGZBfF4ps7/8kzKqWXm8x03beNa7Y=
+SIZE (clamav-0.93.1.tar.gz) = 17246314
diff -uNr clamav.orig/patches/patch-clamav-config_in
clamav/patches/patch-clamav-config_in
--- clamav.orig/patches/patch-clamav-config_in Thu Jan 1 01:00:00 1970
+++ clamav/patches/patch-clamav-config_in Thu Jul 3 13:38:32 2008
@@ -0,0 +1,11 @@
+--- clamav-config.h.in.orig Thu Jul 3 13:37:16 2008
++++ clamav-config.h.in Thu Jul 3 13:38:05 2008
+@@ -304,7 +304,7 @@
+ #undef INCOMPLETE_CMSG
+
+ /* bzip funtions do not have bz2 prefix */
+-#undef NOBZ2PREFIX
++/*#undef NOBZ2PREFIX*/
+
+ /* "no fd_set" */
+ #undef NO_FD_SET
diff -uNr 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 Apr 16
21:46:01 2008
+++ clamav/patches/patch-clamav_milter-clamav_milter_c Thu Jul 3 10:01:35 2008
@@ -1,6 +1,6 @@
---- clamav-milter/clamav-milter.c.orig Wed Apr 9 17:39:18 2008
-+++ clamav-milter/clamav-milter.c Mon Apr 14 18:41:12 2008
-@@ -1134,7 +1134,7 @@ main(int argc, char **argv)
+--- clamav-milter/clamav-milter.c.orig Thu Jul 3 09:58:16 2008
++++ clamav-milter/clamav-milter.c Thu Jul 3 09:59:27 2008
+@@ -1134,7 +1134,7 @@
* uid == 0 for that
*/
on = 1;
@@ -9,10 +9,10 @@
perror("setsockopt");
return EX_UNAVAILABLE;
}
-@@ -1156,7 +1156,7 @@ main(int argc, char **argv)
-
+@@ -1157,7 +1157,7 @@
memset(&ifr, '\0', sizeof(struct ifreq));
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, 0, &ifr,
sizeof(ifr)) < 0) {
perror(iface);
diff -uNr clamav.orig/patches/patch-libclamav_Makefile_am
clamav/patches/patch-libclamav_Makefile_am
--- clamav.orig/patches/patch-libclamav_Makefile_am Wed Apr 16 21:46:02 2008
+++ clamav/patches/patch-libclamav_Makefile_am Thu Jul 3 10:14:54 2008
@@ -1,8 +1,7 @@
-$OpenBSD: patch-libclamav_Makefile_am,v 1.6 2008/04/16 19:46:02 mbalmer Exp $
---- libclamav/Makefile.am.orig Thu Mar 6 19:41:07 2008
-+++ libclamav/Makefile.am Mon Apr 14 18:41:12 2008
-@@ -26,7 +26,7 @@ else
- libclamav_la_LIBADD = @LIBCLAMAV_LIBS@ @THREAD_LIBS@ lzma/liblzma.la
+--- libclamav/Makefile.am.orig Thu Jul 3 10:12:42 2008
++++ libclamav/Makefile.am Thu Jul 3 10:13:48 2008
+@@ -26,7 +26,7 @@
+ libclamav_la_LIBADD = lzma/liblzma.la @LIBCLAMAV_LIBS@ @THREAD_LIBS@
endif
-libclamav_la_LDFLAGS = @TH_SAFE@ -version-info @LIBCLAMAV_VERSION@
-no-undefined
diff -uNr clamav.orig/patches/patch-libclamav_Makefile_in
clamav/patches/patch-libclamav_Makefile_in
--- clamav.orig/patches/patch-libclamav_Makefile_in Wed Apr 16 21:46:02 2008
+++ clamav/patches/patch-libclamav_Makefile_in Thu Jul 3 10:15:03 2008
@@ -1,10 +1,9 @@
-$OpenBSD: patch-libclamav_Makefile_in,v 1.6 2008/04/16 19:46:02 mbalmer Exp $
---- libclamav/Makefile.in.orig Wed Apr 9 17:55:30 2008
-+++ libclamav/Makefile.in Mon Apr 14 18:46:29 2008
-@@ -265,7 +265,7 @@ SUBDIRS = lzma .
+--- libclamav/Makefile.in.orig Thu Jul 3 10:12:47 2008
++++ libclamav/Makefile.in Thu Jul 3 10:13:14 2008
+@@ -265,7 +265,7 @@
AM_CPPFLAGS = -I$(top_srcdir) [EMAIL PROTECTED]@/nsis [EMAIL PROTECTED]@/lzma
- @[EMAIL PROTECTED] = @LIBCLAMAV_LIBS@ @THREAD_LIBS@ lzma/liblzma.la
- @[EMAIL PROTECTED] = @LIBCLAMAV_LIBS@ @THREAD_LIBS@ lzma/liblzma.la
$(top_builddir)/libclamunrar_iface/libclamunrar_iface.la
+ @[EMAIL PROTECTED] = lzma/liblzma.la @LIBCLAMAV_LIBS@ @THREAD_LIBS@
+ @[EMAIL PROTECTED] = $(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@ $(LIBclamav_LTVERSION) @LIBCLAMAV_VERSION@ \
-no-undefined $(am__append_1)
diff -uNr clamav.orig/patches/patch-libclamav_ole2_extract_c
clamav/patches/patch-libclamav_ole2_extract_c
--- clamav.orig/patches/patch-libclamav_ole2_extract_c Wed Apr 16 21:46:02 2008
+++ clamav/patches/patch-libclamav_ole2_extract_c Thu Jul 3 12:06:02 2008
@@ -1,12 +1,11 @@
-$OpenBSD: patch-libclamav_ole2_extract_c,v 1.6 2008/04/16 19:46:02 mbalmer Exp
$
---- libclamav/ole2_extract.c.orig Wed Apr 2 22:17:28 2008
-+++ libclamav/ole2_extract.c Mon Apr 14 18:41:12 2008
-@@ -136,7 +136,7 @@ typedef struct property_tag
-
+--- libclamav/ole2_extract.c.orig Tue Jun 3 19:47:19 2008
++++ libclamav/ole2_extract.c Thu Jul 3 10:21:44 2008
+@@ -142,7 +142,7 @@
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;
char *newname;
--
see ya,
giovanni
