[xorg-x11-xinit] New upstream release 1.3.4
Hans de Goede
jwrdegoede at fedoraproject.org
Thu Sep 11 17:49:29 UTC 2014
commit a2a0799ba42d524a3973c4ad6a27a3f857c01297
Author: Hans de Goede <hdegoede at redhat.com>
Date: Thu Sep 11 19:47:04 2014 +0200
New upstream release 1.3.4
- Resolves #806491 #990213 #1006029
- Remove stale ck-xinit-session references from xinitrc-common (#910969)
- Make startx pass "-nolisten tcp" by default, use -listen as server
option to disable this (#1111684)
- Teach Xclients script about lxde (#488602)
.gitignore | 1 +
0001-Drop-RAWCPPFLAGS-when-generating-startx.patch | 26 ----
0001-startx-Pass-nolisten-tcp-by-default.patch | 73 ++++++++++
...rtx-Under-Linux-start-X-on-the-current-VT.patch | 50 -------
...Makefile.am-Give-XINITDIR-a-default-value.patch | 28 ----
Xclients | 6 +
ck-xinit-session.c | 147 --------------------
sources | 2 +-
xinit-1.0.2-client-session.patch | 37 +++---
xinitrc-common | 5 -
xorg-x11-xinit.spec | 31 ++---
11 files changed, 113 insertions(+), 293 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 90ebfeb..cd47489 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
xinit-1.0.7.tar.bz2
/xinit-1.3.1.tar.bz2
/xinit-1.3.2.tar.bz2
+/xinit-1.3.4.tar.bz2
diff --git a/0001-startx-Pass-nolisten-tcp-by-default.patch b/0001-startx-Pass-nolisten-tcp-by-default.patch
new file mode 100644
index 0000000..3ad2e13
--- /dev/null
+++ b/0001-startx-Pass-nolisten-tcp-by-default.patch
@@ -0,0 +1,73 @@
+From a750c23c155f889cbb29a3c879b1e19f2707a823 Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede at redhat.com>
+Date: Thu, 11 Sep 2014 18:02:24 +0200
+Subject: [PATCH xinit] startx: Pass "-nolisten tcp" by default
+
+Having servers started by startx listen on tcp by default is not a good idea
+in this time and age. Pass "-nolisten tcp" by default, and add a special
+-listen server option which can be used to disable this new default behavior.
+
+Signed-off-by: Hans de Goede <hdegoede at redhat.com>
+---
+ man/startx.man | 7 +++++++
+ startx.cpp | 5 +++++
+ 2 files changed, 12 insertions(+)
+
+diff --git a/man/startx.man b/man/startx.man
+index 0405be0..fc2cbc3 100644
+--- a/man/startx.man
++++ b/man/startx.man
+@@ -39,6 +39,8 @@ startx \- initialize an X session
+ .I server
+ ] [
+ .I display
++] [
++.I -listen
+ ]
+ .I options
+ \&.\|.\|. ]
+@@ -56,6 +58,11 @@ command are used to start a client in the same manner as
+ The special argument
+ .RB '--'
+ marks the end of client arguments and the beginning of server options.
++By default startx passes
++.RB '-nolisten\ tcp'
++to the server, the special server option
++.RB '-listen'
++can be used to stop startx from doing this.
+ It may be convenient to specify server options with startx to change on a
+ per-session basis the
+ default color depth, the server's notion of the number of dots-per-inch the
+diff --git a/startx.cpp b/startx.cpp
+index 1c6fce0..8612fa6 100644
+--- a/startx.cpp
++++ b/startx.cpp
+@@ -60,6 +60,7 @@ defaultdisplay=":0"
+ clientargs=""
+ serverargs=""
+ vtarg=""
++listenarg="-nolisten tcp"
+
+ #ifdef __APPLE__
+
+@@ -156,6 +157,8 @@ while [ x"$1" != x ]; do
+ if [ x"$serverargs" = x ] && @@
+ expr "$1" : ':[0-9][0-9]*$' > /dev/null 2>&1; then
+ display="$1"
++ elif [ "$1" = "-listen" ]; then
++ listenarg=""
+ else
+ serverargs="$serverargs $1"
+ fi
+@@ -225,6 +228,8 @@ if [ "$have_vtarg" = "no" ]; then
+ serverargs="$serverargs $vtarg"
+ fi
+
++serverargs="$serverargs $listenarg"
++
+ XCOMM if no display, use default
+ if [ x"$display" = x ]; then
+ display=$defaultdisplay
+--
+2.1.0
+
diff --git a/Xclients b/Xclients
index d2b81c7..6f98d2e 100755
--- a/Xclients
+++ b/Xclients
@@ -10,6 +10,7 @@
GSESSION="$(type -p gnome-session)"
STARTKDE="$(type -p startkde)"
+STARTLXDE="$(type -p startlxde)"
# check to see if the user has a preferred desktop
PREFERRED=
@@ -19,6 +20,8 @@ if [ -f /etc/sysconfig/desktop ]; then
PREFERRED="$GSESSION"
elif [ "$DESKTOP" = "KDE" ]; then
PREFERRED="$STARTKDE"
+ elif [ "$DESKTOP" = "LXDE" ]; then
+ PREFERRED="$STARTLXDE"
fi
fi
@@ -35,6 +38,9 @@ if [ -n "$GSESSION" ]; then
elif [ -n "$STARTKDE" ]; then
# if GNOME isn't installed, try KDE.
exec "$STARTKDE"
+elif [ -n "$STARTLXDE" ]; then
+ # if neither GNOME nor KDE then LXDE
+ exec "$STARTLXDE"
fi
# We should also support /etc/X11/xinit/Xclients.d scripts
diff --git a/sources b/sources
index eb0f4e2..ff83b80 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9c0943cbd83e489ad1b05221b97efd44 xinit-1.3.2.tar.bz2
+4e928452dfaf73851413a2d8b8c76388 xinit-1.3.4.tar.bz2
diff --git a/xinit-1.0.2-client-session.patch b/xinit-1.0.2-client-session.patch
index a38c883..f463f68 100644
--- a/xinit-1.0.2-client-session.patch
+++ b/xinit-1.0.2-client-session.patch
@@ -1,8 +1,7 @@
-Index: xinit-1.3.1/xinit.c
-===================================================================
---- xinit-1.3.1.orig/xinit.c
-+++ xinit-1.3.1/xinit.c
-@@ -91,6 +91,8 @@ char xserverrcbuf[256];
+diff -up xinit-1.3.4/xinit.c.client-session xinit-1.3.4/xinit.c
+--- xinit-1.3.4/xinit.c.client-session 2014-03-25 10:20:26.000000000 +0100
++++ xinit-1.3.4/xinit.c 2014-09-11 17:03:30.928360694 +0200
+@@ -89,6 +89,8 @@ char xserverrcbuf[256];
#define TRUE 1
#define FALSE 0
@@ -11,29 +10,29 @@ Index: xinit-1.3.1/xinit.c
static char *default_server = "X";
static char *default_display = ":0"; /* choose most efficient */
-@@ -561,6 +563,7 @@ startClient(char *client[])
+@@ -560,6 +562,7 @@ startClient(char *client_argv[])
{
clientpid = fork();
if (clientpid == 0) {
-+ int fd;
++ int fd;
set_environment();
setWindowPath();
-@@ -568,7 +571,16 @@ startClient(char *client[])
+@@ -567,7 +570,16 @@ startClient(char *client_argv[])
Error("cannot change uid");
_exit(EXIT_FAILURE);
}
- setpgid(0, getpid());
-+ fd = open ("/dev/null", O_RDONLY);
++ fd = open ("/dev/null", O_RDONLY);
+
-+ if (fd < 0) {
-+ Error("cannot open /dev/null: %s\n", strerror(errno));
-+ _exit(ERR_EXIT);
-+ }
-+ close (STDIN_FILENO);
-+ dup2 (fd, STDIN_FILENO);
-+ close (fd);
-+ setsid();
- Execute(client);
- Error("Unable to run program \"%s\"", client[0]);
++ if (fd < 0) {
++ Error("cannot open /dev/null: %s\n", strerror(errno));
++ _exit(ERR_EXIT);
++ }
++ close (STDIN_FILENO);
++ dup2 (fd, STDIN_FILENO);
++ close (fd);
++ setsid();
+ Execute(client_argv);
+ Error("Unable to run program \"%s\"", client_argv[0]);
diff --git a/xinitrc-common b/xinitrc-common
index 000ab67..4564ebc 100644
--- a/xinitrc-common
+++ b/xinitrc-common
@@ -64,8 +64,3 @@ if [ -z "$SSH_AGENT_PID" ] && [ -x /usr/bin/ssh-agent ]; then
SSH_AGENT="/usr/bin/ssh-agent"
fi
fi
-
-CK_XINIT_SESSION=
-if [ -z "$XDG_SESSION_COOKIE" ] && [ -x /usr/bin/ck-xinit-session ]; then
- CK_XINIT_SESSION="/usr/bin/ck-xinit-session"
-fi
diff --git a/xorg-x11-xinit.spec b/xorg-x11-xinit.spec
index 5f4d4a2..6aaac33 100644
--- a/xorg-x11-xinit.spec
+++ b/xorg-x11-xinit.spec
@@ -2,13 +2,13 @@
Summary: X.Org X11 X Window System xinit startup scripts
Name: xorg-x11-%{pkgname}
-Version: 1.3.2
-Release: 13%{?dist}
+Version: 1.3.4
+Release: 1%{?dist}
License: MIT
Group: User Interface/X
URL: http://www.x.org
-Source0: ftp://ftp.x.org/pub/individual/app/%{pkgname}-%{version}.tar.bz2
+Source0: http://xorg.freedesktop.org/archive/individual/app/%{pkgname}-%{version}.tar.bz2
Source10: xinitrc-common
Source11: xinitrc
Source12: Xclients
@@ -25,20 +25,12 @@ Source19: xinit-compat
Patch1: xinit-1.0.2-client-session.patch
-# Fixes scheduled to go upstream for the next release, fixing:
-# https://bugzilla.redhat.com/show_bug.cgi?id=806491
-# https://bugzilla.redhat.com/show_bug.cgi?id=960955
-Patch2: 0001-Drop-RAWCPPFLAGS-when-generating-startx.patch
-Patch3: 0002-startx-Under-Linux-start-X-on-the-current-VT.patch
-Patch4: 0003-Makefile.am-Give-XINITDIR-a-default-value.patch
+# submitted upstream, rhbz#1111684
+Patch2: 0001-startx-Pass-nolisten-tcp-by-default.patch
BuildRequires: pkgconfig
BuildRequires: libX11-devel
-BuildRequires: autoconf
-BuildRequires: automake
BuildRequires: dbus-devel
-BuildRequires: libtool
-BuildRequires: xorg-x11-util-macros
# NOTE: startx needs xauth in order to run, but that is not picked up
# automatically by rpm. (Bug #173684)
Requires: xorg-x11-xauth
@@ -60,11 +52,8 @@ Allows legacy ~/.xsession and ~/.Xclients files to be used from display managers
%setup -q -n %{pkgname}-%{version}
%patch1 -p1 -b .client-session
%patch2 -p1
-%patch3 -p1
-%patch4 -p1
%build
-autoreconf -fi
%configure
make %{?_smp_mflags}
@@ -116,6 +105,14 @@ install -p -m644 -D %{SOURCE18} $RPM_BUILD_ROOT%{_datadir}/xsessions/xinit-compa
%{_datadir}/xsessions/xinit-compat.desktop
%changelog
+* Thu Sep 11 2014 Hans de Goede <hdegoede at redhat.com> - 1.3.4-1
+- New upstream release 1.3.4
+- Resolves #806491 #990213 #1006029
+- Remove stale ck-xinit-session references from xinitrc-common (#910969)
+- Make startx pass "-nolisten tcp" by default, use -listen as server
+ option to disable this (#1111684)
+- Teach Xclients script about lxde (#488602)
+
* Mon Aug 18 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.2-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
@@ -286,7 +283,7 @@ install -p -m644 -D %{SOURCE18} $RPM_BUILD_ROOT%{_datadir}/xsessions/xinit-compa
* Mon May 21 2007 Adam Jackson <ajax at redhat.com> 1.0.2-21
- localuser.sh: Run silently.
-* Sat Apr 22 2007 Matthias Clasen <mclasen at redhat.com> 1.0.2-20
+* Sat Apr 21 2007 Matthias Clasen <mclasen at redhat.com> 1.0.2-20
- Don't install INSTALL
* Thu Apr 19 2007 Warren Togami <wtogami at redhat.com> 1.0.2-19
More information about the scm-commits
mailing list