summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2009-08-06 14:32:11 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2009-08-06 14:32:11 +0000
commit9f4f1d3a0bf31fb907a2158b3de0e3f6b9e29d4f (patch)
tree1a6fa8bfae7151b68a6254a20ebee08338211e7a /app-forensics/afflib
parentAdd keditfiletype in 4.2.4 version and konqueror in 4.3.0 in RDEPEND of dolph... (diff)
downloadhistorical-9f4f1d3a0bf31fb907a2158b3de0e3f6b9e29d4f.tar.gz
historical-9f4f1d3a0bf31fb907a2158b3de0e3f6b9e29d4f.tar.bz2
historical-9f4f1d3a0bf31fb907a2158b3de0e3f6b9e29d4f.zip
Fix building with GLIBC 2.10+ wrt #272878.
Package-Manager: portage-2.2_rc36/cvs/Linux x86_64
Diffstat (limited to 'app-forensics/afflib')
-rw-r--r--app-forensics/afflib/ChangeLog6
-rw-r--r--app-forensics/afflib/Manifest5
-rw-r--r--app-forensics/afflib/afflib-3.3.4.ebuild8
-rw-r--r--app-forensics/afflib/files/afflib-3.3.4-glibc-2.10.patch22
4 files changed, 37 insertions, 4 deletions
diff --git a/app-forensics/afflib/ChangeLog b/app-forensics/afflib/ChangeLog
index 698b33fbf29b..8255e9ae95ed 100644
--- a/app-forensics/afflib/ChangeLog
+++ b/app-forensics/afflib/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-forensics/afflib
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/afflib/ChangeLog,v 1.5 2009/05/01 19:02:17 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/afflib/ChangeLog,v 1.6 2009/08/06 14:32:11 ssuominen Exp $
+
+ 06 Aug 2009; Samuli Suominen <ssuominen@gentoo.org> afflib-3.3.4.ebuild,
+ +files/afflib-3.3.4-glibc-2.10.patch:
+ Fix building with GLIBC 2.10+ wrt #272878.
01 May 2009; Raúl Porcel <armin76@gentoo.org> afflib-3.3.4.ebuild:
Add ~arm/~s390 wrt #203758
diff --git a/app-forensics/afflib/Manifest b/app-forensics/afflib/Manifest
index 43bb3f3e35a3..cdb8996382ec 100644
--- a/app-forensics/afflib/Manifest
+++ b/app-forensics/afflib/Manifest
@@ -1,4 +1,5 @@
+AUX afflib-3.3.4-glibc-2.10.patch 867 RMD160 46fa71f88a38ffb5e3a28421b067aeb534790281 SHA1 962d58d1bed558b2191b8436d50d51e4e1227e07 SHA256 a7623e40b9ccb01e8f3363b4adc5bcef15b53160c7693bb86ab65929b1ede323
DIST afflib-3.3.4.tar.gz 1894802 RMD160 ee64a8e312269348a90ece7edf517b0209a2d0c9 SHA1 e2dd28eb54ed325cead0e6f134f7b1811c87b5a0 SHA256 e87ff2b2dbcd74fa7d0bac370be8b18fab346f3b456d34be9baa325de646ea41
-EBUILD afflib-3.3.4.ebuild 1097 RMD160 ffa81dc21c2126fe808bc3a4a506efd95026046a SHA1 28ad838185d11d22ade71da7e5007ae5beff0c84 SHA256 f66f61ce0cf92537a94e12e5d9ee8d36d777ff31ae2811a918c46f7e7687fdc3
-MISC ChangeLog 842 RMD160 a9bc5d157e3579172d94fa3466ffe8a3995b352c SHA1 24a9f7529a0c009b2a8b6001a1b8841e6de5b8f2 SHA256 2c24ce547db81086fec8e2675703ec3bf003d102381709458e8bc0e12f5a3f9e
+EBUILD afflib-3.3.4.ebuild 1185 RMD160 f05878d49061d803e1a43bc2db45e347d0671e01 SHA1 ce8e6e2addec39afee64eda6eac84ce25fe1e940 SHA256 b946a950971b43d904aa43958793547960a1390a5afa752aa0992abca596de80
+MISC ChangeLog 1005 RMD160 38f0ad3e545f23045f3e234cb2f6449deedd3b2b SHA1 16e8afdab07f30dd69e2f0aed201298457f1fbc4 SHA256 b78c3ee8079ac9fb3757e0a98b9dfc4a7de6803c041c9627e26aefb1ae633567
MISC metadata.xml 427 RMD160 fbadf41d1aa6825ee3b05ac54ca80eac45e501cf SHA1 3f33f0963f7b8680a4768dda492827cd4299ded1 SHA256 e9ae679aa792a4ba4172d7ccdd67d5fa35c0cb2a2f52c2b416b0a7ecbd154007
diff --git a/app-forensics/afflib/afflib-3.3.4.ebuild b/app-forensics/afflib/afflib-3.3.4.ebuild
index 8b6379c07edd..dc7e4f90b102 100644
--- a/app-forensics/afflib/afflib-3.3.4.ebuild
+++ b/app-forensics/afflib/afflib-3.3.4.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-forensics/afflib/afflib-3.3.4.ebuild,v 1.5 2009/05/01 19:02:17 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/afflib/afflib-3.3.4.ebuild,v 1.6 2009/08/06 14:32:11 ssuominen Exp $
inherit eutils
@@ -24,6 +24,12 @@ DEPEND="
dev-libs/openssl"
RDEPEND=${DEPEND}
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+ epatch "${FILESDIR}"/${P}-glibc-2.10.patch
+}
+
src_compile() {
econf \
$(use_enable fuse) \
diff --git a/app-forensics/afflib/files/afflib-3.3.4-glibc-2.10.patch b/app-forensics/afflib/files/afflib-3.3.4-glibc-2.10.patch
new file mode 100644
index 000000000000..b3ea15caed8c
--- /dev/null
+++ b/app-forensics/afflib/files/afflib-3.3.4-glibc-2.10.patch
@@ -0,0 +1,22 @@
+diff -up afflib-3.3.4/tools/afverify.cpp.gcc44 afflib-3.3.4/tools/afverify.cpp
+--- afflib-3.3.4/tools/afverify.cpp.gcc44 2008-07-21 06:25:29.000000000 +0200
++++ afflib-3.3.4/tools/afverify.cpp 2009-03-02 12:48:59.000000000 +0100
+@@ -240,12 +240,16 @@ string get_xml_field(const char *buf,con
+ int verify_bom_signature(AFFILE *af,const char *buf)
+ {
+ const char *cce = "</" AF_XML_AFFBOM ">\n";
+- char *chain_end = strstr(buf,cce);
++ char *buf_tmp;
++ char *cce_tmp;
++ strcpy(buf_tmp, buf);
++ strcpy(cce_tmp, cce);
++ char *chain_end = strstr(buf_tmp,cce_tmp);
+ if(!chain_end){
+ warn("end of chain XML can't be found\n");
+ return -1; // can't find it
+ }
+- char *sig_start = chain_end + strlen(cce);
++ char *sig_start = chain_end + strlen(cce_tmp);
+
+ BIO *seg = BIO_new_mem_buf((void *)buf,strlen(buf));
+ BIO_seek(seg,0);