Version bump. NLS patch fix - do not include sendfile.h inside ENABLE_NLS ifdef, as it has nothing to do with NLS.

Package-Manager: portage-2.1.2.3

5 files changed, 201 insertions, 29 deletions

diff --git a/app-antivirus/clamav/ChangeLog b/app-antivirus/clamav/ChangeLog
index 4c5f25759ab0..7040f727c9cf 100644
--- a/app-antivirus/clamav/ChangeLog
+++ b/app-antivirus/clamav/ChangeLog
@@ -1,6 +1,13 @@
 # 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.220 2007/04/10 20:13:39 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/ChangeLog,v 1.221 2007/04/13 08:46:55 ticho Exp $
+
+*clamav-0.90.2 (13 Apr 2007)
+
+  13 Apr 2007; Andrej Kacian <ticho@gentoo.org> files/clamav-0.90-nls.patch,
+  +clamav-0.90.2.ebuild:
+  Version bump. NLS patch fix - do not include sendfile.h inside ENABLE_NLS
+  ifdef, as it has nothing to do with NLS.
 
   10 Apr 2007; Andrej Kacian <ticho@gentoo.org> files/clamd.rc:
   Make sure clamav-milter starts correctly when --external option is used.
diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest
index 2c427b6b7675..bbd04008a886 100644
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@@ -5,10 +5,10 @@ AUX clamav-0.90-compat.patch 585 RMD160 3ee74f163bd8b4440f06773ec7abe3bcec1fff79
 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-0.90-nls.patch 2335 RMD160 7035c465bec945ccac3cf26484106bfe2a8ef746 SHA1 40b026bf025ef45955df6725237ae824d47111ad SHA256 4fbf245f89544a13695ba8b62082cc093a5ee9129fc0373ea93aa2d33bdbacb4
+MD5 cc65ddeb567d7b9136aeb6059c2a0557 files/clamav-0.90-nls.patch 2335
+RMD160 7035c465bec945ccac3cf26484106bfe2a8ef746 files/clamav-0.90-nls.patch 2335
+SHA256 4fbf245f89544a13695ba8b62082cc093a5ee9129fc0373ea93aa2d33bdbacb4 files/clamav-0.90-nls.patch 2335
 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
@@ -27,6 +27,7 @@ RMD160 64f487cf526d0472cb4c8bd26ddd1e8efa1c9166 files/clamd.rc 3476
 SHA256 678344f493c7f5c0ab6e5344535baf376c69e84fd8bae693cb2b6dbf5b1ea1b0 files/clamd.rc 3476
 DIST clamav-0.88.7.tar.gz 9510548 RMD160 14d7c6255df618b16b704fc1cb5ce2b1385fa0e8 SHA1 7d7833dc454437ed7044b1c734f0a13e4dc1ead2 SHA256 702cb5928bff3d0e647a4a6b505d434e3a0f10f2af74bddac5239a200b92d1e2
 DIST clamav-0.90.1.tar.gz 11643310 RMD160 1fd343d6510fea337a676e32bb1e4e404da4bd6d SHA1 d51f279fce2d702c3e97b2e08fe3b4b863f0acc6 SHA256 08a0255b4f6bdc4312eea6c118e79ecf684aed10640b45037d9dc5890c7687be
+DIST clamav-0.90.2.tar.gz 12062886 RMD160 22daaecb634ca9914f18e85cf3456b544d6bf399 SHA1 ecc72d212a27eef1aa40e61a0b2705e4e42996ce SHA256 30df6a5d4a591dcd4acd7d4cce54dcfd260280fce6bbc9d19d240967bcdabbfa
 DIST clamav-0.90.tar.gz 11575374 RMD160 1b22144d3a41376093b73bbeb5302092a18ca685 SHA1 574b84429b878df3a9d862ea386c970326850158 SHA256 c39005318d4a7d27d9710c3d71396b8c500e0bc5a184cb7392051c9ca9dea60d
 EBUILD clamav-0.88.7-r1.ebuild 3794 RMD160 b3b7a19109bcb762b68468b43a5843e31e9d5304 SHA1 4086fd3a2f0a5b398b3bcf7209d69ed45f654fb1 SHA256 17f88d324fe6de67a95591d9ecb667f1cb235e1cf0d7bfce20d7f9e2652fc1c0
 MD5 e12ef0ba40f91ef851685fdfabae8a77 clamav-0.88.7-r1.ebuild 3794
