xinit 1.4.0

.gitignore

@@ -2,3 +2,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
+/xinit-1.4.0.tar.bz2

0001-startx-Pass-keeptty-when-telling-the-server-to-start.patch

@@ -1,34 +0,0 @@
-From c70ab1d87b4aec8f171615aa8dee4a1fc1104b4b Mon Sep 17 00:00:00 2001
-From: Hans de Goede <hdegoede@redhat.com>
-Date: Tue, 20 Jan 2015 16:18:34 +0100
-Subject: [PATCH xinit] startx: Pass -keeptty when telling the server to start
- on the current tty
-
-Detaching from the tty causes systemd-logind to refuse service to the xserver,
-the xserver already tries to detect that it is being asked to run on the
-current tty and then automatically enables -keeptty, but this code fails if
-all of stdin, stdout and stderr are redirected to a file. So explicitly tell
-the xserver to not detach when we're telling it to run on the current tty.
-
-BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1177513
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
----
- startx.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/startx.cpp b/startx.cpp
-index 1c6fce0..45d7bd9 100644
---- a/startx.cpp
-+++ b/startx.cpp
-@@ -195,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]+$')
--        vtarg="vt$tty_num"
-+        vtarg="vt$tty_num -keeptty"
-     fi
- #endif
- 
--- 
-2.1.0
-

0002-startx-Fix-startx-picking-an-already-used-display-nu.patch

@@ -1,36 +0,0 @@
-From 848dc9b7f3a95f14efd4ea34188cba51965c9f53 Mon Sep 17 00:00:00 2001
-From: Hans de Goede <hdegoede@redhat.com>
-Date: Fri, 20 Mar 2015 14:25:44 +0100
-Subject: [PATCH xinit 2/3] startx: Fix startx picking an already used display
- number when -nolock is used
-
-Currently startx relies on /tmp/.X?-lock being present for automatically
-picking a free display number. This does not work if -nolock is used when
-starting the server, or if the server is started with -displayfd as -displayfd
-implies -nolock.
-
-This is becoming a problem now that -displayfd is getting used by
-display-managers (e.g. gdm), this fixes this by also checking for
-/tmp/.X11-unix/X?
-
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
----
- startx.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/startx.cpp b/startx.cpp
-index 8520399..fe49996 100644
---- a/startx.cpp
-+++ b/startx.cpp
-@@ -120,7 +120,7 @@ enable_xauth=1
- XCOMM Automatically determine an unused $DISPLAY
- d=0
- while true ; do
--    [ -e /tmp/.X$d-lock ] || break
-+    [ -e "/tmp/.X$d-lock" -o -S "/tmp/.X11-unix/X$d" ] || break
-     d=$(($d + 1))
- done
- defaultdisplay=":$d"
--- 
-2.3.3
-

sources

@@ -1 +1 @@
-4e928452dfaf73851413a2d8b8c76388  xinit-1.3.4.tar.bz2
+SHA512 (xinit-1.4.0.tar.bz2) = 53a29081130c1e195eb441ee77ccaa044b18b4cca3d2d5da3a6d67aa421dfd9718fa18b6be6232a41e40cf260c8190064c4d8d9ab771177bd5cd12e77a8fa79e

xorg-x11-xinit.spec

@@ -2,12 +2,12 @@
 
 Summary:    X.Org X11 X Window System xinit startup scripts
 Name:       xorg-x11-%{pkgname}
-Version:    1.3.4
-Release:    18%{?dist}
+Version:    1.4.0
+Release:    1%{?dist}
 License:    MIT
-URL:        http://www.x.org
+URL:        https://www.x.org
 
-Source0:    http://xorg.freedesktop.org/archive/individual/app/%{pkgname}-%{version}.tar.bz2
+Source0:    https://xorg.freedesktop.org/archive/individual/app/%{pkgname}-%{version}.tar.bz2
 Source10:   xinitrc-common
 Source11:   xinitrc
 Source12:   Xclients
@@ -22,9 +22,6 @@ Source19:   xinit-compat
 
 # Fedora specific patches
 Patch1: xinit-1.0.2-client-session.patch
-# A few fixes submitted upstream, rhbz#1177513, rhbz#1203780
-Patch3: 0001-startx-Pass-keeptty-when-telling-the-server-to-start.patch
-Patch4: 0002-startx-Fix-startx-picking-an-already-used-display-nu.patch
 Patch5: 0003-startx-Make-startx-auto-display-select-work-with-per.patch
 # Fedora specific patch to match the similar patch in the xserver
 Patch6: xinit-1.3.4-set-XORG_RUN_AS_USER_OK.patch
@@ -55,8 +52,6 @@ managers.
 %prep
 %setup -q -n %{pkgname}-%{version}
 %patch1 -p1
-%patch3 -p1
-%patch4 -p1
 %patch5 -p1
 %patch6 -p1
 
@@ -112,6 +107,9 @@ install -p -m644 -D %{SOURCE18} $RPM_BUILD_ROOT%{_datadir}/xsessions/xinit-compa
 %{_datadir}/xsessions/xinit-compat.desktop
 
 %changelog
+* Mon Mar 12 2018 Adam Jackson <ajax@redhat.com> - 1.4.0-1
+- xinit 1.4.0
+
 * Mon Feb 19 2018 Peter Hutterer <peter.hutterer@redhat.com> 1.3.4-18
 - Add BR for automake and gcc