Changeset - e96267a91332
[Not reviewed]
default
0 1 3
Nathan Brink (binki) - 16 years ago 2008-11-29 22:30:58
ohnobinki@ohnopublishing.net
Version bump for app-antivirus/clamav-0.94.2
4 files changed with 268 insertions and 1 deletions:
0 comments (0 inline, 0 general)
app-antivirus/clamav/Manifest
Show inline comments
 
AUX clamav-0.94.1-buildfix.patch 845 RMD160 c3b0b524fc5822bb5b50057238e6efdac65efc23 SHA1 890a629a392ed12bad773c2e87c2c043a07048cc SHA256 2e5c90a4ec9f0a0d8667fda620184d336100895c4ef89157ad7e304c6419a214
 
AUX clamav-0.94.1-nls.patch 2429 RMD160 1c2b7a0dcbe3efde5e31f10f49ccdc0283be77e0 SHA1 aedf5fe6546125a5c99d7f488b816fb52bba2387 SHA256 a52a079c12f67569784766aaaf85e77edc3d6083d5a8a689813f4b8384739785
 
AUX clamav-0.94.1-nls.patch 2429 RMD160 d881762f39f71f98b48b5f9bb203e1e1cc515dfd SHA1 376a9ce6155d9f2b66f18779c119fd3914d83852 SHA256 eb6e16997aeebd3c119d31853a043e82fc2d5ab5b0a041b0f950e7dde04ba551
 
AUX clamav-0.94.1rc1-buildfix.patch 837 RMD160 84b017372cf79abb1ef7f32cdb5a52243472a420 SHA1 02c2b58d030097e91e1f3227e2a919d1a8e4afbe SHA256 8b68c3743b6db80367b778f1c6ec290f0b5e46ed08b62e291bc4d62a5f4ad96a
 
AUX clamav-0.94.1rc1-nls.patch 2441 RMD160 67dc09f2dcb4bffcb7109375dce6c4ab377f1867 SHA1 7f407d3b4aab356a014fb2e7638213aa25f6d1f6 SHA256 cd81a3a0e0e39adc5a1a0d8e3e06803fb8de7e8c62cb50ae504ff3ef8a748b6f
 
AUX clamav-0.94.2-buildfix.patch 845 RMD160 54d738e61fcae762c9e1445601845824f29dae2d SHA1 664e3c67af87c7bbd8a96a69ef047e3c2e68202f SHA256 d0353a0d698089e3e7fe29cbc6ac0386affd29d405a40bb4ba44753676762591
 
AUX clamav-0.94.2-buildfix.patch~ 845 RMD160 c3b0b524fc5822bb5b50057238e6efdac65efc23 SHA1 890a629a392ed12bad773c2e87c2c043a07048cc SHA256 2e5c90a4ec9f0a0d8667fda620184d336100895c4ef89157ad7e304c6419a214
 
AUX clamav-0.94.2-nls.patch 2429 RMD160 0b1b54ade225791b3fada186dd60546fb4ebf1b9 SHA1 6368b108ea7932c5f0b75069f89ad861c8285e3b SHA256 0fd8c2a11d56685f88c8fddef446294df5e2c3f123682ebd652a0e948a1a8158
 
AUX clamav-0.94.2-nls.patch~ 2429 RMD160 d881762f39f71f98b48b5f9bb203e1e1cc515dfd SHA1 376a9ce6155d9f2b66f18779c119fd3914d83852 SHA256 eb6e16997aeebd3c119d31853a043e82fc2d5ab5b0a041b0f950e7dde04ba551
 
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
 
@@ -9,7 +13,9 @@ AUX clamd.rc 3686 RMD160 0298ad54c13bb2c
 
AUX lib-ld.m4 3417 RMD160 7b412510e7ef9966f70ed29937e3556283128a9b SHA1 8b72b8f5f76e41e4ca0f2521c06c568490894a84 SHA256 18c4c458009da32c9daf0ea332a539e5edc82ba009b6c2faac004626313f00e5
 
DIST clamav-0.94.1.tar.gz 21817818 RMD160 268d3b4b00c208f8a9aa3bfaa430eb8d22a4bf33 SHA1 8eed11eb68dc6cb15d4bb12de034a4252dc09373 SHA256 15cd3f5ed349f736b9926dd118d0b8edda7d58fe1f73118d4ffd21b3016f5dea
 
DIST clamav-0.94.1rc1.tar.gz 21534700 RMD160 b837748d2e6ef6cc052b386ae326945d8538d0b1 SHA1 01c6a6c7c3bde28948e5e57b6e23939b4b5c742f SHA256 c8aa6ca9fce67ebc5dceb8bc3370132f46cd20d2d0e069882f6b7c25ef44299e
 
