Hello community,
here is the log from the commit of package xdm for openSUSE:Factory checked in
at 2016-02-23 16:52:38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xdm (Old)
and /work/SRC/openSUSE:Factory/.xdm.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xdm"
Changes:
--------
--- /work/SRC/openSUSE:Factory/xdm/xdm.changes 2015-11-08 11:25:16.000000000
+0100
+++ /work/SRC/openSUSE:Factory/.xdm.new/xdm.changes 2016-02-23
16:52:40.000000000 +0100
@@ -1,0 +2,15 @@
+Wed Feb 17 11:16:30 UTC 2016 - wer...@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 - e...@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.
+
+-------------------------------------------------------------------
@@ -6,0 +22,9 @@
+
+-------------------------------------------------------------------
+Fri Oct 16 08:16:11 UTC 2015 - dims...@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).
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xdm.spec ++++++
--- /var/tmp/diff_new_pack.vlOeUM/_old 2016-02-23 16:52:41.000000000 +0100
+++ /var/tmp/diff_new_pack.vlOeUM/_new 2016-02-23 16:52:41.000000000 +0100
@@ -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 @@
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 @@
%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 @@
%{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 @@
%endif
%preun
-%if !0%{?suse_version} < 1320
+%if !0%{?suse_version} < 1315
%service_del_preun display-manager.service
%endif
@@ -205,7 +205,7 @@
%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 @@
%{_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 @@
%{_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 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/etc/X11/xdm/sys.xsession new/etc/X11/xdm/sys.xsession
--- old/etc/X11/xdm/sys.xsession 2014-10-08 11:42:23.000000000 +0200
+++ new/etc/X11/xdm/sys.xsession 2016-02-17 12:32:37.000000000 +0100
@@ -15,6 +15,7 @@
# If gpg is configured and gpg-agent is wanted set "yes"
#
usegpg=yes
+${GNUPGHOME:=$HOME/.gnupg}
#
# Use the file ~/.myagents to overide the defaults
@@ -32,8 +33,8 @@
#
if test -s "$HOME/.myagents" ; then
eval $(grep -E '^use.*=.*' "$HOME/.myagents")
-else
- grep -Eq '^enable-ssh-support' "$HOME/.gnupg/gpg-agent.conf" && usessh=gpg
+elif test -s "$GNUPGHOME/gpg-agent.conf" ; then
+ grep -Eq '^enable-ssh-support' "$GNUPGHOME/gpg-agent.conf" && usessh=gpg
fi
#
@@ -106,14 +107,13 @@
# Run gpg-agent only if gpg service is configured and avaliable.
# Check if there is already a running gpg-agent and if use this.
#
-if test "$usegpg" = yes -a -d "$HOME/.gnupg" && gpgagent=$(type -p gpg-agent)
; then
- GPG_AGENT_FILE="$HOME/.gnupg/agent.info"
+if test "$usegpg" = yes -a -d "$GNUPGHOME" && gpgagent=$(type -p gpg-agent) ;
then
found=no
- for GPG_AGENT_FILE in "$HOME/.gnupg/agent.info" \
- "$HOME/.gnupg/agent.info-${HOSTNAME:-$(hostname -f)}:${DISPLAY#*:}"
+ for GPG_AGENT_FILE in "$GNUPGHOME/agent.info" \
+ "$GNUPGHOME/agent.info-${HOSTNAME:-$(hostname -f)}:${DISPLAY#*:}"
do
- test -s "$gpg_agent" && . "$gpg_agent"
+ test -s "$GPG_AGENT_FILE" && . "$GPG_AGENT_FILE"
if test -n "$GPG_AGENT_INFO" ; then
GPG_AGENT_PID=${GPG_AGENT_INFO#*:}
GPG_AGENT_PID=${GPG_AGENT_PID%%:*}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/etc/init.d/xdm new/etc/init.d/xdm
--- old/etc/init.d/xdm 2014-03-04 13:53:31.000000000 +0100
+++ new/etc/init.d/xdm 2016-02-17 14:10:50.000000000 +0100
@@ -207,16 +207,18 @@
fi
fi
startproc -p $PIDFILE $DISPLAYMANAGER $XDMOPTIONS || rc_failed
- # After a crash or a kill signal we may have
- # a wrong ownership of /dev/xconsole
if rc_status ; then
+ # when started up successfuly, use DMs PID file as ours
+ ln -snf $PIDFILE $PIDFILELNK
+ else
+ # After a crash or a kill signal we may have
+ # a wrong ownership of /dev/xconsole
if test -x $DMDIR/TakeDevices ; then
$DMDIR/TakeDevices
else
chown root:tty /dev/xconsole /dev/tty0
chmod 622 /dev/xconsole /dev/tty0
fi
- ln -snf $PIDFILE $PIDFILELNK
fi
rc_status -v
;;
