summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatteo Azzali <mattepiu@gentoo.org>2007-12-30 12:50:18 +0000
committerMatteo Azzali <mattepiu@gentoo.org>2007-12-30 12:50:18 +0000
commit101c2b0777e5fe0a39135e807d8f54f8cdf9f42f (patch)
tree3ff74f8540e0f2822d3f659c4ab90930519bcc92 /app-antivirus/klamav
parentadd a patch from Christian Schoenebeck <cuse@users.sourceforge.net>, bug #203... (diff)
downloadgentoo-2-101c2b0777e5fe0a39135e807d8f54f8cdf9f42f.tar.gz
gentoo-2-101c2b0777e5fe0a39135e807d8f54f8cdf9f42f.tar.bz2
gentoo-2-101c2b0777e5fe0a39135e807d8f54f8cdf9f42f.zip
Version Bump and fix to bug 202694.
(Portage version: 2.1.4_rc11)
Diffstat (limited to 'app-antivirus/klamav')
-rw-r--r--app-antivirus/klamav/ChangeLog9
-rw-r--r--app-antivirus/klamav/files/digest-klamav-0.41.13
-rw-r--r--app-antivirus/klamav/files/klamav-0.41.1-cl_loaddbdir.patch11
-rw-r--r--app-antivirus/klamav/files/klamav-0.41.1-gentempdesc.patch11
-rw-r--r--app-antivirus/klamav/klamav-0.38.ebuild4
-rw-r--r--app-antivirus/klamav/klamav-0.41.1.ebuild36
-rw-r--r--app-antivirus/klamav/klamav-0.41.ebuild4
7 files changed, 73 insertions, 5 deletions
diff --git a/app-antivirus/klamav/ChangeLog b/app-antivirus/klamav/ChangeLog
index 684616aa7d87..659031bff7dd 100644
--- a/app-antivirus/klamav/ChangeLog
+++ b/app-antivirus/klamav/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for app-antivirus/klamav
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/klamav/ChangeLog,v 1.32 2007/05/19 16:52:09 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/klamav/ChangeLog,v 1.33 2007/12/30 12:50:17 mattepiu Exp $
+
+*klamav-0.41.1 (30 Dec 2007)
+
+ 30 Dec 2007; Matteo Azzali <mattepiu@gentoo.org>
+ +files/klamav-0.41.1-cl_loaddbdir.patch,
+ +files/klamav-0.41.1-gentempdesc.patch, +klamav-0.41.1.ebuild:
+ Version Bump.Also fixes bug #202694 .
19 May 2007; nixnut <nixnut@gentoo.org> klamav-0.41.ebuild:
Stable on ppc wrt bug 177728
diff --git a/app-antivirus/klamav/files/digest-klamav-0.41.1 b/app-antivirus/klamav/files/digest-klamav-0.41.1
new file mode 100644
index 000000000000..f708dca8c37a
--- /dev/null
+++ b/app-antivirus/klamav/files/digest-klamav-0.41.1
@@ -0,0 +1,3 @@
+MD5 073c3f223d89016c14bab957230ac3b7 klamav-0.41.1-source.tar.gz 1784785
+RMD160 fa6115453f9e41c9fd03581aaac8073b8309614f klamav-0.41.1-source.tar.gz 1784785
+SHA256 a57609a7948526bcd0f5b104acb77aa41b86263ebb7d9f93cd46443e2c244344 klamav-0.41.1-source.tar.gz 1784785
diff --git a/app-antivirus/klamav/files/klamav-0.41.1-cl_loaddbdir.patch b/app-antivirus/klamav/files/klamav-0.41.1-cl_loaddbdir.patch
new file mode 100644
index 000000000000..202d942b1aff
--- /dev/null
+++ b/app-antivirus/klamav/files/klamav-0.41.1-cl_loaddbdir.patch
@@ -0,0 +1,11 @@
+--- klamav-0.41/src/klammail/clamdmail.c.orig 2007-03-07 11:51:17.000000000 -0100
++++ klamav-0.41/src/klammail/clamdmail.c 2007-03-07 11:50:08.000000000 -0100
+@@ -185,7 +185,7 @@
+ return 50;
+ }
+ }else{
+- if((ret = cl_loaddbdir(cl_retdbdir(), &engine, &no, CL_DB_STDOPT))) {
++ if((ret = cl_loaddbdir(cl_retdbdir(), &engine, &no))) {
+ printf("cl_loaddbdir: %s\n", cl_strerror(ret));
+ close(fd);
+ exit(2);
diff --git a/app-antivirus/klamav/files/klamav-0.41.1-gentempdesc.patch b/app-antivirus/klamav/files/klamav-0.41.1-gentempdesc.patch
new file mode 100644
index 000000000000..f204c953d34d
--- /dev/null
+++ b/app-antivirus/klamav/files/klamav-0.41.1-gentempdesc.patch
@@ -0,0 +1,11 @@
+--- klamav-0.41.1/src/klamd/scanner.c.orig 2007-12-19 10:38:11.000000000 +0100
++++ klamav-0.41.1/src/klamd/scanner.c 2007-12-19 10:43:12.000000000 +0100
+@@ -396,7 +396,7 @@
+
+ logg("*Accepted connection on port %d, fd %d\n", port, acceptd);
+
+- if ((tmpname = cli_gentempdesc(NULL, &tmpd)) == NULL) {
++ if (cli_gentempfd(NULL, &tmpname, &tmpd) != CL_SUCCESS) {
+ shutdown(sockfd, 2);
+ close(sockfd);
+ close(acceptd);
diff --git a/app-antivirus/klamav/klamav-0.38.ebuild b/app-antivirus/klamav/klamav-0.38.ebuild
index c75426318d66..4c61a68b3fba 100644
--- a/app-antivirus/klamav/klamav-0.38.ebuild
+++ b/app-antivirus/klamav/klamav-0.38.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/klamav/klamav-0.38.ebuild,v 1.6 2006/11/05 10:23:29 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/klamav/klamav-0.38.ebuild,v 1.7 2007/12/30 12:50:17 mattepiu Exp $
inherit kde
@@ -23,7 +23,7 @@ need-kde 3.4
src_unpack(){
kde_src_unpack
# Assure a future version won't try to build this.
- rm -rf ${WORKDIR}/${MY_P}/dazuko* || die "We missed to eradicate some files"
+ rm -rf "${WORKDIR}/${MY_P}/dazuko"* || die "We missed to eradicate some files"
}
pkg_postinst(){
diff --git a/app-antivirus/klamav/klamav-0.41.1.ebuild b/app-antivirus/klamav/klamav-0.41.1.ebuild
new file mode 100644
index 000000000000..a5719ccf2d58
--- /dev/null
+++ b/app-antivirus/klamav/klamav-0.41.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/klamav/klamav-0.41.1.ebuild,v 1.1 2007/12/30 12:50:17 mattepiu Exp $
+
+inherit kde
+
+MY_P="${P}-source"
+S="${WORKDIR}/${MY_P}/${P}"
+
+DESCRIPTION="KlamAV is a KDE frontend for the ClamAV antivirus."
+HOMEPAGE="http://klamav.sourceforge.net/"
+SRC_URI="mirror://sourceforge/klamav/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND=">=app-antivirus/clamav-0.90"
+RDEPEND="${DEPEND}"
+
+need-kde 3.4
+
+PATCHES="${FILESDIR}/${P}-cl_loaddbdir.patch
+ ${FILESDIR}/klamav-gentempdesc.patch"
+
+src_unpack(){
+ kde_src_unpack
+ # Assure a future version won't try to build this.
+ rm -rf "${WORKDIR}/${MY_P}/dazuko"* || die "We missed to eradicate some files"
+}
+
+pkg_postinst(){
+ elog "The on-access scanning functionality is provided by"
+ elog "the Dazuko kernel module: emerge sys-fs/dazuko"
+}
diff --git a/app-antivirus/klamav/klamav-0.41.ebuild b/app-antivirus/klamav/klamav-0.41.ebuild
index 4bab7a17f9b1..1640c0ff52a5 100644
--- a/app-antivirus/klamav/klamav-0.41.ebuild
+++ b/app-antivirus/klamav/klamav-0.41.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/klamav/klamav-0.41.ebuild,v 1.7 2007/05/19 16:52:09 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/klamav/klamav-0.41.ebuild,v 1.8 2007/12/30 12:50:17 mattepiu Exp $
inherit kde
@@ -26,7 +26,7 @@ PATCHES="${FILESDIR}/${P}-cl_loaddbdir.patch"
src_unpack(){
kde_src_unpack
# Assure a future version won't try to build this.
- rm -rf ${WORKDIR}/${MY_P}/dazuko* || die "We missed to eradicate some files"
+ rm -rf "${WORKDIR}/${MY_P}/dazuko"* || die "We missed to eradicate some files"
}
pkg_postinst(){