DIST clamav-0.94.2.tar.gz 22107637 RMD160 ae75e5f546f96b7fd0f76dcf9f4977ec95ba4dba SHA1 82373d25db8b836fd88b2414df43bb0c7192cced SHA256 1aec7fecff375958d067aceeb9782d3ff0be7c13bed0eecf6240fb089f8d268c
 
EBUILD clamav-0.94.1.ebuild 5277 RMD160 47b1cca419956a461cebfff288c05e319fc93fce SHA1 2ba1d6975c3685a58d7fc79d327a147181a79ba2 SHA256 a6508ed88a33a0276d563bb1e2754c2fc15f5b6e49ae7aa0862e73b64f5a1dbe
 
EBUILD clamav-0.94.1_rc1.ebuild 5277 RMD160 47b1cca419956a461cebfff288c05e319fc93fce SHA1 2ba1d6975c3685a58d7fc79d327a147181a79ba2 SHA256 a6508ed88a33a0276d563bb1e2754c2fc15f5b6e49ae7aa0862e73b64f5a1dbe
 
EBUILD clamav-0.94.2.ebuild 5277 RMD160 47b1cca419956a461cebfff288c05e319fc93fce SHA1 2ba1d6975c3685a58d7fc79d327a147181a79ba2 SHA256 a6508ed88a33a0276d563bb1e2754c2fc15f5b6e49ae7aa0862e73b64f5a1dbe
 
MISC ChangeLog 46988 RMD160 e876395945075dc49b16db0f0d2d4f0d86bb83fa SHA1 8482fbd8b7480b32616265d18fd45557e4caebc5 SHA256 3f400d8adbd5919d969d5893bc64214c21cf2b5b84b0bc67f927c2675562c472
 
MISC metadata.xml 184 RMD160 c37bff1fc1cd7139c91dae9b0fa5082e1d81f153 SHA1 cc0a188d9ad2411e78747326c62dd046bd5413c8 SHA256 d51011aa837db802ef539a1321a4af0a4a00879d475b92fd58f3c01df7320b58
app-antivirus/clamav/clamav-0.94.2.ebuild
Show inline comments
 
new file 100644
 
# 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 $
 

	
 
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}/${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 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 )
 
	dev-libs/gmp
 
	>=sys-libs/zlib-1.2.1-r3
 
	>=sys-apps/sed-4"
 

	
 
DEPEND="${COMMON_DEPEND}
 
	>=dev-util/pkgconfig-0.20
 
	test? ( dev-libs/check >=dev-util/duma-2.5.13 dev-util/valgrind )"
 

	
 
RDEPEND="${COMMON_DEPEND}
 
	selinux? ( sec-policy/selinux-clamav )
 
	sys-apps/grep"
 

	
 
PROVIDE="virtual/antivirus"
 

	
 
#until bug #235581 is cleared up:
 
RESTRICT="test"
 

	
 
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}"
 
	# 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}"/${MY_P}-buildfix.patch
 
	epatch "${FILESDIR}"/${MY_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_enable ipv6) \
 
		$(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
 
}
app-antivirus/clamav/files/clamav-0.94.2-buildfix.patch
Show inline comments
 
new file 100644
 
diff -Naur clamav-0.94.orig/configure.in clamav-0.94.1rc1/configure.in
 
--- clamav-0.94.orig/configure.in	2008-09-01 20:41:06.000000000 +0200
 
+++ clamav-0.94.2/configure.in	2008-09-05 21:09:41.201851168 +0200
 
@@ -556,7 +556,7 @@
 
 
 
 	case "$ac_cv_c_cve_2008_1372" in
 
 	ok|bugged|linkfailed)
 
-		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";
app-antivirus/clamav/files/clamav-0.94.2-nls.patch
Show inline comments
 
new file 100644
 
diff -Naur clamav-0.94.orig/clamav-milter/clamav-milter.c clamav-0.94.1rc1/clamav-milter/clamav-milter.c
 
--- clamav-0.94.2.orig/clamav-milter/clamav-milter.c	2008-09-01 19:19:44.000000000 +0200
 
+++ clamav-0.94.2/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.1rc1/configure.in
 
--- clamav-0.94.orig/configure.in	2008-09-05 21:11:13.672860000 +0200
 
+++ clamav-0.94.2/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.1rc1/shared/getopt.c
 
--- clamav-0.94.orig/shared/getopt.c	2008-08-16 19:18:00.000000000 +0200
 
+++ clamav-0.94.2/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.1rc1/shared/output.c
 
--- clamav-0.94.orig/shared/output.c	2008-08-16 19:18:00.000000000 +0200
 
+++ clamav-0.94.2/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>
 
 
0 comments (0 inline, 0 general)