summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app-antivirus/clamav/ChangeLog10
-rw-r--r--app-antivirus/clamav/Manifest11
-rw-r--r--app-antivirus/clamav/clamav-0.93.3.ebuild145
-rw-r--r--app-antivirus/clamav/clamav-0.94.2.ebuild (renamed from app-antivirus/clamav/clamav-0.94.ebuild)34
-rw-r--r--app-antivirus/clamav/files/clamav-0.93-buildfix.patch21
-rw-r--r--app-antivirus/clamav/files/clamav-0.93-nls.patch72
-rw-r--r--app-antivirus/clamav/files/clamav-0.94-buildfix.patch21
7 files changed, 37 insertions, 277 deletions
diff --git a/app-antivirus/clamav/ChangeLog b/app-antivirus/clamav/ChangeLog
index a38e1ac1a501..b5e7f4c199f3 100644
--- a/app-antivirus/clamav/ChangeLog
+++ b/app-antivirus/clamav/ChangeLog
@@ -1,6 +1,14 @@
# 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.315 2008/11/15 17:54:00 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/ChangeLog,v 1.316 2008/11/28 22:26:30 dertobi123 Exp $
+
+*clamav-0.94.2 (28 Nov 2008)
+
+ 28 Nov 2008; Tobias Scherbaum <dertobi123@gentoo.org>
+ -files/clamav-0.93-buildfix.patch, -files/clamav-0.93-nls.patch,
+ -files/clamav-0.94-buildfix.patch, -clamav-0.93.3.ebuild,
+ -clamav-0.94.ebuild, +clamav-0.94.2.ebuild:
+ Cleanup; Version bump, fixes bug #248798
15 Nov 2008; Tobias Scherbaum <dertobi123@gentoo.org>
clamav-0.94.1.ebuild:
diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest
index 702b26aacde1..0dece631128d 100644
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@@ -1,6 +1,3 @@
-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-0.94.1-buildfix.patch 845 RMD160 c3b0b524fc5822bb5b50057238e6efdac65efc23 SHA1 890a629a392ed12bad773c2e87c2c043a07048cc SHA256 2e5c90a4ec9f0a0d8667fda620184d336100895c4ef89157ad7e304c6419a214
AUX clamav-milter.README.gentoo 1124 RMD160 4fb1e2d9b444874838bcea1071969ca6862fb15b SHA1 0b9b86a0e7732eaaf7f880859265754f7a4efd3a SHA256 5e7b142b68964bc3463b077e5698fa77cace45ea9612258b1e1849cee944dd11
@@ -8,11 +5,9 @@ AUX clamav.logrotate 355 RMD160 f59cd8ce96da8210aa858ee59ee3b6940e3253a6 SHA1 5f
AUX clamd.conf 234 RMD160 b517b05e587637cbdd443f7ca3625d582e32722f SHA1 564b1e2f6cf85567f69f2e20cbc942967fa6304b SHA256 17bf4fe3596dc5b145e4163d85181e2edcaa214df3cf9072d852ba0e7a569891
AUX clamd.rc 3686 RMD160 0298ad54c13bb2c9d2e667270546308dbc581d7d SHA1 22299bf3a4812afbf45b792c55bc31c552fe12df SHA256 0f68262e6c55883d2f32cfdbbfeb33f64fc9c4bf019f59ae6b7bc864fa2d346c
AUX lib-ld.m4 3417 RMD160 7b412510e7ef9966f70ed29937e3556283128a9b SHA1 8b72b8f5f76e41e4ca0f2521c06c568490894a84 SHA256 18c4c458009da32c9daf0ea332a539e5edc82ba009b6c2faac004626313f00e5
-DIST clamav-0.93.3.tar.gz 18242568 RMD160 8379148790cc545c801709d46b7db87634f43f67 SHA1 01240613b639144fa8fa655825f6587e044a1c1c SHA256 7aa98796671dfe3db5a20e25669404c4e4461d2a6c77de352edf99f2c989e500
DIST clamav-0.94.1.tar.gz 21817818 RMD160 268d3b4b00c208f8a9aa3bfaa430eb8d22a4bf33 SHA1 8eed11eb68dc6cb15d4bb12de034a4252dc09373 SHA256 15cd3f5ed349f736b9926dd118d0b8edda7d58fe1f73118d4ffd21b3016f5dea
-DIST clamav-0.94.tar.gz 20509228 RMD160 598561b76b1e4ee14120388ba1bbdcac5ac7bfe5 SHA1 d69a0c462ac3ef55329384f8e136d9b7bc1b8ec5 SHA256 ae188c18936ea9154eb6a85ea553c29f4349ee3e95457055fae5fe1b981af602
-EBUILD clamav-0.93.3.ebuild 4287 RMD160 edd95891a2a9e861bf542ec4ff907e9380457839 SHA1 11d6c62cd85304d5f8674835db25046e2408af5f SHA256 08a038108585615abc0ff9592b0d57c3810bb7b01217df3b2c205bb4f6bffd92
+DIST clamav-0.94.2.tar.gz 22107637 RMD160 ae75e5f546f96b7fd0f76dcf9f4977ec95ba4dba SHA1 82373d25db8b836fd88b2414df43bb0c7192cced SHA256 1aec7fecff375958d067aceeb9782d3ff0be7c13bed0eecf6240fb089f8d268c
EBUILD clamav-0.94.1.ebuild 5167 RMD160 15748d0d4e646258e24a76598896dcdc1d0ba1ae SHA1 0cca0f3412deb34d5b66dc1420cc7545b4fe9d15 SHA256 b352ee414341a8ebce79c9afd20633b361674ef016b916b5bd8e77235a54a13a
-EBUILD clamav-0.94.ebuild 4354 RMD160 f3395a086600adce3b9425fccfb0dbd086d56674 SHA1 6fd48a8fab039a99d18e55721d09db16ed155905 SHA256 c8c9e66dd7f8b3344652a9b3339432938dff8286ce2f45f0a3e827732ac7ce05
-MISC ChangeLog 48063 RMD160 fd2cd575f5bda5d36783a0746f2de60487b97f15 SHA1 b021ee4fbf3911c83b6dd2f43f267476b79cfbff SHA256 6b856a54e31209bd5c77de8e31b1da315c8c72aab99b00db03ecbbdf0c5d4755
+EBUILD clamav-0.94.2.ebuild 5180 RMD160 346dc48a47fba26b25bca613ccb45f325d3e244f SHA1 edbec3b43e850f5671a3b5003614cb73cbcbadf7 SHA256 08c466e24a9a9f8343ed1cf2ca228ca85a96a3842cffe9eb558123f1edc6ec84
+MISC ChangeLog 48366 RMD160 84df753f2e58dbfe63f2865173bab5085d024967 SHA1 f82816e7c82528b390152331ac93f53149ad7a67 SHA256 f94f1b6bcf5fcdff604809cb3761b1278b3a8fa542bd4a9b3d24f6e4d9b28538
MISC metadata.xml 184 RMD160 c37bff1fc1cd7139c91dae9b0fa5082e1d81f153 SHA1 cc0a188d9ad2411e78747326c62dd046bd5413c8 SHA256 d51011aa837db802ef539a1321a4af0a4a00879d475b92fd58f3c01df7320b58
diff --git a/app-antivirus/clamav/clamav-0.93.3.ebuild b/app-antivirus/clamav/clamav-0.93.3.ebuild
deleted file mode 100644
index 80d0515c57f6..000000000000
--- a/app-antivirus/clamav/clamav-0.93.3.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# 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.93.3.ebuild,v 1.6 2008/07/22 16:52:31 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}"/${PN}-0.93-buildfix.patch
- epatch "${FILESDIR}"/${PN}-0.93-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.93."
- 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/clamav-0.94.ebuild b/app-antivirus/clamav/clamav-0.94.2.ebuild
index ab4c26db64f5..d242d5773b9c 100644
--- a/app-antivirus/clamav/clamav-0.94.ebuild
+++ b/app-antivirus/clamav/clamav-0.94.2.ebuild
@@ -1,30 +1,34 @@
# 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.10 2008/09/13 22:48:04 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.94.2.ebuild,v 1.1 2008/11/28 22:26:30 dertobi123 Exp $
-inherit autotools eutils flag-o-matic fixheadtails multilib
+inherit autotools eutils flag-o-matic fixheadtails multilib versionator
+
+# for when rc1 is appended to release candidates:
+MY_PV=$(replace_version_separator 3 '');
+MY_P="${PN}-${MY_PV}"
+S="${WORKDIR}/${MY_P}"
DESCRIPTION="Clam Anti-Virus Scanner"
HOMEPAGE="http://www.clamav.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${MY_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 test"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="bzip2 crypt iconv mailwrapper milter nls selinux ipv6"
COMMON_DEPEND="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 )
- test? ( dev-libs/check )
dev-libs/gmp
>=sys-libs/zlib-1.2.1-r3
>=sys-apps/sed-4"
DEPEND="${COMMON_DEPEND}
- dev-util/pkgconfig"
+ >=dev-util/pkgconfig-0.20"
RDEPEND="${COMMON_DEPEND}
selinux? ( sec-policy/selinux-clamav )
@@ -32,6 +36,8 @@ RDEPEND="${COMMON_DEPEND}
PROVIDE="virtual/antivirus"
+RESTRICT="test"
+
pkg_setup() {
if use milter; then
if [ ! -e /usr/$(get_libdir)/libmilter.a ] ; then
@@ -47,8 +53,17 @@ pkg_setup() {
src_unpack() {
unpack ${A}
cd "${S}"
- epatch "${FILESDIR}"/${P}-buildfix.patch
- epatch "${FILESDIR}"/${P}-nls.patch
+ # This newer version of ClamAV packages libtool.m4 and lt*.m4 in m4,
+ # while previous versions did not.
+ # Since autoreconf invokes libtoolize, a different version of ltmain.sh that doesn't
+ # match up with the version of the *.m4 files gets thrown into this directory.
+ # This problem showed up for me in the packages libtool's use of $ECHO while my
+ # system's libtool's instead used $echo internally, and the .m4 file provides the value of
+ # $echo or $ECHO.
+ einfo "removing possibly incompatible libtool-related m4 files"
+ rm m4/libtool.m4 m4/lt*.m4 || die "unable to remove possibly incompatible libtool-related m4 files"
+ epatch "${FILESDIR}"/${PN}-0.94.1-buildfix.patch
+ epatch "${FILESDIR}"/${PN}-0.94-nls.patch
# If nls flag is disabled, gettext may not be available, but eautoreconf
# needs this file (bug #218892).
@@ -77,6 +92,7 @@ src_compile() {
econf ${myconf} \
$(use_enable bzip2) \
$(use_enable nls) \
+ $(use_enable ipv6) \
$(use_with iconv) \
--disable-experimental \
--with-dbdir=/var/lib/clamav || die
diff --git a/app-antivirus/clamav/files/clamav-0.93-buildfix.patch b/app-antivirus/clamav/files/clamav-0.93-buildfix.patch
deleted file mode 100644
index 803a053f85b3..000000000000
--- a/app-antivirus/clamav/files/clamav-0.93-buildfix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -uNr clamav-0.93.orig/configure.in clamav-0.93/configure.in
---- clamav-0.93.orig/configure.in 2008-04-17 18:40:31.041851000 +0200
-+++ clamav-0.93/configure.in 2008-04-17 18:42:42.922065687 +0200
-@@ -387,7 +387,7 @@
- LDFLAGS="$save_LDFLAGS"
- if test "$HAVE_LIBBZ2" = "yes"; then
- AC_CHECK_HEADER([bzlib.h],
-- [LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS $LTLIBBZ2";
-+ [LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lbz2";
- AC_DEFINE([HAVE_BZLIB_H],1,[have bzip2])],
- [AC_MSG_WARN([****** bzip2 support disabled])])
- else
-@@ -498,7 +498,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.93-nls.patch b/app-antivirus/clamav/files/clamav-0.93-nls.patch
deleted file mode 100644
index d2bc7ddc76fe..000000000000
--- a/app-antivirus/clamav/files/clamav-0.93-nls.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff -burN clamav-0.93/clamav-milter/clamav-milter.c clamav-0.93-nls/clamav-milter/clamav-milter.c
---- clamav-0.93/clamav-milter/clamav-milter.c 2008-04-09 17:39:18.000000000 +0200
-+++ clamav-0.93-nls/clamav-milter/clamav-milter.c 2008-04-14 18:31:36.000000000 +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>
-@@ -713,7 +715,7 @@
- else
- progname = "clamav-milter";
-
--#ifdef C_LINUX
-+#ifdef ENABLE_NLS
- setlocale(LC_ALL, "");
- bindtextdomain(progname, DATADIR"/clamav-milter/locale");
- textdomain(progname);
-diff -burN clamav-0.93/configure.in clamav-0.93-nls/configure.in
---- clamav-0.93/configure.in 2008-04-09 17:40:33.000000000 +0200
-+++ clamav-0.93-nls/configure.in 2008-04-14 18:31:36.000000000 +0200
-@@ -399,6 +399,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([dns],
- AC_HELP_STRING([--disable-dns], [disable support for database verification through DNS]),
- [want_dns=$enableval], [want_dns=yes]
-diff -burN clamav-0.93/shared/getopt.c clamav-0.93-nls/shared/getopt.c
---- clamav-0.93/shared/getopt.c 2008-03-06 19:41:02.000000000 +0100
-+++ clamav-0.93-nls/shared/getopt.c 2008-04-14 18:31:36.000000000 +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 -burN clamav-0.93/shared/output.c clamav-0.93-nls/shared/output.c
---- clamav-0.93/shared/output.c 2008-03-06 19:41:02.000000000 +0100
-+++ clamav-0.93-nls/shared/output.c 2008-04-14 18:31:36.000000000 +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>
-
diff --git a/app-antivirus/clamav/files/clamav-0.94-buildfix.patch b/app-antivirus/clamav/files/clamav-0.94-buildfix.patch
deleted file mode 100644
index 0b140b246d1d..000000000000
--- a/app-antivirus/clamav/files/clamav-0.94-buildfix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-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";