xinit: Changes to 'debian-unstable'
.gitignore | 80 +
ChangeLog | 317 +++++
Makefile.am | 10
configure.ac | 25
debian/changelog | 12
debian/control | 2
debian/patches/001_debian_xinitrc.diff | 12
debian/patches/02_startx_hostname.diff | 8
debian/patches/03_debian_startx_manpage.diff | 10
debian/patches/06_move_serverauthfile_into_tmp.diff | 8
privileged_startx/.gitignore | 9
privileged_startx/server.c | 2
startx.cmd | 80 -
startx.cpp | 18
xinit.c | 1164 ++++++++------------
xinit.def | 4
xinitrc.cmd | 61 -
xinitrc.cpp | 4
18 files changed, 935 insertions(+), 891 deletions(-)
New commits:
commit cc598bb8f1beee4ea7c59bdb4d7b9d46d61ca360
Author: Cyril Brulebois <kibi@debian.org>
Date: Wed Nov 3 03:21:03 2010 +0100
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index 9928f62..f8d2239 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-xinit (1.3.0-1) UNRELEASED; urgency=low
+xinit (1.3.0-1) unstable; urgency=low
* New upstream release.
* Refresh patch: 001_debian_xinitrc.diff (context tweak).
* Refresh other patches: line offsets.
* Add myself to Uploaders.
- -- Cyril Brulebois <kibi@debian.org> Wed, 03 Nov 2010 03:10:15 +0100
+ -- Cyril Brulebois <kibi@debian.org> Wed, 03 Nov 2010 03:20:59 +0100
xinit (1.2.0-2) unstable; urgency=low
commit 3cff06d53b94ae45c132680ef1bfe817135c73bb
Author: Cyril Brulebois <kibi@debian.org>
Date: Wed Nov 3 03:17:37 2010 +0100
Add myself to Uploaders.
diff --git a/debian/changelog b/debian/changelog
index 8504d85..9928f62 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xinit (1.3.0-1) UNRELEASED; urgency=low
* New upstream release.
* Refresh patch: 001_debian_xinitrc.diff (context tweak).
* Refresh other patches: line offsets.
+ * Add myself to Uploaders.
-- Cyril Brulebois <kibi@debian.org> Wed, 03 Nov 2010 03:10:15 +0100
diff --git a/debian/control b/debian/control
index 8fbea74..f84c9ae 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xinit
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusinow@debian.org>, Brice Goglin <bgoglin@debian.org>
+Uploaders: David Nusinow <dnusinow@debian.org>, Brice Goglin <bgoglin@debian.org>, Cyril Brulebois <kibi@debian.org>
Build-Depends:
debhelper (>= 5.0.0),
pkg-config,
commit 0aba66a76145bdbe363475fc5db5e928ae17a985
Author: Cyril Brulebois <kibi@debian.org>
Date: Wed Nov 3 03:16:25 2010 +0100
Refresh other patches: line offsets.
diff --git a/debian/changelog b/debian/changelog
index 4d0d11e..8504d85 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xinit (1.3.0-1) UNRELEASED; urgency=low
* New upstream release.
* Refresh patch: 001_debian_xinitrc.diff (context tweak).
+ * Refresh other patches: line offsets.
-- Cyril Brulebois <kibi@debian.org> Wed, 03 Nov 2010 03:10:15 +0100
diff --git a/debian/patches/02_startx_hostname.diff b/debian/patches/02_startx_hostname.diff
index 88b6fd3..723bec3 100644
--- a/debian/patches/02_startx_hostname.diff
+++ b/debian/patches/02_startx_hostname.diff
@@ -2,11 +2,9 @@
startx.cpp | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
-Index: xinit/startx.cpp
-===================================================================
---- xinit.orig/startx.cpp 2009-12-06 23:12:44.000000000 +0100
-+++ xinit/startx.cpp 2009-12-06 23:23:41.000000000 +0100
-@@ -242,18 +242,17 @@
+--- a/startx.cpp
++++ b/startx.cpp
+@@ -245,18 +245,17 @@ if [ x"$enable_xauth" = x1 ] ; then
removelist=
XCOMM set up default Xauth info for this machine
diff --git a/debian/patches/03_debian_startx_manpage.diff b/debian/patches/03_debian_startx_manpage.diff
index 0567647..32c0030 100644
--- a/debian/patches/03_debian_startx_manpage.diff
+++ b/debian/patches/03_debian_startx_manpage.diff
@@ -5,11 +5,9 @@ Robinson.
startx.man | 54 ++++++++++++++++++++++--------------------------------
1 file changed, 22 insertions(+), 32 deletions(-)
-Index: xinit/startx.man
-===================================================================
---- xinit.orig/startx.man 2009-12-06 23:12:44.000000000 +0100
-+++ xinit/startx.man 2009-12-06 23:25:48.000000000 +0100
-@@ -76,6 +76,28 @@
+--- a/startx.man
++++ b/startx.man
+@@ -76,6 +76,28 @@ startx -- -layout Multihead
.RE
#ifdef __SCOMAN__
.PP
@@ -38,7 +36,7 @@ Index: xinit/startx.man
To determine the client to run,
.B startx
looks for the following files, in order:
-@@ -134,38 +156,6 @@
+@@ -134,38 +156,6 @@ and
files are found in the
.I __xinitdir__
directory.
diff --git a/debian/patches/06_move_serverauthfile_into_tmp.diff b/debian/patches/06_move_serverauthfile_into_tmp.diff
index d5e6e91..3ed19de 100644
--- a/debian/patches/06_move_serverauthfile_into_tmp.diff
+++ b/debian/patches/06_move_serverauthfile_into_tmp.diff
@@ -5,11 +5,9 @@ The trap patch didn't seem to work on reboot.
startx.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-Index: xinit/startx.cpp
-===================================================================
---- xinit.orig/startx.cpp 2009-12-06 23:26:32.000000000 +0100
-+++ xinit/startx.cpp 2009-12-06 23:26:37.000000000 +0100
-@@ -271,7 +271,7 @@
+--- a/startx.cpp
++++ b/startx.cpp
+@@ -274,7 +274,7 @@ if [ x"$enable_xauth" = x1 ] ; then
dummy=0
XCOMM create a file with auth information for the server. ':0' is a dummy.
commit f586e983b198caf57f5359ff44c73171f12bec63
Author: Cyril Brulebois <kibi@debian.org>
Date: Wed Nov 3 03:14:14 2010 +0100
Refresh patch: 001_debian_xinitrc.diff (context tweak).
diff --git a/debian/changelog b/debian/changelog
index 832c77e..4d0d11e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xinit (1.3.0-1) UNRELEASED; urgency=low
* New upstream release.
+ * Refresh patch: 001_debian_xinitrc.diff (context tweak).
-- Cyril Brulebois <kibi@debian.org> Wed, 03 Nov 2010 03:10:15 +0100
diff --git a/debian/patches/001_debian_xinitrc.diff b/debian/patches/001_debian_xinitrc.diff
index c75311e..b4ec76f 100644
--- a/debian/patches/001_debian_xinitrc.diff
+++ b/debian/patches/001_debian_xinitrc.diff
@@ -1,8 +1,6 @@
-Index: xinit/xinitrc.cpp
-===================================================================
---- xinit.orig/xinitrc.cpp 2008-05-21 23:08:58.000000000 +0200
-+++ xinit/xinitrc.cpp 2008-05-21 23:19:30.000000000 +0200
-@@ -1,102 +1,8 @@
+--- a/xinitrc.cpp
++++ b/xinitrc.cpp
+@@ -1,98 +1,8 @@
XCOMM!SHELL_CMD
-userresources=$HOME/.Xresources
@@ -92,8 +90,6 @@ Index: xinit/xinitrc.cpp
-XCOMM This is the fallback case if nothing else is executed above
-#endif /* !defined(__SCO__) && !defined(__UNIXWARE__) */
-
--#ifdef __APPLE__
--
-if [ -d XINITDIR/xinitrc.d ] ; then
- for f in XINITDIR/xinitrc.dXSLASHGLOB.sh ; do
- [ -x "$f" ] && . "$f"
@@ -101,8 +97,6 @@ Index: xinit/xinitrc.cpp
- unset f
-fi
-
--#endif
--
-TWM &
-XCLOCK -geometry 50x50-1+1 &
-XTERM -geometry 80x50+494+51 &
commit 99d9b75583880e8db93258d61e7728ec2e3150ef
Author: Cyril Brulebois <kibi@debian.org>
Date: Wed Nov 3 03:10:47 2010 +0100
Fix changelog entry for 1.2.0-1.
diff --git a/debian/changelog b/debian/changelog
index abd4152..832c77e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -42,9 +42,6 @@ xinit (1.2.0-1) unstable; urgency=low
* 06_move_serverauthfile_into_tmp.diff: use mktemp --tmpdir to honour
$TMPDIR (closes: #480958).
- [ Brice Goglin ]
- *
-
-- Brice Goglin <bgoglin@debian.org> Sun, 06 Dec 2009 23:32:47 +0100
xinit (1.1.1-1) unstable; urgency=low
commit 25b489b78d73a611da5866f9c8800857895fc975
Author: Cyril Brulebois <kibi@debian.org>
Date: Wed Nov 3 03:10:26 2010 +0100
Update changelogs.
diff --git a/ChangeLog b/ChangeLog
index 1e97dad..47e3a86 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,320 @@
+commit cc92823c61f9f4d31a25d107017198d1e16d4fcf
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat Oct 30 16:44:22 2010 -0700
+
+ xinit 1.3.0
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit b5ff96271ebf30422f0a4af487ba9b35ce9c2e80
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+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 <alan.coopersmith@oracle.com>
+
+commit 4afe755b28f48390b16d16434cd14a756ef464ce
+Author: Gaetan Nadon <memsize@videotron.ca>
+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 <memsize@videotron.ca>
+
+commit d15d988eaf63d4f840d09ba12caade6bea5f7618
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+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 <jeremyhu@apple.com>
+
+commit 908273df8c0a7a13ff20e4ed4b7b470521f12ce2
+Author: David Shao <davshao@gmail.com>
+Date: Fri May 21 12:44:53 2010 -0700
+
+ DragonFly BSD: includes for PRIO_PROCESS and setpriority() in xinit.c
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 8464a8ab360b72f6817b19ce99b12f0793fbee74
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Mon May 3 00:25:30 2010 -0700
+
+ darwin: Make __APPLE__ path in startx POSIX compliant
+
+ http://xquartz.macosforge.org/trac/ticket/399
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit e4548fe62d58d7cb891dc142c400c22031d471fb
+Author: Mikhail Gusarov <dottedmag@dottedmag.net>
+Date: Sun Apr 25 03:21:43 2010 +0700
+
+ Remove OS/2 leftovers
+
+ Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit c82295911409c611c097ef2e1269a78d54314304
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Thu Apr 15 11:40:33 2010 -0700
+
+ Enable support for an xinitrc.d directory
+
+ This was already done on darwin and Gentoo. Now others can benefit.
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+ Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
+ Reviewed-by: Rémi Cardona <remi@gentoo.org>
+ Reviewed-by: James Cloos <cloos@jhcloos.com>
+
+commit 7f9d31e6342ffe5f2903fb2f4e5d3a1e4e5ed1df
+Author: Mikhail Gusarov <dottedmag@dottedmag.net>
+Date: Wed Apr 14 03:03:29 2010 +0700
+
+ Rationalize errors output
+
+ Implement Errorx/Fatalx in addition to existing Error/Fatal, replace
+ all fprintf(stderr)/exit with Fatal, all fprintf(stderr) with Error.
+
+ Additionally harmonize capitalization and punctuation of error messages.
+
+ Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 3676185a3e3bf1e57362ed4978825d9d6d53592c
+Author: Mikhail Gusarov <dottedmag@dottedmag.net>
+Date: Wed Apr 14 03:03:28 2010 +0700
+
+ Fix comment indentation
+
+ Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit c0f6753d2de16826300a04232e54fbd3aa54c406
+Author: Mikhail Gusarov <dottedmag@dottedmag.net>
+Date: Wed Apr 14 03:03:27 2010 +0700
+
+ Use signals from Unix98 and drop pre-POSIX compatibility
+
+ Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 15cf3d560ab5b6847d8891208080ac964c1682fb
+Author: Mikhail Gusarov <dottedmag@dottedmag.net>
+Date: Wed Apr 14 03:03:26 2010 +0700
+
+ Use sigaction(2) instead of signal(2) to handle SIGUSR1 and SIGALRM
+
+ Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit fa009dcc191e1d70937e5fb4dd8ae8d9c151a607
+Author: Mikhail Gusarov <dottedmag@dottedmag.net>
+Date: Wed Apr 14 03:03:25 2010 +0700
+
+ sys/wait.h is in Unix98
+
+ Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit a13649f91f3856040f53c47d14a2cccff943c702
+Author: Mikhail Gusarov <dottedmag@dottedmag.net>
+Date: Wed Apr 14 03:03:24 2010 +0700
+
+ setpriority and PRIO_PROCESS are in Unix98
+
+ Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 598cb2f5e433014b02eec6270a73bcb95cd7b15a
+Author: Mikhail Gusarov <dottedmag@dottedmag.net>
+Date: Wed Apr 14 03:03:23 2010 +0700
+
+ SIGTT{IN,OU} is in Unix98
+
+ Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit ce5aa4e7a30bff3207695b9ce8cbdcd56ff7b36c
+Author: Mikhail Gusarov <dottedmag@dottedmag.net>
+Date: Wed Apr 14 03:03:22 2010 +0700
+
+ SIGCHLD is in Unix98
+
+ Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit d12f1f2dd625f507cf8a504854dad0a9efd86259
+Author: Mikhail Gusarov <dottedmag@dottedmag.net>
+Date: Wed Apr 14 03:03:21 2010 +0700
+
+ killpg(2) is in Unix98
+
+ Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 36e3f13a32c8ced264d666f1091db7e1bb523e86
+Author: Mikhail Gusarov <dottedmag@dottedmag.net>
+Date: Wed Apr 14 03:03:20 2010 +0700
+
+ waitpid(2) is in Unix98
+
+ Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 63ba277c694104b3f01d0a1adee7903631607694
+Author: Mikhail Gusarov <dottedmag@dottedmag.net>
+Date: Wed Apr 14 03:03:19 2010 +0700
+
+ Use EXIT_{SUCCESS, FAILURE} from C90 instead of homegrown equivalents
+
+ Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit a63c31f74e1c11509b561ab9687138f5c960df0f
+Author: Mikhail Gusarov <dottedmag@dottedmag.net>
+Date: Wed Apr 14 03:03:18 2010 +0700
+
+ Stop converting functions' return types to void
+
+ Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 5dea0c1caaeb0d7f1280fd28c80c3c1bc10c34d0
+Author: Mikhail Gusarov <dottedmag@dottedmag.net>
+Date: Wed Apr 14 03:03:17 2010 +0700
+
+ Simplify environment juggling by using fork() instead of vfork()
+
+ xinit used to copy process environment in order to give client correct DISPLAY
+ and WINDOWPATH variables. It was not possible to do it in client process because
+ it was vforked, not forked.
+
+ As vfork() usage was not entirely correct (manpage specifies that behaviour is
+ undefined if there are any memory modifications between vfork and exec), switch
+ to fork(), move setting environment variables to client process and and drop all
+ the manual mucking with environment.
+
+ Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 2df4ba3b0ef40cefcac2774e042dad0d2df17424
+Author: Mikhail Gusarov <dottedmag@dottedmag.net>
+Date: Wed Apr 14 03:03:16 2010 +0700
+
+ Fix whitespace
+
+ File was indented with mix of 8-space and tab symbols and inconsistently
+ formatted. Apply more-or-less consistent formatting and reindent everything to
+ 4-space.
+
+ Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 0ffa7f2402ae06371aa09a513798a4400b5727c0
+Author: Mikhail Gusarov <dottedmag@dottedmag.net>
+Date: Wed Mar 31 18:15:03 2010 +0700
+
+ Nuke OS/2 and LynxOS support remnants.
+
+ Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit eb541d73b35716e1deaccc3c328473e04a5ef024
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date: Mon Mar 15 15:41:48 2010 -0700
+
+ Update to version 1.2.1 for release.
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
+
+commit 17b65f4420a958c577fd17d91f332465cf9fbfa5
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date: Mon Mar 15 15:39:06 2010 -0700
+
+ Updates for .gitignore
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
+
+commit 3d82396b95bff8ed6028e36cf3aed1f1189ba909
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Thu Mar 11 16:09:35 2010 -0800
+
+ darwin: Handle home directories that contain a single-quote (')
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit ad11d954cf296f2bfbe25ad483459c8485197dd1
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Thu Mar 11 10:24:11 2010 -0800
+
+ Quiet warning for fts_open
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit b61c4977d96fbaabdfb8213d2b9cc2e1416952f1
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Thu Nov 26 09:19:54 2009 -0500
+
+ Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
+
+ Now that the INSTALL file is generated.
+ Allows running make maintainer-clean.
+
+commit 9d15780beb5db0d39cc34ef2d9f3157fa5a81e57
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Oct 28 14:09:08 2009 -0400
+
+ INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
+
+ Add missing INSTALL file. Use standard GNU file on building tarball
+ README may have been updated
+ Remove AUTHORS file as it is empty and no content available yet.
+ Remove NEWS file as it is empty and no content available yet.
+
+commit f60d8d7272efb6da4fd91df9675d9281e4230d9f
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Tue Oct 27 15:07:25 2009 -0400
+
+ Deploy the new XORG_DEFAULT_OPTIONS #24242
+
+ This macro aggregate a number of existing macros that sets commmon
+ X.Org components configuration options. It shields the configuration file from
+ future changes.
+
+commit b748221cf9e7df8b0b460f13f4ad0a86ff7f1b6d
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Thu Oct 22 16:23:27 2009 -0400
+
+ Makefile.am: do not include autogen.sh in distribution #24183
+
+ This is a private build script that should not be distributed
+
+commit 85cd7aa2f632d159af38252639a3020bf9ee18a1
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Thu Oct 22 12:34:15 2009 -0400
+
+ .gitignore: use common defaults with custom section # 24239
+
+ Using common defaults will reduce errors and maintenance.
+ Only the very small or inexistent custom section need periodic maintenance
+ when the structure of the component changes. Do not edit defaults.
+
commit d243b9943879ec2790d65785805aefdfbb64a378
Author: Rémi Cardona <remi@gentoo.org>
Date: Sat Nov 14 14:51:59 2009 +0100
diff --git a/debian/changelog b/debian/changelog
index f585a54..abd4152 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xinit (1.3.0-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Cyril Brulebois <kibi@debian.org> Wed, 03 Nov 2010 03:10:15 +0100
+
xinit (1.2.0-2) unstable; urgency=low
[ Julien Cristau ]
commit cc92823c61f9f4d31a25d107017198d1e16d4fcf
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Oct 30 16:44:22 2010 -0700
xinit 1.3.0
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
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 <alan.coopersmith@oracle.com>
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 <alan.coopersmith@oracle.com>
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 <memsize@videotron.ca>
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 <memsize@videotron.ca>
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 <jeremyhu@apple.com>
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 <jeremyhu@apple.com>
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 <davshao@gmail.com>
Date: Fri May 21 12:44:53 2010 -0700
DragonFly BSD: includes for PRIO_PROCESS and setpriority() in xinit.c
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/xinit.c b/xinit.c
index 313806e..0d31637 100644
--- a/xinit.c
+++ b/xinit.c
@@ -48,6 +48,12 @@ in this Software without prior written authorization from The Open Group.
#endif
#endif
+/* For PRIO_PROCESS and setpriority() */
+#ifdef __DragonFly__
+#include <sys/time.h>
+#include <sys/resource.h>
+#endif /* __DragonFly__ */
+
#include <stdlib.h>
#ifndef SHELL
commit 8464a8ab360b72f6817b19ce99b12f0793fbee74
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Mon May 3 00:25:30 2010 -0700
darwin: Make __APPLE__ path in startx POSIX compliant
http://xquartz.macosforge.org/trac/ticket/399
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
diff --git a/startx.cpp b/startx.cpp
index 48d40aa..f055ad9 100644
--- a/startx.cpp
+++ b/startx.cpp
@@ -87,15 +87,15 @@ if [ "x$X11_PREFS_DOMAIN" = x ] ; then
fi
XCOMM Initialize defaults (this will cut down on "safe" error messages)
-if ! defaults read $X11_PREFS_DOMAIN cache_fonts >& /dev/null ; then
+if ! defaults read $X11_PREFS_DOMAIN cache_fonts > /dev/null 2>&1 ; then
defaults write $X11_PREFS_DOMAIN cache_fonts -bool true
fi
-if ! defaults read $X11_PREFS_DOMAIN no_auth >& /dev/null ; then
+if ! defaults read $X11_PREFS_DOMAIN no_auth > /dev/null 2>&1 ; then
defaults write $X11_PREFS_DOMAIN no_auth -bool false
fi
-if ! defaults read $X11_PREFS_DOMAIN nolisten_tcp >& /dev/null ; then
+if ! defaults read $X11_PREFS_DOMAIN nolisten_tcp > /dev/null 2>&1 ; then
defaults write $X11_PREFS_DOMAIN nolisten_tcp -bool true
fi
@@ -126,14 +126,17 @@ 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
+if defaults read $X11_PREFS_DOMAIN dpi > /dev/null 2>&1 ; then
defaultserverargs="$defaultserverargs -dpi `defaults read $X11_PREFS_DOMAIN dpi`"
fi
-for ((d=0; ; d++)) ; do
- [[ -e /tmp/.X$d-lock ]] || break
+d=0
+while true ; do
+ [ -e /tmp/.X$d-lock ] || break
+ d=$(($d + 1))
done
defaultdisplay=":$d"
+unset d
#else
enable_xauth=1
@@ -278,7 +281,8 @@ if [ x"$enable_xauth" = x1 ] ; then
add :$dummy . $mcookie
EOF
#if defined(__APPLE__) || defined(__CYGWIN__)
- serverargs=${serverargs}" -auth '"${xserverauthfile//\'/\'\\\'\'}"'"
+ xserverauthfilequoted=$(echo ${xserverauthfile} | sed "s/'/'\\\\''/g")
+ serverargs=${serverargs}" -auth '"${xserverauthfilequoted}"'"
#else
serverargs=${serverargs}" -auth "${xserverauthfile}
#endif
commit e4548fe62d58d7cb891dc142c400c22031d471fb
Author: Mikhail Gusarov <dottedmag@dottedmag.net>
Date: Sun Apr 25 03:21:43 2010 +0700
Remove OS/2 leftovers
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/Makefile.am b/Makefile.am
index 28e7c78..2b8a4eb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -76,7 +76,7 @@ MAINTAINERCLEANFILES = ChangeLog INSTALL
CLEANFILES = xinitrc startx $(appman_DATA) $(launchagents_DATA)
EXTRA_DIST = xinitrc.cpp startx.cpp org.x.startx.plist.cpp $(appman_PRE) \
- startx.cmd xinitrc.cmd xinit.def autogen.sh
+ autogen.sh
.PHONY: ChangeLog INSTALL
diff --git a/startx.cmd b/startx.cmd
deleted file mode 100644
index 950ab9d..0000000
--- a/startx.cmd
+++ /dev/null
@@ -1,80 +0,0 @@
-/* OS/2 REXX */
-/*
- * This is just a sample implementation of a slightly less primitive
- * interface than xinit. It looks for user xinitrc.cmd and xservrc.cmd
- * files, then system xinitrc.cmd and xservrc.cmd files, else lets xinit choose
- * its default. The system xinitrc should probably do things like check
- * for Xresources files and merge them in, startup up a window manager,
- * and pop a clock and serveral xterms.
- *
- * Site administrators are STRONGLY urged to write nicer versions.
- */
-'@echo off'
-ADDRESS CMD
-env = 'OS2ENVIRONMENT'
-x11root = VALUE('X11ROOT',,env)
-IF x11root = '' THEN DO
- SAY "The environment variable X11ROOT is not set. X/OS2 won't run without it."
- EXIT
-END
-
-home = VALUE('HOME',,env)
-IF home = '' THEN home = x11root
-os_shell = VALUE('X11SHELL',,env)
-IF os_shell = '' THEN os_shell = VALUE('SHELL',,env)
-IF os_shell = '' THEN os_shell = VALUE('OS2_SHELL',,env)
-IF os_shell = '' THEN DO
- SAY "There is no command interpreter in OS2_SHELL ???"
- EXIT
-END
-
-userclientrc = home'\xinitrc.cmd'
-userserverrc = home'\xservrc.cmd'
-sysclientrc = x11root'\usr\X11R6\lib\X11\xinit\xinitrc.cmd'
-sysserverrc = x11root'\usr\X11R6\lib\X11\xinit\xservrc.cmd'
-clientargs = ''
-serverargs = ''
-
-IF exists(userclientrc) THEN
- clientargs = userclientrc
-ELSE
-IF exists(sysclientrc) THEN
- clientargs = sysclientrc
-
-IF exists(userserverrc) THEN
- serverargs = userserverrc
-ELSE
-IF exists(sysserverrc) THEN
- serverargs = sysserverrc
-
-whoseargs = "client"
-PARSE ARG all
-
-DO i=1 TO WORDS(all)
- cur = WORD(all,i)
- IF \(FILESPEC('DRIVE',cur) = '') THEN DO
- IF whoseargs = "client" THEN
- clientargs = cur
- ELSE
- serverargs = cur
- END
- ELSE
- IF cur = "--" THEN
- whoseargs = "server"
- ELSE
- IF whoseargs = "client" THEN
- clientargs = clientargs' 'cur
- ELSE
- serverargs = serverargs' 'cur
-END
-
-xinit = x11root'\usr\X11R6\bin\xinit'
-xinit os_shell' /c 'clientargs' -- 'serverargs
-
-RETURN
-
-exists:
- IF STREAM(arg(1), 'C', 'QUERY EXISTS') = '' THEN
- RETURN 0
- ELSE
- RETURN 1
diff --git a/xinit.def b/xinit.def
deleted file mode 100644
index 92c4176..0000000
--- a/xinit.def
+++ /dev/null
@@ -1,4 +0,0 @@
-NAME xinit NOTWINDOWCOMPAT
-DESCRIPTION "@#XFREE86:4.4.0#@ $XFree86: xc/programs/xinit/xinit.def,v 3.2 2002/05/31 18:46:13 dawes Exp $"
-PROTMODE
-EXETYPE OS2
diff --git a/xinitrc.cmd b/xinitrc.cmd
deleted file mode 100644
index 623a159..0000000
--- a/xinitrc.cmd
+++ /dev/null
@@ -1,61 +0,0 @@
-/* OS/2 REXX */
-'@echo off'
-env = 'OS2ENVIRONMENT'
-x11root = VALUE('X11ROOT',,env)
-IF x11root = '' THEN DO
- SAY "The environment variable X11ROOT is not set. X/OS2 won't run without it."
- EXIT
-END
-home = VALUE('HOME',,env)
-IF home = '' THEN home = x11root
-
-userresources = home'\.Xresources'
-usermodmap = home'\.Xmodmap'
-sysresources = x11root'\usr\X11R6\lib\X11\xinit\.Xresources'
-sysmodmap = x11root'\usr\X11R6\lib\X11\xinit\.Xmodmap'
-xbitmapdir = x11root'\usr\X11R6\include\X11\bitmaps'
-manpath = VALUE('MANPATH',,env)
-
-/* merge in defaults */
-IF exists(sysresources) THEN
- 'xrdb -merge 'sysresources
-
-IF exists(sysmodmap) THEN
- 'xmodmap 'sysmodmap
-
-IF exists(userresources) THEN
- 'xrdb -merge 'userresources
-
-IF exists(usermodmap) THEN
- 'xmodmap 'usermodmap
-
-/* start some nice :-) test programs */
-'xsetroot -bitmap 'xbitmapdir'\xos2'
-/* also try out the following ones:
- * 'xsetroot -bitmap 'xbitmapdir'\xfree1'
- * 'xsetroot -bitmap 'xbitmapdir'\xfree2'
- */
-
-/****** WARNING! *********
- * Below some programs are started minimized, some are started detached.
- * In general, those that spawn other shells are minimized, others may be
- * detached. You might be tempted to run the xterm's as well as detached.
- * This works, but leaves you with an independent xterm/cmd pair, when the
- * server shuts down, which you can only see in watchcat, not the process list.
- * If you start and stop x11 multiple times, this will let you run out of
- * PTYs, and will lead to a large number of background sessions.
- */
-'detach xclock -update 1 -geometry 100x100-1+1'
-'start/min/n "Login Xterm" xterm -sb -geometry 80x25+0+0 -name login'
-IF manpath \= '' THEN
- 'detach xman -geometry 100x100-105+1'
-/* 'startx/min/n "Xterm 1" xterm -sb -geometry 80x50+494+51' */
-/* 'startx/min/n "Xterm 2" xterm -sb -geometry 80x20+494-0' */
-'twm'
-
-EXIT
-
-exists:
-'DIR "'arg(1)'" >nul 2>&1'
-if rc = 0 THEN RETURN 1
-RETURN 0
commit c82295911409c611c097ef2e1269a78d54314304
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Thu Apr 15 11:40:33 2010 -0700
Enable support for an xinitrc.d directory
This was already done on darwin and Gentoo. Now others can benefit.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
Reviewed-by: Rémi Cardona <remi@gentoo.org>
Reviewed-by: James Cloos <cloos@jhcloos.com>
diff --git a/xinitrc.cpp b/xinitrc.cpp
index 379b1f3..049a8e4 100644
--- a/xinitrc.cpp
+++ b/xinitrc.cpp
@@ -84,8 +84,6 @@ fi
XCOMM This is the fallback case if nothing else is executed above
#endif /* !defined(__SCO__) && !defined(__UNIXWARE__) */
-#ifdef __APPLE__
-
if [ -d XINITDIR/xinitrc.d ] ; then
for f in XINITDIR/xinitrc.dXSLASHGLOB.sh ; do
Reply to: