-amd64 masked on versions 1.2.2 and 1.2.4 due to bad md5 implenation in bug 108653. Corrected version in 1.2.4-r1

(Portage version: 2.0.53_rc3)

7 files changed, 94 insertions, 18 deletions

diff --git a/sys-apps/dcfldd/ChangeLog b/sys-apps/dcfldd/ChangeLog
index 94780df863b4..b175654f4a94 100644
--- a/sys-apps/dcfldd/ChangeLog
+++ b/sys-apps/dcfldd/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-apps/dcfldd
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dcfldd/ChangeLog,v 1.6 2005/09/25 09:27:39 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dcfldd/ChangeLog,v 1.7 2005/10/12 21:51:59 dragonheart Exp $
+
+*dcfldd-1.2.4-r1 (12 Oct 2005)
+
+  12 Oct 2005; Daniel Black <dragonheart@gentoo.org>
+  +files/dcfldd-1.2.4_md5_amd64_fix.patch, dcfldd-1.2.2.ebuild,
+  dcfldd-1.2.4.ebuild, +dcfldd-1.2.4-r1.ebuild:
+  -amd64 masked on versions 1.2.2 and 1.2.4 due to bad md5 implenation in bug
+  108653. Corrected version in 1.2.4-r1 thanks to Martin Scharrer for the bug
+  report and the patch
 
   25 Sep 2005; Daniel Black <dragonheart@gentoo.org> dcfldd-1.2.4.ebuild:
   ~ppc keyworded
diff --git a/sys-apps/dcfldd/Manifest b/sys-apps/dcfldd/Manifest
index 73036932e57f..2b44b1b278a0 100644
--- a/sys-apps/dcfldd/Manifest
+++ b/sys-apps/dcfldd/Manifest
@@ -1,16 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 1a74e17dc2ada3eae01115e085b54c1e ChangeLog 886
-MD5 9f665d3c6a1e0eb7509c6d55fc171395 metadata.xml 227
 MD5 1a2c49dffe18f8a75e17fafae5dc4cbe dcfldd-1.2.2.ebuild 652
-MD5 c998f726ab91bb395e2d8ea68f1836e0 dcfldd-1.2.4.ebuild 563
-MD5 3201022427aff6dedf8455be81c7a2d0 files/digest-dcfldd-1.2.4 64
+MD5 551188afcd392649302c3f7de8a2f9c9 dcfldd-1.2.4-r1.ebuild 656
+MD5 45921941fe4094e43860bb9143bc3f59 dcfldd-1.2.4.ebuild 648
+MD5 3a79a9f5e94568a6ec1bc4d3c789ea12 files/dcfldd-1.2.4_md5_amd64_fix.patch 1033
 MD5 d3182354b01dc122b2ab3b2122302ac5 files/digest-dcfldd-1.2.2 64
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFDNm2jmdTrptrqvGERAg5jAJ0W5EMGctzIT2C7OioUD3i+w2PcMgCeKoGZ
-mkT+az481f2EDOGPfwZdiGs=
-=iHSX
------END PGP SIGNATURE-----
+MD5 3201022427aff6dedf8455be81c7a2d0 files/digest-dcfldd-1.2.4 64
+MD5 3201022427aff6dedf8455be81c7a2d0 files/digest-dcfldd-1.2.4-r1 64
+MD5 9f665d3c6a1e0eb7509c6d55fc171395 metadata.xml 227
diff --git a/sys-apps/dcfldd/dcfldd-1.2.2.ebuild b/sys-apps/dcfldd/dcfldd-1.2.2.ebuild
index 3583eebca964..f0183d4fa51a 100644
--- a/sys-apps/dcfldd/dcfldd-1.2.2.ebuild
+++ b/sys-apps/dcfldd/dcfldd-1.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dcfldd/dcfldd-1.2.2.ebuild,v 1.2 2005/06/22 22:11:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dcfldd/dcfldd-1.2.2.ebuild,v 1.3 2005/10/12 21:51:59 dragonheart Exp $
 
 DESCRIPTION="enhanced dd with features for forensics and security"
 HOMEPAGE="http://dcfldd.sourceforge.net/"
@@ -8,7 +8,9 @@ SRC_URI="mirror://sourceforge/dcfldd/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="-amd64 x86"
+# -amd64 in this version because of bug 108653 - bad md5 impliementation on
+# x86_64
 IUSE=""
 
 DEPEND=""
