summaryrefslogtreecommitdiff
path: root/x11/xinit
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2008-03-15 16:39:32 +0000
committerjoerg <joerg@pkgsrc.org>2008-03-15 16:39:32 +0000
commit8b01a2372396a4421a8185565c814bb8a909cec7 (patch)
tree63a35c82da6166ad96cf9a3e3f802cfb53737730 /x11/xinit
parent1375bd11994e69708ff25f19ec39308b9a317cd3 (diff)
downloadpkgsrc-8b01a2372396a4421a8185565c814bb8a909cec7.tar.gz
Use /dev/urandom by default, no point in waiting for entropy.
Bump revision.
Diffstat (limited to 'x11/xinit')
-rw-r--r--x11/xinit/Makefile4
-rw-r--r--x11/xinit/distinfo3
-rw-r--r--x11/xinit/patches/patch-aa17
3 files changed, 21 insertions, 3 deletions
diff --git a/x11/xinit/Makefile b/x11/xinit/Makefile
index b2ee8dac785..5f67f6458c1 100644
--- a/x11/xinit/Makefile
+++ b/x11/xinit/Makefile
@@ -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 --git a/x11/xinit/distinfo b/x11/xinit/distinfo
index 5f622021ddd..5517e36ad91 100644
--- a/x11/xinit/distinfo
+++ b/x11/xinit/distinfo
@@ -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 --git a/x11/xinit/patches/patch-aa b/x11/xinit/patches/patch-aa
new file mode 100644
index 00000000000..67f85176e4a
--- /dev/null
+++ b/x11/xinit/patches/patch-aa
@@ -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