[pkgsrc/trunk]: pkgsrc/net/gtk-gnutella Add SVN rev 16947 from upstream. Make...

[hasso <hasso%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7ffaa7bb3ff0
branches:  trunk
changeset: 561672:7ffaa7bb3ff0
user:      hasso <hasso%pkgsrc.org@localhost>
date:      Tue Jul 14 09:41:31 2009 +0000

description:
Add SVN rev 16947 from upstream. Makes it build on DragonFly.

diffstat:

 net/gtk-gnutella/distinfo         |   3 ++-
 net/gtk-gnutella/patches/patch-ab |  22 ++++++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletions(-)

diffs (38 lines):

diff -r d15440f3db92 -r 7ffaa7bb3ff0 net/gtk-gnutella/distinfo
--- a/net/gtk-gnutella/distinfo Tue Jul 14 09:14:04 2009 +0000
+++ b/net/gtk-gnutella/distinfo Tue Jul 14 09:41:31 2009 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.29 2009/05/05 06:46:55 adam Exp $
+$NetBSD: distinfo,v 1.30 2009/07/14 09:41:31 hasso Exp $
 
 SHA1 (gtk-gnutella-0.96.6.tar.bz2) = 319417e8de104b33913e08a0aaec8c0f22a6129d
 RMD160 (gtk-gnutella-0.96.6.tar.bz2) = 0dae6af9ac64fa8d75980cafd55c5a3e9eb18dfe
 Size (gtk-gnutella-0.96.6.tar.bz2) = 15739240 bytes
 SHA1 (patch-aa) = 0df2e52177c1601b0533862a841ef61b2ac440ca
+SHA1 (patch-ab) = 45d59a62acbfa38a952cf31e8ceecacc9c90f077
diff -r d15440f3db92 -r 7ffaa7bb3ff0 net/gtk-gnutella/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/gtk-gnutella/patches/patch-ab Tue Jul 14 09:41:31 2009 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-ab,v 1.7 2009/07/14 09:41:31 hasso Exp $
+
+SVN rev 16947 from upstream.
+
+--- src/lib/entropy.c.orig     2009-07-14 12:11:05 +0300
++++ src/lib/entropy.c  2009-07-14 12:11:54 +0300
+@@ -120,15 +120,12 @@ entropy_collect(struct sha1 *digest)
+                * Compute the SHA1 of the output (either ps or /dev/urandom).
+                */
+ 
+-              SHA1Input(&ctx, f, sizeof *f);          /* Initial state */
+-
+               for (;;) {
+                       guint8 data[1024];
+                       int r;
+                       int len = is_pipe ? sizeof(data) : 128;
+ 
+                       r = fread(data, 1, len, f);
+-                      SHA1Input(&ctx, f, sizeof *f);  /* Changes as we read */
+                       if (r)
+                               SHA1Input(&ctx, data, r);
+                       if (r < len || !is_pipe)                /* Read once from /dev/urandom */