Add patch to fix -c with binary files, bug #182417.

Package-Manager: portage-2.1.5.4

4 files changed, 56 insertions, 5 deletions

diff --git a/app-crypt/shash/ChangeLog b/app-crypt/shash/ChangeLog
index 0daadbd83fee..d74c973cc6db 100644
--- a/app-crypt/shash/ChangeLog
+++ b/app-crypt/shash/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-crypt/shash
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/shash/ChangeLog,v 1.21 2008/02/04 18:42:21 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/shash/ChangeLog,v 1.22 2008/06/07 22:08:49 swegener Exp $
+
+  07 Jun 2008; Sven Wegener <swegener@gentoo.org>
+  +files/shash-0.2.6-binary-files.patch, shash-0.2.6-r1.ebuild:
+  Add patch to fix -c with binary files, bug #182417.
 
   04 Feb 2008; Fabian Groffen <grobian@gentoo.org> shash-0.2.6-r1.ebuild:
   Dropped ppc-macos keyword, see you in prefix
diff --git a/app-crypt/shash/Manifest b/app-crypt/shash/Manifest
index 64b29afd5248..d42f3a5a5ecb 100644
--- a/app-crypt/shash/Manifest
+++ b/app-crypt/shash/Manifest
@@ -1,6 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 0.2.6-manpage-fixes.patch 1451 RMD160 4a906e6a23c09d72b9f98f58c737edfa6c2ac83a SHA1 d7052c1f1d26158c6701904ce8fa09c470817218 SHA256 12619eaba8cfd99917658139306fb8c0ff087f10ce05bd285aa3c8e66f88e317
+AUX shash-0.2.6-binary-files.patch 898 RMD160 ef4f8d7e6feae55c45d6a8483dc6d95c4bfc71d2 SHA1 7fb3a989531b74e88556031aebaae9f187822a39 SHA256 e06660afe1afb338bf4f209d39ac33c412ecc6fb22feec684c0a7b5fd80f46a6
 AUX shash.bash-completion 993 RMD160 71a35551e47213e6baec5deaad4c92fff7440450 SHA1 0c356a4307a97b14d73de6af2e2315e75351123c SHA256 5f3d0bb5a202ba3365c81945ec2f0318893f1f372f11c8b4d7bc524888d8d228
 DIST shash-0.2.6.tar.gz 105641 RMD160 9b17e84ca8a6deb312e26f037f4f15056f6838e9 SHA1 306baa20823832627e861f7d20ab3316eaa57b9e SHA256 6abf13eb1c3b4b6ef0f07e5425d10ed2abaad1d08c327647feb3506e76ced9dc
-EBUILD shash-0.2.6-r1.ebuild 1010 RMD160 b12d8f55189a68a57a632fa04857f7cdcc313deb SHA1 d3aabc6287ef1d896fe0244d2f166043417e03d9 SHA256 2978965065308cd5067c13a373171c80a20a1eded907a2a8d1279f5269cecd6e
-MISC ChangeLog 2536 RMD160 6d1a24f1ed480c1e67b73fed2aa28ca7a0fe561c SHA1 8d424bafc6d31794eb16785560c9629f853ba6aa SHA256 6aee148b84392309cf9b743fa7a3ddd39b0d0fbcd94b6517f65ce9cc95566df7
+EBUILD shash-0.2.6-r1.ebuild 1058 RMD160 d5161020e2255f6aee92c5a8ecc1c7a04c3e4cbb SHA1 bf6b1d8e863e6ae017071abda2ae6a8d05d34a41 SHA256 1c2c3978d08931101e4c7d3afa53970ea22e60e4226459fa8433e58f5dbdb097
+MISC ChangeLog 2706 RMD160 ab9721a49cd2111f0bcf4a45bdc00cfddfd76f21 SHA1 66edca1ef610140fbaab171a8f1323f87d872bd5 SHA256 b7a43e1df6b4e37eb255f37d45ac3b2aea0d9fa58622229a7def0a520724452f
 MISC metadata.xml 445 RMD160 8fe3514acbfd6d8af3ebaa9dcdd0a5f19c1b8e05 SHA1 6c6dc372a6a73c35caf1ac26d370550d549cf7fa SHA256 0f32465ca38e78d722e961d48820997094b6bf2191f15a0645600ad7910790c0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFISwb3I1lqEGTUzyQRAjOGAKCOP783kKPoDPqnUEn4f5B4ldP5vQCgvEv4
+45deG/sjLffaTlP05ygBIUo=
+=791h
+-----END PGP SIGNATURE-----
diff --git a/app-crypt/shash/files/shash-0.2.6-binary-files.patch b/app-crypt/shash/files/shash-0.2.6-binary-files.patch
new file mode 100644
index 000000000000..1eb0cba17613
--- /dev/null
+++ b/app-crypt/shash/files/shash-0.2.6-binary-files.patch
@@ -0,0 +1,34 @@
+--- shash-0.2.6/src/shash.c
++++ shash-0.2.6/src/shash.c
+@@ -631,11 +631,11 @@
+ 
+ 		if (nosalt == FALSE && hmac == 1) {
+ 			if (sscanf
+-			    (linebuf, "%s %s  %s\n", hexbuffer, buffer,
+-			     buffer2) < 2) {
++			    (linebuf, "%s %s *%s\n", hexbuffer, buffer,
++			     buffer2) != 3) {
+ 				if (sscanf
+-				    (linebuf, "%s %s *%s\n", hexbuffer,
+-				     buffer, buffer2) < 2)
++				    (linebuf, "%s %s  %s\n", hexbuffer,
++				     buffer, buffer2) != 3)
+ 					continue;
+ 			}
+ 
+@@ -648,11 +648,11 @@
+ 			key = pass2key(algorithm, keymode_buffer, &keylen, password, plen);
+ 
+ 		} else {
+-			if (sscanf(linebuf, "%s  %s\n", buffer, buffer2) ==
+-			    0) {
++			if (sscanf(linebuf, "%s *%s\n", buffer, buffer2) !=
++			    2) {
+ 				if (sscanf
+-				    (linebuf, "%s *%s\n", buffer,
+-				     buffer2) == 0)
++				    (linebuf, "%s  %s\n", buffer,
++				     buffer2) != 2)
+ 					continue;
+ 			}
+ 
diff --git a/app-crypt/shash/shash-0.2.6-r1.ebuild b/app-crypt/shash/shash-0.2.6-r1.ebuild
index dda5694b11f2..259edb84a120 100644
--- a/app-crypt/shash/shash-0.2.6-r1.ebuild
+++ b/app-crypt/shash/shash-0.2.6-r1.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-crypt/shash/shash-0.2.6-r1.ebuild,v 1.20 2008/02/04 18:42:21 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/shash/shash-0.2.6-r1.ebuild,v 1.21 2008/06/07 22:08:49 swegener Exp $
 
 inherit bash-completion eutils
 
@@ -19,7 +19,9 @@ RDEPEND="${DEPEND}"
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/0.2.6-manpage-fixes.patch
+
+	epatch "${FILESDIR}"/${PV}-manpage-fixes.patch
+	epatch "${FILESDIR}"/${P}-binary-files.patch
 }
 
 src_compile() {