@@ -48,14 +49,18 @@ EBUILD clamav-0.90.1.ebuild 4249 RMD160 862af63e89d38f1a148595cd8887e4431194cf67
 MD5 e3fbe0859df4a5f9f554fa173834fdb4 clamav-0.90.1.ebuild 4249
 RMD160 862af63e89d38f1a148595cd8887e4431194cf67 clamav-0.90.1.ebuild 4249
 SHA256 c2c4cd6230918c13cafcd7ab816ad1fe4ba91509bc5fb94fe83944323aca4fd2 clamav-0.90.1.ebuild 4249
+EBUILD clamav-0.90.2.ebuild 4366 RMD160 940c4da1bfadb0f11741ba83e9ab32b8607ef700 SHA1 b5a3c6a4bd63a95709bd827ffea4f83fa491b5a3 SHA256 0febee1149dc628d6494bae69a8e3bde14a0b254a75afeac2aff682f987efd66
+MD5 c462788a07948c148a492e9e5f9c44d5 clamav-0.90.2.ebuild 4366
+RMD160 940c4da1bfadb0f11741ba83e9ab32b8607ef700 clamav-0.90.2.ebuild 4366
+SHA256 0febee1149dc628d6494bae69a8e3bde14a0b254a75afeac2aff682f987efd66 clamav-0.90.2.ebuild 4366
 EBUILD clamav-0.90.ebuild 3958 RMD160 acabf30bc728a8edc824d14d7e965b858b324340 SHA1 071353cfdbfdd72c7ce8bdf70bfcb0d1248f700c SHA256 ec400f0e7387af9362c5ee2d77cb686a227634f9caf638be381f2094e43b6ace
 MD5 1a6bb4a7e8d417feff74b768aaa216e9 clamav-0.90.ebuild 3958
 RMD160 acabf30bc728a8edc824d14d7e965b858b324340 clamav-0.90.ebuild 3958
 SHA256 ec400f0e7387af9362c5ee2d77cb686a227634f9caf638be381f2094e43b6ace clamav-0.90.ebuild 3958
-MISC ChangeLog 34957 RMD160 78253c0c0116105448d20a50ab731f3a154f5888 SHA1 7255939fb75ee65a4fc0bbc4cb8ad5783b4e55d8 SHA256 5c24aba2032c6604d7f90a4fc3c8ea476b7731af8ed2db02c8af5e80ce27460d
-MD5 ce0f7d245e48a5fb86fcef2a9dc6c446 ChangeLog 34957
-RMD160 78253c0c0116105448d20a50ab731f3a154f5888 ChangeLog 34957
-SHA256 5c24aba2032c6604d7f90a4fc3c8ea476b7731af8ed2db02c8af5e80ce27460d ChangeLog 34957
+MISC ChangeLog 35209 RMD160 b3998cbab877a5ab1080a6f1d2894b687d7afb1d SHA1 43266bf1fa2c5afd7f1385a5c8f49cbfdffd59ae SHA256 9d8f3c33abffe54579bedf12d26070ace79d0c890f74c28cceea862d0a7e64ad
+MD5 fb243f2c979fd8d73e7634702c311aaf ChangeLog 35209
+RMD160 b3998cbab877a5ab1080a6f1d2894b687d7afb1d ChangeLog 35209
+SHA256 9d8f3c33abffe54579bedf12d26070ace79d0c890f74c28cceea862d0a7e64ad ChangeLog 35209
 MISC metadata.xml 184 RMD160 c37bff1fc1cd7139c91dae9b0fa5082e1d81f153 SHA1 cc0a188d9ad2411e78747326c62dd046bd5413c8 SHA256 d51011aa837db802ef539a1321a4af0a4a00879d475b92fd58f3c01df7320b58
 MD5 7e32edfd72887a57b16ecd73f0f7a1a0 metadata.xml 184
 RMD160 c37bff1fc1cd7139c91dae9b0fa5082e1d81f153 metadata.xml 184
@@ -78,10 +83,13 @@ SHA256 be92b57874b8c81e9831142039d6ee58ab3aaf3feae75d26a4a5d1d821a21757 files/di
 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
+MD5 a51cf8bdb107839a6a251af7ca543e74 files/digest-clamav-0.90.2 247
+RMD160 07dc65c177668ad15f01334d6476c7c8358d60f9 files/digest-clamav-0.90.2 247
+SHA256 e68c7b04a6e584aec2663aec7d1fb258ddf06e21554f0dd71bc9fec76ed12a20 files/digest-clamav-0.90.2 247
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFGG/AAQlM6RnzZP+IRAtV8AJ4p+Bz7Qy4UawNuzmBn11QVvs9l8gCgt4rv
-Q4bSirnnLJZt/VPDkhRdvoU=
-=6Z/5
+iD8DBQFGH0OKQlM6RnzZP+IRAqClAKCjo6/TaA9s+T5qvn3ymJTA1Y7V5wCgliFB
+xD6S31nevrLPoaDuIdgI92E=
+=EXYn
 -----END PGP SIGNATURE-----
