xinit: Changes to 'debian-unstable'
ChangeLog | 153 ++++++++++
autogen.sh | 5
configure.ac | 12
cpprules.in | 2
debian/changelog | 20 +
debian/patches/001_debian_xinitrc.diff | 45 --
debian/patches/03_debian_startx_manpage.diff | 10
debian/patches/07-Pass-files-to-cpp-via-CLI-arg-instead-of-stdin-to-wo.patch | 27 -
debian/patches/08-Bump-required-util-macros-version-to-1.19.patch | 32 --
debian/patches/09-Replace-RAWCPPFLAGS-with-TRADITIONALCPPFLAGS-when-pr.patch | 31 --
debian/patches/10-startx-Under-Linux-start-X-on-the-current-VT.patch | 52 ---
debian/patches/11-startx-Pass-vtX-as-long-as-the-user-did-not-specify-.patch | 64 ----
debian/patches/series | 11
debian/rules | 1
startx.cpp | 76 +---
xinit.c | 14
xinitrc.cpp | 43 --
17 files changed, 221 insertions(+), 377 deletions(-)
New commits:
commit 5f9161ee3772ba1ea5fb039d92616566f0129433
Author: Laurent Bigonville <bigon@bigon.be>
Date: Fri Sep 12 16:00:33 2014 +0200
Release to unstable
diff --git a/debian/changelog b/debian/changelog
index 329606a..f11e7b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-xinit (1.3.4-1) UNRELEASED; urgency=medium
+xinit (1.3.4-1) unstable; urgency=medium
+ * Team upload.
* New upstream release.
- Drop d/p/07-Pass-files-to-cpp-via-CLI-arg-instead-of-stdin-to-wo.patch,
d/p/08-Bump-required-util-macros-version-to-1.19.patch,
@@ -13,7 +14,7 @@ xinit (1.3.4-1) UNRELEASED; urgency=medium
* debian/rules: Make /etc/X11/xinit/xinitrc executable to make lintian happy
and also to fix LP: #491696
- -- Laurent Bigonville <bigon@debian.org> Fri, 12 Sep 2014 14:46:49 +0200
+ -- Laurent Bigonville <bigon@debian.org> Fri, 12 Sep 2014 16:00:29 +0200
xinit (1.3.3-1) unstable; urgency=medium
commit 96c153a66ac80f7a55310db7e1f2428313c90f2b
Author: Laurent Bigonville <bigon@bigon.be>
Date: Fri Sep 12 15:48:21 2014 +0200
Add LP statement to close launchpad bug
diff --git a/debian/changelog b/debian/changelog
index 57dbc4f..329606a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,7 +29,7 @@ xinit (1.3.3-1) unstable; urgency=medium
* 10-startx-Under-Linux-start-X-on-the-current-VT.patch,
11-startx-Pass-vtX-as-long-as-the-user-did-not-specify-.patch: By default
start the server on the current VT, this is necessary to avoid logind to
- see the startx session as inactive (Closes: #743015)
+ see the startx session as inactive (Closes: #743015 LP: #1247484)
* debian/control: Bump Standards-Version to 3.9.5 (no further changes)
* debian/control: Use the canonical for the VCS-* fields
* debian/rules: Include buildflags.mk to pass the hardening flags
commit 226649c16290cba72958bf51e38c9b750fa7b64b
Author: Laurent Bigonville <bigon@bigon.be>
Date: Fri Sep 12 14:47:30 2014 +0200
debian/rules: Make /etc/X11/xinit/xinitrc executable to make lintian happy and also to fix LP: #491696
diff --git a/debian/changelog b/debian/changelog
index b45c0f2..57dbc4f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,8 +10,10 @@ xinit (1.3.4-1) UNRELEASED; urgency=medium
- debian/patches/001_debian_xinitrc.diff: Refreshed
* Fix debian/patches/03_debian_startx_manpage.diff, a Debian specific note
was not shown anymore
+ * debian/rules: Make /etc/X11/xinit/xinitrc executable to make lintian happy
+ and also to fix LP: #491696
- -- Laurent Bigonville <bigon@debian.org> Fri, 12 Sep 2014 13:54:38 +0200
+ -- Laurent Bigonville <bigon@debian.org> Fri, 12 Sep 2014 14:46:49 +0200
xinit (1.3.3-1) unstable; urgency=medium
diff --git a/debian/rules b/debian/rules
index a149388..388af97 100755
--- a/debian/rules
+++ b/debian/rules
@@ -69,6 +69,7 @@ install: build
install -d debian/tmp/etc/X11/xinit
install -m 755 debian/local/xserverrc debian/tmp/etc/X11/xinit
+ chmod 755 debian/tmp/etc/X11/xinit/xinitrc
# Build architecture-dependent files here.
binary-arch: build install
commit 87375ad9ef25e8a9f3eb001209ac2c6ce223f521
Author: Laurent Bigonville <bigon@bigon.be>
Date: Fri Sep 12 13:55:50 2014 +0200
Fix debian/patches/03_debian_startx_manpage.diff, a Debian specific note was not shown anymore
diff --git a/debian/changelog b/debian/changelog
index eca4945..b45c0f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,10 @@ xinit (1.3.4-1) UNRELEASED; urgency=medium
d/p/11-startx-Pass-vtX-as-long-as-the-user-did-not-specify-.patch:
Merged upstream
- debian/patches/001_debian_xinitrc.diff: Refreshed
+ * Fix debian/patches/03_debian_startx_manpage.diff, a Debian specific note
+ was not shown anymore
- -- Laurent Bigonville <bigon@debian.org> Fri, 12 Sep 2014 12:57:36 +0200
+ -- Laurent Bigonville <bigon@debian.org> Fri, 12 Sep 2014 13:54:38 +0200
xinit (1.3.3-1) unstable; urgency=medium
diff --git a/debian/patches/03_debian_startx_manpage.diff b/debian/patches/03_debian_startx_manpage.diff
index cb7454b..a520f8b 100644
--- a/debian/patches/03_debian_startx_manpage.diff
+++ b/debian/patches/03_debian_startx_manpage.diff
@@ -7,9 +7,9 @@ Robinson.
--- a/man/startx.man
+++ b/man/startx.man
-@@ -76,6 +76,28 @@ startx -- -layout Multihead
- .RE
- #ifdef __SCOMAN__
+@@ -93,6 +93,28 @@ looks for the following files, in order:
+ ..
+ .if !'x.__SCOMAN__'x.' .ig
.PP
+Note that in the Debian system, what many people traditionally put in the
+.I .xinitrc
@@ -35,8 +35,8 @@ Robinson.
+.PP
To determine the client to run,
.B startx
- looks for the following files, in order:
-@@ -134,38 +156,6 @@ and
+ first looks for a file called
+@@ -135,38 +157,6 @@ and
files are found in the
.I __xinitdir__
directory.
commit 00ae168ac8da0ec1ecfd5ba8f028feacf19621eb
Author: Laurent Bigonville <bigon@bigon.be>
Date: Fri Sep 12 12:58:00 2014 +0200
debian/patches/001_debian_xinitrc.diff: Refreshed
diff --git a/debian/changelog b/debian/changelog
index 2bb8cff..eca4945 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,9 @@ xinit (1.3.4-1) UNRELEASED; urgency=medium
d/p/10-startx-Under-Linux-start-X-on-the-current-VT.patch,
d/p/11-startx-Pass-vtX-as-long-as-the-user-did-not-specify-.patch:
Merged upstream
+ - debian/patches/001_debian_xinitrc.diff: Refreshed
- -- Laurent Bigonville <bigon@debian.org> Fri, 12 Sep 2014 12:39:16 +0200
+ -- Laurent Bigonville <bigon@debian.org> Fri, 12 Sep 2014 12:57:36 +0200
xinit (1.3.3-1) unstable; urgency=medium
diff --git a/debian/patches/001_debian_xinitrc.diff b/debian/patches/001_debian_xinitrc.diff
index da76ef4..92741d1 100644
--- a/debian/patches/001_debian_xinitrc.diff
+++ b/debian/patches/001_debian_xinitrc.diff
@@ -1,6 +1,6 @@
--- a/xinitrc.cpp
+++ b/xinitrc.cpp
-@@ -1,98 +1,8 @@
+@@ -1,55 +1,8 @@
XCOMM!SHELL_CMD
-userresources=$HOME/.Xresources
@@ -47,49 +47,6 @@
-
-XCOMM start some nice programs
-
--#if defined(__SCO__) || defined(__UNIXWARE__)
--if [ -r /etc/default/xdesktops ]; then
-- . /etc/default/xdesktops
--fi
--
--if [ -r $HOME/.x11rc ]; then
-- . $HOME/.x11rc
--else
-- if [ -r /etc/default/X11 ]; then
-- . /etc/default/X11
-- fi
--fi
--
--#if defined(__SCO__)
--if [ -n "$XSESSION" ]; then
-- case "$XSESSION" in
-- [Yy][Ee][Ss])
-- [ -x /usr/bin/X11/scosession ] && exec /usr/bin/X11/scosession
-- ;;
-- esac
--fi
--
--if [ -n "$XDESKTOP" ]; then
-- exec `eval echo $"$XDESKTOP"`
--else
-- if [ -x /usr/bin/X11/pmwm -a -x /usr/bin/X11/scoterm ]; then
-- /usr/bin/X11/scoterm 2> /dev/null &
-- exec /usr/bin/X11/pmwm 2> /dev/null
-- fi
--fi
--#elif defined(__UNIXWARE__)
--if [ -n "$XDESKTOP" ]; then
-- exec `eval echo $"$XDESKTOP"`
--else
-- if [ -x /usr/X/bin/pmwm ]; then
-- exec /usr/X/bin/pmwm 2> /dev/null
-- fi
--fi
--#endif
--
--XCOMM This is the fallback case if nothing else is executed above
--#endif /* !defined(__SCO__) && !defined(__UNIXWARE__) */
--
-if [ -d XINITDIR/xinitrc.d ] ; then
- for f in XINITDIR/xinitrc.d/?*.sh ; do
- [ -x "$f" ] && . "$f"
commit bf6635bc7602e5a12123c7f3ffe17d6f9ace47c0
Author: Laurent Bigonville <bigon@bigon.be>
Date: Fri Sep 12 12:41:18 2014 +0200
Drop patches that have been merged upstream
Drop d/p/07-Pass-files-to-cpp-via-CLI-arg-instead-of-stdin-to-wo.patch,
d/p/08-Bump-required-util-macros-version-to-1.19.patch,
d/p/09-Replace-RAWCPPFLAGS-with-TRADITIONALCPPFLAGS-when-pr.patch,
d/p/10-startx-Under-Linux-start-X-on-the-current-VT.patch,
d/p/11-startx-Pass-vtX-as-long-as-the-user-did-not-specify-.patch:
Merged upstream
diff --git a/debian/changelog b/debian/changelog
index b88959b..2bb8cff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,14 @@
xinit (1.3.4-1) UNRELEASED; urgency=medium
* New upstream release.
-
- -- Laurent Bigonville <bigon@debian.org> Fri, 12 Sep 2014 12:32:28 +0200
+ - Drop d/p/07-Pass-files-to-cpp-via-CLI-arg-instead-of-stdin-to-wo.patch,
+ d/p/08-Bump-required-util-macros-version-to-1.19.patch,
+ d/p/09-Replace-RAWCPPFLAGS-with-TRADITIONALCPPFLAGS-when-pr.patch,
+ d/p/10-startx-Under-Linux-start-X-on-the-current-VT.patch,
+ d/p/11-startx-Pass-vtX-as-long-as-the-user-did-not-specify-.patch:
+ Merged upstream
+
+ -- Laurent Bigonville <bigon@debian.org> Fri, 12 Sep 2014 12:39:16 +0200
xinit (1.3.3-1) unstable; urgency=medium
diff --git a/debian/patches/07-Pass-files-to-cpp-via-CLI-arg-instead-of-stdin-to-wo.patch b/debian/patches/07-Pass-files-to-cpp-via-CLI-arg-instead-of-stdin-to-wo.patch
deleted file mode 100644
index 210f159..0000000
--- a/debian/patches/07-Pass-files-to-cpp-via-CLI-arg-instead-of-stdin-to-wo.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 463b85fcf51d8ff5886ebe1f3481e5cb4d603436 Mon Sep 17 00:00:00 2001
-From: Alan Coopersmith <alan.coopersmith@oracle.com>
-Date: Fri, 22 Nov 2013 23:03:39 -0800
-Subject: [PATCH 2/9] Pass files to cpp via CLI arg instead of stdin to
- workaround gcc 4.8 change
-
-Fixes Bug 69439 - Empty lines before #!/bin/sh in startx
-https://bugs.freedesktop.org/show_bug.cgi?id=69439
-
-Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
----
- cpprules.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cpprules.in b/cpprules.in
-index eaea428..0931bee 100644
---- a/cpprules.in
-+++ b/cpprules.in
-@@ -15,4 +15,4 @@ CPP_SED_MAGIC = $(SED) -e '/^\# *[0-9][0-9]* *.*$$/d' \
- SUFFIXES = .cpp
-
- .cpp:
-- $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
-+ $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) $< | $(CPP_SED_MAGIC) > $@
---
-2.1.0
-
diff --git a/debian/patches/08-Bump-required-util-macros-version-to-1.19.patch b/debian/patches/08-Bump-required-util-macros-version-to-1.19.patch
deleted file mode 100644
index 968e077..0000000
--- a/debian/patches/08-Bump-required-util-macros-version-to-1.19.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 7f54370baca4203bb344f5f8a4c2683f5b78d50b Mon Sep 17 00:00:00 2001
-From: Hans de Goede <hdegoede@redhat.com>
-Date: Thu, 27 Mar 2014 14:37:19 +0100
-Subject: [PATCH 4/9] Bump required util-macros version to 1.19
-
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
-Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
----
- configure.ac | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 3d5ea79..37eabfa 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -31,10 +31,10 @@ AC_CONFIG_HEADERS([config.h])
- AM_INIT_AUTOMAKE([foreign dist-bzip2])
- AM_MAINTAINER_MODE
-
--# Require X.Org macros 1.8 or later for AC_PROG_SED in XORG_DEFAULT_OPTIONS
-+# Require X.Org macros 1.19 or later for TRADITIONALCPPFLAGS
- m4_ifndef([XORG_MACROS_VERSION],
-- [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
--XORG_MACROS_VERSION(1.8)
-+ [m4_fatal([must install xorg-macros 1.19 or later before running autoconf/autogen])])
-+XORG_MACROS_VERSION(1.19)
- XORG_DEFAULT_OPTIONS
-
- XORG_PROG_RAWCPP
---
-2.1.0
-
diff --git a/debian/patches/09-Replace-RAWCPPFLAGS-with-TRADITIONALCPPFLAGS-when-pr.patch b/debian/patches/09-Replace-RAWCPPFLAGS-with-TRADITIONALCPPFLAGS-when-pr.patch
deleted file mode 100644
index ea83927..0000000
--- a/debian/patches/09-Replace-RAWCPPFLAGS-with-TRADITIONALCPPFLAGS-when-pr.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 79479a0c45f3177ddf0bb2666d39535b6c767c07 Mon Sep 17 00:00:00 2001
-From: Hans de Goede <hdegoede@redhat.com>
-Date: Tue, 25 Mar 2014 11:48:58 +0100
-Subject: [PATCH 5/9] Replace $RAWCPPFLAGS with $TRADITIONALCPPFLAGS when
- processing cpp files
-
-Various .cpp files containt things like #ifdef __APPLE__ and #ifdef __linux__
-these have been broken (all #ifdef-s always seen as false) since:
-http://cgit.freedesktop.org/xorg/util/macros/commit/?id=d690e4a9febd07988d149a967791c5629c17b258
-
-This commit makes these work again by removing -undef from the cpp flags.
-
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
-Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
----
- cpprules.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cpprules.in b/cpprules.in
-index 0931bee..870efde 100644
---- a/cpprules.in
-+++ b/cpprules.in
-@@ -15,4 +15,4 @@ CPP_SED_MAGIC = $(SED) -e '/^\# *[0-9][0-9]* *.*$$/d' \
- SUFFIXES = .cpp
-
- .cpp:
-- $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) $< | $(CPP_SED_MAGIC) > $@
-+ $(AM_V_GEN)$(RAWCPP) $(TRADITIONALCPPFLAGS) $(CPP_FILES_FLAGS) $< | $(CPP_SED_MAGIC) > $@
---
-2.1.0
-
diff --git a/debian/patches/10-startx-Under-Linux-start-X-on-the-current-VT.patch b/debian/patches/10-startx-Under-Linux-start-X-on-the-current-VT.patch
deleted file mode 100644
index 3bb1456..0000000
--- a/debian/patches/10-startx-Under-Linux-start-X-on-the-current-VT.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 44915d6953076849b69a017f6fc8234b0f254362 Mon Sep 17 00:00:00 2001
-From: Hans de Goede <hdegoede@redhat.com>
-Date: Tue, 25 Mar 2014 11:54:31 +0100
-Subject: [PATCH 6/9] startx: Under Linux start X on the current VT
-
-When we let X allocate a new VT, systemd-logind will not recognize any
-processes running on this VT as belonging to a valid session (since there
-was no pam session opened on that tty).
-
-This causes problems like PolicyKit denials for these processes.
-
-ConsoleKit under Linux has been deprecated for a few years now and is no
-longer being maintained, so simply make this the default under Linux.
-
-Note we do not pass in the vt if the user has specified an alternative server
-to start, as the vtX argument is only valid for the Xorg server, likewise we
-omit it if the user has specified any other server arguments.
-
-Fixes:
-https://bugzilla.redhat.com/show_bug.cgi?id=806491
-
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
-Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
----
- startx.cpp | 11 +++++++++++
- 1 file changed, 11 insertions(+)
-
-diff --git a/startx.cpp b/startx.cpp
-index b7a29f9..f4a0283 100644
---- a/startx.cpp
-+++ b/startx.cpp
-@@ -187,6 +187,17 @@ XCOMM process server arguments
- if [ x"$server" = x ]; then
- server=$defaultserver
-
-+#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
-+ tty=$(tty)
-+ if expr match "$tty" '^/dev/tty[0-9]\+$' > /dev/null; then
-+ tty_num=$(echo "$tty" | grep -oE '[0-9]+$')
-+ defaultserverargs=${defaultserverargs}" vt"${tty_num}
-+ fi
-+#endif
-+
- XCOMM For compatibility reasons, only use xserverrc if there were no server command line arguments
- if [ x"$serverargs" = x -a x"$display" = x ]; then
- if [ -f "$userserverrc" ]; then
---
-2.1.0
-
diff --git a/debian/patches/11-startx-Pass-vtX-as-long-as-the-user-did-not-specify-.patch b/debian/patches/11-startx-Pass-vtX-as-long-as-the-user-did-not-specify-.patch
deleted file mode 100644
index 4eb9f74..0000000
--- a/debian/patches/11-startx-Pass-vtX-as-long-as-the-user-did-not-specify-.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 1b23094a8606bf383ec6c7803a9cd300b1bb96a7 Mon Sep 17 00:00:00 2001
-From: Hans de Goede <hdegoede@redhat.com>
-Date: Mon, 7 Apr 2014 11:23:48 +0200
-Subject: [PATCH 7/9] 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 <hdegoede@redhat.com>
-Reviewed-by: James Cloos <cloos@jhcloos.com>
----
- startx.cpp | 14 +++++++++++++-
- 1 file changed, 13 insertions(+), 1 deletion(-)
-
-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=""
- serverargs=""
-+vtarg=""
-
- #ifdef __APPLE__
-
-@@ -194,7 +195,7 @@ if [ x"$server" = x ]; then
- tty=$(tty)
- if expr match "$tty" '^/dev/tty[0-9]\+$' > /dev/null; then
- tty_num=$(echo "$tty" | grep -oE '[0-9]+$')
-- defaultserverargs=${defaultserverargs}" vt"${tty_num}
-+ vtarg="vt$tty_num"
- fi
- #endif
-
-@@ -213,6 +214,17 @@ if [ x"$serverargs" = x ]; then
- serverargs=$defaultserverargs
- fi
-
-+XCOMM if no vt is specified add vtarg (which may be empty)
-+have_vtarg="no"
-+for i in $serverargs; do
-+ if expr match "$i" '^vt[0-9]\+$' > /dev/null; then
-+ have_vtarg="yes"
-+ fi
-+done
-+if [ "$have_vtarg" = "no" ]; then
-+ serverargs="$serverargs $vtarg"
-+fi
-+
- XCOMM if no display, use default
- if [ x"$display" = x ]; then
- display=$defaultdisplay
---
-2.1.0
-
diff --git a/debian/patches/series b/debian/patches/series
index 7fd863c..316bb5d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,9 +1,4 @@
-001_debian_xinitrc.diff
-02_startx_hostname.diff
-03_debian_startx_manpage.diff
+001_debian_xinitrc.diff
+02_startx_hostname.diff
+03_debian_startx_manpage.diff
06_move_serverauthfile_into_tmp.diff
-07-Pass-files-to-cpp-via-CLI-arg-instead-of-stdin-to-wo.patch
-08-Bump-required-util-macros-version-to-1.19.patch
-09-Replace-RAWCPPFLAGS-with-TRADITIONALCPPFLAGS-when-pr.patch
-10-startx-Under-Linux-start-X-on-the-current-VT.patch
-11-startx-Pass-vtX-as-long-as-the-user-did-not-specify-.patch
commit 22656fe65999f71f75c9a4b792b654a14c61e8fa
Author: Laurent Bigonville <bigon@bigon.be>
Date: Fri Sep 12 12:33:16 2014 +0200
New upstream release.
Update ChangeLog
diff --git a/ChangeLog b/ChangeLog
index 807ec55..00dcc02 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,156 @@
+commit 6f6747d500439782476cf5c029a7fc45fc954c86
+Author: Hans de Goede <hdegoede@redhat.com>
+Date: Thu Sep 11 16:29:06 2014 +0200
+
+ xinit 1.3.4
+
+ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+
+commit e91faac94e36937c96c04277eae7960bf5132b5b
+Author: Brad Smith <brad@comstyle.com>
+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 <matthieu@herrb.eu>
+
+commit 94b002262d27975dabf56c77fd308ebabc894090
+Author: Hans de Goede <hdegoede@redhat.com>
+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 <hdegoede@redhat.com>
+
+commit 5502aaf99f4e723e96791e8f4cf01e0c200ec269
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+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 <alan.coopersmith@oracle.com>
+
+commit a6a720b5181d4d0529e4eb203ece234ba45f69dd
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat May 31 21:38:41 2014 -0700
+
+ configure: Drop AM_MAINTAINER_MODE
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 1b23094a8606bf383ec6c7803a9cd300b1bb96a7
+Author: Hans de Goede <hdegoede@redhat.com>
+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 <hdegoede@redhat.com>
+ Reviewed-by: James Cloos <cloos@jhcloos.com>
+
+commit 44915d6953076849b69a017f6fc8234b0f254362
+Author: Hans de Goede <hdegoede@redhat.com>
+Date: Tue Mar 25 11:54:31 2014 +0100
+
+ startx: Under Linux start X on the current VT
+
+ When we let X allocate a new VT, systemd-logind will not recognize any
+ processes running on this VT as belonging to a valid session (since there
+ was no pam session opened on that tty).
+
+ This causes problems like PolicyKit denials for these processes.
+
+ ConsoleKit under Linux has been deprecated for a few years now and is no
+ longer being maintained, so simply make this the default under Linux.
+
+ Note we do not pass in the vt if the user has specified an alternative server
+ to start, as the vtX argument is only valid for the Xorg server, likewise we
+ omit it if the user has specified any other server arguments.
+
+ Fixes:
+ https://bugzilla.redhat.com/show_bug.cgi?id=806491
+
+ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 79479a0c45f3177ddf0bb2666d39535b6c767c07
+Author: Hans de Goede <hdegoede@redhat.com>
+Date: Tue Mar 25 11:48:58 2014 +0100
+
+ Replace $RAWCPPFLAGS with $TRADITIONALCPPFLAGS when processing cpp files
+
+ Various .cpp files containt things like #ifdef __APPLE__ and #ifdef __linux__
+ these have been broken (all #ifdef-s always seen as false) since:
+ http://cgit.freedesktop.org/xorg/util/macros/commit/?id=d690e4a9febd07988d149a967791c5629c17b258
+
+ This commit makes these work again by removing -undef from the cpp flags.
+
+ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+ Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 7f54370baca4203bb344f5f8a4c2683f5b78d50b
+Author: Hans de Goede <hdegoede@redhat.com>
+Date: Thu Mar 27 14:37:19 2014 +0100
+
+ Bump required util-macros version to 1.19
+
+ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+ Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit fdf03cd2fdfd9cd5635334c5e4dc2bb23e92e37a
+Author: Hans de Goede <hdegoede@redhat.com>
+Date: Thu Mar 27 12:29:19 2014 +0100
+
+ Remove unixware / sco support
+
+ We don't support SCO / Unixware anymore, so lets remove the SCO / Unixware
+ specific bits from startx and xinitrc
+
+ SCO support was removed from the server in 2010:
+ http://lists.x.org/archives/xorg-devel/2010-December/017209.html
+
+ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+ Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
+ Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 463b85fcf51d8ff5886ebe1f3481e5cb4d603436
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Fri Nov 22 23:03:39 2013 -0800
+
+ Pass files to cpp via CLI arg instead of stdin to workaround gcc 4.8 change
+
+ Fixes Bug 69439 - Empty lines before #!/bin/sh in startx
+ https://bugs.freedesktop.org/show_bug.cgi?id=69439
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 182920f156c87715d91b2f64b8781a0072af996e
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sun Sep 8 09:48:50 2013 -0700
+
+ Fix warnings about parameters to startServer & startClient shadowing globals
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
commit cdc39fd28649ea906dea8f58981d15d4b04a0a47
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun Sep 8 09:35:35 2013 -0700
diff --git a/debian/changelog b/debian/changelog
index 604b0f8..b88959b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xinit (1.3.4-1) UNRELEASED; urgency=medium
+
+ * New upstream release.
+
+ -- Laurent Bigonville <bigon@debian.org> Fri, 12 Sep 2014 12:32:28 +0200
+
xinit (1.3.3-1) unstable; urgency=medium
* Team upload.
commit 6f6747d500439782476cf5c029a7fc45fc954c86
Author: Hans de Goede <hdegoede@redhat.com>
Date: Thu Sep 11 16:29:06 2014 +0200
xinit 1.3.4
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
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 <brad@comstyle.com>
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 <matthieu@herrb.eu>
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 <hdegoede@redhat.com>
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 <hdegoede@redhat.com>
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 <alan.coopersmith@oracle.com>
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 <alan.coopersmith@oracle.com>
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 <alan.coopersmith@oracle.com>
Date: Sat May 31 21:38:41 2014 -0700
configure: Drop AM_MAINTAINER_MODE
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
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 <hdegoede@redhat.com>
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 <hdegoede@redhat.com>
Reviewed-by: James Cloos <cloos@jhcloos.com>
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=""
serverargs=""
+vtarg=""
#ifdef __APPLE__
@@ -194,7 +195,7 @@ if [ x"$server" = x ]; then
tty=$(tty)
if expr match "$tty" '^/dev/tty[0-9]\+$' > /dev/null; then
tty_num=$(echo "$tty" | grep -oE '[0-9]+$')
- defaultserverargs=${defaultserverargs}" vt"${tty_num}
+ vtarg="vt$tty_num"
fi
#endif
@@ -213,6 +214,17 @@ if [ x"$serverargs" = x ]; then
serverargs=$defaultserverargs
fi
+XCOMM if no vt is specified add vtarg (which may be empty)
+have_vtarg="no"
+for i in $serverargs; do
+ if expr match "$i" '^vt[0-9]\+$' > /dev/null; then
+ have_vtarg="yes"
+ fi
+done
+if [ "$have_vtarg" = "no" ]; then
+ serverargs="$serverargs $vtarg"
+fi
+
XCOMM if no display, use default
if [ x"$display" = x ]; then
display=$defaultdisplay
commit 44915d6953076849b69a017f6fc8234b0f254362
Author: Hans de Goede <hdegoede@redhat.com>
Date: Tue Mar 25 11:54:31 2014 +0100
startx: Under Linux start X on the current VT
When we let X allocate a new VT, systemd-logind will not recognize any
processes running on this VT as belonging to a valid session (since there
was no pam session opened on that tty).
This causes problems like PolicyKit denials for these processes.
ConsoleKit under Linux has been deprecated for a few years now and is no
longer being maintained, so simply make this the default under Linux.
Note we do not pass in the vt if the user has specified an alternative server
to start, as the vtX argument is only valid for the Xorg server, likewise we
omit it if the user has specified any other server arguments.
Fixes:
https://bugzilla.redhat.com/show_bug.cgi?id=806491
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/startx.cpp b/startx.cpp
index b7a29f9..f4a0283 100644
--- a/startx.cpp
+++ b/startx.cpp
@@ -187,6 +187,17 @@ XCOMM process server arguments
if [ x"$server" = x ]; then
server=$defaultserver
+#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
+ tty=$(tty)
+ if expr match "$tty" '^/dev/tty[0-9]\+$' > /dev/null; then
+ tty_num=$(echo "$tty" | grep -oE '[0-9]+$')
+ defaultserverargs=${defaultserverargs}" vt"${tty_num}
+ fi
+#endif
+
XCOMM For compatibility reasons, only use xserverrc if there were no server command line arguments
if [ x"$serverargs" = x -a x"$display" = x ]; then
if [ -f "$userserverrc" ]; then
commit 79479a0c45f3177ddf0bb2666d39535b6c767c07
Author: Hans de Goede <hdegoede@redhat.com>
Date: Tue Mar 25 11:48:58 2014 +0100
Replace $RAWCPPFLAGS with $TRADITIONALCPPFLAGS when processing cpp files
Various .cpp files containt things like #ifdef __APPLE__ and #ifdef __linux__
these have been broken (all #ifdef-s always seen as false) since:
http://cgit.freedesktop.org/xorg/util/macros/commit/?id=d690e4a9febd07988d149a967791c5629c17b258
This commit makes these work again by removing -undef from the cpp flags.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/cpprules.in b/cpprules.in
index 0931bee..870efde 100644
--- a/cpprules.in
+++ b/cpprules.in
@@ -15,4 +15,4 @@ CPP_SED_MAGIC = $(SED) -e '/^\# *[0-9][0-9]* *.*$$/d' \
SUFFIXES = .cpp
.cpp:
- $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) $< | $(CPP_SED_MAGIC) > $@
+ $(AM_V_GEN)$(RAWCPP) $(TRADITIONALCPPFLAGS) $(CPP_FILES_FLAGS) $< | $(CPP_SED_MAGIC) > $@
commit 7f54370baca4203bb344f5f8a4c2683f5b78d50b
Author: Hans de Goede <hdegoede@redhat.com>
Date: Thu Mar 27 14:37:19 2014 +0100
Bump required util-macros version to 1.19
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 3d5ea79..37eabfa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,10 +31,10 @@ AC_CONFIG_HEADERS([config.h])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
-# Require X.Org macros 1.8 or later for AC_PROG_SED in XORG_DEFAULT_OPTIONS
+# Require X.Org macros 1.19 or later for TRADITIONALCPPFLAGS
m4_ifndef([XORG_MACROS_VERSION],
- [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.8)
+ [m4_fatal([must install xorg-macros 1.19 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.19)
XORG_DEFAULT_OPTIONS
Reply to: