fix for bug #264852 and bug #264952

(Portage version: 2.1.6.7/cvs/Linux x86_64)

5 files changed, 61 insertions, 7 deletions

diff --git a/app-antivirus/clamav/ChangeLog b/app-antivirus/clamav/ChangeLog
index f5eca4388dae..ff27651e7b96 100644
--- a/app-antivirus/clamav/ChangeLog
+++ b/app-antivirus/clamav/ChangeLog
@@ -1,11 +1,19 @@
 # ChangeLog for app-antivirus/clamav
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/ChangeLog,v 1.325 2009/04/10 07:49:54 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/ChangeLog,v 1.326 2009/04/16 14:28:29 lordvan Exp $
 
   10 Apr 2009; Tobias Scherbaum <dertobi123@gentoo.org> clamav-0.95.ebuild,
   clamav-0.95.1.ebuild:
   Fix soname change ewarn message.
 
+  16 Apr 2009; Thomas Raschbacher <lordvan@gentoo.org>
+  +files/clamav-0.95.1-nls.patch, +files/clamav-0.95-nls.patch,
+  clamav-0.95.ebuild, clamav-0.95.1.ebuild:
+  added patch for NLS on ulibc from Bug #264852 Thanks to Aurélien
+  Francillon <aurelien.francillon@inrialpes.fr>
+  added fix to 0.95.1 for bug #264952 thanks to Robert S
+  <robert.spam.me.senseless@gmail.com>
+
 *clamav-0.95.1 (09 Apr 2009)
 
   09 Apr 2009; Thomas Raschbacher <lordvan@gentoo.org>
diff --git a/app-antivirus/clamav/clamav-0.95.1.ebuild b/app-antivirus/clamav/clamav-0.95.1.ebuild
index 268bd2e354c9..1ee1bec385d1 100644
--- a/app-antivirus/clamav/clamav-0.95.1.ebuild
+++ b/app-antivirus/clamav/clamav-0.95.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.95.1.ebuild,v 1.2 2009/04/10 07:49:54 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.95.1.ebuild,v 1.3 2009/04/16 14:28:29 lordvan Exp $
 
 inherit autotools eutils flag-o-matic fixheadtails multilib versionator
 
@@ -49,6 +49,12 @@ pkg_setup() {
 	enewuser clamav -1 -1 /dev/null clamav
 }
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-nls.patch"
+}
+
 src_compile() {
 	has_version =sys-libs/glibc-2.2* && filter-lfs-flags
 
@@ -108,6 +114,20 @@ src_install() {
 		-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
 		"${D}"/etc/freshclam.conf
 
+	if use milter; then
+	   # And again same for /etc/clamav-milter.conf
+	   # MilterSocket one to include ' /' because there is a 2nd line for
+	   # inet: which we want to leave
+	   sed -i -e "s:^\(Example\):\# \1:" \
+	       -e "s:.*\(PidFile\) .*:\1 /var/run/clamav/clamav-milter.pid:" \
+	       -e "s:^\#\(ClamdSocket\) .*:\1 /var/run/clamav/clamd.sock:" \
+	       -e "s:.*\(User\) .*:\1 clamav:" \
+	       -e "s:^\#\(MilterSocket\) /.*:\1 /var/run/clamav/clamav-milter.sock:" \
+	       -e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
+	       -e "s:^\#\(LogFile\) .*:\1 /var/log/clamav/clamav-milter.log:" \
+	       "${D}"/etc/clamav-milter.conf
+	fi
+
 	if use milter ; then
 		echo "
 START_MILTER=no
diff --git a/app-antivirus/clamav/clamav-0.95.ebuild b/app-antivirus/clamav/clamav-0.95.ebuild
index cb1756121964..bd0ad474d74f 100644
--- a/app-antivirus/clamav/clamav-0.95.ebuild
+++ b/app-antivirus/clamav/clamav-0.95.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.95.ebuild,v 1.3 2009/04/10 07:49:54 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.95.ebuild,v 1.4 2009/04/16 14:28:29 lordvan Exp $
 
 inherit autotools eutils flag-o-matic fixheadtails multilib versionator
 
@@ -39,16 +39,22 @@ 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
+	   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}-nls.patch"
+}
+
 src_compile() {
 	has_version =sys-libs/glibc-2.2* && filter-lfs-flags
 
diff --git a/app-antivirus/clamav/files/clamav-0.95-nls.patch b/app-antivirus/clamav/files/clamav-0.95-nls.patch
new file mode 100644
index 000000000000..8f7f914b818e
--- /dev/null
+++ b/app-antivirus/clamav/files/clamav-0.95-nls.patch
@@ -0,0 +1,10 @@
+--- clamav-0.95/shared/output.c-orig	2009-04-04 10:17:42 +0000
++++ clamav-0.95/shared/output.c	2009-04-04 10:18:30 +0000
+@@ -67,7 +67,7 @@
+ pthread_mutex_t logg_mutex = PTHREAD_MUTEX_INITIALIZER;
+ #endif
+ 
+-#ifdef  C_LINUX
++#if defined(C_LINUX) && defined(HAVE_LIBINTL_H)
+ #include <libintl.h>
+ #include <locale.h>
diff --git a/app-antivirus/clamav/files/clamav-0.95.1-nls.patch b/app-antivirus/clamav/files/clamav-0.95.1-nls.patch
new file mode 100644
index 000000000000..7992b34688e1
--- /dev/null
+++ b/app-antivirus/clamav/files/clamav-0.95.1-nls.patch
@@ -0,0 +1,10 @@
+--- clamav-0.95.1/shared/output.c-orig	2009-04-04 10:17:42 +0000
++++ clamav-0.95.1/shared/output.c	2009-04-04 10:18:30 +0000
+@@ -67,7 +67,7 @@
+ pthread_mutex_t logg_mutex = PTHREAD_MUTEX_INITIALIZER;
+ #endif
+ 
+-#ifdef  C_LINUX
++#if defined(C_LINUX) && defined(HAVE_LIBINTL_H)
+ #include <libintl.h>
+ #include <locale.h>