diff --git a/sys-apps/dcfldd/dcfldd-1.2.4-r1.ebuild b/sys-apps/dcfldd/dcfldd-1.2.4-r1.ebuild
new file mode 100644
index 000000000000..c3c2c55879b3
--- /dev/null
+++ b/sys-apps/dcfldd/dcfldd-1.2.4-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dcfldd/dcfldd-1.2.4-r1.ebuild,v 1.1 2005/10/12 21:51:59 dragonheart Exp $
+
+inherit eutils
+
+DESCRIPTION="enhanced dd with features for forensics and security"
+HOMEPAGE="http://dcfldd.sourceforge.net/"
+SRC_URI="mirror://sourceforge/dcfldd/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${P}_md5_amd64_fix.patch
+}
+
+src_install() {
+	make install DESTDIR="${D}" || die "make install failed"
+	dodoc AUTHORS ChangeLog README
+}
diff --git a/sys-apps/dcfldd/dcfldd-1.2.4.ebuild b/sys-apps/dcfldd/dcfldd-1.2.4.ebuild
index 486ca717aed2..3df30b1b0325 100644
--- a/sys-apps/dcfldd/dcfldd-1.2.4.ebuild
+++ b/sys-apps/dcfldd/dcfldd-1.2.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dcfldd/dcfldd-1.2.4.ebuild,v 1.3 2005/09/25 09:27:39 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dcfldd/dcfldd-1.2.4.ebuild,v 1.4 2005/10/12 21:51:59 dragonheart Exp $
 
 DESCRIPTION="enhanced dd with features for forensics and security"
 HOMEPAGE="http://dcfldd.sourceforge.net/"
@@ -8,7 +8,9 @@ SRC_URI="mirror://sourceforge/dcfldd/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="-amd64 ~ppc x86"
+# -amd64 in this version because of bug 108653 - bad md5 impliementation on
+# x86_64
 IUSE=""
 
 DEPEND=""
diff --git a/sys-apps/dcfldd/files/dcfldd-1.2.4_md5_amd64_fix.patch b/sys-apps/dcfldd/files/dcfldd-1.2.4_md5_amd64_fix.patch
new file mode 100644
index 000000000000..f20990bf4230
--- /dev/null
+++ b/sys-apps/dcfldd/files/dcfldd-1.2.4_md5_amd64_fix.patch
@@ -0,0 +1,43 @@
+diff -Nur dcfldd-1.2.4/md5.c dcfldd-1.2.4.fixed/md5.c
+--- dcfldd-1.2.4/md5.c	2005-05-10 00:56:15.000000000 +0100
++++ dcfldd-1.2.4.fixed/md5.c	2005-10-11 22:33:20.091158683 +0100
+@@ -31,6 +31,18 @@
+  **********************************************************************
+  */
+ 
++#ifdef HAVE_CONFIG_H
++#include <config.h>
++#endif /* HAVE_CONFIG_H */
++
++#if HAVE_INTTYPES_H
++# include <inttypes.h>
++#else
++# if HAVE_STDINT_H
++#  include <stdint.h>
++# endif
++#endif
++
+ /* -- include the following line if the md5.h header file is separate -- */
+ #include "md5.h"
+ 
+diff -Nur dcfldd-1.2.4/md5.h dcfldd-1.2.4.fixed/md5.h
+--- dcfldd-1.2.4/md5.h	2005-05-10 00:56:15.000000000 +0100
++++ dcfldd-1.2.4.fixed/md5.h	2005-10-11 22:33:57.261568986 +0100
+@@ -39,8 +39,16 @@
+ #ifndef MD5_H
+ #define MD5_H
+ 
++#if HAVE_INTTYPES_H
++# include <inttypes.h>
++#else
++# if HAVE_STDINT_H
++#  include <stdint.h>
++# endif
++#endif
++
+ /* typedef a 32 bit type */
+-typedef unsigned long int UINT4;
++typedef uint32_t UINT4;
+ 
+ #define MD5_DIGEST_STRING_LENGTH 32
+ 
diff --git a/sys-apps/dcfldd/files/digest-dcfldd-1.2.4-r1 b/sys-apps/dcfldd/files/digest-dcfldd-1.2.4-r1
new file mode 100644
index 000000000000..484bac25b547
--- /dev/null
+++ b/sys-apps/dcfldd/files/digest-dcfldd-1.2.4-r1
@@ -0,0 +1 @@
+MD5 429a0df4d6a6bf35b8be3f3204b98f0c dcfldd-1.2.4.tar.gz 163087