From b5ff2e5e6ce1eac125767c0791b77ebdbf0bf4a7 Mon Sep 17 00:00:00 2001
From: bjs <bjs>
Date: Fri, 21 Sep 2007 17:52:05 +0000
Subject: Update to xinit-1.0.7.  This release fixes several fairly serious
 bugs, including:

-- Bug #12448: Don't try to trap 'ERR'.
	startx is advertised as a POSIX sh script. These shells don't
	necessarily support trapping 'ERR'. This makes startx work again with
	dash (and probably others).

-- Fix broken test for /dev/random cookie generation failure.

-- Use /dev/random to generate the cookie if mcookie is unavailable.

-- Setting XAUTHORITY without having actually generated a cookie and created
	.Xauthority led to issues if somebody like ssh later came around
	and made the .Xauthority file for their own setup.  So, simply make
	it so that we never fail to create one.

-- Remove .serverauth.$$ file on signals or errors

pkgsrc changes:

Remove cookie maker environment variable from CONFIGURE_ENV, as the
script now does the "right thing".

tested by me, seems to work fine, ok'd by agc@
---
 x11/xinit/Makefile | 6 ++----
 x11/xinit/distinfo | 8 ++++----
 2 files changed, 6 insertions(+), 8 deletions(-)

(limited to 'x11')

diff --git a/x11/xinit/Makefile b/x11/xinit/Makefile
index 1390f0b8373..a4f643e0665 100644
--- a/x11/xinit/Makefile
+++ b/x11/xinit/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2007/07/12 14:32:49 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2007/09/21 17:52:05 bjs Exp $
 #
 
-DISTNAME=		xinit-1.0.4
+DISTNAME=		xinit-1.0.7
 CATEGORIES=		x11
 MASTER_SITES=		http://xorg.freedesktop.org/releases/individual/app/
 EXTRACT_SUFX=		.tar.bz2
@@ -15,8 +15,6 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		pkg-config
 
-CONFIGURE_ENV+=		MCOOKIE="/bin/dd if=/dev/urandom bs=16 count=1 2>/dev/null | hexdump -e '\\\"%08x\\\"'"
-
 .include "../../x11/libX11/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xinit/distinfo b/x11/xinit/distinfo
index 0d27cd3e70f..5f622021ddd 100644
--- a/x11/xinit/distinfo
+++ b/x11/xinit/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2007/07/12 14:32:49 joerg Exp $
+$NetBSD: distinfo,v 1.3 2007/09/21 17:52:05 bjs Exp $
 
-SHA1 (xinit-1.0.4.tar.bz2) = cad1f17464f48e3c08f2d76af1206004cbdfa731
-RMD160 (xinit-1.0.4.tar.bz2) = 7a3fd5930dcb88c101842bcf9599de4632d9fed1
-Size (xinit-1.0.4.tar.bz2) = 106555 bytes
+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
-- 
cgit v1.2.3