Hello community,
here is the log from the commit of package xorg-x11
checked in at Mon Jun 23 01:48:41 CEST 2008.
--------
--- xorg-x11/xorg-x11.changes 2008-05-29 18:39:21.000000000 +0200
+++ xorg-x11/xorg-x11.changes 2008-06-13 09:47:23.165265000 +0200
@@ -1,0 +2,14 @@
+Fri Jun 13 09:46:10 CEST 2008 - sndirsch@suse.de
+
+- sessreg 1.0.4
+- rgb 1.0.3
+- xinit 1.1.0
+ * Properly handle using xserverrc, which was broken in 1.0.9
+
+-------------------------------------------------------------------
+Mon Jun 9 05:16:58 CEST 2008 - sndirsch@suse.de
+
+- /etc/X11/xinit/xinitrc.common: fix keyboard before calling
+ xmodmap (bnc #397942)
+
+-------------------------------------------------------------------
Old:
----
rgb-X11R7.1-1.0.1.tar.bz2
sessreg-1.0.3.tar.bz2
xinit-1.0.8.tar.bz2
New:
----
rgb-1.0.3.tar.bz2
sessreg-1.0.4.tar.bz2
xinit-1.1.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11.spec ++++++
--- /var/tmp/diff_new_pack.N14355/_old 2008-06-23 01:42:35.000000000 +0200
+++ /var/tmp/diff_new_pack.N14355/_new 2008-06-23 01:42:35.000000000 +0200
@@ -19,7 +19,7 @@
%endif
Url: http://xorg.freedesktop.org/
Version: 7.3
-Release: 94
+Release: 98
License: X11/MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Utilities
@@ -49,10 +49,10 @@
Source15: mkfontscale-1.0.5.tar.bz2
Source16: oclock-X11R7.0-1.0.1.tar.bz2
Source17: proxymngr-X11R7.0-1.0.1.tar.bz2
-Source18: rgb-X11R7.1-1.0.1.tar.bz2
+Source18: rgb-1.0.3.tar.bz2
Source19: rstart-X11R7.1-1.0.2.tar.bz2
Source20: scripts-X11R7.0-1.0.1.tar.bz2
-Source21: sessreg-1.0.3.tar.bz2
+Source21: sessreg-1.0.4.tar.bz2
Source22: setxkbmap-1.0.4.tar.bz2
Source23: showfont-1.0.2.tar.bz2
Source24: smproxy-X11R7.1-1.0.2.tar.bz2
@@ -85,7 +85,7 @@
Source52: xgamma-1.0.2.tar.bz2
Source53: xgc-X11R7.0-1.0.1.tar.bz2
Source54: xhost-1.0.2.tar.bz2
-Source55: xinit-1.0.8.tar.bz2
+Source55: xinit-1.1.0.tar.bz2
Source56: xkbcomp-1.0.5.tar.bz2
Source57: xkbevd-X11R7.1-1.0.2.tar.bz2
Source58: xkbprint-X11R7.0-1.0.1.tar.bz2
@@ -460,6 +460,14 @@
/var/lib/xdm/authdir/
%changelog
+* Fri Jun 13 2008 sndirsch@suse.de
+- sessreg 1.0.4
+- rgb 1.0.3
+- xinit 1.1.0
+ * Properly handle using xserverrc, which was broken in 1.0.9
+* Mon Jun 09 2008 sndirsch@suse.de
+- /etc/X11/xinit/xinitrc.common: fix keyboard before calling
+ xmodmap (bnc #397942)
* Thu May 29 2008 schwab@suse.de
- Fix crash in xfd when a font spec cannot be parsed.
* Mon May 26 2008 sndirsch@suse.de
++++++ ps_suse.diff ++++++
--- /var/tmp/diff_new_pack.N14355/_old 2008-06-23 01:42:38.000000000 +0200
+++ /var/tmp/diff_new_pack.N14355/_new 2008-06-23 01:42:38.000000000 +0200
@@ -18,7 +18,7 @@
Color
--- xinit-X11R7.1-1.0.2.orig/xinitrc.cpp 2006-08-19 11:02:26.000000000 +0200
-+++ xinit-1.0.8/xinitrc.cpp 2006-08-19 11:02:35.000000000 +0200
++++ xinit-1.1.0/xinitrc.cpp 2006-08-19 11:02:35.000000000 +0200
@@ -68,8 +68,10 @@
#endif
@@ -33,7 +33,7 @@
-exec XTERM -geometry 80x66+0+0 -name login
+exec TWM
--- xinit-X11R7.1-1.0.2.orig/startx.cpp 2006-08-19 11:02:26.000000000 +0200
-+++ xinit-1.0.8/startx.cpp 2006-08-19 11:14:43.000000000 +0200
++++ xinit-1.1.0/startx.cpp 2006-08-19 11:14:43.000000000 +0200
@@ -62,10 +62,115 @@
sysclientrc=XINITDIR/xinitrc
#endif
++++++ p_xauth.diff ++++++
--- /var/tmp/diff_new_pack.N14355/_old 2008-06-23 01:42:38.000000000 +0200
+++ /var/tmp/diff_new_pack.N14355/_new 2008-06-23 01:42:38.000000000 +0200
@@ -289,7 +289,7 @@
}
doWrite = 1;
--- programs/xinit/startx.cpp.orig 2005-11-11 11:16:53.000000000 +0100
-+++ xinit-1.0.8/startx.cpp 2005-11-11 11:35:19.000000000 +0100
++++ xinit-1.1.0/startx.cpp 2005-11-11 11:35:19.000000000 +0100
@@ -328,6 +328,7 @@
. /etc/sysconfig/displaymanager
test "$DISPLAYMANAGER_XSERVER_TCP_PORT_6000_OPEN" != "yes" && \
++++++ rgb-X11R7.1-1.0.1.tar.bz2 -> rgb-1.0.3.tar.bz2 ++++++
++++ 13336 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/rgb-X11R7.1-1.0.1/ChangeLog new/rgb-1.0.3/ChangeLog
--- old/rgb-X11R7.1-1.0.1/ChangeLog 2006-05-19 20:30:39.000000000 +0200
+++ new/rgb-1.0.3/ChangeLog 2008-06-06 05:18:09.000000000 +0200
@@ -1,53 +1,276 @@
-2006-05-15 Adam Jackson
+commit f0c7399100f25d2c512ee7c922cf13a4bd9c507e
+Author: Alan Coopersmith
+Date: Thu Jun 5 20:17:09 2008 -0700
- * configure.ac:
- Bump to 1.0.1
+ rgb version 1.0.3
+
+ Don't you hate it when you push out a new version and then realize minutes
+ later than you've got a manpage in your distro that's not in upstream you
+ could have included?
-2006-04-28 Jeremy C. Reed
+commit 2e8b928b2176a67a0d533748f385078ad8829cc3
+Author: Alan Coopersmith
+Date: Thu Jun 5 20:13:35 2008 -0700
- reviewed by: Adam Jackson
+ Include rgb(1) man page from Solaris
- * configure.ac:
- pkg-config check for xproto instead of x11.
+commit bd94a52404b0e23a61e6ca330b759fdd82a59996
+Author: Alan Coopersmith
+Date: Thu Jun 5 18:25:47 2008 -0700
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
+ rgb version 1.0.2
- * configure.ac:
- Update package version number for final X11R7 release candidate.
+commit 7bb6478c651dcb576e2a0ff756365f52d9db04e4
+Author: Alan Coopersmith
+Date: Wed Jun 4 20:24:05 2008 -0700
-2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
+ Update showrgb man page to better match current implementation
- * Makefile.am:
- Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+commit 749182c37cb455939ba327e9420dd652c0ff58a1
+Author: Alan Coopersmith
+Date: Wed Jun 4 20:16:12 2008 -0700
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
+ Nuke CVS version tags
- * configure.ac:
- Update package version number for X11R7 RC3 release.
+commit 11193caceaa02f639d1e8a701ed92947e7eaad36
+Author: Alan Coopersmith
+Date: Wed Jun 4 20:09:01 2008 -0700
-2005-12-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
+ Fix build to work with --with-rgb-db-type=dbm
- * configure.ac:
- Change the default rgb dir to be the same path as the X server.
+commit 0351f14a999264c152d7c585fc91ad4901e3c776
+Author: Alan Coopersmith
+Date: Wed Jun 4 19:40:44 2008 -0700
-2005-11-23 Alan Coopersmith
+ Fix build to work with --with-rgb-db-type=ndbm
+
+ Also remove #includes of unused headers & convert K&R to ANSI C
- * configure.ac:
- Fix --with-rgb-dir help string to give the right flag name.
+commit 7a327431337875e81094aaed0002c89041a0f570
+Author: James Cloos
+Date: Thu Dec 6 16:37:05 2007 -0500
-2005-11-19 Kevin E. Martin <kem-at-freedesktop-dot-org>
+ Replace static ChangeLog with dist-hook to generate from git log
- * Makefile.am:
- * configure.ac:
- Update dependencies to work with separate build roots.
+commit 42c6e9a89d45c897c82f7ec1973f66aa1190d241
+Author: James Cloos
+Date: Mon Sep 3 05:51:08 2007 -0400
-2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org>
+ Add *~ to .gitignore to skip patch/emacs droppings
- * configure.ac:
- Update package version number for X11R7 RC2 release.
+commit 654ea29b1abed12d88e5a38abbf538779c679922
+Author: James Cloos
+Date: Thu Aug 23 19:24:33 2007 -0400
-2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org>
+ Rename .cvsignore to .gitignore
- * configure.ac:
- Update package version number for RC1 release.
+commit d96f362956d9e58cbb46740f825d5bad50f0fbf1
+Author: Adam Jackson
+Date: Fri May 19 18:30:39 2006 +0000
+ Bump to 1.0.1
+
+commit 808ad54d56095cc09138e2d25580009daed47c8f
+Author: Jeremy C. Reed
+Date: Fri Apr 28 17:13:37 2006 +0000
+
+ pkg-config check for xproto instead of x11.
+
+commit 4a9b01708d7d0ea08534e0699311a41e8b55a9d7
+Author: Kevin E Martin
+Date: Thu Dec 15 00:24:03 2005 +0000
+
+ Update package version number for final X11R7 release candidate.
+
+commit a5dfa8230f98bf7f21046f9217cee5461587e620
+Author: Kevin E Martin
+Date: Tue Dec 6 22:48:18 2005 +0000
+
+ Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+
+commit 159ab1fbe0dbb05699cc847862f135a216cfa8a0
+Author: Kevin E Martin
+Date: Sat Dec 3 05:49:17 2005 +0000
+
+ Update package version number for X11R7 RC3 release.
+
+commit f1226de089929e89ed0e77535ae129373935f4b5
+Author: Kevin E Martin
+Date: Fri Dec 2 01:40:06 2005 +0000
+
+ Change the default rgb dir to be the same path as the X server.
+
+commit 93b6b4cda7a0a2323a10405bb8b7af0e4a1a6110
+Author: Alan Coopersmith
+Date: Mon Nov 28 22:01:38 2005 +0000
+
+ Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4
+ update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir)
+
+commit 7b13cbbdbd82403fff16fbbde0c0150f051ebdfa
+Author: Alan Coopersmith
+Date: Thu Nov 24 00:25:59 2005 +0000
+
+ Fix --with-rgb-dir help string to give the right flag name.
+
+commit 191f46bdd6a7ed44e22d5a8a095939697649e669
+Author: Eric Anholt
+Date: Mon Nov 21 10:34:57 2005 +0000
+
+ Another pass at .cvsignores for apps.
+
+commit 46f1e5df56048a5d93aca3cb800e78dbba084846
+Author: Eric Anholt
+Date: Sun Nov 20 22:08:49 2005 +0000
+
+ Add/improve .cvsignore files for apps.
+
+commit f9fe12f84b6f774b696cc3075ec22b9605fdbb65
+Author: Kevin E Martin
+Date: Sat Nov 19 07:15:35 2005 +0000
+
+ Update pkgconfig files to separate library build-time dependencies from
+ application build-time dependencies, and update package deps to work
+ with separate build roots.
+
+commit 3a2f377dbbea0b5aca6986f90e92b54ddc106dfb
+Author: Kevin E Martin
+Date: Wed Nov 9 21:09:20 2005 +0000
+
+ Update package version number for X11R7 RC2 release.
+
+commit 93b884959f2a9ef4c893ffa3d26ecef13c1ca4e8
+Author: Kean Johnson
+Date: Tue Nov 8 06:33:31 2005 +0000
+
+ See ChangeLog entry 2005-11-07 for details.
+
+commit cb599821a3c8dd2136b3d207911c74c2e5ad571c
+Author: Kevin E Martin
+Date: Wed Oct 19 02:47:49 2005 +0000
+
+ Update package version number for RC1 release.
+
+commit e6ddb673f5835bf7b9804fa29e62edd20419ea47
+Author: Alan Coopersmith
+Date: Mon Oct 17 23:56:20 2005 +0000
+
+ Use @APP_MAN_SUFFIX@ instead of $(APP_MAN_SUFFIX) in macro substitutions to
+ work better with BSD make
+
+commit 15bccd547d6038edb9cbc4f9ad02dfbed6f9dcb8
+Author: Alan Coopersmith
+Date: Fri Oct 14 00:25:42 2005 +0000
+
+ Use sed to fill in variables in man page
+
+commit 9ee0a8cb83cfcf475441e393bfa04ea4fcbf49f9
+Author: Alan Coopersmith
+Date: Mon Aug 1 22:35:37 2005 +0000
+
+ Change default install dir for rgb.txt from libdir to libdir/X11, since
+ that's where Xorg looks for it
+
+commit fbb5f013d40c7a0ea26ac33a5abce1e9dd0ccadc
+Author: Alan Coopersmith
+Date: Mon Aug 1 20:25:28 2005 +0000
+
+ Install man pages to section 1 instead of section m (Patch from Donnie
+ Berkholz)
+
+commit 321c5f16ba1851a96a12bc5bafa832c3b9ac08e9
+Author: Kevin E Martin
+Date: Fri Jul 29 21:22:30 2005 +0000
+
+ Various changes preparing packages for RC0:
+ - Verify and update package version numbers as needed
+ - Implement versioning scheme
+ - Change bug address to point to bugzilla bug entry form
+ - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
+ reenable it)
+ - Fix makedepend to use pkgconfig and pass distcheck
+ - Update build script to build macros first
+ - Update modular Xorg version
+
+commit 1dda7081659c8d5eacbfed77ee0aa594b17440a0
+Author: Kevin E Martin
+Date: Thu Jul 28 15:57:12 2005 +0000
+
+ Fix distcheck for remaining apps
+
+commit 794993251c8700061f84246f87ec3c060f2ffb37
+Author: Søren Sandmann Pedersen
+Date: Wed Jul 27 19:40:28 2005 +0000
+
+ Check for xproto
+
+commit 4531a95fde3e9e0dac1e24c0e140094d24503ce2
+Author: Alan Coopersmith
+Date: Sat Jul 23 15:32:50 2005 +0000
+
+ Don't link in -lucb on Solaris
+ #ifdef HAVE_CONFIG_H/#include "config.h" for modularization
+
+commit d468fba83ec0d963f70ac0f6be47c41ce4080803
+Author: Alan Coopersmith
+Date: Thu Jul 21 04:21:06 2005 +0000
+
+ oops, forgot to cvs add autogen.sh
+
+commit ab0ad07c8529ee5d5da88de28956f81b9ecf833c
+Author: Alan Coopersmith
+Date: Thu Jul 21 04:20:35 2005 +0000
+
+ Initial autotooling of rgb/showrgb (Defaults to flat text file - dbm/ndbm
+ support partially implemented, but not yet buildable since it requires
+ site.h & rgb.h from Xserver/includes)
+
+commit 7a676fdf168ed250baef3b99393f3dccbda91a7e
+Author: Søren Sandmann Pedersen
+Date: Wed Jun 29 18:20:16 2005 +0000
+
+ Add build system for rgb symlink.sh: Link pmconfig.cpp, link various text
+ files for rgb xc/programs/rgb/showrgb.c: Don't include rgb.h and site.h
+ when USE_RGB_TXT is defined
+
+commit ad45da26f8f399bad12c6af78cc211f1dc563e58
+Author: Egbert Eich
+Date: Fri Apr 23 19:54:36 2004 +0000
+
+ Merging XORG-CURRENT into trunk
+
+commit a1edb12b592188781e4a18898fb1cd3fab472e4f
+Author: Egbert Eich
+Date: Sun Mar 14 08:34:55 2004 +0000
+
+ Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit 2c7849cf40d3f24e14a9668110a93e35a9120cd9
+Author: Egbert Eich
+Date: Wed Mar 3 12:12:53 2004 +0000
+
+ Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit 3798295f9b9e66543233d7fd44e95a244f0f8b06
+Author: Egbert Eich
+Date: Thu Feb 26 13:36:15 2004 +0000
+
+ readding XFree86's cvs IDs
+
+commit 3bfe5e286e3ca975e1a0e12bbb527f73bbf443aa
+Author: Egbert Eich
+Date: Thu Feb 26 09:23:57 2004 +0000
+
+ Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit da58b20fd4fd40bccb34ce2e8f1401fc994c973c
+Author: Kaleb Keithley
+Date: Fri Nov 14 16:48:58 2003 +0000
+
+ XFree86 4.3.0.1
+
+commit 1f2079d6943e2c85edbeeb4309f7ec5e216ee640
+Author: Kaleb Keithley
+Date: Fri Nov 14 15:54:53 2003 +0000
+
+ R6.6 is the Xorg base-line
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/rgb-X11R7.1-1.0.1/compile new/rgb-1.0.3/compile
--- old/rgb-X11R7.1-1.0.1/compile 2006-05-21 03:44:35.000000000 +0200
+++ new/rgb-1.0.3/compile 1970-01-01 01:00:00.000000000 +0100
@@ -1,142 +0,0 @@
-#! /bin/sh
-# Wrapper for compilers which do not understand `-c -o'.
-
-scriptversion=2005-05-14.22
-
-# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
-# Written by Tom Tromey .
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# This file is maintained in Automake, please report
-# bugs to or send patches to
-# .
-
-case $1 in
- '')
- echo "$0: No command. Try \`$0 --help' for more information." 1>&2
- exit 1;
- ;;
- -h | --h*)
- cat <<\EOF
-Usage: compile [--help] [--version] PROGRAM [ARGS]
-
-Wrapper for compilers which do not understand `-c -o'.
-Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
-arguments, and rename the output as expected.
-
-If you are trying to build a whole package this is not the
-right script to run: please start by reading the file `INSTALL'.
-
-Report bugs to .
-EOF
- exit $?
- ;;
- -v | --v*)
- echo "compile $scriptversion"
- exit $?
- ;;
-esac
-
-ofile=
-cfile=
-eat=
-
-for arg
-do
- if test -n "$eat"; then
- eat=
- else
- case $1 in
- -o)
- # configure might choose to run compile as `compile cc -o foo foo.c'.
- # So we strip `-o arg' only if arg is an object.
- eat=1
- case $2 in
- *.o | *.obj)
- ofile=$2
- ;;
- *)
- set x "$@" -o "$2"
- shift
- ;;
- esac
- ;;
- *.c)
- cfile=$1
- set x "$@" "$1"
- shift
- ;;
- *)
- set x "$@" "$1"
- shift
- ;;
- esac
- fi
- shift
-done
-
-if test -z "$ofile" || test -z "$cfile"; then
- # If no `-o' option was seen then we might have been invoked from a
- # pattern rule where we don't need one. That is ok -- this is a
- # normal compilation that the losing compiler can handle. If no
- # `.c' file was seen then we are probably linking. That is also
- # ok.
- exec "$@"
-fi
-
-# Name of file we expect compiler to create.
-cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
-
-# Create the lock directory.
-# Note: use `[/.-]' here to ensure that we don't use the same name
-# that we are using for the .o file. Also, base the name on the expected
-# object file name, since that is what matters with a parallel build.
-lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d
-while true; do
- if mkdir "$lockdir" >/dev/null 2>&1; then
- break
- fi
- sleep 1
-done
-# FIXME: race condition here if user kills between mkdir and trap.
-trap "rmdir '$lockdir'; exit 1" 1 2 15
-
-# Run the compile.
-"$@"
-ret=$?
-
-if test -f "$cofile"; then
- mv "$cofile" "$ofile"
-elif test -f "${cofile}bj"; then
- mv "${cofile}bj" "$ofile"
-fi
-
-rmdir "$lockdir"
-exit $ret
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/rgb-X11R7.1-1.0.1/config.h.in new/rgb-1.0.3/config.h.in
--- old/rgb-X11R7.1-1.0.1/config.h.in 2006-05-21 03:44:34.000000000 +0200
+++ new/rgb-1.0.3/config.h.in 2008-06-06 05:17:52.000000000 +0200
@@ -1,5 +1,35 @@
/* config.h.in. Generated from configure.ac by autoheader. */
+/* Header file to include for dbm functions */
+#undef DBM_HEADER
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_UNISTD_H
+
/* Define to 1 if you have ndbm.h interfaces */
#undef NDBM
@@ -21,6 +51,18 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
+/* Major version of this package */
+#undef PACKAGE_VERSION_MAJOR
+
+/* Minor version of this package */
+#undef PACKAGE_VERSION_MINOR
+
+/* Patch version of this package */
+#undef PACKAGE_VERSION_PATCHLEVEL
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
/* Define to 1 to use plain text files for rgb database */
#undef USE_RGB_TXT
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/rgb-X11R7.1-1.0.1/configure.ac new/rgb-1.0.3/configure.ac
--- old/rgb-X11R7.1-1.0.1/configure.ac 2006-05-19 20:30:39.000000000 +0200
+++ new/rgb-1.0.3/configure.ac 2008-06-06 05:15:38.000000000 +0200
@@ -28,7 +28,7 @@
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
-AC_INIT(rgb,[1.0.1],[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],rgb)
+AC_INIT(rgb,[1.0.3],[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],rgb)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
@@ -37,6 +37,8 @@
AC_PROG_CC
AC_PROG_INSTALL
+PKG_CHECK_MODULES(RGB, xproto)
+
AC_MSG_CHECKING([for rgb database location])
AC_ARG_WITH([rgb-db-dir],
AC_HELP_STRING([--with-rgb-db-dir=<path>],
@@ -56,6 +58,8 @@
[db_type=$withval], [db_type="text"])
AC_MSG_RESULT([$db_type])
+RGB_DB_TYPE=$db_type
+
case $db_type in
text)
RGB_DB_FILES=""
@@ -63,23 +67,35 @@
[Define to 1 to use plain text files for rgb database])
;;
dbm)
- AC_SEARCH_LIBS([dbminit], [db dbm], [],
+ AC_SEARCH_LIBS([dbminit], [db dbm nsl], [],
AC_MSG_ERROR([dbm requested but dbminit() not found in any libraries]))
- RGB_DB_FILES="$(db_file).dir $(db_file).pag"
+ AC_CHECK_HEADER([dbm.h], [DBM_HEADER=''],
+ [AC_CHECK_HEADER([rpcsvc/dbm.h], [DBM_HEADER=''],
+ [AC_MSG_ERROR([dbm requested but dbm.h not found])])])
+ PKG_CHECK_MODULES(XORG, [xorg-server])
+ RGB_CFLAGS="$RGB_CFLAGS $XORG_CFLAGS"
+ RGB_DB_FILES='$(db_file).dir $(db_file).pag'
;;
ndbm)
# Find a dbm or ndbm implementation
- AC_SEARCH_LIBS([dbm_open], [db ndbm dbm],
- AC_DEFINE([NDBM], [1],
+ AC_SEARCH_LIBS([dbm_open], [db ndbm dbm],
+ AC_DEFINE([NDBM], [1],
[Define to 1 if you have ndbm.h interfaces]),
AC_MSG_ERROR([ndbm requested but dbm_open() not found in any libraries]))
- RGB_DB_FILES="$(db_file).dir $(db_file).pag"
+ DBM_HEADER=''
+ PKG_CHECK_MODULES(XORG, [xorg-server])
+ RGB_CFLAGS="$RGB_CFLAGS $XORG_CFLAGS"
+ RGB_DB_FILES='$(db_file).dir $(db_file).pag'
;;
esac
+if test x$DBM_HEADER != x ; then
+ AC_DEFINE_UNQUOTED([DBM_HEADER], [$DBM_HEADER],
+ [Header file to include for dbm functions])
+fi
+AC_SUBST([RGB_DB_TYPE])
AC_SUBST([RGB_DB_FILES])
-AM_CONDITIONAL(RGB_TXT, [test x$db_type = xtext])
+AM_CONDITIONAL(RGB_DB, [test x$db_type != xtext])
-PKG_CHECK_MODULES(RGB, xproto)
AC_SUBST(RGB_CFLAGS)
XORG_MANPAGE_SECTIONS
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/rgb-X11R7.1-1.0.1/COPYING new/rgb-1.0.3/COPYING
--- old/rgb-X11R7.1-1.0.1/COPYING 2005-07-21 06:20:35.000000000 +0200
+++ new/rgb-1.0.3/COPYING 2008-06-06 04:53:48.000000000 +0200
@@ -21,3 +21,30 @@
not be used in advertising or otherwise to promote the sale, use or
other dealings in this Software without prior written authorization
from The Open Group.
+
+Copyright 1994, 2008 Sun Microsystems, Inc. All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, and/or sell copies of the Software, and to permit persons
+to whom the Software is furnished to do so, provided that the above
+copyright notice(s) and this permission notice appear in all copies of
+the Software and that both the above copyright notice(s) and this
+permission notice appear in supporting documentation.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale, use
+or other dealings in this Software without prior written authorization
+of the copyright holder.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/rgb-X11R7.1-1.0.1/Makefile.am new/rgb-1.0.3/Makefile.am
--- old/rgb-X11R7.1-1.0.1/Makefile.am 2005-12-06 23:48:18.000000000 +0100
+++ new/rgb-1.0.3/Makefile.am 2008-06-06 05:06:55.000000000 +0200
@@ -1,4 +1,4 @@
-# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the
@@ -27,24 +27,28 @@
#
-if RGB_TXT
bin_PROGRAMS = showrgb
-else
-bin_PROGRAMS = rgb showrgb
-rgb_CFLAGS = $(RGB_CFLAGS) $(RGB_DB_DEFINES)
+showrgb_SOURCES = showrgb.c
+
+appman_PRE = showrgb.man
+
+if RGB_DB
+bin_PROGRAMS += rgb
+
rgb_SOURCES = rgb.c
+
+appman_PRE += rgb.man
+
+$(RGB_DB_FILES): rgb rgb.txt
+ -rm -f $(RGB_DB_FILES)
+ ./rgb rgb < $(srcdir)/rgb.txt
endif
rgbdir = $(db_dir)
rgb_DATA = $(db_file).txt $(RGB_DB_FILES)
RGB_DB_DEFINES = -DRGB_DB=\"$(db_dir)/$(db_file)\"
-
-showrgb_CFLAGS = $(RGB_CFLAGS) $(RGB_DB_DEFINES)
-showrgb_SOURCES = showrgb.c
-
-appman_PRE = \
- showrgb.man
+AM_CFLAGS = $(RGB_CFLAGS) $(RGB_DB_DEFINES)
EXTRA_DIST= \
rgb.txt \
@@ -58,7 +62,7 @@
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
EXTRA_DIST += $(appman_PRE)
-CLEANFILES = $(appman_DATA)
+CLEANFILES = $(appman_DATA) $(RGB_DB_FILES)
SED = sed
@@ -67,6 +71,10 @@
XORGMANNAME = X Version 11
MAN_SUBSTS = \
+ -e 's|__RGB_DB__|$(db_dir)/$(db_file)|' \
+ -e 's|__RGB_DB_DIR__|$(db_dir)|' \
+ -e 's|__RGB_DB_TYPE__|$(RGB_DB_TYPE)|' \
+ -e 's|__RGB_DB_FILES__|$(RGB_DB_FILES)|' \
-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
-e 's|__xservername__|Xorg|g' \
@@ -83,3 +91,13 @@
.man.$(APP_MAN_SUFFIX):
sed $(MAN_SUBSTS) < $< > $@
+
+EXTRA_DIST += ChangeLog
+MAINTAINERCLEANFILES = ChangeLog
+
+.PHONY: ChangeLog
+
+ChangeLog:
+ (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
+
+dist-hook: ChangeLog
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/rgb-X11R7.1-1.0.1/missing new/rgb-1.0.3/missing
--- old/rgb-X11R7.1-1.0.1/missing 2006-05-21 03:44:35.000000000 +0200
+++ new/rgb-1.0.3/missing 2008-06-06 05:17:52.000000000 +0200
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2005-06-08.21
+scriptversion=2006-05-10.23
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
@@ -33,6 +33,8 @@
fi
run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -44,7 +46,7 @@
msg="missing on your system"
-case "$1" in
+case $1 in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
@@ -77,6 +79,7 @@
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
+ autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -106,7 +109,7 @@
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
# the program).
-case "$1" in
+case $1 in
lex|yacc)
# Not GNU programs, they don't have --version.
;;
@@ -135,7 +138,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case "$1" in
+case $1 in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -164,7 +167,7 @@
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case "$f" in
+ case $f in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -192,8 +195,8 @@
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -f "$file"; then
touch $file
else
@@ -214,25 +217,25 @@
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if [ ! -f y.tab.h ]; then
+ if test ! -f y.tab.h; then
echo >y.tab.h
fi
- if [ ! -f y.tab.c ]; then
+ if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
@@ -244,18 +247,18 @@
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if [ ! -f lex.yy.c ]; then
+ if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
@@ -267,11 +270,9 @@
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
- if test -z "$file"; then
- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
- fi
- if [ -f "$file" ]; then
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
touch $file
else
test -z "$file" || exec >$file
@@ -289,11 +290,17 @@
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
# The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -z "$file"; then
# ... or it is the one specified with @setfilename ...
infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+ file=`sed -n '
+ /^@setfilename/{
+ s/.* \([^ ]*\) *$/\1/
+ p
+ q
+ }' $infile`
# ... or it is derived from the source name (dir/f.texi becomes f.info)
test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
@@ -317,13 +324,13 @@
fi
firstarg="$1"
if shift; then
- case "$firstarg" in
+ case $firstarg in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case "$firstarg" in
+ case $firstarg in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/rgb-X11R7.1-1.0.1/rgb.c new/rgb-1.0.3/rgb.c
--- old/rgb-X11R7.1-1.0.1/rgb.c 2005-11-08 07:33:31.000000000 +0100
+++ new/rgb-1.0.3/rgb.c 2008-06-05 05:13:39.000000000 +0200
@@ -1,5 +1,3 @@
-/* $Xorg: rgb.c,v 1.4 2001/02/09 02:05:35 xorgcvs Exp $ */
-/* $XdotOrg: app/rgb/rgb.c,v 1.4 2005/11/08 06:33:31 jkj Exp $ */
/*
Copyright 1985, 1998 The Open Group
@@ -27,7 +25,6 @@
from The Open Group.
*/
-/* $XFree86: xc/programs/rgb/rgb.c,v 3.8tsi Exp $ */
/* reads from standard input lines of the form:
@@ -39,14 +36,8 @@
# include "config.h"
#endif
-#ifdef NDBM
-#include
-#else
-#if defined(SVR4)
-#include
-#else
-#include
-#endif
+#include DBM_HEADER
+#ifndef NDBM
#define dbm_open(name,flags,mode) (!dbminit(name))
#define dbm_store(db,key,content,flags) (store(key,content))
#define dbm_close(db) dbmclose()
@@ -57,23 +48,14 @@
#include
#include
#include "rgb.h"
-#include "site.h"
#include
#include
-char *ProgramName;
-
-char *SysError ()
-{
- register char *s = strerror(errno);
- return s ? s : "?";
-}
+static char *ProgramName;
int
-main(argc, argv)
- int argc;
- char **argv;
+main(int argc, char **argv)
{
char *dbname;
char line[512];
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/rgb-X11R7.1-1.0.1/rgb.man new/rgb-1.0.3/rgb.man
--- old/rgb-X11R7.1-1.0.1/rgb.man 1970-01-01 01:00:00.000000000 +0100
+++ new/rgb-1.0.3/rgb.man 2008-06-06 05:09:01.000000000 +0200
@@ -0,0 +1,91 @@
+.\" Copyright 1994, 2008 Sun Microsystems, Inc. All rights reserved.
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining a
+.\" copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, and/or sell copies of the Software, and to permit persons
+.\" to whom the Software is furnished to do so, provided that the above
+.\" copyright notice(s) and this permission notice appear in all copies of
+.\" the Software and that both the above copyright notice(s) and this
+.\" permission notice appear in supporting documentation.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+.\" OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+.\" HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+.\" INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+.\" FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+.\" NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+.\" WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+.\"
+.\" Except as contained in this notice, the name of a copyright holder
+.\" shall not be used in advertising or otherwise to promote the sale, use
+.\" or other dealings in this Software without prior written authorization
+.\" of the copyright holder.
+.\"
+.TH rgb __appmansuffix__ __xorgversion__
+.IX "rgb" "" "\f3rgb\fP(1) \(em build colorname database" ""
+.IX "color" "build" "color" "building the colorname database \(em \f3rgb\fP(1)" ""
+.SH NAME
+rgb \- build the color name database
+.SH SYNOPSIS
+.B rgb
+[
+.I dbname
+]
+.SH DESCRIPTION
+.B rgb
+reads from standard input lines of the form:
+.PP
+.nf
+.I
+ red\ \ green\ \ blue\ \ \ \ \ \ name
+.fi
+.PP
+where
+.I red
+/
+.I green
+/
+.I blue
+are decimal values between the range 0 to 255, and
+.I name
+is a description of the color.
+.B rgb
+then builds a color name database in
+.B __RGB_DB_TYPE__
+format. The color name database provides a mapping between ASCII color
+names and RGB color values. It is useful for increasing the
+portability of color programs. The input source for the database is
+in \fI__RGB_DB__.txt\fP. \fIrgb.txt\fP
+is compiled into the __RGB_DB_TYPE__ files
+.IR "__RGB_DB_FILES__" .
+When the server first starts up, it consults the contents of these
+files to build an internal representation of their contents. This
+internal representation is consulted to map color names to color
+values.
+.PP
+.B rgb
+uses the default color name database of \fI__RGB_DB__.txt\fP.
+.SH OPTIONS
+.IP "\fIdbname" 1i
+Color name database.
+.SH EXAMPLES
+example% rgb rgb < __RGB_DB__.txt
+.PP
+example% cat __RGB_DB__.txt
+.SH FILES
+.PD 0
+.TP 30
+.B __RGB_DB__.txt
+color name database source.
+Maps color names to RGB color values.
+.TP
+.B __RGB_DB_DIR__/__RGB_DB_FILES__
+__RGB_DB_TYPE__ files containing color name to RGB mapping.
+.PD
+.SH SEE ALSO
+.BR cat (1),
+.BR __RGB_DB_TYPE__ (3)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/rgb-X11R7.1-1.0.1/rgb.txt new/rgb-1.0.3/rgb.txt
--- old/rgb-X11R7.1-1.0.1/rgb.txt 2003-11-14 17:48:58.000000000 +0100
+++ new/rgb-1.0.3/rgb.txt 2008-06-05 05:15:39.000000000 +0200
@@ -1,4 +1,3 @@
-! $Xorg: rgb.txt,v 1.3 2000/08/17 19:54:00 cpqbld Exp $
255 250 250 snow
248 248 255 ghost white
248 248 255 GhostWhite
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/rgb-X11R7.1-1.0.1/showrgb.c new/rgb-1.0.3/showrgb.c
--- old/rgb-X11R7.1-1.0.1/showrgb.c 2005-11-08 07:33:31.000000000 +0100
+++ new/rgb-1.0.3/showrgb.c 2008-06-05 05:14:00.000000000 +0200
@@ -1,6 +1,4 @@
/*
- * $Xorg: showrgb.c,v 1.4 2001/02/09 02:05:35 xorgcvs Exp $
- * $XdotOrg: app/rgb/showrgb.c,v 1.5 2005/11/08 06:33:31 jkj Exp $
*
Copyright 1989, 1998 The Open Group
@@ -27,21 +25,13 @@
* Author: Jim Fulton, MIT X Consortium
*/
-/* $XFree86: xc/programs/rgb/showrgb.c,v 3.8 2001/12/14 20:01:04 dawes Exp $ */
-
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#ifndef USE_RGB_TXT
-#ifdef NDBM
-#include
-#else
-#if defined(SVR4)
-#include
-#else
-#include
-#endif
+#include DBM_HEADER
+#ifndef NDBM
#define dbm_open(name,flags,mode) (!dbminit(name))
#define dbm_firstkey(db) (firstkey())
#define dbm_fetch(db,key) (fetch(key))
@@ -55,11 +45,10 @@
#include
#ifndef USE_RGB_TXT
#include "rgb.h" /* off in server/include/ */
-#include "site.h"
#endif
#include
-char *ProgramName;
+static char *ProgramName;
static void dumprgb(char *filename);
int
@@ -77,8 +66,7 @@
#ifndef USE_RGB_TXT
static void
-dumprgb (filename)
- char *filename;
+dumprgb (char *filename)
{
#ifdef NDBM
DBM *rgb_dbm;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/rgb-X11R7.1-1.0.1/showrgb.man new/rgb-1.0.3/showrgb.man
--- old/rgb-X11R7.1-1.0.1/showrgb.man 2004-04-23 21:54:36.000000000 +0200
+++ new/rgb-1.0.3/showrgb.man 2008-06-06 05:01:19.000000000 +0200
@@ -1,4 +1,3 @@
-.\" $Xorg: showrgb.man,v 1.4 2001/02/09 02:05:35 xorgcvs Exp $
.\" Copyright 1993, 1998 The Open Group
.\"
.\" Permission to use, copy, modify, distribute, and sell this software and its
@@ -23,11 +22,9 @@
.\" other dealings in this Software without prior written authorization
.\" from The Open Group.
.\"
-.\" $XFree86: xc/programs/rgb/showrgb.man,v 1.7 2001/12/14 20:01:04 dawes Exp $
-.\"
.TH SHOWRGB 1 __xorgversion__
.SH NAME
-showrgb \- uncompile an rgb color-name database
+showrgb \- display an rgb color-name database
.SH SYNOPSIS
.B showrgb
[
@@ -36,13 +33,13 @@
.SH DESCRIPTION
The
.I showrgb
-program reads an rgb color-name database compiled for use with the dbm
-database routines and converts it back to source form, printing the
+program reads an rgb color-name database from a __RGB_DB_TYPE__ file
+and converts it back to source form, printing the
result to standard output. The default
database is the one that X was built with, and may be overridden on
the command line. Specify the database name without
-the \fI.pag\fP or \fI.dir\fP suffix.
+the \fI.txt\fP, \fI.pag\fP or \fI.dir\fP suffix.
.SH FILES
.TP 20
-.I __projectroot__/lib/X11/rgb
+.I __RGB_DB__
default database.
++++++ sessreg-1.0.3.tar.bz2 -> sessreg-1.0.4.tar.bz2 ++++++
++++ 1831 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sessreg-1.0.3/ChangeLog new/sessreg-1.0.4/ChangeLog
--- old/sessreg-1.0.3/ChangeLog 2007-08-17 23:30:54.000000000 +0200
+++ new/sessreg-1.0.4/ChangeLog 2008-06-11 23:46:53.000000000 +0200
@@ -1,3 +1,27 @@
+commit 3db21d655b0a2988ae0fd47e360d29bb8763cd03
+Author: Alan Coopersmith
+Date: Wed Jun 11 14:46:29 2008 -0700
+
+ Version bump: 1.0.4
+
+commit accc7988851b983d1589d64e32a707c0b44fee0e
+Author: Alan Coopersmith
+Date: Wed Jun 11 14:44:10 2008 -0700
+
+ X_NOT_POSIX bits for pre-POSIX-1990 systems not needed any more
+
+commit c9973031a696cc00c509d7013145b1116093bf82
+Author: David Nusinow
+Date: Sat Mar 1 13:53:21 2008 -0500
+
+ Require xproto instead of libX11 for building (bug #9631)
+
+commit a888e809b4e1c9576e667cb50cc62009a1bf391e
+Author: James Cloos
+Date: Thu Dec 6 15:51:04 2007 -0500
+
+ Add missing PHONY line for automatic ChangeLog generation
+
commit da1b5f42fcb1bd0bc9b80f6f1ab7ebb9eb506554
Author: Alan Coopersmith
Date: Fri Aug 17 14:30:31 2007 -0700
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sessreg-1.0.3/compile new/sessreg-1.0.4/compile
--- old/sessreg-1.0.3/compile 2006-11-08 22:30:31.000000000 +0100
+++ new/sessreg-1.0.4/compile 1970-01-01 01:00:00.000000000 +0100
@@ -1,142 +0,0 @@
-#! /bin/sh
-# Wrapper for compilers which do not understand `-c -o'.
-
-scriptversion=2005-05-14.22
-
-# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
-# Written by Tom Tromey .
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# This file is maintained in Automake, please report
-# bugs to or send patches to
-# .
-
-case $1 in
- '')
- echo "$0: No command. Try \`$0 --help' for more information." 1>&2
- exit 1;
- ;;
- -h | --h*)
- cat <<\EOF
-Usage: compile [--help] [--version] PROGRAM [ARGS]
-
-Wrapper for compilers which do not understand `-c -o'.
-Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
-arguments, and rename the output as expected.
-
-If you are trying to build a whole package this is not the
-right script to run: please start by reading the file `INSTALL'.
-
-Report bugs to .
-EOF
- exit $?
- ;;
- -v | --v*)
- echo "compile $scriptversion"
- exit $?
- ;;
-esac
-
-ofile=
-cfile=
-eat=
-
-for arg
-do
- if test -n "$eat"; then
- eat=
- else
- case $1 in
- -o)
- # configure might choose to run compile as `compile cc -o foo foo.c'.
- # So we strip `-o arg' only if arg is an object.
- eat=1
- case $2 in
- *.o | *.obj)
- ofile=$2
- ;;
- *)
- set x "$@" -o "$2"
- shift
- ;;
- esac
- ;;
- *.c)
- cfile=$1
- set x "$@" "$1"
- shift
- ;;
- *)
- set x "$@" "$1"
- shift
- ;;
- esac
- fi
- shift
-done
-
-if test -z "$ofile" || test -z "$cfile"; then
- # If no `-o' option was seen then we might have been invoked from a
- # pattern rule where we don't need one. That is ok -- this is a
- # normal compilation that the losing compiler can handle. If no
- # `.c' file was seen then we are probably linking. That is also
- # ok.
- exec "$@"
-fi
-
-# Name of file we expect compiler to create.
-cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
-
-# Create the lock directory.
-# Note: use `[/.-]' here to ensure that we don't use the same name
-# that we are using for the .o file. Also, base the name on the expected
-# object file name, since that is what matters with a parallel build.
-lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d
-while true; do
- if mkdir "$lockdir" >/dev/null 2>&1; then
- break
- fi
- sleep 1
-done
-# FIXME: race condition here if user kills between mkdir and trap.
-trap "rmdir '$lockdir'; exit 1" 1 2 15
-
-# Run the compile.
-"$@"
-ret=$?
-
-if test -f "$cofile"; then
- mv "$cofile" "$ofile"
-elif test -f "${cofile}bj"; then
- mv "${cofile}bj" "$ofile"
-fi
-
-rmdir "$lockdir"
-exit $ret
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sessreg-1.0.3/configure.ac new/sessreg-1.0.4/configure.ac
--- old/sessreg-1.0.3/configure.ac 2007-08-17 23:29:39.000000000 +0200
+++ new/sessreg-1.0.4/configure.ac 2008-06-11 23:45:53.000000000 +0200
@@ -21,7 +21,7 @@
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
-AC_INIT(sessreg, [1.0.3],
+AC_INIT(sessreg, [1.0.4],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
sessreg)
AM_INIT_AUTOMAKE([dist-bzip2])
@@ -47,7 +47,7 @@
AC_SYS_LARGEFILE
# Checks for pkg-config packages
-PKG_CHECK_MODULES(SESSREG, x11)
+PKG_CHECK_MODULES(SESSREG, xproto)
AC_SUBST(SESSREG_CFLAGS)
# Allow checking code with lint, sparse, etc.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sessreg-1.0.3/Makefile.am new/sessreg-1.0.4/Makefile.am
--- old/sessreg-1.0.3/Makefile.am 2007-08-17 02:16:12.000000000 +0200
+++ new/sessreg-1.0.4/Makefile.am 2008-06-11 23:30:54.000000000 +0200
@@ -75,6 +75,8 @@
MAINTAINERCLEANFILES=ChangeLog
+.PHONY: ChangeLog
+
ChangeLog:
git-log > ChangeLog
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sessreg-1.0.3/missing new/sessreg-1.0.4/missing
--- old/sessreg-1.0.3/missing 2006-11-08 22:30:31.000000000 +0100
+++ new/sessreg-1.0.4/missing 2008-06-11 23:46:44.000000000 +0200
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2005-06-08.21
+scriptversion=2006-05-10.23
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
@@ -33,6 +33,8 @@
fi
run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -44,7 +46,7 @@
msg="missing on your system"
-case "$1" in
+case $1 in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
@@ -77,6 +79,7 @@
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
+ autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -106,7 +109,7 @@
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
# the program).
-case "$1" in
+case $1 in
lex|yacc)
# Not GNU programs, they don't have --version.
;;
@@ -135,7 +138,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case "$1" in
+case $1 in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -164,7 +167,7 @@
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case "$f" in
+ case $f in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -192,8 +195,8 @@
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -f "$file"; then
touch $file
else
@@ -214,25 +217,25 @@
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if [ ! -f y.tab.h ]; then
+ if test ! -f y.tab.h; then
echo >y.tab.h
fi
- if [ ! -f y.tab.c ]; then
+ if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
@@ -244,18 +247,18 @@
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if [ ! -f lex.yy.c ]; then
+ if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
@@ -267,11 +270,9 @@
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
- if test -z "$file"; then
- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
- fi
- if [ -f "$file" ]; then
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
touch $file
else
test -z "$file" || exec >$file
@@ -289,11 +290,17 @@
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
# The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -z "$file"; then
# ... or it is the one specified with @setfilename ...
infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+ file=`sed -n '
+ /^@setfilename/{
+ s/.* \([^ ]*\) *$/\1/
+ p
+ q
+ }' $infile`
# ... or it is derived from the source name (dir/f.texi becomes f.info)
test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
@@ -317,13 +324,13 @@
fi
firstarg="$1"
if shift; then
- case "$firstarg" in
+ case $firstarg in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case "$firstarg" in
+ case $firstarg in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sessreg-1.0.3/sessreg.c new/sessreg-1.0.4/sessreg.c
--- old/sessreg-1.0.3/sessreg.c 2006-11-08 03:32:05.000000000 +0100
+++ new/sessreg-1.0.4/sessreg.c 2008-06-11 23:37:37.000000000 +0200
@@ -88,10 +88,6 @@
#include
#define Time_t time_t
-#ifdef X_NOT_POSIX
-extern long lseek ();
-extern char *ttyname ();
-#endif
static void set_utmp (struct utmp *u, char *line, char *user, char *host, Time_t date, int addp);
++++++ xinit-1.0.8.tar.bz2 -> xinit-1.1.0.tar.bz2 ++++++
++++ 3952 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xinit-1.0.8/ChangeLog new/xinit-1.1.0/ChangeLog
--- old/xinit-1.0.8/ChangeLog 2008-03-06 23:09:38.000000000 +0100
+++ new/xinit-1.1.0/ChangeLog 2008-06-12 21:26:28.000000000 +0200
@@ -1,3 +1,162 @@
+commit 44e2ee01b456deb2630d21786d19ee2734d2f40a
+Author: Jeremy Huddleston
+Date: Wed May 28 12:01:35 2008 -0700
+
+ Apple: Don't use launchd on Tiger since it doesn't support the features we need.
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=15893
+
+commit d315445cb85876cda56f46cb657167d4eb906ba0
+Author: Jeremy Huddleston
+Date: Wed May 28 11:54:22 2008 -0700
+
+ Properly handle using xserverrc
+
+commit 3c5e2ed686bd3ab39e2c1e87feffb5990603cf3c
+Author: Adam Jackson
+Date: Wed May 21 14:34:52 2008 -0400
+
+ xinit 1.0.9
+
+commit c07501f69239e9c1448736ad7e689a2c3da49af9
+Author: Adam Jackson
+Date: Wed May 21 14:29:55 2008 -0400
+
+ Unset session environment variables so startx works within a running session.
+
+commit ef2610f44c7cf40489203fddc77ddcdfb7764eed
+Author: Alan Coopersmith
+Date: Tue May 13 16:28:33 2008 -0700
+
+ Use /bin/ksh instead of /bin/sh on Solaris
+
+commit d3bc7001315a8ba13be073af86fe710740b2d4c3
+Author: Alan Coopersmith
+Date: Tue May 13 16:25:49 2008 -0700
+
+ Check for proper cookie creation on all platforms
+
+commit ef7abe2e72074f8252f0812ab2ca05dff7e76a38
+Author: Alan Coopersmith
+Date: Tue May 13 16:25:22 2008 -0700
+
+ Use od on /dev/random to generate cookie on Solaris
+
+commit e0e89545db1fc08ffe49b2b24455bb30137da671
+Author: Jeremy Huddleston
+Date: Mon May 12 13:17:46 2008 -0700
+
+ Apple: Don't need to spew unneccessary 'directory exists' messages.
+
+commit 85561f8347b33422dd4b0ea11911347c0666e409
+Author: Jeremy Huddleston
+Date: Tue May 6 00:07:18 2008 -0700
+
+ Apple: No need for these bits being here in xinit as of xserver-1.4.0-apple9
+
+commit 280774466dc9f57b4b46c618345f7938290dbb2c
+Author: Jeremy Huddleston
+Date: Fri Apr 25 19:00:23 2008 -0700
+
+ Apple: Added some OSX version protection, so this will still compile on Tiger and below.
+
+commit 0806ae2ecfdcb4ad5f3b7a66dcc9bc5d29d72649
+Author: Jeremy Huddleston
+Date: Fri Apr 25 15:12:54 2008 -0700
+
+ Apple: Use CFProcessPath instead of argv[0] trick.
+
+commit edc3112679af749f0c6fc54b2eec1b89aaf0d0c8
+Author: Matthieu Herrb
+Date: Sun Apr 20 17:30:14 2008 +0200
+
+ Replace sprintf() and strcpy() with snprintf().
+
+commit 47d561fd6efb8923cfbace6fea40dfeb314b4662
+Author: Jeremy Huddleston
+Date: Sat Apr 19 08:50:45 2008 -0700
+
+ Cleaned up handling of defaultserver{,args}
+ Per comments from Jeremy Reed on the list... basically doing for everyone what I do for Apple
+
+commit f6e75ebf5f7f245e1cdeb883a1d2db74f2451fd4
+Author: Jeremy Huddleston
+Date: Sat Apr 19 08:47:20 2008 -0700
+
+ Apple: Fixed make dist to include a missing header and not include generated sources
+
+commit 2b06b58a328e13df4704df8a48d4cd0b1100ba7e
+Author: Jeremy Huddleston
+Date: Thu Apr 17 17:19:41 2008 -0700
+
+ Apple: Added privileged_startx
+
+commit fe5af014f2645d1ecf981d40d3c10a3621e9ec56
+Author: Jeremy Huddleston
+Date: Mon Apr 14 13:05:26 2008 -0700
+
+ Apple: Wait for privileged_startx to finish, so we don't race to create /tmp/.X11-unix
+
+commit d5590dba3cce39367762d39822094ca51000142b
+Author: Jeremy Huddleston
+Date: Sun Apr 13 23:15:27 2008 -0700
+
+ Apple: We renamed font_cache.sh to font_cache for better consistency... Changing startx to work with this
+
+commit 5ef443bb6bff0a03ee00105d9bf95bc3f6f82b11
+Author: Jeremy Huddleston
+Date: Sun Apr 13 19:51:18 2008 -0700
+
+ Apple: privileged_startx is in XINITDIR
+
+commit c1b70ca67ecd12d6837584e7ef4abd01ee3b7ad9
+Author: Jeremy Huddleston
+Date: Tue Apr 8 17:25:54 2008 -0700
+
+ Correctly handle users with spaces in $HOME
+
+commit 1cb4bb208d481967fb736acf10c6ac2b66bf3181
+Author: Jeremy Huddleston
+Date: Sat Apr 5 17:23:02 2008 -0700
+
+ Apple: Renamed LaunchAgent to org.x.startx to distinguish it from the org.x.X11 application
+
+commit f7c706ff46d4a2364d65731cd1c3135ef7987380
+Author: Jeremy Huddleston
+Date: Fri Apr 4 22:49:51 2008 -0700
+
+ Apple: Execute /usr/X11/bin/privileged_startx if it's present
+
+commit ca08a36d10f15be6d230a9af92288da4cb24cd43
+Author: Jeremy Huddleston
+Date: Fri Apr 4 02:31:10 2008 -0700
+
+ Apple: Fixed issue where display would not be passed correctly to the server if nolisten tcp was enabled.
+
+commit 8c52bd4509b7fe5a74026b5bc638d59add9e8945
+Author: Jeremy C. Reed
+Date: Sat Mar 15 18:23:45 2008 -0500
+
+ Use /dev/urandom for cookie it it exists
+ else fall back to /dev/random.
+ Not doing in configure.ac because can't easily check for
+ existence when doing cross-builds.
+ (Alternative would be to define this for every operating system
+ in configure.ac. Currently only is defined for OpenBSD.
+ Systems that have mcookie also will not be effected.)
+
+commit 062524614fdd4f11f32ba3d054f7fc16b9bc5f12
+Author: Matthieu Herrb
+Date: Sat Mar 8 19:02:05 2008 +0100
+
+ OpenBSD: use openssl rand -hex 16 to generate the cookie.
+
+commit 3eaee22196a03d88c419c42470baf562552c1a3b
+Author: Adam Jackson
+Date: Thu Mar 6 17:09:45 2008 -0500
+
+ xinit 1.0.8
+
commit 96c8650369a99e344b4e3510f713b331d83c4272
Author: Jeremy Huddleston
Date: Sun Mar 2 10:32:58 2008 -0800
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xinit-1.0.8/configure.ac new/xinit-1.1.0/configure.ac
--- old/xinit-1.0.8/configure.ac 2008-03-06 23:09:05.000000000 +0100
+++ new/xinit-1.1.0/configure.ac 2008-06-12 21:26:07.000000000 +0200
@@ -21,7 +21,7 @@
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
-AC_INIT(xinit,[1.0.8], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xinit)
+AC_INIT(xinit,[1.1.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xinit)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
@@ -92,37 +92,34 @@
[XINIT="$withval"],
[XINIT="$DEFAULT_XINIT"])
-AC_ARG_WITH(launchd, AS_HELP_STRING([--with-launchd], [Build with suppo
-rt for Apple's launchd (default: auto)]), [LAUNCHD=$withval], [LAUNCHD=auto])
-AC_ARG_WITH(launchagents-dir,AS_HELP_STRING([--with-launchagents-dir=PATH], [Pat
-h to launchd's LaunchAgents directory (default: /Library/LaunchAgents)]),
+AC_ARG_WITH(launchd, AS_HELP_STRING([--with-launchd], [Build with support for Apple's launchd (default: auto)]), [LAUNCHD=$withval], [LAUNCHD=auto])
+AC_ARG_WITH(launchagents-dir, AS_HELP_STRING([--with-launchagents-dir=PATH], [Path to launchd's LaunchAgents directory (default: /Library/LaunchAgents)]),
[ launchagentsdir="${withval}" ],
[ launchagentsdir="/Library/LaunchAgents" ])
+AC_ARG_WITH(launchdaemons-dir, AS_HELP_STRING([--with-launchdaemons-dir=PATH], [Path to launchd's LaunchDaemonss directory (default: /Library/LaunchDaemons)]),
+ [ launchdaemonsdir="${withval}" ],
+ [ launchdaemonsdir="/Library/LaunchDaemons" ])
if test "x$LAUNCHD" = "xauto"; then
unset LAUNCHD
- AC_CHECK_PROG(LAUNCHD, [launchd], [yes], [no])
-fi
-
-if test "x$LAUNCHD" = "xyes" ; then
- AC_DEFINE(HAVE_LAUNCHD, 1, [launchd support available])
-
case $host_os in
- darwin*)
- # For now, this is how we find X11.app on OS-X...
- # A future version of launchd should let us do this cleaner
- #XSERVER=\'\`'$(libexecdir)/x11-exec'\`\'
- AM_CONDITIONAL(APPLE, true)
+ darwin8*)
+ LAUNCHD=no
;;
*)
- AM_CONDITIONAL(APPLE, false)
+ AC_CHECK_PROG(LAUNCHD, [launchd], [yes], [no])
;;
esac
+fi
+
+if test "x$LAUNCHD" = "xyes" ; then
+ AC_DEFINE(HAVE_LAUNCHD, 1, [launchd support available])
else
- AM_CONDITIONAL(APPLE,false)
launchagentsdir=""
+ launchdaemonsdir=""
fi
AC_SUBST([launchagentsdir])
+AC_SUBST([launchdaemonsdir])
AM_CONDITIONAL(LAUNCHD, [test "x$LAUNCHD" = "xyes"])
# Checks for pkg-config packages
@@ -142,7 +139,10 @@
case $host_os in
*openbsd*)
- MCOOKIE='dd if=/dev/arandom bs=16 count=1 2>/dev/null | hexdump -e \\\"%08x\\\"'
+ MCOOKIE='/usr/sbin/openssl rand -hex 16'
+ ;;
+ *solaris*)
+ MCOOKIE="/usr/bin/od -X -A n -N 16 /dev/urandom | /usr/bin/tr -d ' '"
;;
esac
@@ -151,9 +151,13 @@
fi
AC_SUBST(STARTX_COOKIE_FLAGS)
-# Additional substitutions in xinitrc & man pages
+# Additional substitutions in startx, xinitrc & man pages
case $host_os in
- *sco*)
+ *solaris*)
+ SHELL_CMD="/bin/ksh"
+ ARCHMANDEFS=""
+ ;;
+ *sco*)
SHELL_CMD="/bin/ksh"
ARCHMANDEFS="-D__SCOMAN__"
;;
@@ -182,3 +186,4 @@
XORG_RELEASE_VERSION
AC_OUTPUT([Makefile])
+AC_OUTPUT([privileged_startx/Makefile])
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xinit-1.0.8/Makefile.am new/xinit-1.1.0/Makefile.am
--- old/xinit-1.0.8/Makefile.am 2008-03-06 23:08:48.000000000 +0100
+++ new/xinit-1.1.0/Makefile.am 2008-06-12 21:25:46.000000000 +0200
@@ -27,10 +27,6 @@
xinit_CFLAGS = $(XINIT_CFLAGS) -DXINITDIR=\"$(XINITDIR)\" -DBINDIR=\"$(bindir)\"
xinit_LDADD = $(XINIT_LIBS)
-if APPLE
-xinit_LDFLAGS = -framework CoreServices
-endif
-
xinit_SOURCES = \
xinit.c
@@ -63,10 +59,14 @@
-D__bindir__="$(bindir)"
if LAUNCHD
-launchagents_PRE = org.x.X11.plist.pre
-launchagents_DATA = $(launchagents_PRE:plist.pre=plist)
+launchagents_PRE = org.x.startx.plist.cpp
+launchagents_DATA = $(launchagents_PRE:plist.cpp=plist)
+
+SUBDIRS = privileged_startx
endif
+DIST_SUBDIRS = privileged_startx
+
xinitrc: xinitrc.cpp Makefile
startx: startx.cpp Makefile
@@ -74,7 +74,7 @@
CLEANFILES = xinitrc startx $(appman_DATA) $(launchagents_DATA)
-EXTRA_DIST = xinitrc.cpp startx.cpp org.x.X11.plist.cpp $(appman_PRE) \
+EXTRA_DIST = xinitrc.cpp startx.cpp org.x.startx.plist.cpp $(appman_PRE) \
startx.cmd xinitrc.cmd xinit.def ChangeLog autogen.sh
.PHONY: ChangeLog
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xinit-1.0.8/org.x.startx.plist.cpp new/xinit-1.1.0/org.x.startx.plist.cpp
--- old/xinit-1.0.8/org.x.startx.plist.cpp 1970-01-01 01:00:00.000000000 +0100
+++ new/xinit-1.1.0/org.x.startx.plist.cpp 2008-05-21 20:09:16.000000000 +0200
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>Label</key>
+ <string>org.x.startx</string>
+ <key>ProgramArguments</key>
+ <array>
+ <string>/bin/bash</string>
+ <string>--login</string>
+ <string>-c</string>
+ <string>__bindir__/startx</string>
+ </array>
+ <key>Sockets</key>
+ <dict>
+ <key>:0</key>
+ <dict>
+ <key>SecureSocketWithKey</key>
+ <string>DISPLAY</string>
+ </dict>
+ </dict>
+ <key>ServiceIPC</key>
+ <true/>
+</dict>
+</plist>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xinit-1.0.8/org.x.X11.plist.cpp new/xinit-1.1.0/org.x.X11.plist.cpp
--- old/xinit-1.0.8/org.x.X11.plist.cpp 2008-03-06 23:08:48.000000000 +0100
+++ new/xinit-1.1.0/org.x.X11.plist.cpp 1970-01-01 01:00:00.000000000 +0100
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
- <key>Label</key>
- <string>org.x.X11</string>
- <key>ProgramArguments</key>
- <array>
-#ifdef __APPLE__
- <string>/bin/bash</string>
- <string>--login</string>
- <string>-c</string>
-#endif
- <string>__bindir__/startx</string>
- </array>
- <key>Sockets</key>
- <dict>
- <key>:0</key>
- <dict>
- <key>SecureSocketWithKey</key>
- <string>DISPLAY</string>
- </dict>
- </dict>
- <key>ServiceIPC</key>
- <true/>
-</dict>
-</plist>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xinit-1.0.8/privileged_startx/10-tmpdirs.cpp new/xinit-1.1.0/privileged_startx/10-tmpdirs.cpp
--- old/xinit-1.0.8/privileged_startx/10-tmpdirs.cpp 1970-01-01 01:00:00.000000000 +0100
+++ new/xinit-1.1.0/privileged_startx/10-tmpdirs.cpp 2008-05-21 20:09:16.000000000 +0200
@@ -0,0 +1,37 @@
+XCOMM!/bin/sh
+XCOMM Copyright (c) 2008 Apple Inc.
+XCOMM
+XCOMM Permission is hereby granted, free of charge, to any person
+XCOMM obtaining a copy of this software and associated documentation files
+XCOMM (the "Software"), to deal in the Software without restriction,
+XCOMM including without limitation the rights to use, copy, modify, merge,
+XCOMM publish, distribute, sublicense, and/or sell copies of the Software,
+XCOMM and to permit persons to whom the Software is furnished to do so,
+XCOMM subject to the following conditions:
+XCOMM
+XCOMM The above copyright notice and this permission notice shall be
+XCOMM included in all copies or substantial portions of the Software.
+XCOMM
+XCOMM THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+XCOMM EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+XCOMM MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+XCOMM NONINFRINGEMENT. IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT
+XCOMM HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+XCOMM WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+XCOMM OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+XCOMM DEALINGS IN THE SOFTWARE.
+XCOMM
+XCOMM Except as contained in this notice, the name(s) of the above
+XCOMM copyright holders shall not be used in advertising or otherwise to
+XCOMM promote the sale, use or other dealings in this Software without
+XCOMM prior written authorization.
+
+XCOMM Make sure these are owned by root
+for dir in /tmp/.ICE-unix /tmp/.X11-unix /tmp/.font-unix ; do
+ # Use mktemp rather than mkdir to avoid possible security issue
+ # if $dir exists and is a symlink
+ if mktemp -d ${dir} >& /dev/null ; then
+ chmod 1777 $dir
+ chown root:wheel $dir
+ fi
+done
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xinit-1.0.8/privileged_startx/20-font_cache.cpp new/xinit-1.1.0/privileged_startx/20-font_cache.cpp
--- old/xinit-1.0.8/privileged_startx/20-font_cache.cpp 1970-01-01 01:00:00.000000000 +0100
+++ new/xinit-1.1.0/privileged_startx/20-font_cache.cpp 2008-05-21 20:09:16.000000000 +0200
@@ -0,0 +1,35 @@
+XCOMM!/bin/sh
+XCOMM Copyright (c) 2008 Apple Inc.
+XCOMM
+XCOMM Permission is hereby granted, free of charge, to any person
+XCOMM obtaining a copy of this software and associated documentation files
+XCOMM (the "Software"), to deal in the Software without restriction,
+XCOMM including without limitation the rights to use, copy, modify, merge,
+XCOMM publish, distribute, sublicense, and/or sell copies of the Software,
+XCOMM and to permit persons to whom the Software is furnished to do so,
+XCOMM subject to the following conditions:
+XCOMM
+XCOMM The above copyright notice and this permission notice shall be
+XCOMM included in all copies or substantial portions of the Software.
+XCOMM
+XCOMM THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+XCOMM EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+XCOMM MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+XCOMM NONINFRINGEMENT. IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT
+XCOMM HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+XCOMM WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+XCOMM OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+XCOMM DEALINGS IN THE SOFTWARE.
+XCOMM
+XCOMM Except as contained in this notice, the name(s) of the above
+XCOMM copyright holders shall not be used in advertising or otherwise to
+XCOMM promote the sale, use or other dealings in this Software without
+XCOMM prior written authorization.
+
+if [ -x BINDIR/font_cache ] ; then
+ BINDIR/font_cache &
+elif [ -x BINDIR/font_cache.sh ] ; then
+ BINDIR/font_cache.sh -s &
+elif [ -x /usr/X11/bin/fc-cache ] ; then
+ BINDIR/fc-cache &
+fi
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xinit-1.0.8/privileged_startx/client.c new/xinit-1.1.0/privileged_startx/client.c
--- old/xinit-1.0.8/privileged_startx/client.c 1970-01-01 01:00:00.000000000 +0100
+++ new/xinit-1.1.0/privileged_startx/client.c 2008-05-21 20:09:16.000000000 +0200
@@ -0,0 +1,56 @@
+/* Copyright (c) 2008 Apple Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation files
+ * (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge,
+ * publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT
+ * HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Except as contained in this notice, the name(s) of the above
+ * copyright holders shall not be used in advertising or otherwise to
+ * promote the sale, use or other dealings in this Software without
+ * prior written authorization.
+ */
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include "privileged_startx.h"
+
+int client_main(void) {
+ kern_return_t kr;
+ mach_port_t mp;
+
+ kr = bootstrap_look_up(bootstrap_port, BOOTSTRAP_NAME, &mp);
+ if (kr != KERN_SUCCESS) {
+ fprintf(stderr, "bootstrap_look_up(): %s\n", bootstrap_strerror(kr));
+ exit(EXIT_FAILURE);
+ }
+
+ kr = privileged_startx(mp);
+ if (kr != KERN_SUCCESS) {
+ fprintf(stderr, "privileged_startx client: %s\n", mach_error_string(kr));
+ exit(EXIT_FAILURE);
+ }
+
+ exit(EXIT_SUCCESS);
+}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xinit-1.0.8/privileged_startx/Makefile.am new/xinit-1.1.0/privileged_startx/Makefile.am
--- old/xinit-1.0.8/privileged_startx/Makefile.am 1970-01-01 01:00:00.000000000 +0100
+++ new/xinit-1.1.0/privileged_startx/Makefile.am 2008-05-21 20:09:16.000000000 +0200
@@ -0,0 +1,74 @@
+# Copyright (c) 2008 Apple Inc.
+#
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of this software and associated documentation files
+# (the "Software"), to deal in the Software without restriction,
+# including without limitation the rights to use, copy, modify, merge,
+# publish, distribute, sublicense, and/or sell copies of the Software,
+# and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT
+# HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+#
+# Except as contained in this notice, the name(s) of the above
+# copyright holders shall not be used in advertising or otherwise to
+# promote the sale, use or other dealings in this Software without
+# prior written authorization.
+
+include $(top_srcdir)/cpprules.in
+
+xinitrcdir = $(libdir)/X11/xinit
+privstartxdir = $(xinitrcdir)/privileged_startx.d
+
+xinitrc_PROGRAMS = privileged_startx
+privstartx_SCRIPTS = 10-tmpdirs 20-font_cache
+
+AM_CPPFLAGS = -DXINITDIR=\"$(xinitrcdir)\" -DSCRIPTDIR=\"$(privstartxdir)\" -DBINDIR=\"$(bindir)\"
+
+CPP_FILES_FLAGS = -DXINITDIR="$(xinitrcdir)" -DSCRIPTDIR="$(privstartxdir)" -DBINDIR="$(bindir)"
+
+dist_privileged_startx_SOURCES = \
+ server.c \
+ client.c \
+ privileged_startx.c
+
+nodist_privileged_startx_SOURCES = \
+ privileged_startxServer.c \
+ privileged_startxUser.c
+
+BUILT_SOURCES = \
+ privileged_startxServer.c \
+ privileged_startxUser.c \
+ privileged_startxServer.h \
+ privileged_startx.h
+
+launchdaemons_PRE = org.x.privileged_startx.plist.cpp
+launchdaemons_DATA = $(launchdaemons_PRE:plist.cpp=plist)
+
+10-tmpdirs: 10-tmpdirs.cpp Makefile
+20-font_cache: 20-font_cache.cpp Makefile
+
+CLEANFILES = \
+ $(privstartx_SCRIPTS) \
+ $(BUILT_SOURCES) \
+ $(launchdaemons_DATA)
+
+EXTRA_DIST = \
+ 10-tmpdirs.cpp \
+ 20-font_cache.cpp \
+ org.x.privileged_startx.plist.cpp \
+ privileged_startx.defs \
+ privileged_startx_types.h
+
+$(BUILT_SOURCES): privileged_startx.defs
+ mig -sheader privileged_startxServer.h privileged_startx.defs
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xinit-1.0.8/privileged_startx/org.x.privileged_startx.plist.cpp new/xinit-1.1.0/privileged_startx/org.x.privileged_startx.plist.cpp
--- old/xinit-1.0.8/privileged_startx/org.x.privileged_startx.plist.cpp 1970-01-01 01:00:00.000000000 +0100
+++ new/xinit-1.1.0/privileged_startx/org.x.privileged_startx.plist.cpp 2008-05-21 20:09:16.000000000 +0200
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>Label</key>
+ <string>org.x.privileged_startx</string>
+ <key>MachServices</key>
+ <dict>
+ <key>org.x.privileged_startx</key>
+ <true/>
+ </dict>
+ <key>ProgramArguments</key>
+ <array>
+ <string>XINITDIR/privileged_startx</string>
+ <string>-d</string>
+ <string>SCRIPTDIR</string>
+ </array>
+ <key>TimeOut</key>
+ <integer>60</integer>
+</dict>
+</plist>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xinit-1.0.8/privileged_startx/privileged_startx.c new/xinit-1.1.0/privileged_startx/privileged_startx.c
--- old/xinit-1.0.8/privileged_startx/privileged_startx.c 1970-01-01 01:00:00.000000000 +0100
+++ new/xinit-1.1.0/privileged_startx/privileged_startx.c 2008-05-21 20:09:16.000000000 +0200
@@ -0,0 +1,59 @@
+/* Copyright (c) 2008 Apple Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation files
+ * (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge,
+ * publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT
+ * HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Except as contained in this notice, the name(s) of the above
+ * copyright holders shall not be used in advertising or otherwise to
+ * promote the sale, use or other dealings in this Software without
+ * prior written authorization.
+ */
+
+#include
+#include
+
+#ifndef SCRIPTDIR
+#define SCRIPTDIR="/usr/X11/lib/X11/xinit/privileged_startx.d"
+#endif
+
+static void usage(const char *prog) {
+ fprintf(stderr, "%s: usage\n", prog);
+ fprintf(stderr, " %s [-d [<script dir>]]\n\n", prog);
+ fprintf(stderr, " -d: Passed when called from launchd to denote server-mode.\n");
+ fprintf(stderr, " <script dir>: Directory to use instead of %s\n", SCRIPTDIR);
+}
+
+int client_main(void);
+int server_main(const char *dir);
+
+int main(int argc, char *argv[]) {
+
+ if(argc == 1) {
+ return client_main();
+ } else if(!strncmp(argv[1], "-d", 2)) {
+ if(argc == 2)
+ return server_main(NULL);
+ else if(argc == 3)
+ return server_main(argv[2]);
+ }
+
+ usage(argv[0]);
+ return 1;
+}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xinit-1.0.8/privileged_startx/privileged_startx.defs new/xinit-1.1.0/privileged_startx/privileged_startx.defs
--- old/xinit-1.0.8/privileged_startx/privileged_startx.defs 1970-01-01 01:00:00.000000000 +0100
+++ new/xinit-1.1.0/privileged_startx/privileged_startx.defs 2008-05-21 20:09:16.000000000 +0200
@@ -0,0 +1,40 @@
+/* Copyright (c) 2008 Apple Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation files
+ * (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge,
+ * publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT
+ * HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Except as contained in this notice, the name(s) of the above
+ * copyright holders shall not be used in advertising or otherwise to
+ * promote the sale, use or other dealings in this Software without
+ * prior written authorization.
+ */
+
+#include
+#include
+import "privileged_startx_types.h";
+
+subsystem privileged_startx 12345;
+serverprefix do_;
+
+routine privileged_startx(
+ port : mach_port_t);
+
+routine idle_exit(
+ port : mach_port_t);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xinit-1.0.8/privileged_startx/privileged_startx_types.h new/xinit-1.1.0/privileged_startx/privileged_startx_types.h
--- old/xinit-1.0.8/privileged_startx/privileged_startx_types.h 1970-01-01 01:00:00.000000000 +0100
+++ new/xinit-1.1.0/privileged_startx/privileged_startx_types.h 2008-05-21 20:09:16.000000000 +0200
@@ -0,0 +1,6 @@
+#ifndef _PRIV_STARTX_TYPES_H_
+#define _PRIV_STARTX_TYPES_H_
+
+#define BOOTSTRAP_NAME "org.x.privileged_startx"
+
+#endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xinit-1.0.8/privileged_startx/server.c new/xinit-1.1.0/privileged_startx/server.c
--- old/xinit-1.0.8/privileged_startx/server.c 1970-01-01 01:00:00.000000000 +0100
+++ new/xinit-1.1.0/privileged_startx/server.c 2008-05-21 20:09:16.000000000 +0200
@@ -0,0 +1,250 @@
+/* Copyright (c) 2008 Apple Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation files
+ * (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge,
+ * publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT
+ * HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Except as contained in this notice, the name(s) of the above
+ * copyright holders shall not be used in advertising or otherwise to
+ * promote the sale, use or other dealings in this Software without
+ * prior written authorization.
+ */
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include "privileged_startx.h"
+#include "privileged_startxServer.h"
+
+union MaxMsgSize {
+ union __RequestUnion__privileged_startx_subsystem req;
+ union __ReplyUnion__privileged_startx_subsystem rep;
+};
+
+/* globals to trigger idle exit */
+#define DEFAULT_IDLE_TIMEOUT 60 /* 60 second timeout, then the server exits */
+
+struct idle_globals {
+ mach_port_t mp;
+ long timeout;
+ struct timeval lastmsg;
+};
+
+struct idle_globals idle_globals;
+
+#ifndef SCRIPTDIR
+#define SCRIPTDIR="/usr/X11/lib/X11/xinit/privileged_startx.d"
+#endif
+
+/* Default script dir */
+const char *script_dir = SCRIPTDIR;
+
+static void* idle_thread(void* param __attribute__((unused)));
+
+int server_main(const char *dir) {
+ mach_msg_size_t mxmsgsz = sizeof(union MaxMsgSize) + MAX_TRAILER_SIZE;
+ mach_port_t mp;
+ kern_return_t kr;
+ long idle_timeout = DEFAULT_IDLE_TIMEOUT;
+
+ launch_data_t config = NULL, checkin = NULL;
+ checkin = launch_data_new_string(LAUNCH_KEY_CHECKIN);
+ config = launch_msg(checkin);
+ if (!config || launch_data_get_type(config) == LAUNCH_DATA_ERRNO) {
+ asl_log(NULL, NULL, ASL_LEVEL_ERR, "launchd checkin failed");
+ exit(EXIT_FAILURE);
+ }
+
+ launch_data_t tmv;
+ tmv = launch_data_dict_lookup(config, LAUNCH_JOBKEY_TIMEOUT);
+ if (tmv) {
+ idle_timeout = launch_data_get_integer(tmv);
+ asl_log(NULL, NULL, ASL_LEVEL_DEBUG,
+ "idle timeout set: %ld seconds", idle_timeout);
+ }
+
+ if(dir) {
+ script_dir = dir;
+ asl_log(NULL, NULL, ASL_LEVEL_DEBUG,
+ "script directory set: %s", script_dir);
+ }
+
+ launch_data_t svc;
+ svc = launch_data_dict_lookup(config, LAUNCH_JOBKEY_MACHSERVICES);
+ if (!svc) {
+ asl_log(NULL, NULL, ASL_LEVEL_ERR, "no mach services");
+ exit(EXIT_FAILURE);
+ }
+
+ svc = launch_data_dict_lookup(svc, BOOTSTRAP_NAME);
+ if (!svc) {
+ asl_log(NULL, NULL, ASL_LEVEL_ERR, "no mach service: %s",
+ BOOTSTRAP_NAME);
+ exit(EXIT_FAILURE);
+ }
+
+ mp = launch_data_get_machport(svc);
+ if (mp == MACH_PORT_NULL) {
+ asl_log(NULL, NULL, ASL_LEVEL_ERR, "NULL mach service: %s",
+ BOOTSTRAP_NAME);
+ exit(EXIT_FAILURE);
+ }
+
+ /* insert a send right so we can send our idle exit message */
+ kr = mach_port_insert_right(mach_task_self(), mp, mp,
+ MACH_MSG_TYPE_MAKE_SEND);
+ if (kr != KERN_SUCCESS) {
+ asl_log(NULL, NULL, ASL_LEVEL_ERR, "send right failed: %s",
+ mach_error_string(kr));
+ exit(EXIT_FAILURE);
+ }
+
+ /* spawn a thread to monitor our idle timeout */
+ pthread_t thread;
+ idle_globals.mp = mp;
+ idle_globals.timeout = idle_timeout;
+ gettimeofday(&idle_globals.lastmsg, NULL);
+ pthread_create(&thread, NULL, &idle_thread, NULL);
+
+ /* Main event loop */
+ kr = mach_msg_server(privileged_startx_server, mxmsgsz, mp, 0);
+ if (kr != KERN_SUCCESS) {
+ asl_log(NULL, NULL, ASL_LEVEL_ERR,
+ "mach_msg_server(mp): %s\n", mach_error_string(kr));
+ exit(EXIT_FAILURE);
+ }
+
+ exit(EXIT_SUCCESS);
+}
+
+static int ftscmp(const FTSENT **a, const FTSENT **b) {
+ return strcmp((**a).fts_name, (**b).fts_name);
+}
+
+kern_return_t do_privileged_startx(mach_port_t test_port __attribute__((unused))) {
+ kern_return_t retval = KERN_SUCCESS;
+ char fn_buf[PATH_MAX + 1];
+ char *s;
+ int error_code;
+ FTS *ftsp;
+ FTSENT *ftsent;
+
+ const char * path_argv[2] = {script_dir, NULL};
+
+ /* Store that we were called, so the idle timer will reset */
+ gettimeofday(&idle_globals.lastmsg, NULL);
+
+ /* script_dir contains a set of files to run with root privs when X11 starts */
+ ftsp = fts_open(path_argv, FTS_PHYSICAL, ftscmp);
+ if(!ftsp) {
+ asl_log(NULL, NULL, ASL_LEVEL_ERR,
+ "do_privileged_startx: fts_open(%s): %s\n",
+ script_dir, strerror(errno));
+ return KERN_FAILURE;
+ }
+
+ /* Grab our dir */
+ ftsent = fts_read(ftsp);
+ if(!ftsent) {
+ asl_log(NULL, NULL, ASL_LEVEL_ERR,
+ "do_privileged_startx: fts_read(): %s\n", strerror(errno));
+ fts_close(ftsp);
+ return KERN_FAILURE;
+ }
+
+ /* Get a list of the files in this directory */
+ ftsent = fts_children(ftsp, 0);
+ if(!ftsent) {
+ asl_log(NULL, NULL, ASL_LEVEL_ERR,
+ "do_privileged_startx: fts_children(): %s\n", strerror(errno));
+ fts_close(ftsp);
+ return KERN_FAILURE;
+ }
+
+ /* Setup the buffer to have the path to the script dir */
+ strncpy(fn_buf, script_dir, PATH_MAX-1);
+ strcat(fn_buf, "/");
+ s = strrchr(fn_buf, 0);
+
+ /* Itterate over these files in alphabetical order */
+ for(; ftsent; ftsent = ftsent->fts_link) {
+ /* We only source regular files that are executable */
+ /* Note: This assumes we own them, which should always be the case */
+ if((ftsent->fts_statp->st_mode & S_IFREG) &&
+ (ftsent->fts_statp->st_mode & S_IXUSR)) {
+
+ /* Complete the full path filename in fn_buf */
+ strcpy(s, ftsent->fts_name);
+
+ /* Run it */
+ error_code = system(fn_buf);
+ if(error_code != 0) {
+ asl_log(NULL, NULL, ASL_LEVEL_ERR,
+ "do_privileged_startx: %s: exited with status %d\n",
+ fn_buf, error_code);
+ retval = KERN_FAILURE;
+ }
+ }
+ }
+
+ fts_close(ftsp);
+ return retval;
+}
+
+kern_return_t do_idle_exit(mach_port_t test_port __attribute__((unused))) {
+ struct timeval now;
+ gettimeofday(&now, NULL);
+
+ long delta = now.tv_sec - idle_globals.lastmsg.tv_sec;
+ if (delta >= idle_globals.timeout) {
+ exit(EXIT_SUCCESS);
+ }
+
+ return KERN_SUCCESS;
+}
+
+static void *idle_thread(void* param __attribute__((unused))) {
+ for(;;) {
+ struct timeval now;
+ gettimeofday(&now, NULL);
+ long delta = (now.tv_sec - idle_globals.lastmsg.tv_sec);
+ if (delta < idle_globals.timeout) {
+ /* sleep for remainder of timeout */
+ sleep(idle_globals.timeout - delta);
+ } else {
+ /* timeout has elapsed, attempt to idle exit */
+ idle_exit(idle_globals.mp);
+ }
+ }
+ return NULL;
+}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xinit-1.0.8/startx.cpp new/xinit-1.1.0/startx.cpp
--- old/xinit-1.0.8/startx.cpp 2008-03-06 23:08:48.000000000 +0100
+++ new/xinit-1.1.0/startx.cpp 2008-06-12 21:25:46.000000000 +0200
@@ -13,6 +13,9 @@
XCOMM
XCOMM $XFree86: xc/programs/xinit/startx.cpp,v 3.16tsi Exp $
+unset DBUS_SESSION_BUS_ADDRESS
+unset SESSION_MANAGER
+
#if defined(__SCO__) || defined(__UNIXWARE__) || defined(__APPLE__)
XCOMM Check for /usr/bin/X11 and BINDIR in the path, if not add them.
@@ -75,6 +78,7 @@
defaultserver=XSERVER
defaultclientargs=""
defaultserverargs=""
+defaultdisplay=":0"
clientargs=""
serverargs=""
@@ -95,13 +99,21 @@
XCOMM First, start caching fonts
if [ x`defaults read org.x.X11 cache_fonts` = x1 ] ; then
- if [ -x /usr/X11/bin/font_cache.sh ] ; then
+ if [ -x /usr/X11/bin/font_cache ] ; then
+ /usr/X11/bin/font_cache &
+ elif [ -x /usr/X11/bin/font_cache.sh ] ; then
/usr/X11/bin/font_cache.sh &
elif [ -x /usr/X11/bin/fc-cache ] ; then
/usr/X11/bin/fc-cache &
fi
fi
+if [ -x XINITDIR/privileged_startx ] ; then
+ # Don't push this into the background becasue it can cause
+ # a race to create /tmp/.X11-unix
+ XINITDIR/privileged_startx
+fi
+
if [ x`defaults read org.x.X11 no_auth` = x0 ] ; then
enable_xauth=1
else
@@ -149,12 +161,6 @@
esac
#endif
-if [ -f $userserverrc ]; then
- defaultserverargs=$userserverrc
-elif [ -f $sysserverrc ]; then
- defaultserverargs=$sysserverrc
-fi
-
whoseargs="client"
while [ x"$1" != x ]; do
case "$1" in
@@ -206,14 +212,19 @@
XCOMM process server arguments
if [ x"$server" = x ]; then
- XCOMM if no server arguments or display either, use rc file instead
+ server=$defaultserver
+
+ XCOMM if no server arguments or display either, use defaults
if [ x"$serverargs" = x -a x"$display" = x ]; then
- server="$defaultserverargs"
-#ifdef __APPLE__
- display="$defaultdisplay"
-#endif
- else
- server=$defaultserver
+ XCOMM For compatibility reasons, only use xserverrc if there were no server command line arguments
+ if [ -f $userserverrc ]; then
+ server=$userserverrc
+ elif [ -f $sysserverrc ]; then
+ server=$sysserverrc
+ fi
+
+ serverargs=$defaultserverargs
+ display=$defaultdisplay
fi
fi
@@ -243,12 +254,16 @@
#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
+#endif
if test x"$mcookie" = x; then
echo "Couldn't create cookie"
exit 1
fi
-#endif
dummy=0
XCOMM create a file with auth information for the server. ':0' is a dummy.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xinit-1.0.8/xinit.c new/xinit-1.1.0/xinit.c
--- old/xinit-1.0.8/xinit.c 2008-03-06 23:08:48.000000000 +0100
+++ new/xinit-1.1.0/xinit.c 2008-05-21 20:09:16.000000000 +0200
@@ -39,12 +39,6 @@
#include
#include
-#ifdef __APPLE__
-#include
-#define kX11AppBundleId "org.x.X11"
-#define kX11AppBundlePath "/Contents/MacOS/X11"
-#endif
-
#ifdef X_POSIX_C_SOURCE
#define _POSIX_C_SOURCE X_POSIX_C_SOURCE
#include
@@ -176,9 +170,6 @@
static char *displayNum = NULL;
static char *program = NULL;
static Display *xd = NULL; /* server connection */
-#ifdef __APPLE__
-static char x11_path[PATH_MAX];
-#endif
#ifndef SYSV
#if defined(__CYGWIN__) || defined(SVR4) || defined(_POSIX_SOURCE) || defined(CSRG_BASED) || defined(__UNIXOS2__) || defined(Lynx) || defined(__APPLE__)
int status;
@@ -228,56 +219,11 @@
#endif
}
-#ifdef __APPLE__
-static void set_x11_path() {
- CFURLRef appURL = NULL;
- OSStatus osstatus = LSFindApplicationForInfo(kLSUnknownCreator, CFSTR(kX11AppBundleId), nil, nil, &appURL);
-
- switch (osstatus) {
- case noErr:
- if (appURL == NULL) {
- fprintf(stderr, "xinit: Invalid response from LSFindApplicationForInfo(%s)\n",
- kX11AppBundleId);
- exit(1);
- }
-
- if (!CFURLGetFileSystemRepresentation(appURL, true, (unsigned char *)x11_path, sizeof(x11_path))) {
- fprintf(stderr, "xinit: Error resolving URL for %s\n", kX11AppBundleId);
- exit(2);
- }
-
- strlcat(x11_path, kX11AppBundlePath, sizeof(x11_path));
-#ifdef DEBUG
- fprintf(stderr, "xinit: X11.app = %s\n", x11_path);
-#endif
- break;
- case kLSApplicationNotFoundErr:
- fprintf(stderr, "xinit: Unable to find application for %s\n", kX11AppBundleId);
- exit(4);
- default:
- fprintf(stderr, "xinit: Unable to find application for %s, error code = %d\n",
- kX11AppBundleId, (int)osstatus);
- exit(5);
- }
-}
-#endif
-
static void
Execute(char **vec, /* has room from up above */
char **envp)
{
- char *file = vec[0];
-#ifdef __APPLE__
- /* This is ugly, but currently, we need to trick OS-X into thinking X is in
- * the X11.app bundle. Hopefully UI, icons, etc will eventually be set
- * by Xquartz, but this is how we're doing it for now. -JH
- */
- if(!strcmp(file, "/usr/X11/bin/X") || !strcmp(file, "/usr/X11/bin/Xquartz") || !strcmp(file, "X") || !strcmp(file, "Xquartz")) {
- vec[0] = x11_path;
- fprintf(stderr, "xinit: Detected Xquartz startup, setting file=%s, argv[0]=%s\n", file, vec[0]);
- }
-#endif
- Execvpe (file, vec, envp);
+ Execvpe (vec[0], vec, envp);
#ifndef __UNIXOS2__
if (access (vec[0], R_OK) == 0) {
vec--; /* back it up to stuff shell in */
@@ -305,10 +251,6 @@
int start_of_client_args, start_of_server_args;
struct sigaction sa;
-#ifdef __APPLE__
- set_x11_path();
-#endif
-
#ifdef __UNIXOS2__
envsave = envp; /* circumvent an EMX problem */
@@ -412,10 +354,11 @@
xinitrcbuf[0] = '\0';
if ((cp = getenv ("XINITRC")) != NULL) {
- strcpy (xinitrcbuf, cp);
+ (void) snprintf (xinitrcbuf, sizeof(xinitrcbuf), "%s", cp);
required = True;
} else if ((cp = getenv ("HOME")) != NULL) {
- (void) sprintf (xinitrcbuf, "%s/%s", cp, XINITRC);
+ (void) snprintf (xinitrcbuf, sizeof(xinitrcbuf),
+ "%s/%s", cp, XINITRC);
}
if (xinitrcbuf[0]) {
if (access (xinitrcbuf, F_OK) == 0) {
@@ -439,10 +382,11 @@
xserverrcbuf[0] = '\0';
if ((cp = getenv ("XSERVERRC")) != NULL) {
- strcpy (xserverrcbuf, cp);
+ (void) snprintf (xserverrcbuf, sizeof(xserverrcbuf), "%s", cp);
required = True;
} else if ((cp = getenv ("HOME")) != NULL) {
- (void) sprintf (xserverrcbuf, "%s/%s", cp, XSERVERRC);
+ (void) snprintf (xserverrcbuf, sizeof(xserverrcbuf),
+ "%s/%s", cp, XSERVERRC);
}
if (xserverrcbuf[0]) {
if (access (xserverrcbuf, F_OK) == 0) {
@@ -705,6 +649,7 @@
unsigned long num;
char nums[10];
int numn;
+ size_t len;
prop = XInternAtom(xd, "XFree86_VT", False);
if (prop == None) {
#ifdef DEBUG
@@ -760,11 +705,18 @@
windowpath = getenv("WINDOWPATH");
numn = snprintf(nums, sizeof(nums), "%lu", num);
if (!windowpath) {
- newwindowpath = malloc(10 + 1 + numn + 1);
- sprintf(newwindowpath, "WINDOWPATH=%s", nums);
+ len = 10 + 1 + numn + 1;
+ newwindowpath = malloc(len);
+ if (newwindowpath == NULL)
+ return;
+ snprintf(newwindowpath, len, "WINDOWPATH=%s", nums);
} else {
- newwindowpath = malloc(10 + 1 + strlen(windowpath) + 1 + numn + 1);
- sprintf(newwindowpath, "WINDOWPATH=%s:%s", windowpath, nums);
+ len = 10 + 1 + strlen(windowpath) + 1 + numn + 1;
+ newwindowpath = malloc(len);
+ if (newwindowpath == NULL)
+ return;
+ snprintf(newwindowpath, len, "WINDOWPATH=%s:%s",
+ windowpath, nums);
}
*newenvironlast++ = newwindowpath;
*newenvironlast = NULL;
@@ -887,8 +839,7 @@
}
/* put DISPLAY=displayname as first element */
- strcpy (displaybuf, "DISPLAY=");
- strcpy (displaybuf + 8, displayNum);
+ snprintf (displaybuf, sizeof(displaybuf), "DISPLAY=%s", displayNum);
newPtr = newenviron;
*newPtr++ = displaybuf;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xinit-1.0.8/xinitrc.cpp new/xinit-1.1.0/xinitrc.cpp
--- old/xinit-1.0.8/xinitrc.cpp 2008-03-06 23:08:48.000000000 +0100
+++ new/xinit-1.1.0/xinitrc.cpp 2008-05-21 20:09:16.000000000 +0200
@@ -24,20 +24,20 @@
XMODMAP $sysmodmap
fi
-if [ -f $userresources ]; then
+if [ -f "$userresources" ]; then
#ifdef __APPLE__
if [ -x /usr/bin/cpp ] ; then
- XRDB -merge $userresources
+ XRDB -merge "$userresources"
else
- XRDB -nocpp -merge $userresources
+ XRDB -nocpp -merge "$userresources"
fi
#else
- XRDB -merge $userresources
+ XRDB -merge "$userresources"
#endif
fi
-if [ -f $usermodmap ]; then
- XMODMAP $usermodmap
+if [ -f "$usermodmap" ]; then
+ XMODMAP "$usermodmap"
fi
XCOMM start some nice programs
++++++ xinit.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/X11/xinit/xinitrc.common new/etc/X11/xinit/xinitrc.common
--- old/etc/X11/xinit/xinitrc.common 2008-05-23 15:34:16.000000000 +0200
+++ new/etc/X11/xinit/xinitrc.common 2008-06-09 05:14:28.000000000 +0200
@@ -98,6 +98,11 @@
fi
#
+# Fix keyboard layout (Bug #368673)
+#
+setxkbmap -print | xkbcomp - $DISPLAY
+
+#
# Handle the the users Xmodmap or Xkbmap.
# Note that xkb and xmodmap should not be mixed.
#
@@ -141,8 +146,3 @@
#else
# unset XCURSOR_CORE
#fi
-
-#
-# Fix keyboard layout (Bug #368673)
-#
-setxkbmap -print | xkbcomp - $DISPLAY
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org