# ChangeLog for app-antivirus/clamav
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/ChangeLog,v 1.208 2007/03/03 11:49:36 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/ChangeLog,v 1.209 2007/03/08 16:59:35 ticho Exp $
+
+*clamav-0.90.1-r1 (08 Mar 2007)
+
+ 08 Mar 2007; Andrej Kacian <ticho@gentoo.org>
+ +files/clamav-0.90-nls.patch, files/clamd.rc, +clamav-0.90.1-r1.ebuild:
+ Wait for clamd socket if clamav-milter is started with --external argument.
+ Patch provided by Dean C Bullock <dean at bullock.net>, bug #169561. Apply
+ patch to allow building without NLS. Patch by Ned Ludd <solar at
+ gentoo.org>, bug #167829.
03 Mar 2007; Andrej Kacian <ticho@gentoo.org> clamav-0.90.ebuild,
clamav-0.90.1.ebuild:
MD5 6c50cdabc6ee6dc40df2b89c075380a5 files/clamav-0.90-compat.patch 585
RMD160 3ee74f163bd8b4440f06773ec7abe3bcec1fff79 files/clamav-0.90-compat.patch 585
SHA256 7a646386f74bc9094bd39d6762b78ef74310678cdef5484650e0aa242cf570e9 files/clamav-0.90-compat.patch 585
+AUX clamav-0.90-nls.patch 2223 RMD160 436402df482c646ef456669c829fdfdc99378925 SHA1 c9b78bb39f09744f9b56e2bf63c23d2b197cd144 SHA256 d4a819cf3e1948df77fd4b65780f8bbc39209a62084d4fefbebab6ab9b193a39
+MD5 1f4360e5f815a48fef5f5d3708c9ea30 files/clamav-0.90-nls.patch 2223
+RMD160 436402df482c646ef456669c829fdfdc99378925 files/clamav-0.90-nls.patch 2223
+SHA256 d4a819cf3e1948df77fd4b65780f8bbc39209a62084d4fefbebab6ab9b193a39 files/clamav-0.90-nls.patch 2223
AUX clamav-milter.README.gentoo 1124 RMD160 4fb1e2d9b444874838bcea1071969ca6862fb15b SHA1 0b9b86a0e7732eaaf7f880859265754f7a4efd3a SHA256 5e7b142b68964bc3463b077e5698fa77cace45ea9612258b1e1849cee944dd11
MD5 08f7b320461c04bbb88555e389c2e544 files/clamav-milter.README.gentoo 1124
RMD160 4fb1e2d9b444874838bcea1071969ca6862fb15b files/clamav-milter.README.gentoo 1124
MD5 e29ee77ca9bfe28ed18dbf67a9c90e75 files/clamd.conf 193
RMD160 abebb5e1607e6819859b51e1a41b583c8266c6df files/clamd.conf 193
SHA256 cd867dc66af694282584fa2cfd40a662ac2a7c25d6f2288b9afdc657a07226e3 files/clamd.conf 193
-AUX clamd.rc 2033 RMD160 aed0e44ce893dad9da77fba3f1ee56001e99adcb SHA1 d2dc3c366cc373d13f7336940b61597fa66f2cef SHA256 6ccae0a0f3f7be2946ed0975ea5093dac605889c44952bd4e02f20e91e606bce
-MD5 1906bcd8209370d0a03fb066161f6d59 files/clamd.rc 2033
-RMD160 aed0e44ce893dad9da77fba3f1ee56001e99adcb files/clamd.rc 2033
-SHA256 6ccae0a0f3f7be2946ed0975ea5093dac605889c44952bd4e02f20e91e606bce files/clamd.rc 2033
+AUX clamd.rc 2570 RMD160 9b9faaa639f9618dc7b8dad6dd13b28e32adf21a SHA1 2a447bb8181ae4eade1a8f332af3a4ebcd40ec95 SHA256 57a587a7bf68f85843d84da0aab295f041333a39d7a2089cacd7a3470eb5271a
+MD5 38228c159ccedca19e3a9bc2cb87421b files/clamd.rc 2570
+RMD160 9b9faaa639f9618dc7b8dad6dd13b28e32adf21a files/clamd.rc 2570
+SHA256 57a587a7bf68f85843d84da0aab295f041333a39d7a2089cacd7a3470eb5271a files/clamd.rc 2570
DIST clamav-0.88.5.tar.gz 8663193 RMD160 b0e24b90f2a085ded89fcd90f3434d6bc1981caf SHA1 eb4c671d14d43b7079f19da9d9ef37357fa24c83 SHA256 8b807fcb64e2c523d7da8002ca1174c4173526ae48a7deecca41db30f51cee8f
DIST clamav-0.88.6.tar.gz 8929534 RMD160 efa53c600a70a8f808fbf9cde92ebf193b76e574 SHA1 5fe6efa7c7dc9eb157a78e7851392c737d586bb7 SHA256 cc7f90983aa61b3d893c3311e3f832c5faa204467143cff597ad80bf8ad24daa
DIST clamav-0.88.7.tar.gz 9510548 RMD160 14d7c6255df618b16b704fc1cb5ce2b1385fa0e8 SHA1 7d7833dc454437ed7044b1c734f0a13e4dc1ead2 SHA256 702cb5928bff3d0e647a4a6b505d434e3a0f10f2af74bddac5239a200b92d1e2
MD5 28a0ef2c2910d9e96558ca1c3e33f239 clamav-0.88.7.ebuild 3432
RMD160 e96b060fd6cdb828ed19f25fcb66606a09949c27 clamav-0.88.7.ebuild 3432
SHA256 cee9e104b7e6a6f3c2d4659b6b92825ece9078ff941b91ceac1b29ed0c245a78 clamav-0.88.7.ebuild 3432
+EBUILD clamav-0.90.1-r1.ebuild 4310 RMD160 3f212b7bfbe6cb69e00f484bd0dce7d4e4307b78 SHA1 526ea003d82c2ca3a58e129f2dae440b748eab6c SHA256 54f19f074c9aaa7028825f69a264fd2353530acbee287b0d286f3514f97ca4ef
+MD5 30bc7dde50f871f9baa895377e00722f clamav-0.90.1-r1.ebuild 4310
+RMD160 3f212b7bfbe6cb69e00f484bd0dce7d4e4307b78 clamav-0.90.1-r1.ebuild 4310
+SHA256 54f19f074c9aaa7028825f69a264fd2353530acbee287b0d286f3514f97ca4ef clamav-0.90.1-r1.ebuild 4310
EBUILD clamav-0.90.1.ebuild 4213 RMD160 53fbd93f6c46e3406941cfadf8133da673ba1ecb SHA1 f29c247e1024436549a946d28acf810752586846 SHA256 8b1e2defe423f11448befbd772dba9823f4fef3f2f90707c56f470c320aebfa5
MD5 80eaa8415a2a9fa60c4432f22dc26cf9 clamav-0.90.1.ebuild 4213
RMD160 53fbd93f6c46e3406941cfadf8133da673ba1ecb clamav-0.90.1.ebuild 4213
MD5 7d9228731f4340580dd1bb09b760be82 clamav-0.90.ebuild 3921
RMD160 633d0a020576b51857e586d54ada4914273a7fa4 clamav-0.90.ebuild 3921
SHA256 380d2e3d88ccb398966ce3f4eb2bda300ad0ad875da477efbe8f90e052ca6269 clamav-0.90.ebuild 3921
-MISC ChangeLog 32680 RMD160 7480d1ff3d630decad329227f24565361e67807c SHA1 b7685b1a94436e71bfa8090bcb6d89d2b5a3b4d6 SHA256 89057bdfe27c7e189cd0096e05e9c7d8756f614a0c83d27add3794727562a8e2
-MD5 49aed005e28c31c1690d23e47f26b464 ChangeLog 32680
-RMD160 7480d1ff3d630decad329227f24565361e67807c ChangeLog 32680
-SHA256 89057bdfe27c7e189cd0096e05e9c7d8756f614a0c83d27add3794727562a8e2 ChangeLog 32680
+MISC ChangeLog 33086 RMD160 51813ecda8aa726b3076efe5e8f328eafd581919 SHA1 ed524e61333a7e53322bfbfaa459cdbe8bcd5ed6 SHA256 0a4bb30195306602bfa6c05820753e67fcb2283330c47651394a6232ddb86023
+MD5 81d33531c1e011a167e991df22f6a7d8 ChangeLog 33086
+RMD160 51813ecda8aa726b3076efe5e8f328eafd581919 ChangeLog 33086
+SHA256 0a4bb30195306602bfa6c05820753e67fcb2283330c47651394a6232ddb86023 ChangeLog 33086
MISC metadata.xml 184 RMD160 c37bff1fc1cd7139c91dae9b0fa5082e1d81f153 SHA1 cc0a188d9ad2411e78747326c62dd046bd5413c8 SHA256 d51011aa837db802ef539a1321a4af0a4a00879d475b92fd58f3c01df7320b58
MD5 7e32edfd72887a57b16ecd73f0f7a1a0 metadata.xml 184
RMD160 c37bff1fc1cd7139c91dae9b0fa5082e1d81f153 metadata.xml 184
MD5 2990615ce8ce0c303dc772558ee52ea4 files/digest-clamav-0.90.1 247
RMD160 be0e20cdadaa82a58211c754908e439923513e21 files/digest-clamav-0.90.1 247
SHA256 be92b57874b8c81e9831142039d6ee58ab3aaf3feae75d26a4a5d1d821a21757 files/digest-clamav-0.90.1 247
+MD5 2990615ce8ce0c303dc772558ee52ea4 files/digest-clamav-0.90.1-r1 247
+RMD160 be0e20cdadaa82a58211c754908e439923513e21 files/digest-clamav-0.90.1-r1 247
+SHA256 be92b57874b8c81e9831142039d6ee58ab3aaf3feae75d26a4a5d1d821a21757 files/digest-clamav-0.90.1-r1 247
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
-iD8DBQFF6WDfQlM6RnzZP+IRAhPFAJ9fFoVBa+68L0roEAeoAbJYlTWOBQCfbfMm
-u0UXTKXr/iDLvqZMKH1zyt0=
-=9P4I
+iD8DBQFF8EEFQlM6RnzZP+IRAnDBAJ9UVlgFJu06DdE4PBEXMsN7tKK52QCgiE/y
+MQiuK3XlqVRMtsQlvQmiHA8=
+=CupZ
-----END PGP SIGNATURE-----
--- /dev/null
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.90.1-r1.ebuild,v 1.1 2007/03/08 16:59:35 ticho Exp $
+
+inherit eutils flag-o-matic fixheadtails
+
+DESCRIPTION="Clam Anti-Virus Scanner"
+HOMEPAGE="http://www.clamav.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="bzip2 crypt curl logrotate mailwrapper milter nls selinux"
+
+DEPEND="virtual/libc
+ bzip2? ( app-arch/bzip2 )
+ crypt? ( >=dev-libs/gmp-4.1.2 )
+ curl? ( >=net-misc/curl-7.10.0 )
+ milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) )
+ nls? ( sys-devel/gettext )
+ dev-libs/gmp
+ >=sys-libs/zlib-1.2.1-r3
+ >=sys-apps/sed-4"
+RDEPEND="${DEPEND}
+ selinux? ( sec-policy/selinux-clamav )
+ logrotate? ( app-admin/logrotate )
+ sys-apps/grep"
+PROVIDE="virtual/antivirus"
+
+pkg_setup() {
+ if use milter; then
+ if [ ! -e /usr/lib/libmilter.a ] ; then
+ ewarn "In order to enable milter support, clamav needs sendmail with enabled milter"
+ ewarn "USE flag. Either recompile sendmail with milter USE flag enabled, or disable"
+ ewarn "this flag for clamav as well to disable milter support."
+ die "need milter-enabled sendmail"
+ fi
+ fi
+ enewgroup clamav
+ enewuser clamav -1 -1 /dev/null clamav
+}
+
+src_unpack() {
+ unpack "${A}"
+ cd "${S}"
+ epatch "${FILESDIR}"/${P%.*}-compat.patch
+ epatch "${FILESDIR}"/${P%.*}-nls.patch
+}
+
+src_compile() {
+ has_version =sys-libs/glibc-2.2* && filter-lfs-flags
+
+ local myconf
+
+ # we depend on fixed zlib, so we can disable this check to prevent redundant
+ # warning (bug #61749)
+ myconf="${myconf} --disable-zlib-vcheck"
+ # use id utility instead of /etc/passwd parsing (bug #72540)
+ myconf="${myconf} --enable-id-check"
+ use milter && {
+ myconf="${myconf} --enable-milter"
+ use mailwrapper && \
+ myconf="${myconf} --with-sendmail=/usr/sbin/sendmail.sendmail"
+ }
+
+ ht_fix_file configure
+ econf ${myconf} \
+ $(use_enable bzip2) \
+ $(use_with curl libcurl) \
+ $(use_enable nls) \
+ --disable-experimental \
+ --with-dbdir=/var/lib/clamav || die
+ emake || die
+}
+
+src_install() {
+ make DESTDIR=${D} install || die
+ dodoc AUTHORS BUGS NEWS README ChangeLog FAQ INSTALL
+ newconfd ${FILESDIR}/clamd.conf clamd
+ newinitd ${FILESDIR}/clamd.rc clamd
+ dodoc ${FILESDIR}/clamav-milter.README.gentoo
+
+ dodir /var/run/clamav
+ keepdir /var/run/clamav
+ fowners clamav:clamav /var/run/clamav
+ dodir /var/log/clamav
+ keepdir /var/log/clamav
+ fowners clamav:clamav /var/log/clamav
+
+ # Change /etc/clamd.conf to be usable out of the box
+ sed -i -e "s:^\(Example\):\# \1:" \
+ -e "s:.*\(PidFile\) .*:\1 /var/run/clamav/clamd.pid:" \
+ -e "s:.*\(LocalSocket\) .*:\1 /var/run/clamav/clamd.sock:" \
+ -e "s:.*\(User\) .*:\1 clamav:" \
+ -e "s:^\#\(LogFile\) .*:\1 /var/log/clamav/clamd.log:" \
+ -e "s:^\#\(LogTime\).*:\1 yes:" \
+ ${D}/etc/clamd.conf
+
+ # Do the same for /etc/freshclam.conf
+ sed -i -e "s:^\(Example\):\# \1:" \
+ -e "s:.*\(PidFile\) .*:\1 /var/run/clamav/freshclam.pid:" \
+ -e "s:.*\(DatabaseOwner\) .*:\1 clamav:" \
+ -e "s:^\#\(UpdateLogFile\) .*:\1 /var/log/clamav/freshclam.log:" \
+ -e "s:^\#\(NotifyClamd\).*:\1 /etc/clamd.conf:" \
+ ${D}/etc/freshclam.conf
+
+ if use milter ; then
+ echo "START_MILTER=no" \
+ >> ${D}/etc/conf.d/clamd
+ echo "MILTER_SOCKET=\"/var/run/clamav/clmilter.sock\"" \
+ >>${D}/etc/conf.d/clamd
+ echo "MILTER_OPTS=\"-m 10 --timeout=0\"" \
+ >>${D}/etc/conf.d/clamd
+ fi
+
+ if use logrotate ; then
+ diropts ""
+ dodir /etc/logrotate.d
+ insopts -m0644
+ insinto /etc/logrotate.d
+ newins ${FILESDIR}/${PN}.logrotate ${PN}
+ fi
+}
+
+pkg_postinst() {
+ echo
+ if use milter ; then
+ elog "For simple instructions how to setup the clamav-milter"
+ elog "read /usr/share/doc/${PF}/clamav-milter.README.gentoo.gz"
+ echo
+ fi
+ ewarn "Warning: clamd and/or freshclam have not been restarted."
+ ewarn "You should restart them to start using new version: /etc/init.d/clamd restart"
+ echo
+ ewarn "The soname for libclamav has changed after clamav-0.90."
+ ewarn "If you have upgraded from that or earlier version, it is recommended to run:"
+ ewarn
+ ewarn "revdep-rebuild --library libclamav.so.1"
+ ewarn
+ ewarn "This will fix linking errors caused by this change."
+ echo
+}
--- /dev/null
+diff -bur clamav-0.90.1-orig/clamav-milter/clamav-milter.c clamav-0.90.1/clamav-milter/clamav-milter.c
+--- clamav-0.90.1-orig/clamav-milter/clamav-milter.c 2007-03-07 17:56:53.000000000 +0100
++++ clamav-0.90.1/clamav-milter/clamav-milter.c 2007-03-07 18:00:05.000000000 +0100
+@@ -108,7 +108,7 @@
+ #endif
+ #endif
+
+-#ifdef C_LINUX
++#if defined(C_LINUX) && defined(ENABLE_NLS)
+ #include <sys/sendfile.h> /* FIXME: use sendfile on BSD not Linux */
+ #include <libintl.h>
+ #include <locale.h>
+diff -bur clamav-0.90.1-orig/configure.in clamav-0.90.1/configure.in
+--- clamav-0.90.1-orig/configure.in 2007-03-07 17:56:53.000000000 +0100
++++ clamav-0.90.1/configure.in 2007-03-07 17:57:30.000000000 +0100
+@@ -160,6 +160,15 @@
+ AC_CHECK_HEADER(dlfcn.h,[LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -ldl" ; AC_DEFINE(HAVE_NCORE,1,Support for NodalCore acceleration)], AC_MSG_WARN([****** NodalCore support disabled (no support for dlopen)]))
+ fi
+
++AC_ARG_ENABLE(nls,
++ AC_HELP_STRING([--disable-nls], [disable nls support]),
++ [want_nls=$enableval], [want_nls=yes]
++)
++
++if test $want_nls = yes; then
++ CPPFLAGS="$CPPFLAGS -DENABLE_NLS"
++fi
++
+ AC_ARG_ENABLE(dns,
+ AC_HELP_STRING([--disable-dns], [disable support for database verification through DNS]),
+ [want_dns=$enableval], [want_dns=yes]
+diff -bur clamav-0.90.1-orig/shared/getopt.c clamav-0.90.1/shared/getopt.c
+--- clamav-0.90.1-orig/shared/getopt.c 2007-03-07 17:56:53.000000000 +0100
++++ clamav-0.90.1/shared/getopt.c 2007-03-07 18:00:25.000000000 +0100
+@@ -82,7 +82,7 @@
+
+ #ifndef _
+ /* This is for other GNU distributions with internationalized messages. */
+-# if defined HAVE_LIBINTL_H || defined _LIBC
++# if (defined(HAVE_LIBINTL_H) || defined(_LIBC)) && defined(ENABLE_NLS)
+ # include <libintl.h>
+ # ifndef _
+ # define _(msgid) gettext (msgid)
+diff -bur clamav-0.90.1-orig/shared/output.c clamav-0.90.1/shared/output.c
+--- clamav-0.90.1-orig/shared/output.c 2007-03-07 17:56:53.000000000 +0100
++++ clamav-0.90.1/shared/output.c 2007-03-07 17:57:30.000000000 +0100
+@@ -61,7 +61,7 @@
+ pthread_mutex_t logg_mutex = PTHREAD_MUTEX_INITIALIZER;
+ #endif
+
+-#ifdef C_LINUX
++#if defined(C_LINUX) && defined(ENABLE_NLS)
+ #include <libintl.h>
+ #include <locale.h>
+
#!/sbin/runscript
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/files/clamd.rc,v 1.8 2005/11/09 16:40:05 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/files/clamd.rc,v 1.9 2007/03/08 16:59:35 ticho Exp $
depend() {
use net
chown ${clamav_user} ${logfile}
fi
+ if [[ ${MILTER_OPTS} == *--external* ]]; then
+ local clamd_socket_wait_count=0
+ local clamd_socket_wait_max=10
+ local clamd_socket_wait_result=-1
+ ebegin "Waiting for clamd to create ${clamd_socket}"
+ while [[ clamd_socket_wait < clamd_socket_wait_max ]]; do
+ if [ -S "${clamd_socket:-/tmp/clamd}" ]; then
+ clamd_socket_wait_result=0
+ break
+ else
+ echo -n " ."
+ let clamd_socket_wait++
+ sleep 1
+ fi
+ done
+ echo
+ eend $clamd_socket_wait_result "Timeout waiting for ${clamd_socket}"
+ fi
+
ebegin "Starting clamav-milter"
start-stop-daemon --start --quiet \
--exec /usr/sbin/clamav-milter -- ${MILTER_OPTS} ${MILTER_SOCKET}
--- /dev/null
+MD5 cd11c05b5476262eaea4fa3bd7dc25bf clamav-0.90.1.tar.gz 11643310
+RMD160 1fd343d6510fea337a676e32bb1e4e404da4bd6d clamav-0.90.1.tar.gz 11643310
+SHA256 08a0255b4f6bdc4312eea6c118e79ecf684aed10640b45037d9dc5890c7687be clamav-0.90.1.tar.gz 11643310
projects / gentoo.git / commitdiff