summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo Chatzimichos <tampakrap@gentoo.org>2009-06-09 12:39:35 +0000
committerTheo Chatzimichos <tampakrap@gentoo.org>2009-06-09 12:39:35 +0000
commita640cb365085c0ab5a26c277e10a40edff195b41 (patch)
treeb18b2c1a9147ad745a674da8f6cee8d24f64d762 /app-antivirus
parentSparc stable, part of Bug #273294. (diff)
downloadhistorical-a640cb365085c0ab5a26c277e10a40edff195b41.tar.gz
historical-a640cb365085c0ab5a26c277e10a40edff195b41.tar.bz2
historical-a640cb365085c0ab5a26c277e10a40edff195b41.zip
Remove old ones, slot change to 3.5
Package-Manager: portage-2.2_rc33/cvs/Linux x86_64
Diffstat (limited to 'app-antivirus')
-rw-r--r--app-antivirus/klamav/ChangeLog9
-rw-r--r--app-antivirus/klamav/Manifest19
-rw-r--r--app-antivirus/klamav/files/klamav-0.41-cl_loaddbdir.patch11
-rw-r--r--app-antivirus/klamav/files/klamav-0.42-clamav093.patch91
-rw-r--r--app-antivirus/klamav/files/klamav-clamav094.patch14
-rw-r--r--app-antivirus/klamav/klamav-0.42.ebuild54
-rw-r--r--app-antivirus/klamav/klamav-0.44.ebuild54
-rw-r--r--app-antivirus/klamav/klamav-0.45.ebuild49
-rw-r--r--app-antivirus/klamav/klamav-0.46.ebuild4
9 files changed, 15 insertions, 290 deletions
diff --git a/app-antivirus/klamav/ChangeLog b/app-antivirus/klamav/ChangeLog
index 7704487a4a67..fd3fba6e6556 100644
--- a/app-antivirus/klamav/ChangeLog
+++ b/app-antivirus/klamav/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for app-antivirus/klamav
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/klamav/ChangeLog,v 1.59 2009/05/23 10:27:09 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/klamav/ChangeLog,v 1.60 2009/06/09 12:39:35 tampakrap Exp $
+
+ 09 Jun 2009; Theo Chatzimichos <tampakrap@gentoo.org>
+ -files/klamav-0.41-cl_loaddbdir.patch, -klamav-0.44.ebuild,
+ -files/klamav-clamav094.patch, -klamav-0.42.ebuild,
+ -files/klamav-0.42-clamav093.patch, -klamav-0.45.ebuild,
+ klamav-0.46.ebuild:
+ Remove old ones, change slot to 3.5
23 May 2009; Markus Meier <maekke@gentoo.org> klamav-0.46.ebuild:
amd64 stable, bug #265545
diff --git a/app-antivirus/klamav/Manifest b/app-antivirus/klamav/Manifest
index 502680c2604b..cabd40ac0988 100644
--- a/app-antivirus/klamav/Manifest
+++ b/app-antivirus/klamav/Manifest
@@ -1,24 +1,15 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-AUX klamav-0.41-cl_loaddbdir.patch 653 RMD160 5130f329a36e2f38c3e5b8a5d84bd47940597084 SHA1 6a3b9f2a61e91eeaf06f17c1805f5209123c8589 SHA256 d6931d5840f1f45e623b53868bce9971397cbce88dea86342e15b350c303bfcd
-AUX klamav-0.42-clamav093.patch 4995 RMD160 bd8c88b62114a75180370cbb18b80b51b672db8a SHA1 499a7bc5b29455cf073a2576ec9dbd428bf024bf SHA256 9ab0ccbd7b714bdb7f93ebd16350a01cc47f2ff8c19f0e30909f1263b1a698b7
AUX klamav-0.43-desktop-entry.diff 742 RMD160 e9466d6730f1c850a68ed60a20b6a2f2c46a53cf SHA1 1be211ff6c77dd4f9e5733d6dce66f4e0412711c SHA256 54b48efd0fac7abcf4335a8fcb17c868b06134e9467e8e5c79d213bf3ac199b2
-AUX klamav-clamav094.patch 623 RMD160 e2905e3fdf2f1f9f5f1eca2fe27d88c3ef5bd0fc SHA1 cf3ead163b38912344da224267902d5924fbc202 SHA256 b2fa9dc687d2697d9dce9ef3a5aa98a095071c790b4387071ae0279a077996c0
-DIST klamav-0.42-source.tar.gz 1920149 RMD160 75171ac0a35df29fd97132b1ecd2f345c671884f SHA1 122b439d03d29332286610aa9cf4052fb6f0d407 SHA256 3dd03c802a24d0fe033bdd7f27ec77b2fd5c9aedf18ebec30cee801e36966ca7
-DIST klamav-0.44-source.tar.gz 2029215 RMD160 2490fcadfa271ff31cbae176d79b9c7a867aaa21 SHA1 571df2430af8f3d2f16ac28e2e9d85180b5bd45e SHA256 6427bd94b33ff23d78c5edd3ef6340229d1478ee683b92b9171487f3e4f8fc6a
-DIST klamav-0.45-source.tar.gz 2056282 RMD160 13d7fbe109964c1d9c08e7c6ebdae1bb1d8133f2 SHA1 c7fa6948115a7744fd0d7d3998011c2f582b2d03 SHA256 f56420165f1583dc4092b7b7dd5beeee218b66930f9ee42586d3cc08332836a6
DIST klamav-0.46-source.tar.gz 2058031 RMD160 8d8fb9cb05d10c5f68ca14d0fb5df9ea6ad230c1 SHA1 37fd30c67d8e7c0b90a308dfc9960154c91a0e88 SHA256 b39b3c8df613272e2dc5120d409d947f1250262318fc659efd4b93a8a3f90079
-EBUILD klamav-0.42.ebuild 1465 RMD160 4260ee084207bbe64201039b8c4667d0fe21f893 SHA1 505e681257c2162d37142d1f3de845d0a0d7e377 SHA256 85eb7e1e8983bca972dcb4be9e0f5abe5d53e8da6d2402464c196c04a34ed182
-EBUILD klamav-0.44.ebuild 1353 RMD160 11e47d34c746ce564219633a7dd4bca47c09d56a SHA1 f7757b160558f44d27363a7eeb52189426c31894 SHA256 aa424935248a2e56df8e671996b0fe7e7c69e4a8c2681e1bcade28394d4d2663
-EBUILD klamav-0.45.ebuild 1178 RMD160 ff0105311b9df66d5d719e45687a3434e4916c80 SHA1 1f4376716bc14c8d7e8f601875e46bd0ce0bff8f SHA256 92860ca08e0b98e23bc84a26621a398decee9a2c03fb09db4226a49eeacde758
-EBUILD klamav-0.46.ebuild 1174 RMD160 61a7287d8166b0f8f2d7dcd12b597fbc0df8d023 SHA1 b1f9254c5421340d9bc94e49683029dd3b94ce29 SHA256 1030292191d5ba4c4cb732d19648ad666a621cd72249eebdc7cf21c6b9a15725
-MISC ChangeLog 8078 RMD160 0dcf4d948007bba08428a9ff8b61aee563767963 SHA1 f285799c1cb7575c2887cd89bf06f4ef73f8d392 SHA256 5bafd90c7943ea24378503a60d1d649a00b7cfd0d93519aa0f7200142c2c3091
+EBUILD klamav-0.46.ebuild 1179 RMD160 5b6b8ff300ca212dec705fff31e0dd0b312347a9 SHA1 235b1d7343a825fb688b22c7d44f323b0cd5499b SHA256 9c5a9338488858659ead5429f9e3b7edbebb97a1298e2c7ca5e391e72a102498
+MISC ChangeLog 8373 RMD160 6282904370f226670eed0a10c4fa45e3b819874e SHA1 e1c13913fa7fb7bde3c5502c17a2aea90e192128 SHA256 f2c0b11dd11ee31b805559718c19e41292f6d2917065d0a26cf628912421dadf
MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.11 (GNU/Linux)
-iEYEARECAAYFAkoXz5EACgkQkKaRLQcq0GJhogCfXLeS/g40gcfNBa5RUXif6v8p
-DZMAnRJRhyfcGlHbQdvE+FicwJ31SGUp
-=nD+M
+iEYEARECAAYFAkouZPIACgkQjDdoMVfcAHgmkwCg1YUlTYaFhyWtgfYj6E0H+QNG
+J0kAoKaMP6KbPxCwBkKIWdPgE0H8H2nT
+=Io6J
-----END PGP SIGNATURE-----
diff --git a/app-antivirus/klamav/files/klamav-0.41-cl_loaddbdir.patch b/app-antivirus/klamav/files/klamav-0.41-cl_loaddbdir.patch
deleted file mode 100644
index 202d942b1aff..000000000000
--- a/app-antivirus/klamav/files/klamav-0.41-cl_loaddbdir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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.42-clamav093.patch b/app-antivirus/klamav/files/klamav-0.42-clamav093.patch
deleted file mode 100644
index c4f81ad07042..000000000000
--- a/app-antivirus/klamav/files/klamav-0.42-clamav093.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-diff -ur klamav-0.42/src/klammail/cfgparser.c klamav-0.42-clamav093/src/klammail/cfgparser.c
---- klamav-0.42/src/klammail/cfgparser.c 2008-01-06 17:00:35.000000000 +0100
-+++ klamav-0.42-clamav093/src/klammail/cfgparser.c 2008-03-28 07:00:26.000000000 +0100
-@@ -63,10 +63,10 @@
- {"ScanOLE2", OPT_NOARG},
- {"ScanArchive", OPT_NOARG},
- {"ScanRAR", OPT_NOARG},
-- {"ArchiveMaxFileSize", OPT_COMPSIZE},
-- {"ArchiveMaxRecursion", OPT_NUM},
-- {"ArchiveMaxFiles", OPT_NUM},
-- {"ArchiveMaxCompressionRatio", OPT_NUM},
-+ {"MaxScanSize", OPT_COMPSIZE},
-+ {"MaxFileSize", OPT_COMPSIZE},
-+ {"MaxRecursion", OPT_NUM},
-+ {"MaxFiles", OPT_NUM},
- {"ArchiveLimitMemoryUsage", OPT_NOARG},
- {"ArchiveBlockEncrypted", OPT_NOARG},
- {"DataDirectory", OPT_STR}, /* obsolete */
-diff -ur klamav-0.42/src/klammail/clamdmail.c klamav-0.42-clamav093/src/klammail/clamdmail.c
---- klamav-0.42/src/klammail/clamdmail.c 2008-01-06 17:00:35.000000000 +0100
-+++ klamav-0.42-clamav093/src/klammail/clamdmail.c 2008-03-28 07:10:31.000000000 +0100
-@@ -151,14 +151,14 @@
- while((bytes = read(0, buff, BUFFSIZE)) > 0) {
-
- if(write(fd, buff, bytes) != bytes) {
-- cli_dbgmsg("clamdmail -> Can't write() file.\n");
-+ printf("clamdmail -> Can't write() file.\n");
- close(fd);
- return CL_EMEM;
- }
- }
-
- if(fsync(fd) == -1) {
-- cli_dbgmsg("fsync() failed for descriptor %d\n", fd);
-+ printf("fsync() failed for descriptor %d\n", fd);
- close(fd);
- return CL_EFSYNC;
- }
-@@ -202,13 +202,12 @@
- /* set up archive limits */
- memset(&limits, 0, sizeof(struct cl_limits));
- limits.maxfiles = 1000; /* max files */
-- limits.maxfilesize = 10 * 1048576; /* maximum size of archived/compressed
-+ limits.maxfilesize = 10 * 1048576; /* maximum size of
- * file (files exceeding this limit
- * will be ignored)
- */
-- limits.maxreclevel = 5; /* maximum recursion level for archives */
-- limits.maxmailrec = 64; /* maximum recursion level for mail files */
-- limits.maxratio = 200; /* maximum compression ratio */
-+ limits.maxreclevel = 5; /* maximum recursion level for archives and mail files */
-+ limits.maxscansize = 200 * limits.maxfilesize; /* maximum compression ratio */
-
- ret = cl_scandesc(fd, &virname, &size, engine, &limits, CL_SCAN_STDOPT | CL_ARCHIVE | CL_MAIL | CL_OLE2 | CL_SCAN_HTML);
-
-@@ -368,7 +367,7 @@
- while((bytes = read(fd, buff, BUFFSIZE)) > 0) {
-
- if(write(1, buff, bytes) != bytes) {
-- cli_dbgmsg("clamdmail -> Can't write() file.\n");
-+ printf("clamdmail -> Can't write() file.\n");
- close(fd);
- return CL_EMEM;
- }
-diff -ur klamav-0.42/src/scanviewer.cpp klamav-0.42-clamav093/src/scanviewer.cpp
---- klamav-0.42/src/scanviewer.cpp 2008-01-06 17:00:35.000000000 +0100
-+++ klamav-0.42-clamav093/src/scanviewer.cpp 2008-03-28 07:00:26.000000000 +0100
-@@ -393,18 +393,18 @@
- options += "--max-files=" + QString("%1").arg(KlamavConfig::noFilesToExtract()) + " ";
-
- if (KlamavConfig::mBsToExtract() > 0)
-- options += "--max-space=" + QString("%1").arg(KlamavConfig::mBsToExtract()) + " ";
-+ options += "--max-filesize=" + QString("%1").arg(KlamavConfig::mBsToExtract()) + " ";
-
-- if (KlamavConfig::compressionRatio() > 0)
-- options += "--max-ratio=" + QString("%1").arg(KlamavConfig::compressionRatio()) + " ";
-+ if (KlamavConfig::mBsToExtract() > 0 && KlamavConfig::compressionRatio() > 0)
-+ options += "--max-scansize=" + QString("%1").arg(KlamavConfig::mBsToExtract() * KlamavConfig::compressionRatio()) + " ";
-
- if (KlamavConfig::recursionLevel() > 0)
- options += "--max-recursion=" + QString("%1").arg(KlamavConfig::recursionLevel()) + " ";
-
-
- //config->setGroup("Klamscan");
-- if (KlamavConfig::virusLimitsExceeded())
-- options += "--block-max ";
-+// if (KlamavConfig::virusLimitsExceeded())
-+// options += "--block-max ";
-
- if (KlamavConfig::virusEncrypted())
- options += "--block-encrypted ";
diff --git a/app-antivirus/klamav/files/klamav-clamav094.patch b/app-antivirus/klamav/files/klamav-clamav094.patch
deleted file mode 100644
index 5131cf911375..000000000000
--- a/app-antivirus/klamav/files/klamav-clamav094.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ur klamav-0.44/src/klammail/clamdmail.c klamav-0.44-clamav094/src/klammail/clamdmail.c
---- klamav-0.44/src/klammail/clamdmail.c 2008-07-06 14:05:39.000000000 +0200
-+++ klamav-0.44-clamav094/src/klammail/clamdmail.c 2008-09-06 13:51:46.000000000 +0200
-@@ -160,7 +160,8 @@
- if(fsync(fd) == -1) {
- // cli_dbgmsg("fsync() failed for descriptor %d\n", fd);
- close(fd);
-- return CL_EFSYNC;
-+// return CL_EFSYNC;
-+ return CL_EIO;
- }
-
- close(fd);
-
diff --git a/app-antivirus/klamav/klamav-0.42.ebuild b/app-antivirus/klamav/klamav-0.42.ebuild
deleted file mode 100644
index 0021688202ba..000000000000
--- a/app-antivirus/klamav/klamav-0.42.ebuild
+++ /dev/null
@@ -1,54 +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/klamav/klamav-0.42.ebuild,v 1.9 2008/09/06 15:19:41 keytoaster 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/${PN}/${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.5
-
-PATCHES=( "${FILESDIR}/${PN}-0.41-cl_loaddbdir.patch" )
-
-src_unpack(){
- kde_src_unpack
-
- # Make things work with clamav versions >= 0.93. Fixes bug 219021.
- if has_version '>=app-antivirus/clamav-0.93' ; then
- epatch "${FILESDIR}/${P}-clamav093.patch"
- fi
-
- # Fix compiliaton error with >=clamav-0.94, bug #236838
- if has_version '>=app-antivirus/clamav-0.94' ; then
- epatch "${FILESDIR}/klamav-clamav094.patch"
- fi
-
- # Assure a future version won't try to build this.
- rm -rf "${WORKDIR}/${MY_P}/dazuko"* || die "We missed to eradicate some files"
-
- rm -f "${S}"/configure
-}
-
-src_compile(){
- # Disable updates from the GUI. We have package managers for that. cf. bug 171414
- myconf="--with-disableupdates"
- kde_src_compile
-}
-
-pkg_postinst(){
- elog "The on-access scanning functionality is provided by"
- elog "the Dazuko kernel module. To use it, install sys-fs/dazuko."
-}
diff --git a/app-antivirus/klamav/klamav-0.44.ebuild b/app-antivirus/klamav/klamav-0.44.ebuild
deleted file mode 100644
index dbf7ced59e31..000000000000
--- a/app-antivirus/klamav/klamav-0.44.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/klamav/klamav-0.44.ebuild,v 1.7 2009/02/25 12:50:01 josejx Exp $
-
-ARTS_REQUIRED="never"
-
-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/${PN}/${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.5
-
-src_unpack(){
- kde_src_unpack
-
- # Fix .desktop entry.
- epatch "${FILESDIR}/klamav-0.43-desktop-entry.diff"
-
- # Fix compiliaton error with >=clamav-0.94, bug #236838
- if has_version '>=app-antivirus/clamav-0.94' ; then
- epatch "${FILESDIR}/klamav-clamav094.patch"
- fi
-
- # Assure a future version won't try to build this.
- rm -rf "${WORKDIR}/${MY_P}/dazuko"* || die "We missed to eradicate some files"
-
- rm -f "${S}"/configure
-}
-
-src_compile(){
- # Disable updates from the GUI. We have package managers for that. cf. bug 171414
- myconf="--with-disableupdates"
- kde_src_compile
-}
-
-pkg_postinst(){
- kde_pkg_postinst
-
- elog "The on-access scanning functionality is provided by"
- elog "the Dazuko kernel module. To use it, install sys-fs/dazuko."
-}
diff --git a/app-antivirus/klamav/klamav-0.45.ebuild b/app-antivirus/klamav/klamav-0.45.ebuild
deleted file mode 100644
index 3767d6b4cc82..000000000000
--- a/app-antivirus/klamav/klamav-0.45.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/klamav/klamav-0.45.ebuild,v 1.1 2009/02/22 13:35:43 carlo Exp $
-
-ARTS_REQUIRED="never"
-
-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/${PN}/${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.5
-
-PATCHES=(
- "${FILESDIR}/klamav-0.43-desktop-entry.diff"
- )
-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 -f "${S}"/configure
-}
-
-src_compile(){
- # Disable updates from the GUI. We have package managers for that. cf. bug 171414
- myconf="--with-disableupdates"
- kde_src_compile
-}
-
-pkg_postinst(){
- kde_pkg_postinst
-
- elog "The on-access scanning functionality is provided by"
- elog "the Dazuko kernel module. To use it, install sys-fs/dazuko."
-}
diff --git a/app-antivirus/klamav/klamav-0.46.ebuild b/app-antivirus/klamav/klamav-0.46.ebuild
index 1d4bd115630b..4bd6b4cab900 100644
--- a/app-antivirus/klamav/klamav-0.46.ebuild
+++ b/app-antivirus/klamav/klamav-0.46.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/klamav/klamav-0.46.ebuild,v 1.5 2009/05/23 10:27:09 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/klamav/klamav-0.46.ebuild,v 1.6 2009/06/09 12:39:35 tampakrap Exp $
ARTS_REQUIRED="never"
@@ -14,7 +14,7 @@ HOMEPAGE="http://klamav.sourceforge.net/"
SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
LICENSE="GPL-2"
-SLOT="0"
+SLOT="3.5"
KEYWORDS="amd64 ppc ppc64 sparc x86"
IUSE=""