Fix compilation error with >=clamav-0.94, bug #236838

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.25-gentoo-r7 x86_64

5 files changed, 45 insertions, 6 deletions

diff --git a/app-antivirus/klamav/ChangeLog b/app-antivirus/klamav/ChangeLog
index 3b4b88c47e67..2677462a2eaf 100644
--- a/app-antivirus/klamav/ChangeLog
+++ b/app-antivirus/klamav/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-antivirus/klamav
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/klamav/ChangeLog,v 1.47 2008/08/22 18:40:00 tgurr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/klamav/ChangeLog,v 1.48 2008/09/06 15:19:41 keytoaster Exp $
+
+  06 Sep 2008; Tobias Heinlein <keytoaster@gentoo.org>
+  +files/klamav-clamav094.patch, klamav-0.42.ebuild, klamav-0.44.ebuild:
+  Fix compilation error with >=clamav-0.94, bug #236838
 
 *klamav-0.44 (22 Aug 2008)
 
diff --git a/app-antivirus/klamav/Manifest b/app-antivirus/klamav/Manifest
index 628cebb5dae7..d3beded23f39 100644
--- a/app-antivirus/klamav/Manifest
+++ b/app-antivirus/klamav/Manifest
@@ -1,9 +1,20 @@
+-----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
-EBUILD klamav-0.42.ebuild 1304 RMD160 3146c6464412d18f314985d73381588aa02aab2d SHA1 612d2108d82fb121f9cd68f1b07c5a077c79e596 SHA256 ba57390cee497fb3acedf64c18718a5ef73611dd2fe87ea7d81051f24a01d5ee
-EBUILD klamav-0.44.ebuild 1177 RMD160 3f16ef377cf59eb4bb944e2d9ba152dce220d864 SHA1 6918d4e3a2e37934343e7a24570f00dfa98b5436 SHA256 caa54afce7273724d509dafef763768658aa6f983524bbe21efb336850086410
-MISC ChangeLog 6647 RMD160 1486d082e8499e9402931292c4997888303d264c SHA1 2705b2d2293207655e4da9e30d4b85a1dad0315f SHA256 18f73a89516123bd4b0f2daa56325a9b1f9a0f61dc7f06c9d9a8c8f9f863c68c
+EBUILD klamav-0.42.ebuild 1465 RMD160 4260ee084207bbe64201039b8c4667d0fe21f893 SHA1 505e681257c2162d37142d1f3de845d0a0d7e377 SHA256 85eb7e1e8983bca972dcb4be9e0f5abe5d53e8da6d2402464c196c04a34ed182
+EBUILD klamav-0.44.ebuild 1343 RMD160 c7a67b0ab1150101663c311b05c3a2fc0b124504 SHA1 bd77666d516b4fc29f7e4d391fdad54e744a7f20 SHA256 7fc630cbc9fa4587fd62d8ba8323744cd1f6efc92302a5b2cb9176b23d56a9fc
+MISC ChangeLog 6837 RMD160 308ac2a621dba5f8389ef1db58dd949c4e9651e5 SHA1 a2de478b0f62beb54b438ba2492b769b6dd5d546 SHA256 aa0820f73b6cfc60d32312047341fb7ea4fdf44c9a5658902680279436bb9cad
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkjCn5oACgkQt3UOBHx+2m9fwACgh1dEzA42mvWYm8OqcBC4Vm07
+g6gAn3DDpoB8tkUMMTNN0k45CPcfVPox
+=WzQZ
+-----END PGP SIGNATURE-----
diff --git a/app-antivirus/klamav/files/klamav-clamav094.patch b/app-antivirus/klamav/files/klamav-clamav094.patch
new file mode 100644
index 000000000000..5131cf911375
--- /dev/null
+++ b/app-antivirus/klamav/files/klamav-clamav094.patch
@@ -0,0 +1,14 @@
+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
index dc50538bae4a..0021688202ba 100644
--- a/app-antivirus/klamav/klamav-0.42.ebuild
+++ b/app-antivirus/klamav/klamav-0.42.ebuild
@@ -1,6 +1,6 @@
 # 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.8 2008/04/25 22:48:51 philantrop Exp $
+# $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
 
@@ -31,6 +31,11 @@ src_unpack(){
 		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"
 
diff --git a/app-antivirus/klamav/klamav-0.44.ebuild b/app-antivirus/klamav/klamav-0.44.ebuild
index e3f8396ee6fd..685f151ecf30 100644
--- a/app-antivirus/klamav/klamav-0.44.ebuild
+++ b/app-antivirus/klamav/klamav-0.44.ebuild
@@ -1,6 +1,6 @@
 # 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.44.ebuild,v 1.1 2008/08/22 18:40:00 tgurr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/klamav/klamav-0.44.ebuild,v 1.2 2008/09/06 15:19:41 keytoaster Exp $
 
 ARTS_REQUIRED="never"
 
@@ -29,6 +29,11 @@ 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"