SOURCES: clamav-pld_config.patch, clamav-no_auto_libwrap.patch, cl...
glen
glen at pld-linux.org
Wed Feb 14 09:53:20 CET 2007
Author: glen Date: Wed Feb 14 08:53:20 2007 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- update to 0.90
---- Files affected:
SOURCES:
clamav-pld_config.patch (1.14 -> 1.15) , clamav-no_auto_libwrap.patch (1.4 -> 1.5) , clamav-nolibs.patch (1.1 -> 1.2) , clamav-find_milter.patch (1.3 -> 1.4)
---- Diffs:
================================================================
Index: SOURCES/clamav-pld_config.patch
diff -u SOURCES/clamav-pld_config.patch:1.14 SOURCES/clamav-pld_config.patch:1.15
--- SOURCES/clamav-pld_config.patch:1.14 Wed Dec 27 12:24:43 2006
+++ SOURCES/clamav-pld_config.patch Wed Feb 14 09:53:15 2007
@@ -1,5 +1,5 @@
--- clamav-0.90rc2/etc/clamd.conf 2006-11-05 18:53:11.342468909 +0200
-+++ clamav-0.90rc2/etc/clamd.conf 2006-11-05 18:53:11.342468909 +0200
++++ clamav-0.90/etc/clamd.conf 2007-02-14 10:46:12.916118373 +0200
@@ -5,13 +5,13 @@
@@ -68,7 +68,7 @@
# Stop daemon when libclamav reports out of memory condition.
#ExitOnOOM yes
-@@ -303,15 +303,15 @@
+@@ -326,15 +326,15 @@
# Set access mask for Clamuko.
# Default: no
@@ -79,7 +79,7 @@
+ClamukoScanOnClose yes
+ClamukoScanOnExec yes
- # Set the include paths (all files in them will be scanned). You can have
+ # Set the include paths (all files inside them will be scanned). You can have
# multiple ClamukoIncludePath directives but each directory must be added
# in a seperate line.
# Default: disabled
================================================================
Index: SOURCES/clamav-no_auto_libwrap.patch
diff -u SOURCES/clamav-no_auto_libwrap.patch:1.4 SOURCES/clamav-no_auto_libwrap.patch:1.5
--- SOURCES/clamav-no_auto_libwrap.patch:1.4 Sat Jul 1 22:03:23 2006
+++ SOURCES/clamav-no_auto_libwrap.patch Wed Feb 14 09:53:15 2007
@@ -1,25 +1,3 @@
-diff -uNr clamav-0.80rc4.orig/configure clamav-0.80rc4/configure
---- clamav-0.80rc4.orig/configure 2004-10-11 04:20:10.000000000 +0200
-+++ clamav-0.80rc4/configure 2004-10-16 23:35:11.146407944 +0200
-@@ -1042,7 +1042,7 @@
- --with-dbdir=path path to virus database directory
- --with-db1=name name of the main database (default=main.cvd)
- --with-db2=name name of the daily database (default=daily.cvd)
-- --with-tcpwrappers support hosts.allow / hosts.deny (default=auto)
-+ --with-tcpwrappers support hosts.allow / hosts.deny (default=no)
-
- Some influential environment variables:
- CC C compiler command
-@@ -14321,7 +14321,7 @@
- { (exit 1); exit 1; }; } ;;
- esac
- else
-- tcpw=auto
-+ tcpw=no
- fi
-
-
-diff -uNr clamav-0.80rc4.orig/configure.in clamav-0.80rc4/configure.in
--- clamav-0.80rc4.orig/configure.in 2004-10-11 04:13:35.000000000 +0200
+++ clamav-0.80rc4/configure.in 2004-10-16 23:33:12.456451560 +0200
@@ -480,12 +480,12 @@
================================================================
Index: SOURCES/clamav-nolibs.patch
diff -u SOURCES/clamav-nolibs.patch:1.1 SOURCES/clamav-nolibs.patch:1.2
--- SOURCES/clamav-nolibs.patch:1.1 Wed Aug 25 00:31:42 2004
+++ SOURCES/clamav-nolibs.patch Wed Feb 14 09:53:15 2007
@@ -1,13 +1,15 @@
---- clamav-0.75.1/configure.in.orig 2004-08-25 00:15:42.315217000 +0200
-+++ clamav-0.75.1/configure.in 2004-08-25 00:26:37.646270662 +0200
-@@ -378,8 +378,8 @@
- AC_SUBST(TH_SAFE)
- AC_SUBST(ADDITIONAL_LIBS)
+--- clamav-0.90/configure.in~ 2007-02-14 10:48:07.728714670 +0200
++++ clamav-0.90/configure.in 2007-02-14 10:50:17.861657126 +0200
+@@ -49,8 +49,12 @@
+ AC_COMPILE_CHECK_SIZEOF(long)
+ AC_COMPILE_CHECK_SIZEOF(long long)
--AC_CHECK_LIB(socket, bind, [LIBS="$LIBS -lsocket"; CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lsocket"; LDFLAGS="$LDFLAGS -lsocket"; FRESHCLAM_LIBS="$FRESHCLAM_LIBS -lsocket"; CLAMD_LIBS="$CLAMD_LIBS -lsocket"])
--AC_CHECK_LIB(nsl, gethostent, [LIBS="$LIBS -lnsl"; CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lnsl"; LDFLAGS="$LDFLAGS -lnsl"; FRESHCLAM_LIBS="$FRESHCLAM_LIBS -lnsl"; CLAMD_LIBS="$CLAMD_LIBS -lnsl"])
-+AC_CHECK_FUNC(socket,,[AC_CHECK_LIB(socket, bind, [LIBS="$LIBS -lsocket"; CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lsocket"; LDFLAGS="$LDFLAGS -lsocket"; FRESHCLAM_LIBS="$FRESHCLAM_LIBS -lsocket"; CLAMD_LIBS="$CLAMD_LIBS -lsocket"])])
-+AC_CHECK_FUNC(gethostent,,[AC_CHECK_LIB(nsl, gethostent, [LIBS="$LIBS -lnsl"; CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lnsl"; LDFLAGS="$LDFLAGS -lnsl"; FRESHCLAM_LIBS="$FRESHCLAM_LIBS -lnsl"; CLAMD_LIBS="$CLAMD_LIBS -lnsl"])])
++AC_CHECK_FUNC(socket,,
+ AC_CHECK_LIB(socket, bind, [LIBS="$LIBS -lsocket"; CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lsocket"; FRESHCLAM_LIBS="$FRESHCLAM_LIBS -lsocket"; CLAMD_LIBS="$CLAMD_LIBS -lsocket"])
++])
++AC_CHECK_FUNC(gethostent,, [
+ AC_CHECK_LIB(nsl, gethostent, [LIBS="$LIBS -lnsl"; CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lnsl"; FRESHCLAM_LIBS="$FRESHCLAM_LIBS -lnsl"; CLAMD_LIBS="$CLAMD_LIBS -lnsl"])
++])
+
+ AC_CHECK_LIB(iconv, libiconv_open, LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -liconv")
- dnl --enable-milter
- if test "$have_milter" = "yes"; then
================================================================
Index: SOURCES/clamav-find_milter.patch
diff -u SOURCES/clamav-find_milter.patch:1.3 SOURCES/clamav-find_milter.patch:1.4
--- SOURCES/clamav-find_milter.patch:1.3 Thu Jan 4 00:50:47 2007
+++ SOURCES/clamav-find_milter.patch Wed Feb 14 09:53:15 2007
@@ -1,9 +1,9 @@
---- configure.in 2007-01-04 00:47:35.000000000 +0100
-+++ configure.in-new 2007-01-04 00:47:07.000000000 +0100
-@@ -612,10 +612,7 @@
-
+--- clamav-0.90/configure.in~ 2007-02-14 10:50:45.652285467 +0200
++++ clamav-0.90/configure.in 2007-02-14 10:52:06.844121121 +0200
+@@ -603,10 +603,7 @@
dnl Check for libmilter and it's header files in the usual locations
save_LDFLAGS="$LDFLAGS"
+ CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread"
- if test -d /usr/lib/libmilter ; then
- CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -L/usr/lib/libmilter"
- fi
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/clamav-pld_config.patch?r1=1.14&r2=1.15&f=u
http://cvs.pld-linux.org/SOURCES/clamav-no_auto_libwrap.patch?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/SOURCES/clamav-nolibs.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/SOURCES/clamav-find_milter.patch?r1=1.3&r2=1.4&f=u
More information about the pld-cvs-commit
mailing list