head	1.3;
access;
symbols
	pkgsrc-2013Q2:1.3.0.18
	pkgsrc-2013Q2-base:1.3
	pkgsrc-2012Q4:1.3.0.16
	pkgsrc-2012Q4-base:1.3
	pkgsrc-2011Q4:1.3.0.14
	pkgsrc-2011Q4-base:1.3
	pkgsrc-2011Q2:1.3.0.12
	pkgsrc-2011Q2-base:1.3
	pkgsrc-2009Q4:1.3.0.10
	pkgsrc-2009Q4-base:1.3
	pkgsrc-2008Q4:1.3.0.8
	pkgsrc-2008Q4-base:1.3
	pkgsrc-2008Q3:1.3.0.6
	pkgsrc-2008Q3-base:1.3
	cube-native-xorg:1.3.0.4
	cube-native-xorg-base:1.3
	pkgsrc-2008Q2:1.3.0.2
	pkgsrc-2008Q2-base:1.3
	pkgsrc-2008Q1:1.1.0.2
	pkgsrc-2008Q1-base:1.1;
locks; strict;
comment	@# @;


1.3
date	2008.05.22.21.24.17;	author wiz;	state dead;
branches;
next	1.2;

1.2
date	2008.04.16.22.07.24;	author wiz;	state Exp;
branches;
next	1.1;

1.1
date	2008.03.15.16.39.32;	author joerg;	state Exp;
branches;
next	;


desc
@@


1.3
log
@Update to 1.0.9:

Adam Jackson (2):
      Unset session environment variables so startx works within a running session.
      xinit 1.0.9

Alan Coopersmith (3):
      Use od on /dev/random to generate cookie on Solaris
      Check for proper cookie creation on all platforms
      Use /bin/ksh instead of /bin/sh on Solaris

Jeremy C. Reed (1):
      Use /dev/urandom for cookie it it exists

Jeremy Huddleston (14):
      Apple: Fixed issue where display would not be passed correctly to the server if nolisten tcp was enabled.
      Apple: Execute /usr/X11/bin/privileged_startx if it's present
      Apple: Renamed LaunchAgent to org.x.startx to distinguish it from the org.x.X11 application
      Correctly handle users with spaces in $HOME
      Apple: privileged_startx is in XINITDIR
      Apple: We renamed font_cache.sh to font_cache for better consistency... Changing startx to work with this
      Apple: Wait for privileged_startx to finish, so we don't race to create /tmp/.X11-unix
      Apple: Added privileged_startx
      Apple: Fixed make dist to include a missing header and not include generated sources
      Cleaned up handling of defaultserver{,args}
      Apple: Use CFProcessPath instead of argv[0] trick.
      Apple: Added some OSX version protection, so this will still compile on Tiger and below.
      Apple: No need for these bits being here in xinit as of xserver-1.4.0-apple9
      Apple: Don't need to spew unneccessary 'directory exists' messages.

Matthieu Herrb (2):
      OpenBSD: use openssl rand -hex 16 to generate the cookie.
      Replace sprintf() and strcpy() with snprintf().
@
text
@$NetBSD: patch-aa,v 1.2 2008/04/16 22:07:24 wiz Exp $

--- startx.cpp.orig	2008-03-06 22:08:48.000000000 +0000
+++ startx.cpp
@@@@ -243,7 +243,11 @@@@ if [ x"$enable_xauth" = x1 ] ; then
 #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
@


1.2
log
@Update to 1.0.8:

Adam Jackson (1):
      xinit 1.0.8

David Nusinow (1):
      Unbreak installs on non-launchd systems

James Cloos (1):
      Add missing PHONY line for automatic ChangeLog generation

Jeremy Huddleston (19):
      Added some support for Xquartz on OS-X.
      Added Apple launchd support
      Changed x11-exec to actually start X11.app.  X11.app will be responsible for calling xinit.
      OS-X: Added argv[0] hack for finding Xquartz UI and icon as well as claiming its dock icon
      Added support for OS-X preferences to disable tcp/ip connections and xauth
      OS-X: Made defaults test more robust
      OS-X: Need to use bash --login to setup the environment from launchd.
      XQuartz doesn't need the -launchd command line argument anymore.
      OS-X: Properly set enable_xauth if the user has no defaults set and choose a valid $display for fast-user-switching.
      OS-X: Add bindir to $PATH in startx if it's not there
      OS-X: Fixed typo
      OS-X: Set fontpath in xinitrc to include system / user fonts.  Additionally fixed font scaling issues (trac #52)
      Apple: use -nocpp arg to xrdb if cpp is not installed
      Apple: Cleaned up font path setting and added font caching to xinitrc
      Apple: Support spaces in $HOME for font path, and remove duplicate entry
      Added org.x.X11.plist.cpp to EXTRA_DIST
      Apple: font caching and defaults
      Apple: Adding support for an xinitrc.d directory on OSX, so fink doesn't need to clobber files
      Apple: Use -c in the launchd plist, so broken .profile/.bashrc don't much up startx

Matthieu Herrb (1):
      Use /dev/arandom instead of /dev/urandom to generate the cookie

root (1):
      Define APPLE for the rest of us
@
text
@d1 1
a1 1
$NetBSD: patch-aa,v 1.1 2008/03/15 16:39:32 joerg Exp $
@


1.1
log
@Use /dev/urandom by default, no point in waiting for entropy.
Bump revision.
@
text
@d1 1
a1 1
$NetBSD$
d3 1
a3 1
--- startx.cpp.orig	2007-09-16 23:24:48.000000000 +0200
d5 1
a5 1
@@@@ -188,7 +188,11 @@@@ authdisplay=${display:-:0}
d7 1
a7 1
 mcookie=`MK_COOKIE`
d9 2
a10 2
-mcookie=`dd if=/dev/random bs=16 count=1 2>/dev/null | hexdump -e \\"%08x\\"`
+if [ -r /dev/urandom ]; then
d12 1
a12 1
+else
d14 4
a17 4
+fi
 if test x"$mcookie" = x; then
                 echo "Couldn't create cookie"
                 exit 1
@