Version bump, #236665

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.25-gentoo-r7 x86_64

5 files changed, 251 insertions, 2 deletions

diff --git a/app-antivirus/clamav/ChangeLog b/app-antivirus/clamav/ChangeLog
index 92ec9061e5ef..fe5d306d5ae0 100644
--- a/app-antivirus/clamav/ChangeLog
+++ b/app-antivirus/clamav/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-antivirus/clamav
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/ChangeLog,v 1.297 2008/07/22 16:52:31 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/ChangeLog,v 1.298 2008/09/05 19:44:47 dertobi123 Exp $
+
+*clamav-0.94 (05 Sep 2008)
+
+  05 Sep 2008; Tobias Scherbaum <dertobi123@gentoo.org>
+  +files/clamav-0.94-buildfix.patch, +files/clamav-0.94-nls.patch,
+  +clamav-0.94.ebuild:
+  Version bump, #236665
 
   22 Jul 2008; Tobias Scherbaum <dertobi123@gentoo.org>
   clamav-0.93.3.ebuild:
diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest
index a1fa099d3492..a0e9212f7ac3 100644
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@@ -5,6 +5,8 @@ AUX clamav-0.91.2-CVE-2007-6336.patch 1002 RMD160 dd72433cba5bea2b163a09d82fc5c4
 AUX clamav-0.91.2-CVE-2007-6337.patch 891 RMD160 491e27ad67741a04891e522ec2f4f7ba25f91381 SHA1 e02199c35043a1811a077e7fb6a7044dd820d12b SHA256 d6552c8990fc82fd8072b0e331ec7c1bf4ef7f3899d2edf7a2b9991bd6f2337a
 AUX clamav-0.93-buildfix.patch 936 RMD160 ce5c8297fdbd3d9fc306003d6010dba45de89c45 SHA1 e6ed67358100019c7fc78ff454cb964549330616 SHA256 d5e45ae6f9a4faee8325bbb0cbdabb8a6023130fc4e78085415c25fcbeb6b7d2
 AUX clamav-0.93-nls.patch 2405 RMD160 b95a897cdd6a007cd6b70fde233fd29e5244ad50 SHA1 7cec15f8723f842e03f1a35ded5e094826844bde SHA256 59e44aaf1a9a0aa1d94ed2d0177e886c3376506f666587a753ef20022d049dd8
+AUX clamav-0.94-buildfix.patch 827 RMD160 74531c8223d61b96824e00325c2b8d6506dd583e SHA1 55c6d7dee019eb5b422946746e322db5efbf933a SHA256 df13dce6729b0a1aa06d792f71de2c496388e200545a1797ba8e90ef6ffd3d03
+AUX clamav-0.94-nls.patch 2399 RMD160 96434fbaf7a2da8e54a19bd4a855d959482a40af SHA1 447dd66820b50836c8c9d709c369e54be49d9edb SHA256 c81ff834f49ac8039e8d0339049e750445a74c162418c75ba5b4d9663c97d34b
 AUX clamav-milter.README.gentoo 1124 RMD160 4fb1e2d9b444874838bcea1071969ca6862fb15b SHA1 0b9b86a0e7732eaaf7f880859265754f7a4efd3a SHA256 5e7b142b68964bc3463b077e5698fa77cace45ea9612258b1e1849cee944dd11
 AUX clamav.logrotate 355 RMD160 f59cd8ce96da8210aa858ee59ee3b6940e3253a6 SHA1 5fbd9364997400681d5a93cb50cac8a0f188e56f SHA256 ab91f784d5098d2162be9277e3a006bdb392d9d89975838ad4ac7dfd8b418170
 AUX clamd.conf 234 RMD160 b517b05e587637cbdd443f7ca3625d582e32722f SHA1 564b1e2f6cf85567f69f2e20cbc942967fa6304b SHA256 17bf4fe3596dc5b145e4163d85181e2edcaa214df3cf9072d852ba0e7a569891
