Accepting request 360008 from X11:XOrg

1

OBS-URL: https://build.opensuse.org/request/show/360008
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xdm?expand=0&rev=50

xdm.changes

@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Wed Feb 17 11:16:30 UTC 2016 - werner@suse.de
+
+- Touch /etc/X11/xdm/sys.xsession for boo#967002 that is simply
+  add attachment #66582 by using GNUPGHOME variable.
+
+-------------------------------------------------------------------
+Wed Feb 17 09:20:19 UTC 2016 - eich@suse.com
+
+- xdm.tar.bz2:
+  * Test for the presence of $HOME/.gnupg/gpg-agent.conf before
+    attemting to access it (boo#967002). 
+- xdm.spec:
+  * Fix %suse_version checking to work on Leap 42.1 as well.
+
 -------------------------------------------------------------------
 Wed Nov  4 12:51:56 UTC 2015 - eich@suse.com
 
@@ -5,6 +20,15 @@ Wed Nov  4 12:51:56 UTC 2015 - eich@suse.com
   * /etc/X11/xdm/SuSEconfig.xdm -> /etc/X11/xdm/SUSEconfig.xdm
   * created a symlink for the old file (bsc#953563).
 
+-------------------------------------------------------------------
+Fri Oct 16 08:16:11 UTC 2015 - dimstar@opensuse.org
+
+- Fix the same TakeDevice racing bug also in /etc/init.d/xdm, which
+  is an almost exact copy of /usr/lib/X11/display-manager.
+- Set the installation of the systemd based service again to be
+  valid on Leap (thus, in fact, not really caring for the bug in
+  /etc/init.d/xdm).
+
 -------------------------------------------------------------------
 Wed Oct  7 07:25:37 UTC 2015 - dimstar@opensuse.org
 

xdm.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package xdm
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -146,14 +146,14 @@ rm %{buildroot}%{_libdir}/X11/xdm/libXdmGreet.la
 mv %{buildroot}%{_libdir}/X11/xdm/chooser %{buildroot}%{_bindir}
 # fdo#35868 (closed INVALID, but because of above fix, we want it)
 ln -s xdm.1%{?ext_man} %{buildroot}%{_mandir}/man1/chooser.1%{?ext_man}
-%if 0%{?suse_version} < 1320
+%if 0%{?suse_version} < 1315
 # missing manual page
 mkdir -p %{buildroot}%{_mandir}/man8
 ln -s ../man7/init.d.7%{?ext_man} %{buildroot}%{_mandir}/man8/rcxdm.8%{?ext_man}
 ln -sf %{_sysconfdir}/init.d/xdm %{buildroot}%{_sbindir}/rcxdm
 %else
 rm -f %{buildroot}%{_sbindir}/rcxdm
-install -D %{S:4} -m 0644 %{buildroot}%{_unitdir}/display-manager.service
+%__install -D %{S:4} -m 0444 %{buildroot}%{_unitdir}/display-manager.service
 ln -sf service %{buildroot}%{_sbindir}/rcdisplay-manager
 cat > %{buildroot}%{_sbindir}/rcxdm <<-'EOF'
 	#!/bin/bash
@@ -163,7 +163,7 @@ chmod 0755 %{buildroot}%{_sbindir}/rcxdm
 %endif
 
 %post
-%if 0%{?suse_version} < 1320
+%if 0%{?suse_version} < 1315
 %{fillup_and_insserv -Y xdm}
 %else
 %service_add_post display-manager.service
@@ -171,12 +171,12 @@ chmod 0755 %{buildroot}%{_sbindir}/rcxdm
 %{fillup_only -n displaymanager}
 
 %pre
-%if !0%{?suse_version} < 1320
+%if !0%{?suse_version} < 1315
   %service_add_pre display-manager.service
 %endif
 
 %postun
-%if 0%{?suse_version} < 1320
+%if 0%{?suse_version} < 1315
 %{insserv_cleanup}
 %else
 # Do not restart DM on update (bnc#886641)
@@ -185,7 +185,7 @@ export DISABLE_RESTART_ON_UPDATE=yes
 %endif
 
 %preun
-%if !0%{?suse_version} < 1320
+%if !0%{?suse_version} < 1315
   %service_del_preun display-manager.service
 %endif
 
@@ -205,7 +205,7 @@ export DISABLE_RESTART_ON_UPDATE=yes
 %endif
 %config %{_sysconfdir}/X11/xdm/
 %config(noreplace) %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/xdmcp
-%if 0%{?suse_version} < 1320
+%if 0%{?suse_version} < 1315
 %{_sysconfdir}/init.d/xdm
 %exclude %{_libexecdir}/X11/display-manager
 %else
@@ -223,7 +223,7 @@ export DISABLE_RESTART_ON_UPDATE=yes
 %{_bindir}/chooser
 %{_bindir}/xdm
 %{_sbindir}/rcxdm
-%if 0%{?suse_version} >= 1320
+%if 0%{?suse_version} >= 1315
 %{_sbindir}/rcdisplay-manager
 %endif
 %{_libdir}/X11/xdm/
@@ -231,7 +231,7 @@ export DISABLE_RESTART_ON_UPDATE=yes
 %{_datadir}/X11/app-defaults/Chooser
 %{_mandir}/man1/chooser.1%{?ext_man}
 %{_mandir}/man1/xdm.1%{?ext_man}
-%if 0%{?suse_version} < 1320
+%if 0%{?suse_version} < 1315
 %{_mandir}/man8/rcxdm.8%{?ext_man}
 %endif
 %ifnarch %ix86

xdm.tar.bz2

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0ad53cb2a98a61e590109b7373fcced4dc83703c307649a1059f2a90c40546d1
+oid sha256:84058c07eba515d89b0b481bf5ab8e41d0322aa7ba89d2ea853596617e95de73
-size 22175
+size 22344