xinit: Changes to 'upstream-unstable'
autogen.sh |5 ++- configure.ac | 12 +++-- cpprules.in |2 - startx.cpp | 76 ++- xinit.c | 14 +- xinitrc.cpp | 43 - 6 files changed, 39 insertions(+), 113 deletions(-) New commits: commit 6f6747d500439782476cf5c029a7fc45fc954c86 Author: Hans de Goede Date: Thu Sep 11 16:29:06 2014 +0200 xinit 1.3.4 Signed-off-by: Hans de Goede diff --git a/configure.ac b/configure.ac index 3e9bd79..18794b3 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ dnl Process this file with autoconf to create configure. # Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([xinit], [1.3.3], +AC_INIT([xinit], [1.3.4], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xinit]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([config.h]) commit e91faac94e36937c96c04277eae7960bf5132b5b Author: Brad Smith Date: Fri Aug 29 01:34:16 2014 -0400 Remove hardcoded path to OpenSSL for OpenBSD Since xinit's autoconf script was changed to use AC_PATH_PROGS() to find openssl this hardcoded path to openssl can be removed. This was noticed recently when openssl was moved from /usr/sbin to /usr/bin and developers were looking for anything having hardcoded paths. Reviewed-by: Matthieu Herrb diff --git a/configure.ac b/configure.ac index f04b7c1..3e9bd79 100644 --- a/configure.ac +++ b/configure.ac @@ -160,9 +160,6 @@ if test "x$MCOOKIE" = x ; then MCOOKIE="$OPENSSL rand -hex 16" else case $host_os in -*openbsd*) -MCOOKIE='/usr/sbin/openssl rand -hex 16' -;; *solaris*) MCOOKIE="/usr/bin/od -X -A n -N 16 /dev/urandom | /usr/bin/tr -d ' '" ;; commit 94b002262d27975dabf56c77fd308ebabc894090 Author: Hans de Goede Date: Tue Aug 26 11:52:20 2014 +0200 startx: Make the bugzilla reference in a comment survive cpp processing https://bugs.freedesktop.org/show_bug.cgi?id=83019 Signed-off-by: Hans de Goede diff --git a/startx.cpp b/startx.cpp index 5dafce7..1c6fce0 100644 --- a/startx.cpp +++ b/startx.cpp @@ -191,7 +191,7 @@ if [ x"$server" = x ]; then #ifdef __linux__ XCOMM When starting the defaultserver start X on the current tty to avoid XCOMM the startx session being seen as inactive: -XCOMM https://bugzilla.redhat.com/show_bug.cgi?id=806491 +XCOMM "https://bugzilla.redhat.com/show_bug.cgi?id=806491"; tty=$(tty) if expr match "$tty" '^/dev/tty[0-9]\+$' > /dev/null; then tty_num=$(echo "$tty" | grep -oE '[0-9]+$') commit 5502aaf99f4e723e96791e8f4cf01e0c200ec269 Author: Alan Coopersmith Date: Sat May 31 21:39:32 2014 -0700 autogen.sh: Honor NOCONFIGURE=1 See http://people.gnome.org/~walters/docs/build-api.txt Signed-off-by: Alan Coopersmith diff --git a/autogen.sh b/autogen.sh index 80ae530..fc34bd5 100755 --- a/autogen.sh +++ b/autogen.sh @@ -9,5 +9,6 @@ cd $srcdir autoreconf -v --install || exit 1 cd $ORIGDIR || exit $? -$srcdir/configure "$@" - +if test -z "$NOCONFIGURE"; then +$srcdir/configure "$@" +fi commit a6a720b5181d4d0529e4eb203ece234ba45f69dd Author: Alan Coopersmith Date: Sat May 31 21:38:41 2014 -0700 configure: Drop AM_MAINTAINER_MODE Signed-off-by: Alan Coopersmith diff --git a/autogen.sh b/autogen.sh index e81f989..80ae530 100755 --- a/autogen.sh +++ b/autogen.sh @@ -9,5 +9,5 @@ cd $srcdir autoreconf -v --install || exit 1 cd $ORIGDIR || exit $? -$srcdir/configure --enable-maintainer-mode "$@" +$srcdir/configure "$@" diff --git a/configure.ac b/configure.ac index 37eabfa..f04b7c1 100644 --- a/configure.ac +++ b/configure.ac @@ -29,7 +29,6 @@ AC_CONFIG_HEADERS([config.h]) # Initialize Automake AM_INIT_AUTOMAKE([foreign dist-bzip2]) -AM_MAINTAINER_MODE # Require X.Org macros 1.19 or later for TRADITIONALCPPFLAGS m4_ifndef([XORG_MACROS_VERSION], commit 1b23094a8606bf383ec6c7803a9cd300b1bb96a7 Author: Hans de Goede Date: Mon Apr 7 11:23:48 2014 +0200 startx: Pass vtX as long as the user did not specify one Adding vtX to $defaultserverargs means that it will only be added when the user specifies no server arguments. This means that doing ie: "startx -- -depth 16" will cause the server to start on a different vt then just "startx", which does not meat the principle of least surprise. Instead always pass the vtX argument, except when the user has specified its own vtX argument. Note that vtX still only gets added for the default server, since for ie Xnest or Xephyr it makes no sense. Signed-off-by: Hans de Goede Reviewed-by: James Cloos diff --git a/startx.cpp b/startx.cpp index f4a0283..5dafce7 100644 --- a/startx.cpp +++ b/startx.cpp @@ -59,6 +59,7 @@ defaultserverargs="" defaultdisplay=":0" clientargs="
xinit: Changes to 'upstream-unstable'
configure.ac | 10 ++
launchd/user_startx/Makefile.am |4
launchd/user_startx/launchd_startx.c | 22 +-
launchd/user_startx/startx.plist.cpp |4
startx.cpp | 34 ++
xinit.c |2 --
6 files changed, 57 insertions(+), 19 deletions(-)
New commits:
commit f5ef7a3f8c1e8ac3f715e4059bf3b9a03aafd5a7
Author: Jeremy Huddleston
Date: Fri Jan 27 23:13:48 2012 -0800
configure.ac: 1.3.2
Signed-off-by: Jeremy Huddleston
diff --git a/configure.ac b/configure.ac
index 4402ba5..d18c4b0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ dnl Process this file with autoconf to create configure.
# Initialize Autoconf
AC_PREREQ([2.60])
-AC_INIT([xinit], [1.3.1],
+AC_INIT([xinit], [1.3.2],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xinit])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([config.h])
commit ec55c94dfe1bf43ece808d984c672602faddd91b
Author: Jeremy Huddleston
Date: Tue Nov 8 14:14:19 2011 -0800
Use default clientargs, serverargs, and display if none were set
Previously, we did not use the default values unless server or client
weren't
set, but we should still use the defaults if they were not set but the
server
was. This is most evident when you want to tell startx which server to use,
but you want startx to figure out which display to use automatically.
This fixes a regression introduced by the previous patch on XQuartz:
http://xquartz.macosforge.org/trac/ticket/523
Signed-off-by: Jeremy Huddleston
diff --git a/startx.cpp b/startx.cpp
index 9135da8..c92c51c 100644
--- a/startx.cpp
+++ b/startx.cpp
@@ -201,7 +201,7 @@ XCOMM process client arguments
if [ x"$client" = x ]; then
client=$defaultclient
-XCOMM if no client arguments either, use rc file instead
+XCOMM For compatibility reasons, only use startxrc if there were no client
command line arguments
if [ x"$clientargs" = x ]; then
if [ -f "$userclientrc" ]; then
client=$userclientrc
@@ -214,29 +214,38 @@ if [ x"$client" = x ]; then
client=$scosysclientrc
#endif
fi
-
-clientargs=$defaultclientargs
fi
fi
+XCOMM if no client arguments, use defaults
+if [ x"$clientargs" = x ]; then
+clientargs=$defaultclientargs
+fi
+
XCOMM process server arguments
if [ x"$server" = x ]; then
server=$defaultserver
-XCOMM if no server arguments or display either, use defaults
+XCOMM For compatibility reasons, only use xserverrc if there were no
server command line arguments
if [ x"$serverargs" = x -a x"$display" = x ]; then
- 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
+XCOMM if no server arguments, use defaults
+if [ x"$serverargs" = x ]; then
+serverargs=$defaultserverargs
+fi
+
+XCOMM if no display, use default
+if [ x"$display" = x ]; then
+display=$defaultdisplay
+fi
+
if [ x"$enable_xauth" = x1 ] ; then
if [ x"$XAUTHORITY" = x ]; then
XAUTHORITY=$HOME/.Xauthority
commit 98b85a1ac235dbf421d1a49b41599e8bcaf490d3
Author: Jeremy Huddleston
Date: Wed Oct 19 23:00:56 2011 -0700
launchd: Add an option (--with-launchagent-xserver) to set the default X11
server
This allows the LaunchAgent and startx to have different default servers
which will be useful as the Xorg DDX becomes available on darwin.
Signed-off-by: Jeremy Huddleston
diff --git a/configure.ac b/configure.ac
index 4e808ec..4402ba5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -101,6 +101,9 @@ AC_ARG_WITH(launchd,
AS_HELP_STRING([--with-launchd], [Build with sup
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(launchagent-xserver,
AS_HELP_STRING([--with-launchagent-xserver=PATH], [Path to the X server which
the LaunchAgent should start (if not provided, let startx decide)"]),
+ [ launchagentxserver="${withval}" ],
+ [ launchagentxserver="no" ])
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/Lau
xinit: Changes to 'upstream-unstable'
.gitignore|1 Makefile.am | 31 - README| 26 + configure.ac | 44 + cpprules.in | 22 launchd/Makefile.am |3 launchd/console_redirect.c| 418 ++ launchd/console_redirect.h| 44 + launchd/privileged_startx/.gitignore |9 launchd/privileged_startx/10-tmpdirs.cpp | 46 + launchd/privileged_startx/20-font_cache.cpp | 35 + launchd/privileged_startx/Makefile.am | 82 +++ launchd/privileged_startx/client.c| 66 ++ launchd/privileged_startx/privileged_startx.c | 63 ++ launchd/privileged_startx/privileged_startx.defs | 40 + launchd/privileged_startx/privileged_startx.plist.cpp | 28 + launchd/privileged_startx/privileged_startx_types.h | 10 launchd/privileged_startx/server.c| 320 + launchd/user_startx/.gitignore|2 launchd/user_startx/Makefile.am | 49 ++ launchd/user_startx/launchd_startx.c | 64 ++ launchd/user_startx/startx.plist.cpp | 25 + man/Makefile.am | 20 man/startx.man| 224 + man/xinit.man | 199 org.x.startx.plist.cpp| 24 - privileged_startx/.gitignore |9 privileged_startx/10-tmpdirs.cpp | 37 - privileged_startx/20-font_cache.cpp | 35 - privileged_startx/Makefile.am | 80 --- privileged_startx/client.c| 62 -- privileged_startx/org.x.privileged_startx.plist.cpp | 28 - privileged_startx/privileged_startx.c | 59 -- privileged_startx/privileged_startx.defs | 40 - privileged_startx/privileged_startx_types.h | 10 privileged_startx/server.c| 306 - startx.cpp|8 startx.man| 223 - xinit.c |5 xinit.man | 199 40 files changed, 1812 insertions(+), 1184 deletions(-) New commits: commit 6543a881708a2a410b51bb5644d9123c847a2908 Author: Jeremy Huddleston Date: Sun Jul 24 17:15:10 2011 -0700 configure.ac: Bump version to 1.3.1 Signed-off-by: Jeremy Huddleston diff --git a/configure.ac b/configure.ac index 9aa2f2e..4e808ec 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ dnl Process this file with autoconf to create configure. # Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([xinit], [1.3.0], +AC_INIT([xinit], [1.3.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xinit]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([config.h]) commit b0b9c21b752faab43241665f8fd12e10973e739c Author: Gaetan Nadon Date: Fri Jun 17 13:49:11 2011 -0400 DIST_SUBDIRS is not required when using AM_CONDITIONALs LAUNCHD is an Automake conditional which means that Automake will traverse the launchd directory when running the dist target. http://www.gnu.org/software/automake/manual/automake.html One less variables to maintain. Signed-off-by: Gaetan Nadon diff --git a/Makefile.am b/Makefile.am index c179fa9..3867bea 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,6 +19,11 @@ # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. +SUBDIRS = man +if LAUNCHD +SUBDIRS += launchd +endif + bin_PROGRAMS = xinit bin_SCRIPTS = startx @@ -50,13 +55,6 @@ CPP_FILES_FLAGS = \ -D__bindir__="$(bindir)" \ -DBUNDLE_ID_PREFIX="$(bundleidprefix)" -SUBDIRS = man -if LAUNCHD -SUBDIRS += launchd -endif - -DIST_SUBDIRS = launchd man - xinitrc_DATA = xinitrc MAINTAINERCLEANFILES = ChangeLog INSTALL commit 120a58116f2e3a223dbb78e0b33d3755eeb8ad5a Author: Gaetan Nadon Date: Fri Jun 17 13:39:27 2011 -0400 Move man pages in the man directory Now that the cpp tool is no longer needed, normalize the man pages build. Reviewed-by: Alan Coopersmith Signed-off-by: Gaetan Nadon diff --git a/Makefile.am b/Makefile.am index 6c4ef24..c179fa9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -29,25 +29,8 @@ xinit_LDADD = $(XINIT_LIBS) xinit_SOURCES =\ xinit.c -appmandir = $(APP_MAN_DIR) -appman_PRE = startx.man xinit.man -appman_DATA = $(appman_PRE:man=$(APP_MAN_SUFF
xinit: Changes to 'upstream-unstable'
.gitignore | 77 + INSTALL | 236 --- Makefile.am | 25 configure.ac| 67 - cpprules.in |8 org.x.startx.plist.cpp |4 privileged_startx/.gitignore|9 privileged_startx/Makefile.am |7 privileged_startx/client.c |4 privileged_startx/org.x.privileged_startx.plist.cpp |4 privileged_startx/privileged_startx_types.h |6 privileged_startx/server.c |8 startx.cmd | 81 - startx.cpp | 34 startx.man | 44 xinit.c | 1226 xinit.def |4 xinit.man | 79 - xinitrc.cmd | 62 - xinitrc.cpp |5 20 files changed, 748 insertions(+), 1242 deletions(-) New commits: commit cc92823c61f9f4d31a25d107017198d1e16d4fcf Author: Alan Coopersmith Date: Sat Oct 30 16:44:22 2010 -0700 xinit 1.3.0 Signed-off-by: Alan Coopersmith diff --git a/configure.ac b/configure.ac index 974ea99..7650249 100644 --- a/configure.ac +++ b/configure.ac @@ -21,7 +21,8 @@ dnl dnl Process this file with autoconf to create configure. AC_PREREQ([2.60]) -AC_INIT(xinit,[1.2.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xinit) +AC_INIT([xinit], [1.3.0], +[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xinit]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE commit b5ff96271ebf30422f0a4af487ba9b35ce9c2e80 Author: Alan Coopersmith Date: Thu Sep 23 20:26:42 2010 -0700 config: Remove unnecessary calls from configure.ac AC_PROG_CC, AC_PROG_SED, & AC_PROG_INSTALL are provided by XORG_DEFAULT_OPTIONS 1.8 Signed-off-by: Alan Coopersmith diff --git a/configure.ac b/configure.ac index 0127329..974ea99 100644 --- a/configure.ac +++ b/configure.ac @@ -25,19 +25,15 @@ AC_INIT(xinit,[1.2.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -# Require xorg-macros: XORG_DEFAULT_OPTIONS +# Require X.Org macros 1.8 or later for AC_PROG_SED in XORG_DEFAULT_OPTIONS m4_ifndef([XORG_MACROS_VERSION], - [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.3) + [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.8) XORG_DEFAULT_OPTIONS AM_CONFIG_HEADER(config.h) -AC_PROG_CC -AM_PROG_CC_C_O XORG_PROG_RAWCPP -AC_PROG_INSTALL -AC_PATH_PROG(SED,sed) AC_CANONICAL_HOST m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))]) commit 4afe755b28f48390b16d16434cd14a756ef464ce Author: Gaetan Nadon Date: Tue Jul 20 18:45:18 2010 -0400 config: update AC_PREREQ statement to 2.60 Unrelated to the previous patches, the new value simply reflects the reality that the minimum level for autoconf to configure all x.org modules is 2.60 dated June 2006. ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz Signed-off-by: Gaetan Nadon diff --git a/configure.ac b/configure.ac index c4f4c84..0127329 100644 --- a/configure.ac +++ b/configure.ac @@ -20,7 +20,7 @@ dnl PERFORMANCE OF THIS SOFTWARE. dnl dnl Process this file with autoconf to create configure. -AC_PREREQ([2.57]) +AC_PREREQ([2.60]) AC_INIT(xinit,[1.2.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xinit) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE commit d15d988eaf63d4f840d09ba12caade6bea5f7618 Author: Jeremy Huddleston Date: Mon Jul 12 16:55:03 2010 -0700 launchd: Explicitly search /sbin Previously, launchd wasn't found if /sbin wasn't in the user's PATH. https://bugs.freedesktop.org/show_bug.cgi?id=29028 Signed-off-by: Jeremy Huddleston diff --git a/configure.ac b/configure.ac index 8930b39..c4f4c84 100644 --- a/configure.ac +++ b/configure.ac @@ -113,7 +113,7 @@ AC_ARG_WITH(launchd-id-prefix, AS_HELP_STRING([--with-launchd-id-prefix=PATH], if test "x$LAUNCHD" = "xauto"; then unset LAUNCHD - AC_CHECK_PROG(LAUNCHD, [launchd], [yes], [no]) + AC_CHECK_PROG(LAUNCHD, [launchd], [yes], [no], [$PATH$PATH_SEPARATOR/sbin]) fi TIGER_LAUNCHD=no commit 908273df8c0a7a13ff20e4ed4b7b470521f12ce2 Author: David Shao Date: Fri May 21 12:44:53 2010 -0700 DragonFly BSD: includes for PRIO_PROCESS and setpriority() in xinit.c
xinit: Changes to 'upstream-unstable'
Makefile.am |7 -
configure.ac| 13 --
org.x.startx.plist.cpp |5
privileged_startx/20-font_cache.cpp |4
privileged_startx/Makefile.am |9 +
privileged_startx/client.c |6 +
privileged_startx/org.x.privileged_startx.plist.cpp | 19 ++-
privileged_startx/server.c | 68 ++--
startx.cpp | 111 +++-
xinit.c | 40 ++-
10 files changed, 195 insertions(+), 87 deletions(-)
New commits:
commit 46d641fdd020d07a9b4bd0364cf126643342a7e3
Author: Jeremy Huddleston
Date: Wed Dec 17 15:19:38 2008 -0800
xinit 1.1.1
diff --git a/configure.ac b/configure.ac
index 86bd1f2..78b8827 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@ dnl
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
-AC_INIT(xinit,[1.1.0],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xinit)
+AC_INIT(xinit,[1.1.1],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xinit)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
commit c340932db548d1a3d4fc5bbc682b7730e5b2cf4a
Author: Jeremy Huddleston
Date: Wed Dec 17 13:00:23 2008 -0800
Apple: Allow defaults option that maps to a -dpi server command line in
startx
diff --git a/startx.cpp b/startx.cpp
index 529366d..8a44965 100644
--- a/startx.cpp
+++ b/startx.cpp
@@ -128,6 +128,10 @@ if [ x`defaults read $X11_PREFS_DOMAIN nolisten_tcp` = x1
] ; then
defaultserverargs="$defaultserverargs -nolisten tcp"
fi
+if defaults read $X11_PREFS_DOMAIN dpi >& /dev/null ; then
+defaultserverargs="$defaultserverargs -dpi `defaults read
$X11_PREFS_DOMAIN dpi`"
+fi
+
for ((d=0; ; d++)) ; do
[[ -e /tmp/.X$d-lock ]] || break
done
commit 89c1675d128da3477cac6858c4249b839ec68346
Author: Jeremy Huddleston
Date: Sat Dec 13 00:14:54 2008 -0800
OSX: Don't use login/bash -c hack anymore for org.x.startx LaunchAgent
diff --git a/org.x.startx.plist.cpp b/org.x.startx.plist.cpp
index 4bcedcf..4f3ce74 100644
--- a/org.x.startx.plist.cpp
+++ b/org.x.startx.plist.cpp
@@ -6,9 +6,6 @@
org.x.startx
ProgramArguments
- /bin/bash
- --login
- -c
__bindir__/startx
Sockets
commit 13accec7614960965470f17894bc9212842ea6d7
Author: Jeremy Huddleston
Date: Tue Dec 9 21:15:13 2008 -0800
OSX: More prefix fixes
diff --git a/startx.cpp b/startx.cpp
index fb23f18..529366d 100644
--- a/startx.cpp
+++ b/startx.cpp
@@ -103,12 +103,12 @@ fi
XCOMM First, start caching fonts
if [ x`defaults read $X11_PREFS_DOMAIN cache_fonts` = x1 ] ; 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 &
+if [ -x $bindir/font_cache ] ; then
+$bindir/font_cache &
+elif [ -x $bindir/font_cache.sh ] ; then
+$bindir/font_cache.sh &
+elif [ -x $bindir/fc-cache ] ; then
+$bindir/fc-cache &
fi
fi
commit e06ebf63e2c91e590fc1091e5ea2e49bab835526
Author: Jeremy Huddleston
Date: Wed Dec 3 11:19:48 2008 -0800
OSX: Fixed bad prefix
diff --git a/privileged_startx/20-font_cache.cpp
b/privileged_startx/20-font_cache.cpp
index c13384b..6d43e10 100755
--- a/privileged_startx/20-font_cache.cpp
+++ b/privileged_startx/20-font_cache.cpp
@@ -27,9 +27,9 @@ 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 &
+ BINDIR/font_cache -s &
elif [ -x BINDIR/font_cache.sh ] ; then
BINDIR/font_cache.sh -s &
-elif [ -x /usr/X11/bin/fc-cache ] ; then
+elif [ -x BINDIR/fc-cache ] ; then
BINDIR/fc-cache &
fi
commit 4ee72a6f1fc5d045adb71260107ca605ec68a84a
Author: Jeremy Huddleston
Date: Tue Dec 2 20:56:11 2008 -0800
OSX Tiger: Fix discovery of mach port
diff --git a/privileged_startx/server.c b/privileged_startx/server.c
index bfe7ca4..6dd4f2b 100644
--- a/privileged_startx/server.c
+++ b/privileged_startx/server.c
@@ -153,10 +153,6 @@ int server_main(const char *dir) {
mp = launch_data_get_machport(svc);
#else
-kr = bootstrap_check_in(bootstrap_port, "org.x.X11", &mp);
-if (kr == KERN_SUCCESS)
-return mp;
-
mp = checkin_or_register("org.x.privileged_startx");
#endif
commit ca9cb9750d2dd480240a37cdbd94fdba0a34da4c
Author: Jeremy Huddleston
Date: Tue Dec 2 20:31:10 2008 -0800
Apple: Honor X11_PREFS_DOMAIN if it's set (1.4.2-apple26 and later)
diff --git a/startx.
xinit: Changes to 'upstream-unstable'
Makefile.am | 12
configure.ac| 38 +--
org.x.X11.plist.cpp | 27 --
org.x.startx.plist.cpp | 25 ++
privileged_startx/10-tmpdirs.cpp| 37 ++
privileged_startx/20-font_cache.cpp | 35 ++
privileged_startx/Makefile.am | 74 +
privileged_startx/client.c | 56
privileged_startx/org.x.privileged_startx.plist.cpp | 21 +
privileged_startx/privileged_startx.c | 59
privileged_startx/privileged_startx.defs| 40 +++
privileged_startx/privileged_startx_types.h |6
privileged_startx/server.c | 250
startx.cpp | 29 +-
xinit.c | 89 +--
xinitrc.cpp | 12
16 files changed, 682 insertions(+), 128 deletions(-)
New commits:
commit 3c5e2ed686bd3ab39e2c1e87feffb5990603cf3c
Author: Adam Jackson <[EMAIL PROTECTED]>
Date: Wed May 21 14:34:52 2008 -0400
xinit 1.0.9
diff --git a/configure.ac b/configure.ac
index b3ba68e..42c3b60 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@ dnl
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.0.9],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xinit)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
commit c07501f69239e9c1448736ad7e689a2c3da49af9
Author: Adam Jackson <[EMAIL PROTECTED]>
Date: Wed May 21 14:29:55 2008 -0400
Unset session environment variables so startx works within a running
session.
diff --git a/startx.cpp b/startx.cpp
index fde780f..9266341 100644
--- a/startx.cpp
+++ b/startx.cpp
@@ -13,6 +13,9 @@ XCOMM Site administrators are STRONGLY urged to write nicer
versions.
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.
commit ef2610f44c7cf40489203fddc77ddcdfb7764eed
Author: Alan Coopersmith <[EMAIL PROTECTED]>
Date: Tue May 13 16:28:33 2008 -0700
Use /bin/ksh instead of /bin/sh on Solaris
diff --git a/configure.ac b/configure.ac
index 5ad468b..b3ba68e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -154,9 +154,13 @@ if test "x$MCOOKIE" != x ; then
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__"
;;
commit d3bc7001315a8ba13be073af86fe710740b2d4c3
Author: Alan Coopersmith <[EMAIL PROTECTED]>
Date: Tue May 13 16:25:49 2008 -0700
Check for proper cookie creation on all platforms
diff --git a/startx.cpp b/startx.cpp
index c93812f..fde780f 100644
--- a/startx.cpp
+++ b/startx.cpp
@@ -256,11 +256,11 @@ if [ x"$enable_xauth" = x1 ] ; then
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.
commit ef7abe2e72074f8252f0812ab2ca05dff7e76a38
Author: Alan Coopersmith <[EMAIL PROTECTED]>
Date: Tue May 13 16:25:22 2008 -0700
Use od on /dev/random to generate cookie on Solaris
diff --git a/configure.ac b/configure.ac
index b476c1c..5ad468b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -144,6 +144,9 @@ case $host_os in
*openbsd*)
MCOOKIE='/usr/sbin/openssl rand -hex 16'
;;
+ *solaris*)
+ MCOOKIE="/usr/bin/od -X -A n -N 16 /dev/urandom | /usr/bin/tr -d ' '"
+ ;;
esac
if test "x$MCOOKIE" != x ; then
commit e0e89545db1fc08ffe49b2b24455bb30137da671
Author: Jeremy Huddleston <[EMAIL PROTECTED]>
Date: Mon May 12 13:17:46 2008 -0700
Apple: Don't need to spew unneccessary 'directory exists' messages.
diff --git a/privileged_startx/10-tmpdirs.cpp b/privileged_startx/10-tmpdirs.cpp
index dd5071c..e30abac 100755
--- a/privileged_startx/10-tmpdirs.cpp
+++ b/privileged_startx/10-tmpdirs.cpp
@@ -30,7 +30,7 @@ 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
+ if mktemp -d ${dir} >& /de
xinit: Changes to 'upstream-unstable'
.gitignore |2 Makefile.am | 58 configure.ac| 38 +- cpprules.in | 37 ++ org.x.X11.plist.cpp | 27 +++ startx.cpp | 188 ++-- xinit.c | 98 +-- xinitrc.cpp | 28 +++ 8 files changed, 348 insertions(+), 128 deletions(-) New commits: commit 3eaee22196a03d88c419c42470baf562552c1a3b Author: Adam Jackson <[EMAIL PROTECTED]> Date: Thu Mar 6 17:09:45 2008 -0500 xinit 1.0.8 diff --git a/configure.ac b/configure.ac index 2a364ee..0d13f8d 100644 --- a/configure.ac +++ b/configure.ac @@ -21,7 +21,7 @@ dnl dnl Process this file with autoconf to create configure. AC_PREREQ([2.57]) -AC_INIT(xinit,[1.0.7], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xinit) +AC_INIT(xinit,[1.0.8], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xinit) AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE commit 96c8650369a99e344b4e3510f713b331d83c4272 Author: Jeremy Huddleston <[EMAIL PROTECTED]> Date: Sun Mar 2 10:32:58 2008 -0800 Apple: Use -c in the launchd plist, so broken .profile/.bashrc don't much up startx diff --git a/org.x.X11.plist.cpp b/org.x.X11.plist.cpp index 2e597ca..3ee22bd 100644 --- a/org.x.X11.plist.cpp +++ b/org.x.X11.plist.cpp @@ -9,6 +9,7 @@ #ifdef __APPLE__ /bin/bash --login + -c #endif __bindir__/startx commit aa026deef43a8c1479e6a558194e0a473bbdaeb0 Author: Jeremy Huddleston <[EMAIL PROTECTED]> Date: Sat Mar 1 17:30:47 2008 -0800 Apple: Adding support for an xinitrc.d directory on OSX, so fink doesn't need to clobber files diff --git a/cpprules.in b/cpprules.in index 2e50207..f32eafc 100644 --- a/cpprules.in +++ b/cpprules.in @@ -10,6 +10,7 @@ CPP_SED_MAGIC = $(SED) -e '/^\# *[0-9][0-9]* *.*$$/d' \ -e '/^[ ]*XCOMM$$/s/XCOMM/\#/' \ -e '/^[ ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \ -e '/^[ ]*XHASH/s/XHASH/\#/' \ + -e '/XSLASHGLOB/s/XSLASHGLOB/\/\*/' \ -e '/[EMAIL PROTECTED]@$$/s/[EMAIL PROTECTED]@$$/\\/' # Strings to replace in man pages diff --git a/xinitrc.cpp b/xinitrc.cpp index e42002d..89a65ca 100644 --- a/xinitrc.cpp +++ b/xinitrc.cpp @@ -87,20 +87,13 @@ XCOMM This is the fallback case if nothing else is executed above #ifdef __APPLE__ -if [ -x /usr/X11/bin/xset ] ; then - fontpath="/usr/X11/lib/X11/fonts/misc/,/usr/X11/lib/X11/fonts/TTF/,/usr/X11/lib/X11/fonts/OTF,/usr/X11/lib/X11/fonts/Type1/,/usr/X11/lib/X11/fonts/75dpi:unscaled/,/usr/X11/lib/X11/fonts/100dpi/:unscaled,/usr/X11/lib/X11/fonts/75dpi:unscaled/,/usr/X11/lib/X11/fonts/100dpi/:unscaled" - - [ -e "$HOME"/.fonts/fonts.dir ] && fontpath="$fontpath,$HOME/.fonts" - [ -e "$HOME"/Library/Fonts/fonts.dir ] && fontpath="$fontpath,$HOME/Library/Fonts" - [ -e /Library/Fonts/fonts.dir ] && fontpath="$fontpath,/Library/Fonts" - [ -e /System/Library/Fonts/fonts.dir ] && fontpath="$fontpath,/System/Library/Fonts" - - /usr/X11/bin/xset fp= "$fontpath" - unset fontpath +if [ -d XINITDIR/xinitrc.d ] ; then + for f in XINITDIR/xinitrc.dXSLASHGLOB.sh ; do + [ -x "$f" ] && . "$f" + done + unset f fi -[ -x /usr/bin/quartz-wm ] && exec /usr/bin/quartz-wm - #endif TWM & commit 916b1ab10d10efbdf3a544534acb95f9d28692cf Author: Jeremy Huddleston <[EMAIL PROTECTED]> Date: Mon Feb 18 15:53:46 2008 -0800 Apple: font caching and defaults Quieted defaults "error" messages by initializing default values Do font caching in startx, so users with custom ~/.xinitrc won't have to worry about updating it. Add "cache_fonts" defaults item to toggle whether or not to cache fonts at startup Fall back on fc-cache if font_cache.sh is not present. diff --git a/startx.cpp b/startx.cpp index bde93fb..c31fd7f 100644 --- a/startx.cpp +++ b/startx.cpp @@ -79,7 +79,30 @@ clientargs="" serverargs="" #ifdef __APPLE__ -if [ x`defaults read org.x.X11 no_auth` = x0 ] || ! defaults read org.x.X11 no_auth ; then + +XCOMM Initialize defaults (this will cut down on "safe" error messages) +if ! defaults read org.x.X11 cache_fonts >& /dev/null ; then +defaults write org.x.X11 cache_fonts -bool true +fi + +if ! defaults read org.x.X11 no_auth >& /dev/null ; then +defaults write org.x.X11 no_auth -bool false +fi + +if ! defaults read org.x.X11 nolisten_tcp >& /dev/null ; then +defaults write org.x.X11 nolisten_tcp -bool true +fi + +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 +/usr/X11/bin/font_cache.sh & +elif [ -x /usr/X11/bin/fc-cache ] ; then +/usr/X11/bin/f
xinit: Changes to 'upstream-unstable'
INSTALL | 236 +++ configure.ac | 10 ++ startx.cpp |1 3 files changed, 245 insertions(+), 2 deletions(-) New commits: commit 051633650c7b7a7eb9ef494a48a6a79fa2e06080 Author: Tilman Sauerbeck <[EMAIL PROTECTED]> Date: Mon Sep 17 12:46:59 2007 +0200 Bumped version to 1.0.7. diff --git a/configure.ac b/configure.ac index c42cfa5..92eeeb7 100644 --- a/configure.ac +++ b/configure.ac @@ -21,7 +21,7 @@ dnl dnl Process this file with autoconf to create configure. AC_PREREQ([2.57]) -AC_INIT(xinit,[1.0.6], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xinit) +AC_INIT(xinit,[1.0.7], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xinit) AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE commit 52121e9de907c61a16e41f0f08acecc1dc1546e5 Author: Tilman Sauerbeck <[EMAIL PROTECTED]> Date: Mon Sep 17 08:27:23 2007 +0200 Bug #12448: Don't try to trap 'ERR'. startx is advertised as a POSIX sh script. These shells don't necessarily support trapping 'ERR'. This makes startx work again with dash (and probably others). diff --git a/startx.cpp b/startx.cpp index a9b4199..81e776f 100644 --- a/startx.cpp +++ b/startx.cpp @@ -198,7 +198,7 @@ dummy=0 XCOMM create a file with auth information for the server. ':0' is a dummy. xserverauthfile=$HOME/.serverauth.$$ -trap "rm -f $xserverauthfile" ERR HUP INT QUIT ILL TRAP KILL BUS TERM +trap "rm -f $xserverauthfile" HUP INT QUIT ILL TRAP KILL BUS TERM xauth -q -f $xserverauthfile << EOF add :$dummy . $mcookie EOF commit ff9752bc4304e5a29ef7e06b56bd4e0e5ca32926 Author: Matthieu Herrb <[EMAIL PROTECTED]> Date: Sat Sep 15 18:51:19 2007 +0200 Bump to 1.0.6 diff --git a/configure.ac b/configure.ac index 9fb335c..c42cfa5 100644 --- a/configure.ac +++ b/configure.ac @@ -21,7 +21,7 @@ dnl dnl Process this file with autoconf to create configure. AC_PREREQ([2.57]) -AC_INIT(xinit,[1.0.5], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xinit) +AC_INIT(xinit,[1.0.6], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xinit) AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE commit af5e859a8da23f063fd3371a9e7266054532d769 Author: Matthieu Herrb <[EMAIL PROTECTED]> Date: Sat Sep 15 18:50:57 2007 +0200 generate diff --git a/INSTALL b/INSTALL index e69de29..23e5f25 100644 --- a/INSTALL +++ b/INSTALL @@ -0,0 +1,236 @@ +Installation Instructions +* + +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free +Software Foundation, Inc. + +This file is free documentation; the Free Software Foundation gives +unlimited permission to copy, distribute and modify it. + +Basic Installation +== + +These are generic installation instructions. + + The `configure' shell script attempts to guess correct values for +various system-dependent variables used during compilation. It uses +those values to create a `Makefile' in each directory of the package. +It may also create one or more `.h' files containing system-dependent +definitions. Finally, it creates a shell script `config.status' that +you can run in the future to recreate the current configuration, and a +file `config.log' containing compiler output (useful mainly for +debugging `configure'). + + It can also use an optional file (typically called `config.cache' +and enabled with `--cache-file=config.cache' or simply `-C') that saves +the results of its tests to speed up reconfiguring. (Caching is +disabled by default to prevent problems with accidental use of stale +cache files.) + + If you need to do unusual things to compile the package, please try +to figure out how `configure' could check whether to do them, and mail +diffs or instructions to the address given in the `README' so they can +be considered for the next release. If you are using the cache, and at +some point `config.cache' contains results you don't want to keep, you +may remove or edit it. + + The file `configure.ac' (or `configure.in') is used to create +`configure' by a program called `autoconf'. You only need +`configure.ac' if you want to change it or regenerate `configure' using +a newer version of `autoconf'. + +The simplest way to compile this package is: + + 1. `cd' to the directory containing the package's source code and type + `./configure' to configure the package for your system. If you're + using `csh' on an old version of System V, you might need to type + `sh ./configure' instead to prevent `csh' from trying to execute + `configure' itself. + + Running `configure' takes awhile. While running, it prints some + messages telling which features it is checking for. + + 2. Type `make' to compile the package. + + 3. Optionally, type `make check' to run any self-tests that come with + the package. + + 4. Type `make install' to install the programs and any data files and + documentation. + + 5. You
xinit: Changes to 'upstream-unstable'
New branch 'upstream-unstable' available with the following commits: commit e91874313c99dfb6be042cd1739e463e080b71fc Author: Eric Anholt <[EMAIL PROTECTED]> Date: Wed Sep 5 10:14:52 2007 -0700 Bump version to 1.0.5. commit 2640fb97a42e0d91603defc0f37388735c56a54d Author: Eric Anholt <[EMAIL PROTECTED]> Date: Tue Sep 4 13:05:47 2007 -0700 Fix broken test for /dev/random cookie generation failure. commit fc6cc81be41af58ffd996994e1325dd072a9ab34 Author: Eric Anholt <[EMAIL PROTECTED]> Date: Fri Jul 13 15:34:43 2007 -0700 Use /dev/random to generate the cookie if mcookie is unavailable. Setting XAUTHORITY without having actually generated a cookie and created .Xauthority led to issues if somebody like ssh later came around and made the .Xauthority file for their own setup. So, simply make it so that we never fail to create one. -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