@@ -16,6 +18,7 @@ DIST clamav-0.92.tar.gz 14300798 RMD160 37f0450b9b3c6fc863f94811ae372ece1677d791
 DIST clamav-0.93.1.tar.gz 17246314 RMD160 22296401b3ce96a268f0db224e72c31e69090895 SHA1 3306f3cd289aac3793962c9834cd1bd500abfb0c SHA256 c9a3991107dd377a63cfe7866417c5e29b3bffc9332aa5979bcc74ddb78d6bb6
 DIST clamav-0.93.3.tar.gz 18242568 RMD160 8379148790cc545c801709d46b7db87634f43f67 SHA1 01240613b639144fa8fa655825f6587e044a1c1c SHA256 7aa98796671dfe3db5a20e25669404c4e4461d2a6c77de352edf99f2c989e500
 DIST clamav-0.93.tar.gz 16134725 RMD160 a1f301345983ed0606e2f2e13ef63275bd341cd4 SHA1 bae5f70331e8592e9c53a04517038890845d406d SHA256 1fedc2bb4a850c962d6b0938b77b14480297bffa4cbf69ed95c4ee4f35b5db69
+DIST clamav-0.94.tar.gz 20509228 RMD160 598561b76b1e4ee14120388ba1bbdcac5ac7bfe5 SHA1 d69a0c462ac3ef55329384f8e136d9b7bc1b8ec5 SHA256 ae188c18936ea9154eb6a85ea553c29f4349ee3e95457055fae5fe1b981af602
 EBUILD clamav-0.91.2-r1.ebuild 4378 RMD160 0e6be1ff7e473b515e2362f1de934866d3fba12f SHA1 e3b13d2e1545a1d9bb37848d17f835628330f288 SHA256 adef8794ef1de7dabaf2ab1ad18886fc5a353ca2ba53dc56355846ea212c4d50
 EBUILD clamav-0.91.2.ebuild 4235 RMD160 1b50e9d66a1f75306ae8117ff8e2cb2ed86df1d4 SHA1 ba43a4bf6031fda6f254e5f56a76e663e00825ee SHA256 c0427934b1d9dfcdae76d6bfbcd3edc2ae385b18d4e33abfe9f2db45aabc55a0
 EBUILD clamav-0.92.1-r1.ebuild 4270 RMD160 b336c4e7bd8d6f4db47870acde83010b8c723b1f SHA1 45553748226c45c8d7dc4d0652c37823b31a8f3f SHA256 a87f065e3871d429b389c2ca20dfdfd4a0870de4b492d6c094f118bc5cac4a03
@@ -24,5 +27,6 @@ EBUILD clamav-0.92.ebuild 4109 RMD160 87289f95ba172c645c8afa967e09a6aa04fb0403 S
 EBUILD clamav-0.93.1.ebuild 4290 RMD160 54024f30df11a78b08e2683e82f2b818612d87b0 SHA1 28c22161126efdd813d878239e81fbf03e2609d9 SHA256 17c991141ad68190f8d813afc5e1684e2cbd0e4ea60b23ad9be91b671de55e32
 EBUILD clamav-0.93.3.ebuild 4287 RMD160 edd95891a2a9e861bf542ec4ff907e9380457839 SHA1 11d6c62cd85304d5f8674835db25046e2408af5f SHA256 08a038108585615abc0ff9592b0d57c3810bb7b01217df3b2c205bb4f6bffd92
 EBUILD clamav-0.93.ebuild 4273 RMD160 ec29f05a2f9e1ed0b18f5bb08be909fd410532ce SHA1 065ba1a4ac328b50834687020990b51ce88ab654 SHA256 0e1405745d566ca2c990e166773c13f57635ee6138dbac26027a233fea0e10f3