diff --git a/app-antivirus/clamav/clamav-0.90.2.ebuild b/app-antivirus/clamav/clamav-0.90.2.ebuild
new file mode 100644
index 000000000000..96b5d51f3525
--- /dev/null
+++ b/app-antivirus/clamav/clamav-0.90.2.ebuild
@@ -0,0 +1,145 @@
+# 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.2.ebuild,v 1.1 2007/04/13 08:46:55 ticho Exp $
+
+inherit autotools 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
+	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_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
+	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:" \
+		-e "s:^\#\(ScriptedUpdates\).*:\1 yes:" \
+		${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
+}
diff --git a/app-antivirus/clamav/files/clamav-0.90-nls.patch b/app-antivirus/clamav/files/clamav-0.90-nls.patch
index a2535c241178..3a9ac5703f84 100644
--- a/app-antivirus/clamav/files/clamav-0.90-nls.patch
+++ b/app-antivirus/clamav/files/clamav-0.90-nls.patch
@@ -1,18 +1,27 @@
-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
+diff -bur clamav-0.90.2-orig/clamav-milter/clamav-milter.c clamav-0.90.2/clamav-milter/clamav-milter.c
+--- clamav-0.90.2-orig/clamav-milter/clamav-milter.c	2007-04-13 10:26:39.000000000 +0200
++++ clamav-0.90.2/clamav-milter/clamav-milter.c	2007-04-13 10:31:02.000000000 +0200
+@@ -110,6 +110,7 @@
  
--#ifdef	C_LINUX
-+#if defined(C_LINUX) && defined(ENABLE_NLS)
+ #ifdef	C_LINUX
  #include <sys/sendfile.h>	/* FIXME: use sendfile on BSD not Linux */
++#ifdef	ENABLE_NLS
  #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
+ 
+@@ -122,7 +123,8 @@
+ #define	_(s)	s
+ #define	N_(s)	s
+ 
+-#endif
++#endif /* ENABLE_NLS */
++#endif /* C_LINUX */
+ 
+ #ifdef	USE_SYSLOG
+ #include <syslog.h>
+diff -bur clamav-0.90.2-orig/configure.in clamav-0.90.2/configure.in
+--- clamav-0.90.2-orig/configure.in	2007-04-13 10:26:39.000000000 +0200
++++ clamav-0.90.2/configure.in	2007-04-13 10:26:57.000000000 +0200
 @@ -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
@@ -29,9 +38,9 @@ diff -bur clamav-0.90.1-orig/configure.in clamav-0.90.1/configure.in
  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
+diff -bur clamav-0.90.2-orig/shared/getopt.c clamav-0.90.2/shared/getopt.c
+--- clamav-0.90.2-orig/shared/getopt.c	2007-04-13 10:26:39.000000000 +0200
++++ clamav-0.90.2/shared/getopt.c	2007-04-13 10:26:57.000000000 +0200
 @@ -82,7 +82,7 @@
  
  #ifndef _
@@ -41,9 +50,9 @@ diff -bur clamav-0.90.1-orig/shared/getopt.c clamav-0.90.1/shared/getopt.c
  #  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
+diff -bur clamav-0.90.2-orig/shared/output.c clamav-0.90.2/shared/output.c
+--- clamav-0.90.2-orig/shared/output.c	2007-04-13 10:26:39.000000000 +0200
++++ clamav-0.90.2/shared/output.c	2007-04-13 10:26:57.000000000 +0200
 @@ -61,7 +61,7 @@
  pthread_mutex_t logg_mutex = PTHREAD_MUTEX_INITIALIZER;
  #endif
diff --git a/app-antivirus/clamav/files/digest-clamav-0.90.2 b/app-antivirus/clamav/files/digest-clamav-0.90.2
new file mode 100644
index 000000000000..41faa351398b
--- /dev/null
+++ b/app-antivirus/clamav/files/digest-clamav-0.90.2
@@ -0,0 +1,3 @@
+MD5 39d1f07a399b551b55096b6ec7325c33 clamav-0.90.2.tar.gz 12062886
+RMD160 22daaecb634ca9914f18e85cf3456b544d6bf399 clamav-0.90.2.tar.gz 12062886
+SHA256 30df6a5d4a591dcd4acd7d4cce54dcfd260280fce6bbc9d19d240967bcdabbfa clamav-0.90.2.tar.gz 12062886