[pkgsrc/trunk]: pkgsrc/x11/xinit Use /dev/urandom by default, no point in wai...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c0757537ab8b
branches:  trunk
changeset: 539879:c0757537ab8b
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Sat Mar 15 16:39:32 2008 +0000

description:
Use /dev/urandom by default, no point in waiting for entropy.
Bump revision.

diffstat:

 x11/xinit/Makefile         |   4 ++--
 x11/xinit/distinfo         |   3 ++-
 x11/xinit/patches/patch-aa |  17 +++++++++++++++++
 3 files changed, 21 insertions(+), 3 deletions(-)

diffs (46 lines):

diff -r c97d1c766294 -r c0757537ab8b x11/xinit/Makefile
--- a/x11/xinit/Makefile        Sat Mar 15 16:27:42 2008 +0000
+++ b/x11/xinit/Makefile        Sat Mar 15 16:39:32 2008 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2008/02/13 19:39:27 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2008/03/15 16:39:32 joerg Exp $
 #
 
 DISTNAME=              xinit-1.0.7
-PKGREVISION=           1
+PKGREVISION=           2
 CATEGORIES=            x11
 MASTER_SITES=          http://xorg.freedesktop.org/releases/individual/app/
 EXTRACT_SUFX=          .tar.bz2
diff -r c97d1c766294 -r c0757537ab8b x11/xinit/distinfo
--- a/x11/xinit/distinfo        Sat Mar 15 16:27:42 2008 +0000
+++ b/x11/xinit/distinfo        Sat Mar 15 16:39:32 2008 +0000
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.3 2007/09/21 17:52:05 bjs Exp $
+$NetBSD: distinfo,v 1.4 2008/03/15 16:39:32 joerg Exp $
 
 SHA1 (xinit-1.0.7.tar.bz2) = c2fcacba6ea45d5f9118cecc89e9e5fb5b41d7d8
 RMD160 (xinit-1.0.7.tar.bz2) = 1416911d68a9153846b14a3cc199b1b5397d3233
 Size (xinit-1.0.7.tar.bz2) = 110908 bytes
+SHA1 (patch-aa) = b6b8e4ad556b80f4b8a457688205724c40241b1e
diff -r c97d1c766294 -r c0757537ab8b x11/xinit/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/xinit/patches/patch-aa        Sat Mar 15 16:39:32 2008 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-aa,v 1.1 2008/03/15 16:39:32 joerg Exp $
+
+--- startx.cpp.orig    2007-09-16 23:24:48.000000000 +0200
++++ startx.cpp
+@@ -188,7 +188,11 @@ authdisplay=${display:-:0}
+ #if defined(HAS_COOKIE_MAKER) && defined(MK_COOKIE)
+ mcookie=`MK_COOKIE`
+ #else
+-mcookie=`dd if=/dev/random bs=16 count=1 2>/dev/null | hexdump -e \\"%08x\\"`
++if [ -r /dev/urandom ]; then
++      mcookie=`dd if=/dev/urandom bs=16 count=1 2>/dev/null | hexdump -e \\"%08x\\"`
++else
++      mcookie=`dd if=/dev/random bs=16 count=1 2>/dev/null | hexdump -e \\"%08x\\"`
++fi
+ if test x"$mcookie" = x; then
+                 echo "Couldn't create cookie"
+                 exit 1