-MISC ChangeLog 45364 RMD160 9d4f0810b18143987dbe5b3fc843b6e9c0e9e192 SHA1 851c165a0efab9c77c3be70773ef6307b94fb018 SHA256 16a89a0dc8543042dfd7faabcc104ffa1f04b4744595715d0e1631cf7c68f179
+EBUILD clamav-0.94.ebuild 4281 RMD160 ba93c40bdbe4c964d1719469061bde2e29cb195b SHA1 b5778d17bdbbd6d1f0a365425cfcb285ca90651a SHA256 b0a6adf98aeaa350fd4ab088cb08e9a654810c2d97a0177a2a70ad44f17b1666
+MISC ChangeLog 45563 RMD160 a65956ddc9c42233ca211fe9e6f9a167b500f919 SHA1 6d99ccf9894815c8984064664fed2aca600cc6f3 SHA256 48128f984778bfce1b3688973db63ba91b1432b0b9f5335cffe1a23ebe47e7e0
 MISC metadata.xml 184 RMD160 c37bff1fc1cd7139c91dae9b0fa5082e1d81f153 SHA1 cc0a188d9ad2411e78747326c62dd046bd5413c8 SHA256 d51011aa837db802ef539a1321a4af0a4a00879d475b92fd58f3c01df7320b58
