From eda2f81fda3c21a3f97567a3a4d1349612cc9b85 Mon Sep 17 00:00:00 2001 From: Jamie Lenehan Date: Thu, 31 May 2007 00:18:52 +0000 Subject: clamav: Add 0.90.3, remove 0.88.7. From the release announcement: "This release fixes some security bugs in libclamav and improves stability under Solaris. Please see ChangeLog for complete list of changes." --- packages/clamav/clamav-0.88.7/.mtn2git_empty | 0 packages/clamav/clamav-0.88.7/clamd.conf | 25 ---- .../clamav/clamav-0.88.7/cross-compile-fix.patch | 74 ------------ packages/clamav/clamav-0.88.7/freshclam.conf | 19 --- packages/clamav/clamav-0.88.7/libtool-fix.patch | 23 ---- packages/clamav/clamav-0.90.2/.mtn2git_empty | 0 packages/clamav/clamav-0.90.2/clamd.conf | 27 ----- .../clamav/clamav-0.90.2/cross-compile-fix.patch | 133 --------------------- packages/clamav/clamav-0.90.2/freshclam.conf | 21 ---- packages/clamav/clamav.inc | 8 +- packages/clamav/clamav_0.88.7.bb | 5 - packages/clamav/clamav_0.90.2.bb | 16 +-- packages/clamav/clamav_0.90.3.bb | 3 + packages/clamav/files/clamd.conf | 27 +++++ packages/clamav/files/cross-compile-fix.patch | 133 +++++++++++++++++++++ packages/clamav/files/freshclam.conf | 21 ++++ 16 files changed, 191 insertions(+), 344 deletions(-) delete mode 100644 packages/clamav/clamav-0.88.7/.mtn2git_empty delete mode 100644 packages/clamav/clamav-0.88.7/clamd.conf delete mode 100644 packages/clamav/clamav-0.88.7/cross-compile-fix.patch delete mode 100644 packages/clamav/clamav-0.88.7/freshclam.conf delete mode 100644 packages/clamav/clamav-0.88.7/libtool-fix.patch delete mode 100644 packages/clamav/clamav-0.90.2/.mtn2git_empty delete mode 100644 packages/clamav/clamav-0.90.2/clamd.conf delete mode 100644 packages/clamav/clamav-0.90.2/cross-compile-fix.patch delete mode 100644 packages/clamav/clamav-0.90.2/freshclam.conf delete mode 100644 packages/clamav/clamav_0.88.7.bb create mode 100644 packages/clamav/clamav_0.90.3.bb create mode 100644 packages/clamav/files/clamd.conf create mode 100644 packages/clamav/files/cross-compile-fix.patch create mode 100644 packages/clamav/files/freshclam.conf diff --git a/packages/clamav/clamav-0.88.7/.mtn2git_empty b/packages/clamav/clamav-0.88.7/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/clamav/clamav-0.88.7/clamd.conf b/packages/clamav/clamav-0.88.7/clamd.conf deleted file mode 100644 index 485c80d420..0000000000 --- a/packages/clamav/clamav-0.88.7/clamd.conf +++ /dev/null @@ -1,25 +0,0 @@ -## Please read the clamd.conf(5) manual before editing this file. -LocalSocket /var/run/clamav/clamd.ctl -FixStaleSocket -User clamav -AllowSupplementaryGroups -ScanMail -ScanArchive -ArchiveMaxRecursion 5 -ArchiveMaxFiles 1000 -ArchiveMaxFileSize 10M -ArchiveMaxCompressionRatio 250 -ReadTimeout 180 -MaxThreads 12 -MaxConnectionQueueLength 15 -LogFile /var/log/clamav/clamav.log -LogTime -LogFileMaxSize 0 -PidFile /var/run/clamav/clamd.pid -DatabaseDirectory /var/lib/clamav -SelfCheck 3600 -ScanOLE2 -ScanPE -DetectBrokenExecutables -ScanHTML -ArchiveBlockMax diff --git a/packages/clamav/clamav-0.88.7/cross-compile-fix.patch b/packages/clamav/clamav-0.88.7/cross-compile-fix.patch deleted file mode 100644 index 690d680c66..0000000000 --- a/packages/clamav/clamav-0.88.7/cross-compile-fix.patch +++ /dev/null @@ -1,74 +0,0 @@ -Add some caching of values which can't be determined when -cross-compiling. This lets us define the values via the site files. - ---- clamav-0.88.4/configure.in 2006/09/12 05:49:09 1.1 -+++ clamav-0.88.4/configure.in 2006/09/12 06:24:27 -@@ -56,19 +56,18 @@ - - dnl Check for broken snprintf (code by Phil Oleson ) - if test "x$ac_cv_func_snprintf" = "xyes" ; then -- AC_MSG_CHECKING([whether snprintf correctly terminates long strings]) -- AC_TRY_RUN( -- [ -+ AC_CACHE_CHECK([whether snprintf correctly terminates long strings], -+ [clamav_av_func_working_snprintf_long], [ -+ AC_TRY_RUN( -+ [ - #include - int main(void){char b[5];snprintf(b,5,"123456789");return(b[4]!='\0');} -- ], -- [AC_MSG_RESULT(yes)], -- [ -- AC_MSG_RESULT(no) -- AC_DEFINE(BROKEN_SNPRINTF,1,[Define if your snprintf is busted]) -- AC_MSG_WARN([****** Your snprintf() function is broken, complain to your vendor]) -- ] -- ) -+ ]) -+ ]) -+ if test "x$clamav_av_func_working_snprintf_long" = "xno"; then -+ AC_DEFINE(BROKEN_SNPRINTF,1,[Define if your snprintf is busted]) -+ AC_MSG_WARN([****** Your snprintf() function is broken, complain to your vendor]) -+ fi - fi - - have_pthreads=no -@@ -331,18 +330,28 @@ - AC_DEFINE_UNQUOTED(CONFDIR,"$cfg_dir",[where to look for the config file]) - - dnl check for in_port_t definition --AC_TRY_RUN([ --#include --#include --int main(int argc, char **argv) { in_port_t pt; pt = 0; return pt; } --], AC_DEFINE(HAVE_IN_PORT_T,1,[in_port_t is defined]), AC_MSG_RESULT(in_port_t is not defined)) -+AC_CACHE_CHECK([for in_port_t], [clamav_av_have_in_port_t], [ -+ AC_TRY_RUN([ -+ #include -+ #include -+ int main(int argc, char **argv) { in_port_t pt; pt = 0; return pt; } -+ ]) -+ ]) -+if test "$clamav_av_have_in_port_t" = "yes"; then -+ AC_DEFINE(HAVE_IN_PORT_T,1,[in_port_t is defined]) -+fi - - dnl check for in_addr_t definition --AC_TRY_RUN([ --#include --#include --int main(int argc, char **argv) { in_addr_t pt; pt = 0; return pt; } --], AC_DEFINE(HAVE_IN_ADDR_T,1,[in_addr_t is defined]), AC_MSG_RESULT(in_addr_t is not defined)) -+AC_CACHE_CHECK([for in_addr_t], [clamav_av_have_in_addr_t], [ -+ AC_TRY_RUN([ -+ #include -+ #include -+ int main(int argc, char **argv) { in_addr_t pt; pt = 0; return pt; } -+ ]) -+ ]) -+if test "$clamav_av_have_in_addr_t" = "yes"; then -+ AC_DEFINE(HAVE_IN_ADDR_T,1,[in_addr_t is defined]) -+fi - - case "$target_os" in - linux*) diff --git a/packages/clamav/clamav-0.88.7/freshclam.conf b/packages/clamav/clamav-0.88.7/freshclam.conf deleted file mode 100644 index 770490b3ab..0000000000 --- a/packages/clamav/clamav-0.88.7/freshclam.conf +++ /dev/null @@ -1,19 +0,0 @@ -## Please read the freshclam.conf(5) manual before editing this file. - -# Comment or remove the line below. -Example - -# Uncomment the following line and replace XY with your country -# code. See http://www.iana.org/cctld/cctld-whois.htm for the full list. -# Default: There is no default, which results in an error when running freshclam -#DatabaseMirror db.XY.clamav.net - -DatabaseMirror database.clamav.net -DatabaseOwner clamav -UpdateLogFile /var/log/clamav/freshclam.log -LogFileMaxSize 0 -MaxAttempts 5 -Checks 24 -DatabaseDirectory /var/lib/clamav/ -NotifyClamd -DNSDatabaseInfo current.cvd.clamav.net diff --git a/packages/clamav/clamav-0.88.7/libtool-fix.patch b/packages/clamav/clamav-0.88.7/libtool-fix.patch deleted file mode 100644 index 05a4876dd0..0000000000 --- a/packages/clamav/clamav-0.88.7/libtool-fix.patch +++ /dev/null @@ -1,23 +0,0 @@ -Use our own libtool that knows about cross compiling, not the libtool -that is included. - ---- clamav-0.88.4/acinclude.m4 2006/09/12 08:07:27 1.1 -+++ clamav-0.88.4/acinclude.m4 2006/09/12 08:16:31 -@@ -520,7 +520,7 @@ - LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" - - # Always use our own libtool. --LIBTOOL='$(SHELL) $(top_builddir)/libtool' -+LIBTOOL="$host_alias-libtool" - AC_SUBST(LIBTOOL)dnl - - # Prevent multiple expansion -@@ -1238,7 +1238,7 @@ - rm="rm -f" - - # Global variables: --default_ofile=libtool -+default_ofile=${host_alias}-libtool - can_build_shared=yes - - # All known linkers require a `.a' archive for static linking (except M$VC, diff --git a/packages/clamav/clamav-0.90.2/.mtn2git_empty b/packages/clamav/clamav-0.90.2/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/clamav/clamav-0.90.2/clamd.conf b/packages/clamav/clamav-0.90.2/clamd.conf deleted file mode 100644 index 74ebcf5c3f..0000000000 --- a/packages/clamav/clamav-0.90.2/clamd.conf +++ /dev/null @@ -1,27 +0,0 @@ -## Please read the clamd.conf(5) manual before editing this file. -LogFile /var/log/clamav/clamav.log -LogFileMaxSize 0 -LogTime yes -PidFile /var/run/clamav/clamd.pid -DatabaseDirectory /var/lib/clamav -LocalSocket /var/run/clamav/clamd.ctl -FixStaleSocket yes -MaxConnectionQueueLength 15 -MaxThreads 10 -ReadTimeout 180 -SelfCheck 1800 -User clamav -AllowSupplementaryGroups yes -ScanPE yes -ScanELF yes -DetectBrokenExecutables yes -ScanOLE2 yes -ScanMail yes -PhishingSignatures yes -ScanHTML yes -ScanArchive yes -ArchiveMaxRecursion 8 -ArchiveMaxFiles 1000 -ArchiveMaxFileSize 10M -ArchiveMaxCompressionRatio 250 -ArchiveBlockMax yes diff --git a/packages/clamav/clamav-0.90.2/cross-compile-fix.patch b/packages/clamav/clamav-0.90.2/cross-compile-fix.patch deleted file mode 100644 index f7ab4aa69f..0000000000 --- a/packages/clamav/clamav-0.90.2/cross-compile-fix.patch +++ /dev/null @@ -1,133 +0,0 @@ -Add some caching of values which can't be determined when -cross-compiling. This lets us define the values via the site files. - -Also check for libintl and add it to ldflags if required. - -Index: clamav-0.90.2/configure.in -=================================================================== ---- clamav-0.90.2.orig/configure.in 2007-04-13 09:10:37.000000000 +1000 -+++ clamav-0.90.2/configure.in 2007-05-16 14:19:01.000000000 +1000 -@@ -60,19 +60,21 @@ - - dnl Check for broken snprintf (code by Phil Oleson ) - if test "x$ac_cv_func_snprintf" = "xyes" ; then -- AC_MSG_CHECKING([whether snprintf correctly terminates long strings]) -+ AC_CACHE_CHECK([whether snprintf correctly terminates long strings], -+ [ac_cv_have_broken_snprintf], [ - AC_TRY_RUN( - [ - #include - int main(void){char b[5];snprintf(b,5,"123456789");return(b[4]!='\0');} - ], -- [AC_MSG_RESULT(yes)], -- [ -- AC_MSG_RESULT(no) -- AC_DEFINE(BROKEN_SNPRINTF,1,[Define if your snprintf is busted]) -- AC_MSG_WARN([****** Your snprintf() function is broken, complain to your vendor]) -- ] -- ) -+ [ ac_cv_have_broken_snprintf="no" ], -+ [ ac_cv_have_broken_snprintf="yes" ] -+ ) -+ ]) -+ if test "$ac_cv_have_broken_snprintf" = "yes"; then -+ AC_DEFINE(BROKEN_SNPRINTF,1,[Define if your snprintf is busted]) -+ AC_MSG_WARN([****** Your snprintf() function is broken, complain to your vendor]) -+ fi - fi - - have_pthreads=no -@@ -370,18 +372,28 @@ - AC_DEFINE_UNQUOTED(CONFDIR,"$cfg_dir",[where to look for the config file]) - - dnl check for in_port_t definition -+AC_CACHE_CHECK([for in_port_t], [clamav_av_have_in_port_t], [ - AC_TRY_RUN([ - #include - #include - int main(int argc, char **argv) { in_port_t pt; pt = 0; return pt; } --], AC_DEFINE(HAVE_IN_PORT_T,1,[in_port_t is defined]), AC_MSG_RESULT(in_port_t is not defined)) -+], [ clamav_av_have_in_port_t="yes" ], [ clamav_av_have_in_port_t="no" ]) -+]) -+if test "$clamav_av_have_in_port_t" = "yes"; then -+ AC_DEFINE(HAVE_IN_PORT_T,1,[in_port_t is defined]) -+fi - - dnl check for in_addr_t definition -+AC_CACHE_CHECK([for in_addr_t], [clamav_av_have_in_addr_t], [ - AC_TRY_RUN([ - #include - #include - int main(int argc, char **argv) { in_addr_t pt; pt = 0; return pt; } --], AC_DEFINE(HAVE_IN_ADDR_T,1,[in_addr_t is defined]), AC_MSG_RESULT(in_addr_t is not defined)) -+], [ clamav_av_have_in_addr_t="yes" ], [ clamav_av_have_in_addr_t="no" ]) -+]) -+if test "$clamav_av_have_in_addr_t" = "yes"; then -+ AC_DEFINE(HAVE_IN_ADDR_T,1,[in_addr_t is defined]) -+fi - - case "$target_os" in - linux*) -@@ -1100,6 +1112,10 @@ - AC_MSG_RESULT($DEFAULT_FD_SETSIZE) - AC_DEFINE_UNQUOTED(DEFAULT_FD_SETSIZE, $DEFAULT_FD_SETSIZE, "default FD_SETSIZE value") - -+dnl Do we need to link with -lintl? -+AM_GNU_GETTEXT([external]) -+AM_GNU_GETTEXT_VERSION([0.14.1]) -+ - AC_OUTPUT([ - libclamav/Makefile - clamscan/Makefile -Index: clamav-0.90.2/clamd/Makefile.am -=================================================================== ---- clamav-0.90.2.orig/clamd/Makefile.am 2007-05-16 14:22:46.000000000 +1000 -+++ clamav-0.90.2/clamd/Makefile.am 2007-05-16 14:23:08.000000000 +1000 -@@ -60,5 +60,5 @@ - - endif - --LIBS = $(top_builddir)/libclamav/libclamav.la @CLAMD_LIBS@ @THREAD_LIBS@ -+LIBS = $(top_builddir)/libclamav/libclamav.la @CLAMD_LIBS@ @THREAD_LIBS@ @LIBINTL@ - INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav -Index: clamav-0.90.2/clamdscan/Makefile.am -=================================================================== ---- clamav-0.90.2.orig/clamdscan/Makefile.am 2007-05-16 14:24:02.000000000 +1000 -+++ clamav-0.90.2/clamdscan/Makefile.am 2007-05-16 14:24:18.000000000 +1000 -@@ -40,4 +40,4 @@ - - DEFS = @DEFS@ -DCL_NOTHREADS - INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/clamscan -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav --LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @THREAD_LIBS@ -+LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @THREAD_LIBS@ @LIBINTL@ -Index: clamav-0.90.2/clamscan/Makefile.am -=================================================================== ---- clamav-0.90.2.orig/clamscan/Makefile.am 2007-05-16 14:20:23.000000000 +1000 -+++ clamav-0.90.2/clamscan/Makefile.am 2007-05-16 14:20:39.000000000 +1000 -@@ -41,5 +41,5 @@ - treewalk.h - - DEFS = @DEFS@ -DCL_NOTHREADS --LIBS = $(top_builddir)/libclamav/libclamav.la @THREAD_LIBS@ -+LIBS = $(top_builddir)/libclamav/libclamav.la @THREAD_LIBS@ @LIBINTL@ - INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav -Index: clamav-0.90.2/freshclam/Makefile.am -=================================================================== ---- clamav-0.90.2.orig/freshclam/Makefile.am 2007-05-16 14:25:10.000000000 +1000 -+++ clamav-0.90.2/freshclam/Makefile.am 2007-05-16 14:25:25.000000000 +1000 -@@ -48,4 +48,4 @@ - - DEFS = @DEFS@ -DCL_NOTHREADS - INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav --LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @THREAD_LIBS@ -+LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @THREAD_LIBS@ @LIBINTL@ -Index: clamav-0.90.2/sigtool/Makefile.am -=================================================================== ---- clamav-0.90.2.orig/sigtool/Makefile.am 2007-05-16 14:26:18.000000000 +1000 -+++ clamav-0.90.2/sigtool/Makefile.am 2007-05-16 14:26:29.000000000 +1000 -@@ -39,4 +39,4 @@ - - DEFS = @DEFS@ -DCL_NOTHREADS - INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav --LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @THREAD_LIBS@ -+LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @THREAD_LIBS@ @LIBINTL@ diff --git a/packages/clamav/clamav-0.90.2/freshclam.conf b/packages/clamav/clamav-0.90.2/freshclam.conf deleted file mode 100644 index fd45b0dd85..0000000000 --- a/packages/clamav/clamav-0.90.2/freshclam.conf +++ /dev/null @@ -1,21 +0,0 @@ -## Please read the freshclam.conf(5) manual before editing this file. - -# Comment or remove the line below. -Example - -# Uncomment the following line and replace XY with your country -# code. See http://www.iana.org/cctld/cctld-whois.htm for the full list. -# Default: There is no default, which results in an error when running freshclam -#DatabaseMirror db.XY.clamav.net - -DatabaseMirror database.clamav.net - -DatabaseDirectory /var/lib/clamav/ -UpdateLogFile /var/log/clamav/freshclam.log -PidFile /var/run/clamav/freshclam.pid -DatabaseOwner clamav -AllowSupplementaryGroups yes -DNSDatabaseInfo current.cvd.clamav.net -MaxAttempts 5 -Checks 24 -NotifyClamd /etc/clamd.conf diff --git a/packages/clamav/clamav.inc b/packages/clamav/clamav.inc index c00da1d6d7..6bdd36c7d2 100644 --- a/packages/clamav/clamav.inc +++ b/packages/clamav/clamav.inc @@ -10,7 +10,7 @@ DESCRIPTION_${PN}-daemon = "An on-demand file scanning service for Clam AntiViru HOMEPAGE = "http://www.clamav.net/" SECTION = "network" LICENSE = "GPL" -DEPENDS = "zlib bzip2 gmp" +DEPENDS = "zlib bzip2 gmp curl virtual/libintl" RDEPENDS_${PN} = "${PN}-data" RDEPENDS_${PN}-daemon = "${PN}-data ${PN}-conf" RDEPENDS_${PN}-freshclam = "${PN}-conf" @@ -33,6 +33,8 @@ inherit autotools update-rc.d binconfig # Don't check for clamav uid/gid - they don't exist on the host # Put virus definitions in /var/lib not /usr/lib EXTRA_OECONF = "--disable-clamav \ + --with-zlib=${STAGING_DIR}/${HOST_SYS} \ + --with-libcurl \ --with-dbdir=${localstatedir}/lib/clamav" do_install_append() { @@ -62,13 +64,15 @@ do_stage () { install -m 0644 libclamav/clamav.h ${STAGING_INCDIR} } -PACKAGES += "${PN}-freshclam ${PN}-daemon ${PN}-conf ${PN}-data ${PN}-lib" +PACKAGES += "${PN}-freshclam ${PN}-daemon ${PN}-conf ${PN}-data ${PN}-lib \ + ${PN}-clamconf" FILES_${PN} = "${bindir}/clamscan \ ${bindir}/sigtool \ ${bindir}/clamdscan" FILES_${PN}-lib = "${libdir}/libclamav.so.*" FILES_${PN}-conf = "${sysconfdir}/clamd.conf" +FILES_${PN}-clamconf = "${bindir}/clamconf" FILES_${PN}-freshclam = "${bindir}/freshclam \ ${sysconfdir}/freshclam.conf \ ${sysconfdir}/init.d/clamav-freshclam \ diff --git a/packages/clamav/clamav_0.88.7.bb b/packages/clamav/clamav_0.88.7.bb deleted file mode 100644 index 2728c31590..0000000000 --- a/packages/clamav/clamav_0.88.7.bb +++ /dev/null @@ -1,5 +0,0 @@ -require clamav.inc - -PR = "r1" - -SRC_URI_append += " file://libtool-fix.patch;patch=1" diff --git a/packages/clamav/clamav_0.90.2.bb b/packages/clamav/clamav_0.90.2.bb index fe3061606a..e721558efe 100644 --- a/packages/clamav/clamav_0.90.2.bb +++ b/packages/clamav/clamav_0.90.2.bb @@ -1,17 +1,3 @@ require clamav.inc -PR = "r1" - -# 0.9x requires curl for incremental database updates -DEPENDS += "curl" -DEPENDS += "virtual/libintl" -# Don't check for clamav uid/gid - they don't exist on the host -# Put virus definitions in /var/lib not /usr/lib -EXTRA_OECONF = "--disable-clamav \ - --with-zlib=${STAGING_DIR}/${HOST_SYS} \ - --with-libcurl \ - --with-dbdir=${localstatedir}/lib/clamav" - -# Package up configuration utility - new for 0.9x -PACKAGES += "${PN}-clamconf" -FILES_${PN}-clamconf = "${bindir}/clamconf" +PR = "r1" diff --git a/packages/clamav/clamav_0.90.3.bb b/packages/clamav/clamav_0.90.3.bb new file mode 100644 index 0000000000..fec4ae59d8 --- /dev/null +++ b/packages/clamav/clamav_0.90.3.bb @@ -0,0 +1,3 @@ +require clamav.inc + +PR = "r0" diff --git a/packages/clamav/files/clamd.conf b/packages/clamav/files/clamd.conf new file mode 100644 index 0000000000..74ebcf5c3f --- /dev/null +++ b/packages/clamav/files/clamd.conf @@ -0,0 +1,27 @@ +## Please read the clamd.conf(5) manual before editing this file. +LogFile /var/log/clamav/clamav.log +LogFileMaxSize 0 +LogTime yes +PidFile /var/run/clamav/clamd.pid +DatabaseDirectory /var/lib/clamav +LocalSocket /var/run/clamav/clamd.ctl +FixStaleSocket yes +MaxConnectionQueueLength 15 +MaxThreads 10 +ReadTimeout 180 +SelfCheck 1800 +User clamav +AllowSupplementaryGroups yes +ScanPE yes +ScanELF yes +DetectBrokenExecutables yes +ScanOLE2 yes +ScanMail yes +PhishingSignatures yes +ScanHTML yes +ScanArchive yes +ArchiveMaxRecursion 8 +ArchiveMaxFiles 1000 +ArchiveMaxFileSize 10M +ArchiveMaxCompressionRatio 250 +ArchiveBlockMax yes diff --git a/packages/clamav/files/cross-compile-fix.patch b/packages/clamav/files/cross-compile-fix.patch new file mode 100644 index 0000000000..f7ab4aa69f --- /dev/null +++ b/packages/clamav/files/cross-compile-fix.patch @@ -0,0 +1,133 @@ +Add some caching of values which can't be determined when +cross-compiling. This lets us define the values via the site files. + +Also check for libintl and add it to ldflags if required. + +Index: clamav-0.90.2/configure.in +=================================================================== +--- clamav-0.90.2.orig/configure.in 2007-04-13 09:10:37.000000000 +1000 ++++ clamav-0.90.2/configure.in 2007-05-16 14:19:01.000000000 +1000 +@@ -60,19 +60,21 @@ + + dnl Check for broken snprintf (code by Phil Oleson ) + if test "x$ac_cv_func_snprintf" = "xyes" ; then +- AC_MSG_CHECKING([whether snprintf correctly terminates long strings]) ++ AC_CACHE_CHECK([whether snprintf correctly terminates long strings], ++ [ac_cv_have_broken_snprintf], [ + AC_TRY_RUN( + [ + #include + int main(void){char b[5];snprintf(b,5,"123456789");return(b[4]!='\0');} + ], +- [AC_MSG_RESULT(yes)], +- [ +- AC_MSG_RESULT(no) +- AC_DEFINE(BROKEN_SNPRINTF,1,[Define if your snprintf is busted]) +- AC_MSG_WARN([****** Your snprintf() function is broken, complain to your vendor]) +- ] +- ) ++ [ ac_cv_have_broken_snprintf="no" ], ++ [ ac_cv_have_broken_snprintf="yes" ] ++ ) ++ ]) ++ if test "$ac_cv_have_broken_snprintf" = "yes"; then ++ AC_DEFINE(BROKEN_SNPRINTF,1,[Define if your snprintf is busted]) ++ AC_MSG_WARN([****** Your snprintf() function is broken, complain to your vendor]) ++ fi + fi + + have_pthreads=no +@@ -370,18 +372,28 @@ + AC_DEFINE_UNQUOTED(CONFDIR,"$cfg_dir",[where to look for the config file]) + + dnl check for in_port_t definition ++AC_CACHE_CHECK([for in_port_t], [clamav_av_have_in_port_t], [ + AC_TRY_RUN([ + #include + #include + int main(int argc, char **argv) { in_port_t pt; pt = 0; return pt; } +-], AC_DEFINE(HAVE_IN_PORT_T,1,[in_port_t is defined]), AC_MSG_RESULT(in_port_t is not defined)) ++], [ clamav_av_have_in_port_t="yes" ], [ clamav_av_have_in_port_t="no" ]) ++]) ++if test "$clamav_av_have_in_port_t" = "yes"; then ++ AC_DEFINE(HAVE_IN_PORT_T,1,[in_port_t is defined]) ++fi + + dnl check for in_addr_t definition ++AC_CACHE_CHECK([for in_addr_t], [clamav_av_have_in_addr_t], [ + AC_TRY_RUN([ + #include + #include + int main(int argc, char **argv) { in_addr_t pt; pt = 0; return pt; } +-], AC_DEFINE(HAVE_IN_ADDR_T,1,[in_addr_t is defined]), AC_MSG_RESULT(in_addr_t is not defined)) ++], [ clamav_av_have_in_addr_t="yes" ], [ clamav_av_have_in_addr_t="no" ]) ++]) ++if test "$clamav_av_have_in_addr_t" = "yes"; then ++ AC_DEFINE(HAVE_IN_ADDR_T,1,[in_addr_t is defined]) ++fi + + case "$target_os" in + linux*) +@@ -1100,6 +1112,10 @@ + AC_MSG_RESULT($DEFAULT_FD_SETSIZE) + AC_DEFINE_UNQUOTED(DEFAULT_FD_SETSIZE, $DEFAULT_FD_SETSIZE, "default FD_SETSIZE value") + ++dnl Do we need to link with -lintl? ++AM_GNU_GETTEXT([external]) ++AM_GNU_GETTEXT_VERSION([0.14.1]) ++ + AC_OUTPUT([ + libclamav/Makefile + clamscan/Makefile +Index: clamav-0.90.2/clamd/Makefile.am +=================================================================== +--- clamav-0.90.2.orig/clamd/Makefile.am 2007-05-16 14:22:46.000000000 +1000 ++++ clamav-0.90.2/clamd/Makefile.am 2007-05-16 14:23:08.000000000 +1000 +@@ -60,5 +60,5 @@ + + endif + +-LIBS = $(top_builddir)/libclamav/libclamav.la @CLAMD_LIBS@ @THREAD_LIBS@ ++LIBS = $(top_builddir)/libclamav/libclamav.la @CLAMD_LIBS@ @THREAD_LIBS@ @LIBINTL@ + INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav +Index: clamav-0.90.2/clamdscan/Makefile.am +=================================================================== +--- clamav-0.90.2.orig/clamdscan/Makefile.am 2007-05-16 14:24:02.000000000 +1000 ++++ clamav-0.90.2/clamdscan/Makefile.am 2007-05-16 14:24:18.000000000 +1000 +@@ -40,4 +40,4 @@ + + DEFS = @DEFS@ -DCL_NOTHREADS + INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/clamscan -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav +-LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @THREAD_LIBS@ ++LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @THREAD_LIBS@ @LIBINTL@ +Index: clamav-0.90.2/clamscan/Makefile.am +=================================================================== +--- clamav-0.90.2.orig/clamscan/Makefile.am 2007-05-16 14:20:23.000000000 +1000 ++++ clamav-0.90.2/clamscan/Makefile.am 2007-05-16 14:20:39.000000000 +1000 +@@ -41,5 +41,5 @@ + treewalk.h + + DEFS = @DEFS@ -DCL_NOTHREADS +-LIBS = $(top_builddir)/libclamav/libclamav.la @THREAD_LIBS@ ++LIBS = $(top_builddir)/libclamav/libclamav.la @THREAD_LIBS@ @LIBINTL@ + INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav +Index: clamav-0.90.2/freshclam/Makefile.am +=================================================================== +--- clamav-0.90.2.orig/freshclam/Makefile.am 2007-05-16 14:25:10.000000000 +1000 ++++ clamav-0.90.2/freshclam/Makefile.am 2007-05-16 14:25:25.000000000 +1000 +@@ -48,4 +48,4 @@ + + DEFS = @DEFS@ -DCL_NOTHREADS + INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav +-LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @THREAD_LIBS@ ++LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @THREAD_LIBS@ @LIBINTL@ +Index: clamav-0.90.2/sigtool/Makefile.am +=================================================================== +--- clamav-0.90.2.orig/sigtool/Makefile.am 2007-05-16 14:26:18.000000000 +1000 ++++ clamav-0.90.2/sigtool/Makefile.am 2007-05-16 14:26:29.000000000 +1000 +@@ -39,4 +39,4 @@ + + DEFS = @DEFS@ -DCL_NOTHREADS + INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav +-LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @THREAD_LIBS@ ++LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @THREAD_LIBS@ @LIBINTL@ diff --git a/packages/clamav/files/freshclam.conf b/packages/clamav/files/freshclam.conf new file mode 100644 index 0000000000..fd45b0dd85 --- /dev/null +++ b/packages/clamav/files/freshclam.conf @@ -0,0 +1,21 @@ +## Please read the freshclam.conf(5) manual before editing this file. + +# Comment or remove the line below. +Example + +# Uncomment the following line and replace XY with your country +# code. See http://www.iana.org/cctld/cctld-whois.htm for the full list. +# Default: There is no default, which results in an error when running freshclam +#DatabaseMirror db.XY.clamav.net + +DatabaseMirror database.clamav.net + +DatabaseDirectory /var/lib/clamav/ +UpdateLogFile /var/log/clamav/freshclam.log +PidFile /var/run/clamav/freshclam.pid +DatabaseOwner clamav +AllowSupplementaryGroups yes +DNSDatabaseInfo current.cvd.clamav.net +MaxAttempts 5 +Checks 24 +NotifyClamd /etc/clamd.conf -- cgit v1.2.3