diff --git a/app-antivirus/clamav/clamav-0.94.ebuild b/app-antivirus/clamav/clamav-0.94.ebuild
new file mode 100644
index 000000000000..03c71f0e7487
--- /dev/null
+++ b/app-antivirus/clamav/clamav-0.94.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.94.ebuild,v 1.1 2008/09/05 19:44:47 dertobi123 Exp $
+
+inherit autotools eutils flag-o-matic fixheadtails multilib
+
+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 iconv mailwrapper milter nls selinux"
+
+DEPEND="virtual/libc
+	bzip2? ( app-arch/bzip2 )
+	crypt? ( >=dev-libs/gmp-4.1.2 )
+	milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) )
+	iconv? ( virtual/libiconv )
+	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 )
+	sys-apps/grep"
+PROVIDE="virtual/antivirus"
+
+pkg_setup() {
+	if use milter; then
+		if [ ! -e /usr/$(get_libdir)/libmilter.a ] ; then
+			ewarn "In order to enable milter support, clamav needs sendmail with enabled milter"
+			ewarn "USE flag, or mail-filter/libmilter package."
+		fi
+	fi
+
+	enewgroup clamav
+	enewuser clamav -1 -1 /dev/null clamav
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-buildfix.patch
+	epatch "${FILESDIR}"/${P}-nls.patch
+
+	# If nls flag is disabled, gettext may not be available, but eautoreconf
+	# needs this file (bug #218892).
+	use nls || cp "${FILESDIR}"/lib-ld.m4 m4/
+
+	AT_M4DIR="m4" eautoreconf
+}
+
+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_enable nls) \
+		$(use_with iconv) \
+		--disable-experimental \
+		--with-dbdir=/var/lib/clamav || die
+	emake || die
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	dodoc AUTHORS BUGS NEWS README ChangeLog FAQ
+	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:" \
+		-e "s:^\#\(AllowSupplementaryGroups\).*:\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:" \
+		-e "s:^\#\(ScriptedUpdates\).*:\1 yes:" \
+		-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
+		"${D}"/etc/freshclam.conf
+
+	if use milter ; then
+		echo "
+START_MILTER=no
+MILTER_NICELEVEL=19" \
+			>> "${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
+
+	diropts ""
+	dodir /etc/logrotate.d
+	insopts -m0644
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotate ${PN}
+}
+
+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 "The soname for libclamav has changed in clamav-0.94."
+	ewarn "If you have upgraded from that or earlier version, it is"
+	ewarn "recommended to run revdep-rebuild, in order to fix anything"
+	ewarn "that links against libclamav.so library."
+	echo
+}
diff --git a/app-antivirus/clamav/files/clamav-0.94-buildfix.patch b/app-antivirus/clamav/files/clamav-0.94-buildfix.patch
new file mode 100644
index 000000000000..0b140b246d1d
--- /dev/null
+++ b/app-antivirus/clamav/files/clamav-0.94-buildfix.patch
@@ -0,0 +1,21 @@
+diff -Naur clamav-0.94.orig/configure.in clamav-0.94/configure.in
+--- clamav-0.94.orig/configure.in	2008-09-01 20:41:06.000000000 +0200
++++ clamav-0.94/configure.in	2008-09-05 21:09:41.201851168 +0200
+@@ -473,7 +473,7 @@
+ 
+ 	case "$ac_cv_c_cve_2008_1372" in
+ 	ok|bugged)
+-		LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS $LTLIBBZ2"
++		LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS  -lbz2"
+ 		AC_DEFINE([HAVE_BZLIB_H],1,[have bzip2])
+ 		;;
+ 	*)
+@@ -566,7 +566,7 @@
+     dnl we don't need to check for __gmpz_init and mpz_init,
+     dnl since we are not checking directly for symbols
+     if test "$HAVE_LIBGMP" = "yes"; then
+-	    LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS $LTLIBGMP";
++	    LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lgmp";
+     else
+ 	    AC_MSG_WARN([****** GNU MP 2 or newer NOT FOUND - digital signature support will be disabled !]);
+ 	    want_dsig="no";
diff --git a/app-antivirus/clamav/files/clamav-0.94-nls.patch b/app-antivirus/clamav/files/clamav-0.94-nls.patch
new file mode 100644
index 000000000000..d1b78d099094
--- /dev/null
+++ b/app-antivirus/clamav/files/clamav-0.94-nls.patch
@@ -0,0 +1,72 @@
+diff -Naur clamav-0.94.orig/clamav-milter/clamav-milter.c clamav-0.94/clamav-milter/clamav-milter.c
+--- clamav-0.94.orig/clamav-milter/clamav-milter.c	2008-09-01 19:19:44.000000000 +0200
++++ clamav-0.94/clamav-milter/clamav-milter.c	2008-09-05 21:16:03.507610741 +0200
+@@ -110,6 +110,7 @@
+ 
+ #ifdef	C_LINUX
+ #include <sys/sendfile.h>	/* FIXME: use sendfile on BSD not Linux */
++#ifdef ENABLE_NLS
+ #include <libintl.h>
+ #include <locale.h>
+ 
+@@ -122,7 +123,8 @@
+ #define	_(s)	s
+ #define	N_(s)	s
+ 
+-#endif
++#endif /* ENABLE_NLS */
++#endif /* C_LINUX */
+ 
+ #ifdef	USE_SYSLOG
+ #include <syslog.h>
+@@ -771,7 +773,7 @@
+ 	else
+ 		progname = "clamav-milter";
+ 
+-#ifdef	C_LINUX
++#ifdef	ENABLE_NLS
+ 	setlocale(LC_ALL, "");
+ 	bindtextdomain(progname, DATADIR"/clamav-milter/locale");
+ 	textdomain(progname);
+diff -Naur clamav-0.94.orig/configure.in clamav-0.94/configure.in
+--- clamav-0.94.orig/configure.in	2008-09-05 21:11:13.672860000 +0200
++++ clamav-0.94/configure.in	2008-09-05 21:14:46.199611070 +0200
+@@ -490,6 +490,14 @@
+ [  --disable-unrar	  don't build libclamunrar and libclamunrar_iface ],
+ want_unrar=$enableval, want_unrar="yes")
+ 
++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([ipv6],
+ [  --disable-ipv6          disable IPv6 support],
+ want_ipv6=$enableval, want_ipv6="yes")
+diff -Naur clamav-0.94.orig/shared/getopt.c clamav-0.94/shared/getopt.c
+--- clamav-0.94.orig/shared/getopt.c	2008-08-16 19:18:00.000000000 +0200
++++ clamav-0.94/shared/getopt.c	2008-09-05 21:17:31.723611661 +0200
+@@ -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 -Naur clamav-0.94.orig/shared/output.c clamav-0.94/shared/output.c
+--- clamav-0.94.orig/shared/output.c	2008-08-16 19:18:00.000000000 +0200
++++ clamav-0.94/shared/output.c	2008-09-05 21:13:17.334852520 +0200
+@@ -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>
+