commit xdm for openSUSE:Factory

2020-11-05 Thread root
Hello community,

here is the log from the commit of package xdm for openSUSE:Factory checked in 
at 2020-11-05 21:54:34

Comparing /work/SRC/openSUSE:Factory/xdm (Old)
 and  /work/SRC/openSUSE:Factory/.xdm.new.11331 (New)


Package is "xdm"

Thu Nov  5 21:54:34 2020 rev:86 rq:845780 version:1.1.12

Changes:

--- /work/SRC/openSUSE:Factory/xdm/xdm.changes  2020-10-14 15:39:07.942361151 
+0200
+++ /work/SRC/openSUSE:Factory/.xdm.new.11331/xdm.changes   2020-11-05 
21:55:15.140139336 +0100
@@ -1,0 +2,7 @@
+Tue Nov  3 14:38:22 UTC 2020 - Franck Bui 
+
+- Replace  '%service_del_postun -n' with '%service_del_postun_without_restart'
+
+  '-n' is deprecated and will be removed in the future.
+
+---



Other differences:
--
++ xdm.spec ++
--- /var/tmp/diff_new_pack.ox1mOZ/_old  2020-11-05 21:55:15.776137906 +0100
+++ /var/tmp/diff_new_pack.ox1mOZ/_new  2020-11-05 21:55:15.780137897 +0100
@@ -189,7 +189,7 @@
 
 %postun
 # Do not restart DM on update (bnc#886641)
-%service_del_postun -n display-manager.service
+%service_del_postun_without_restart display-manager.service
 [ -f /usr/lib/X11/displaymanagers/console ] || %{_sbindir}/update-alternatives 
\
   --remove default-displaymanager /usr/lib/X11/displaymanagers/console
 [ -f /usr/lib/X11/displaymanagers/xdm ] || %{_sbindir}/update-alternatives \




commit xdm for openSUSE:Factory

2020-10-14 Thread root
Hello community,

here is the log from the commit of package xdm for openSUSE:Factory checked in 
at 2020-10-14 15:38:20

Comparing /work/SRC/openSUSE:Factory/xdm (Old)
 and  /work/SRC/openSUSE:Factory/.xdm.new.3486 (New)


Package is "xdm"

Wed Oct 14 15:38:20 2020 rev:85 rq:841329 version:1.1.12

Changes:

--- /work/SRC/openSUSE:Factory/xdm/xdm.changes  2020-10-07 14:16:25.221387099 
+0200
+++ /work/SRC/openSUSE:Factory/.xdm.new.3486/xdm.changes2020-10-14 
15:39:07.942361151 +0200
@@ -1,0 +2,7 @@
+Mon Oct 12 16:14:57 UTC 2020 - Stefan Dirsch 
+
+- no longer package symlinks for Xsession, Xsetupm Xstartup and
+  Xreset in /etc/X11/xdm, since meanwhile sddm, gdm and lightdm
+  have been adjusted
+
+---



Other differences:
--
++ xdm.spec ++
--- /var/tmp/diff_new_pack.r8mGla/_old  2020-10-14 15:39:08.490361342 +0200
+++ /var/tmp/diff_new_pack.r8mGla/_new  2020-10-14 15:39:08.490361342 +0200
@@ -124,10 +124,6 @@
 patch -p0 < %{PATCH2}
 mkdir -p usr/etc/X11/xdm
 mv etc/X11/xdm/* usr/etc/X11/xdm
-# Install compatibility symlinks. Remove once DMs adjusted
-for i in Xsession Xsetup Xstartup Xreset; do
-   ln -s /usr/etc/X11/xdm/$i etc/X11/xdm/$i
-done
 # Edited by SUSEConfig.xdm, package a copy
 for i in xdm-config Xservers; do
cp usr/etc/X11/xdm/$i etc/X11/xdm/$i




commit xdm for openSUSE:Factory

2020-10-07 Thread root
Hello community,

here is the log from the commit of package xdm for openSUSE:Factory checked in 
at 2020-10-07 14:16:22

Comparing /work/SRC/openSUSE:Factory/xdm (Old)
 and  /work/SRC/openSUSE:Factory/.xdm.new.4249 (New)


Package is "xdm"

Wed Oct  7 14:16:22 2020 rev:84 rq:839607 version:1.1.12

Changes:

--- /work/SRC/openSUSE:Factory/xdm/xdm.changes  2020-08-31 17:14:59.221045259 
+0200
+++ /work/SRC/openSUSE:Factory/.xdm.new.4249/xdm.changes2020-10-07 
14:16:25.221387099 +0200
@@ -1,0 +2,115 @@
+Mon Oct  5 14:57:23 UTC 2020 - Stefan Dirsch 
+
+- removed /etc/X11/xdm/Keyboard.map since it meanwhile has been
+  replaced by /usr/share/systemd/kbd-model-map (used by YaST)
+
+---
+Sun Oct  4 09:40:50 UTC 2020 - Fabian Vogt 
+
+- Don't create the compat symlinks in /etc on the fly, track them
+  properly as %config
+
+---
+Sat Oct  3 16:52:18 UTC 2020 - Stefan Dirsch 
+
+- /etc/X11/xdm/scripts/11-ssh-agent
+  * ssh-askpass now moved to /usr/libexec/ssh (boo#1175991) 
+
+---
+Tue Sep 29 09:57:42 UTC 2020 - Stefan Dirsch 
+
+- moved xdm/xdm-np PAM files to /usr/etc/pam.d, since lightdm has
+  been adjusted meanwhile
+
+---
+Tue Sep 15 10:16:41 UTC 2020 - Dominique Leuenberger 
+
+- Switch to /usr/bin/pidof dependency, provided by procps-ng.
+
+---
+Thu Sep 10 02:42:45 UTC 2020 - Stefan Dirsch 
+
+- fixes in xdm-tarball.patch
+  * /usr/lib/X11/display-manager: fixes sddm, which didn't use 
+xdm_reload_files in xdm_start_proc() of 
+/usr/lib/X11/displaymanagers/sddm (boo#1173049)
+
+---
+Wed Sep  9 15:50:51 UTC 2020 - Stefan Dirsch 
+
+- fixes in xdm-tarball.patch
+  * symlink also $XDMDIR/xinitrc.common in /etc/X11/xinit; it
+is still often sourced in old ~/.xinitrc user files ...
+
+---
+Wed Sep  9 13:53:33 UTC 2020 - Stefan Dirsch 
+
+- fixes in xdm-tarball.patch 
+  * fixed include path for generic Xresources in xdm's Xresources file
+  * fixed $XDMDIR in Xsession, so sys.xsession can be found
+  * sys.xsession: fixed syntax error in code, which reads 
+additional xdm scripts
+  * display-manager: also symlink Xstartup and Xreset in 
+/etc/X11/xdm (needed by lighdm)
+- specfile: 
+  * for now use again /etc/pam.d for xdm/xdm-np PAM files instead
+of /usr/etc/pam.d (using the latter resulted in
+"authentificataion failure" with lightdm)
+
+---
+Tue Sep  8 22:02:59 UTC 2020 - Stefan Dirsch 
+
+- reenabled move to /usr/etc/X11/xdm; updated xdm-tarball.patch
+  (includes changes from xinit-UsrEtcMove.patch) [boo#1176212]
+
+---
+Tue Sep  8 15:00:50 UTC 2020 - Stefan Dirsch 
+
+- xinit-UsrEtcMove.patch
+  * changes needed with xinitrc moving to %{_libexecdir}/xinit and
+xinitrc.common moving to /usr/etc/X11/xinit/
+
+---
+Tue Sep  8 09:29:10 UTC 2020 - Stefan Dirsch 
+
+- reverted move to /usr/etc/X11/xdm for now due to boo#1176212
+
+---
+Sat Sep  5 03:41:38 UTC 2020 - Stefan Dirsch 
+
+- updated xdm-tarball.patch
+  * adjusted for changes in xmodmap and xinit (boo#1173049) 
+
+---
+Fri Sep  4 22:33:30 UTC 2020 - Stefan Dirsch 
+
+- xdm-tarball.patch
+  * /usr/etc changes still needed for xdm.tar.bz2; will need
+more changes once xmodmap and xinit files are also moved to
+/usr/etc (boo#1173049)
+
+---
+Fri Sep  4 20:20:05 UTC 2020 - Stefan Dirsch 
+
+- move /etc/X11/xdm --> /usr/etc/X11/xdm and
+  /etc/pam.d -> /usr/etc/pam.d; still TODO: adjust scripts in 
+  xdm.tar.bz2 (boo#1173049)
+
+---
+Fri Sep  4 11:17:34 UTC 2020 - Stefan Dirsch 
+
+- more cleanup
+  * no longer support sle12; adjusted xdm.tar.bz2 and
+applied xdm-with-update-alternative.patch to this tarball
+
+---
+Fri Sep  4 10:29:39 UTC 2020 - Stefan Dirsch 
+
+- cleanup
+  * get rid of xdm-fallbacks.tar.bz2, which wasn't used any longer
+since SUSE 12.1
+  * no longer support systmed based OSes like SUSE < 12.1 and sle11;
+removed therefore also xdm-consolekit.diff
+  * no longer support 

commit xdm for openSUSE:Factory

2020-08-31 Thread root
Hello community,

here is the log from the commit of package xdm for openSUSE:Factory checked in 
at 2020-08-31 17:14:54

Comparing /work/SRC/openSUSE:Factory/xdm (Old)
 and  /work/SRC/openSUSE:Factory/.xdm.new.3399 (New)


Package is "xdm"

Mon Aug 31 17:14:54 2020 rev:83 rq:830260 version:1.1.12

Changes:

--- /work/SRC/openSUSE:Factory/xdm/xdm.changes  2020-07-17 20:48:01.808743190 
+0200
+++ /work/SRC/openSUSE:Factory/.xdm.new.3399/xdm.changes2020-08-31 
17:14:59.221045259 +0200
@@ -1,0 +2,52 @@
+Fri Aug 28 10:22:12 UTC 2020 - Dominique Leuenberger 
+
+- Require /sbin/startproc: with systemd no longer pulling in
+  sysvinit-tools. we are responsible for our own deps. /sbin/pidof
+  and /sbin/startproc both were presented by sysvinit-tools. but
+  the sole presence of the /sbin/pidof dep is not sufficient, as
+  this can be provided by various packages (e.g.
+  busybox-sysvinit-tools, which then does not provide startproc).
+  Spelling the deps out ensures that we get the right package set
+  installed.
+
+---
+Thu Aug 27 11:36:48 UTC 2020 - Franck Bui 
+
+- Drop insserv-compat dependency when display-manager.service is used
+
+  insserv-compat is going to be dropped soon or later on systems with
+  systemd as init system.
+
+  It was only needed by /usr/lib/X11/display-manager script that uses
+  rc_status to pretty print the status of a command.
+
+  Since this script is intended to be used by display-manager.service
+  and not called directly by users and systemd has already its own
+  mechanism to report status, the use of rc_status doesn't seem to be
+  useful.
+
+  The exit failure status for each command has been preserved.
+
+---
+Wed Aug 26 17:23:18 UTC 2020 - Franck Bui 
+
+- Drop commands in /usr/lib/X11/display-manager that are never used by systemd
+
+  Assuming that this script is only called from
+  display-manager.service unit, some commands of the scripts are
+  either never used or redundant with systemd functionalities.
+
+  More specifically, there's no need to redefine a "stop" command as
+  this is one basic command that systemd implements already.
+
+  Also convert "reload" to make use of $MAINPID exported by systemd
+  which should be slighly more reliable and hence stop relying on
+  killproc that might be removed in the future.
+
+---
+Wed Aug 26 13:39:08 UTC 2020 - Franck Bui 
+
+- Replace /var/run with /run as /var/run is obsolete since quite some
+  time now.
+
+---



Other differences:
--
++ xdm.spec ++
--- /var/tmp/diff_new_pack.j5Sbiz/_old  2020-08-31 17:14:59.989045651 +0200
+++ /var/tmp/diff_new_pack.j5Sbiz/_new  2020-08-31 17:14:59.993045654 +0200
@@ -72,10 +72,13 @@
 BuildRequires:  firewall-macros
 %endif
 Requires:   /sbin/pidof
+Requires:   /sbin/startproc
 %if 0%{?with_systemd}
 Requires:   %fillup_prereq
 %endif
+%if 0%{?suse_version} < 1315
 Requires:   insserv-compat
+%endif
 Requires:   logrotate
 Requires:   sessreg
 Requires:   xconsole

++ display-manager.service ++
--- /var/tmp/diff_new_pack.j5Sbiz/_old  2020-08-31 17:15:00.041045678 +0200
+++ /var/tmp/diff_new_pack.j5Sbiz/_new  2020-08-31 17:15:00.045045680 +0200
@@ -1,6 +1,5 @@
 [Unit]
 Description=X Display Manager
-Requires=var-run.mount
 Conflicts=getty@tty7.service plymouth-quit.service
 After=ypbind.service gpm.service time-sync.target winbind.service acpid.service
 Wants=remote-fs.target dbus.socket systemd-user-sessions.service 
systemd-logind.service
@@ -9,9 +8,8 @@
 
 [Service]
 Type=forking
-PIDFile=/var/run/displaymanager.pid
+PIDFile=/run/displaymanager.pid
 ExecStart=/usr/lib/X11/display-manager start
-ExecStop=/usr/lib/X11/display-manager stop
 ExecReload=/usr/lib/X11/display-manager reload
 KillMode=process
 

++ xdm-with-update-alternative.patch ++
--- /var/tmp/diff_new_pack.j5Sbiz/_old  2020-08-31 17:15:00.069045692 +0200
+++ /var/tmp/diff_new_pack.j5Sbiz/_new  2020-08-31 17:15:00.069045692 +0200
@@ -30,10 +30,10 @@
for i in $DISPLAY_MANAGERS
do
name="${i}_vars"
--  PIDFILE=/var/run/$i.pid;
+-  PIDFILE=/run/$i.pid;
 -  $name $DM && break;
 +  type -t $name &> /dev/null || continue
-+  PIDFILE=/var/run/$i.pid
++  PIDFILE=/run/$i.pid
 +  $name $DM && break
done
if [ -z "$DISPLAYMANAGER" -o ! -x "$DISPLAYMANAGER" ]

++ xdm.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 

commit xdm for openSUSE:Factory

2020-07-17 Thread root
Hello community,

here is the log from the commit of package xdm for openSUSE:Factory checked in 
at 2020-07-17 20:47:14

Comparing /work/SRC/openSUSE:Factory/xdm (Old)
 and  /work/SRC/openSUSE:Factory/.xdm.new.3592 (New)


Package is "xdm"

Fri Jul 17 20:47:14 2020 rev:82 rq:821182 version:1.1.12

Changes:

--- /work/SRC/openSUSE:Factory/xdm/xdm.changes  2020-06-25 16:46:57.980881024 
+0200
+++ /work/SRC/openSUSE:Factory/.xdm.new.3592/xdm.changes2020-07-17 
20:48:01.808743190 +0200
@@ -1,0 +2,6 @@
+Thu Jul 16 05:13:42 UTC 2020 - Stefan Dirsch 
+
+- readd insserv-compat also when using systemd due to missing
+  /etc/rc.status, etc. (boo#1174180)
+
+---



Other differences:
--
++ xdm.spec ++
--- /var/tmp/diff_new_pack.p4Zt90/_old  2020-07-17 20:48:03.644745147 +0200
+++ /var/tmp/diff_new_pack.p4Zt90/_new  2020-07-17 20:48:03.648745151 +0200
@@ -74,9 +74,8 @@
 Requires:   /sbin/pidof
 %if 0%{?with_systemd}
 Requires:   %fillup_prereq
-%else
-Requires:   insserv-compat
 %endif
+Requires:   insserv-compat
 Requires:   logrotate
 Requires:   sessreg
 Requires:   xconsole




commit xdm for openSUSE:Factory

2020-06-25 Thread root
Hello community,

here is the log from the commit of package xdm for openSUSE:Factory checked in 
at 2020-06-25 16:46:31

Comparing /work/SRC/openSUSE:Factory/xdm (Old)
 and  /work/SRC/openSUSE:Factory/.xdm.new.3060 (New)


Package is "xdm"

Thu Jun 25 16:46:31 2020 rev:81 rq:816540 version:1.1.12

Changes:

--- /work/SRC/openSUSE:Factory/xdm/xdm.changes  2020-06-11 09:59:44.246201961 
+0200
+++ /work/SRC/openSUSE:Factory/.xdm.new.3060/xdm.changes2020-06-25 
16:46:57.980881024 +0200
@@ -1,0 +2,5 @@
+Mon Jun 22 18:56:47 UTC 2020 - Cristian Rodríguez 
+
+- Require fillup_prereq not insserv-compat when using systemd 
+
+---



Other differences:
--
++ xdm.spec ++
--- /var/tmp/diff_new_pack.OvY3GO/_old  2020-06-25 16:46:58.628883300 +0200
+++ /var/tmp/diff_new_pack.OvY3GO/_new  2020-06-25 16:46:58.632883313 +0200
@@ -72,7 +72,11 @@
 BuildRequires:  firewall-macros
 %endif
 Requires:   /sbin/pidof
+%if 0%{?with_systemd}
+Requires:   %fillup_prereq
+%else
 Requires:   insserv-compat
+%endif
 Requires:   logrotate
 Requires:   sessreg
 Requires:   xconsole




commit xdm for openSUSE:Factory

2020-06-11 Thread root
Hello community,

here is the log from the commit of package xdm for openSUSE:Factory checked in 
at 2020-06-11 09:59:32

Comparing /work/SRC/openSUSE:Factory/xdm (Old)
 and  /work/SRC/openSUSE:Factory/.xdm.new.3606 (New)


Package is "xdm"

Thu Jun 11 09:59:32 2020 rev:80 rq:811813 version:1.1.12

Changes:

--- /work/SRC/openSUSE:Factory/xdm/xdm.changes  2020-03-24 22:31:14.317056023 
+0100
+++ /work/SRC/openSUSE:Factory/.xdm.new.3606/xdm.changes2020-06-11 
09:59:44.246201961 +0200
@@ -1,0 +2,5 @@
+Fri Jun  5 12:12:52 UTC 2020 - Callum Farmer 
+
+- Fixes for %_libexecdir changing to /usr/libexec
+
+---



Other differences:
--
++ xdm.spec ++
--- /var/tmp/diff_new_pack.JjqxT9/_old  2020-06-11 09:59:45.850207127 +0200
+++ /var/tmp/diff_new_pack.JjqxT9/_new  2020-06-11 09:59:45.854207140 +0200
@@ -21,7 +21,7 @@
   %define _fillupdir /var/adm/fillup-templates
 %endif
 
-%define _dminitdir %{_libexecdir}/X11/displaymanagers
+%define _dminitdir /usr/lib/X11/displaymanagers
 %if 0%{?suse_version} > 1230
 %define with_systemd 1
 %else
@@ -211,9 +211,9 @@
 # prepare for defaul-dm to be chosen by means of update-alternatives
 mkdir -p %{buildroot}%{_sysconfdir}/alternatives
 touch %{buildroot}%{_sysconfdir}/alternatives/default-displaymanager
-ln -s %{_sysconfdir}/alternatives/default-displaymanager 
%{buildroot}%{_libexecdir}/X11/displaymanagers/default-displaymanager
+ln -s %{_sysconfdir}/alternatives/default-displaymanager 
%{buildroot}/usr/lib/X11/displaymanagers/default-displaymanager
 # Inject a dummy 'console' selection - which used to be choice in 
/etc/sysconfig/displaymanager
-touch %{buildroot}%{_libexecdir}/X11/displaymanagers/console
+touch %{buildroot}/usr/lib/X11/displaymanagers/console
 %endif
 
 %post
@@ -224,10 +224,10 @@
 %{fillup_only -n displaymanager}
 %endif
 %if 0%{?suse_version} >= 1330
-%{_sbindir}/update-alternatives --install 
%{_libexecdir}/X11/displaymanagers/default-displaymanager \
-  default-displaymanager %{_libexecdir}/X11/displaymanagers/console 5
-%{_sbindir}/update-alternatives --install 
%{_libexecdir}/X11/displaymanagers/default-displaymanager \
-  default-displaymanager %{_libexecdir}/X11/displaymanagers/xdm 10
+%{_sbindir}/update-alternatives --install 
/usr/lib/X11/displaymanagers/default-displaymanager \
+  default-displaymanager /usr/lib/X11/displaymanagers/console 5
+%{_sbindir}/update-alternatives --install 
/usr/lib/X11/displaymanagers/default-displaymanager \
+  default-displaymanager /usr/lib/X11/displaymanagers/xdm 10
 # get rid of DISPLAYMANAGER in /etc/sysconfig/displaymanager (boo#1125040)
 sed -i 's/DISPLAYMANAGER=.*//g' /etc/sysconfig/displaymanager
 %endif
@@ -248,10 +248,10 @@
 %service_del_postun -n display-manager.service
 %endif
 %if 0%{?suse_version} >= 1330
-[ -f %{_libexecdir}/X11/displaymanagers/console ] || 
%{_sbindir}/update-alternatives \
-  --remove default-displaymanager %{_libexecdir}/X11/displaymanagers/console
-[ -f %{_libexecdir}/X11/displaymanagers/xdm ] || 
%{_sbindir}/update-alternatives \
-  --remove default-displaymanager %{_libexecdir}/X11/displaymanagers/xdm
+[ -f /usr/lib/X11/displaymanagers/console ] || %{_sbindir}/update-alternatives 
\
+  --remove default-displaymanager /usr/lib/X11/displaymanagers/console
+[ -f /usr/lib/X11/displaymanagers/xdm ] || %{_sbindir}/update-alternatives \
+  --remove default-displaymanager /usr/lib/X11/displaymanagers/xdm
 %endif
 
 %preun
@@ -267,7 +267,7 @@
 %{_dminitdir}/xdm
 %if 0%{?suse_version} >= 1330
 %{_dminitdir}/console
-%{_libexecdir}/X11/displaymanagers/default-displaymanager
+/usr/lib/X11/displaymanagers/default-displaymanager
 %ghost %{_sysconfdir}/alternatives/default-displaymanager
 %endif
 %if %dm_fallbacks
@@ -281,19 +281,19 @@
 %config %{_sysconfdir}/X11/xdm/
 %dir %{_sysconfdir}/X11/xdm/scripts
 %if 0%{?suse_version} > 1320
-%dir %{_libexecdir}/firewalld
-%dir %{_libexecdir}/firewalld/services
-%{_libexecdir}/firewalld/services/x11.xml
+%dir /usr/lib/firewalld
+%dir /usr/lib/firewalld/services
+/usr/lib/firewalld/services/x11.xml
 %else
 %config(noreplace) %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/xdmcp
 %endif
 %if 0%{?suse_version} < 1315
 %{_sysconfdir}/init.d/xdm
-%exclude %{_libexecdir}/X11/display-manager
+%exclude /usr/lib/X11/display-manager
 %else
 %exclude %{_sysconfdir}/init.d/xdm
 %{_unitdir}/display-manager.service
-%{_libexecdir}/X11/display-manager
+/usr/lib/X11/display-manager
 %endif
 %config %{_sysconfdir}/logrotate.d/xdm
 %config(noreplace) %{_sysconfdir}/pam.d/xdm




commit xdm for openSUSE:Factory

2020-03-24 Thread root
Hello community,

here is the log from the commit of package xdm for openSUSE:Factory checked in 
at 2020-03-24 22:30:53

Comparing /work/SRC/openSUSE:Factory/xdm (Old)
 and  /work/SRC/openSUSE:Factory/.xdm.new.3160 (New)


Package is "xdm"

Tue Mar 24 22:30:53 2020 rev:79 rq:787134 version:1.1.12

Changes:

--- /work/SRC/openSUSE:Factory/xdm/xdm.changes  2020-01-30 09:38:35.193399742 
+0100
+++ /work/SRC/openSUSE:Factory/.xdm.new.3160/xdm.changes2020-03-24 
22:31:14.317056023 +0100
@@ -1,0 +2,6 @@
+Sat Mar 21 12:44:02 UTC 2020 - Stefan Dirsch 
+
+- README.security: fixed and improved documentation about how to
+  enable xdmcp for xdm (boo#1167293)
+
+---



Other differences:
--
++ xdm.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/etc/X11/xdm/README.security 
new/etc/X11/xdm/README.security
--- old/etc/X11/xdm/README.security 2014-03-04 13:53:31.0 +0100
+++ new/etc/X11/xdm/README.security 2020-03-21 13:43:09.840493000 +0100
@@ -6,7 +6,7 @@
 can not contact this XDM. In order to use XDMCP the resource line
 with DisplayManager.requestPort in the file  xdm-config should be
 commented out.  This enables the XDMCP port with the default port
-number 177 (see /etc/services).
+number 177 ('getent services xdmcp').
 
 Please configure access rules  within the file  Xaccess  for your
 Xterminals.  These  rules  are host based and/or  domain based to




commit xdm for openSUSE:Factory

2020-01-30 Thread root
Hello community,

here is the log from the commit of package xdm for openSUSE:Factory checked in 
at 2020-01-30 09:37:55

Comparing /work/SRC/openSUSE:Factory/xdm (Old)
 and  /work/SRC/openSUSE:Factory/.xdm.new.26092 (New)


Package is "xdm"

Thu Jan 30 09:37:55 2020 rev:78 rq:767981 version:1.1.12

Changes:

--- /work/SRC/openSUSE:Factory/xdm/xdm.changes  2019-08-27 15:21:58.904822884 
+0200
+++ /work/SRC/openSUSE:Factory/.xdm.new.26092/xdm.changes   2020-01-30 
09:38:35.193399742 +0100
@@ -1,0 +2,7 @@
+Tue Jan 28 08:14:40 UTC 2020 - Dominique Leuenberger 
+
+- Require insserv-compat: /usr/lib/X11/display-manager sources
+  /etc/rc.status, which is part of insserv-compat. Without this
+  present, display-manager fails to start up.
+
+---



Other differences:
--
++ xdm.spec ++
--- /var/tmp/diff_new_pack.ynko1g/_old  2020-01-30 09:38:36.985400700 +0100
+++ /var/tmp/diff_new_pack.ynko1g/_new  2020-01-30 09:38:36.989400703 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package xdm
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -41,7 +41,7 @@
 Summary:X Display Manager
 License:MIT
 Group:  System/X11/Utilities
-Url:http://xorg.freedesktop.org/
+URL:http://xorg.freedesktop.org/
 Source0:
http://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.tar.bz2
 Source1:xdm.tar.bz2
 Source2:HOWTO.xdm
@@ -72,6 +72,7 @@
 BuildRequires:  firewall-macros
 %endif
 Requires:   /sbin/pidof
+Requires:   insserv-compat
 Requires:   logrotate
 Requires:   sessreg
 Requires:   xconsole




commit xdm for openSUSE:Factory

2019-08-27 Thread root
Hello community,

here is the log from the commit of package xdm for openSUSE:Factory checked in 
at 2019-08-27 15:21:57

Comparing /work/SRC/openSUSE:Factory/xdm (Old)
 and  /work/SRC/openSUSE:Factory/.xdm.new.7948 (New)


Package is "xdm"

Tue Aug 27 15:21:57 2019 rev:77 rq:724603 version:1.1.12

Changes:

--- /work/SRC/openSUSE:Factory/xdm/xdm.changes  2019-04-03 09:23:15.199681453 
+0200
+++ /work/SRC/openSUSE:Factory/.xdm.new.7948/xdm.changes2019-08-27 
15:21:58.904822884 +0200
@@ -1,0 +2,5 @@
+Mon Aug 19 14:52:14 UTC 2019 - Stefan Dirsch 
+
+- pam.d/xdm{,-np}: added pam_keyinit.so (boo#1144063)
+
+---



Other differences:
--
++ xdm.spec ++
--- /var/tmp/diff_new_pack.P6Gzap/_old  2019-08-27 15:22:00.372822145 +0200
+++ /var/tmp/diff_new_pack.P6Gzap/_new  2019-08-27 15:22:00.376822143 +0200
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 

++ xdm.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/etc/pam.d/xdm new/etc/pam.d/xdm
--- old/etc/pam.d/xdm   2014-03-04 13:53:31.0 +0100
+++ new/etc/pam.d/xdm   2019-08-19 17:06:22.892104000 +0200
@@ -4,3 +4,4 @@
 password includecommon-password
 session  required   pam_loginuid.so
 session  includecommon-session
+session  optional   pam_keyinit.so revoke force
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/etc/pam.d/xdm-np new/etc/pam.d/xdm-np
--- old/etc/pam.d/xdm-np2014-03-04 13:53:31.0 +0100
+++ new/etc/pam.d/xdm-np2019-08-19 17:06:28.590192000 +0200
@@ -4,3 +4,4 @@
 password includecommon-password
 session  required   pam_loginuid.so
 session  includecommon-session
+session  optional   pam_keyinit.so revoke force




commit xdm for openSUSE:Factory

2019-04-03 Thread root
Hello community,

here is the log from the commit of package xdm for openSUSE:Factory checked in 
at 2019-04-03 09:23:07

Comparing /work/SRC/openSUSE:Factory/xdm (Old)
 and  /work/SRC/openSUSE:Factory/.xdm.new.25356 (New)


Package is "xdm"

Wed Apr  3 09:23:07 2019 rev:76 rq:689377 version:1.1.12

Changes:

--- /work/SRC/openSUSE:Factory/xdm/xdm.changes  2019-03-08 11:58:33.079983854 
+0100
+++ /work/SRC/openSUSE:Factory/.xdm.new.25356/xdm.changes   2019-04-03 
09:23:15.199681453 +0200
@@ -1,0 +2,7 @@
+Thu Mar 28 14:03:43 UTC 2019 - Stefan Dirsch 
+
+- n_Allow-the-greeter-to-set-the-input-fields-bg-color.patch
+  * reverse applied in order to fix greeter again; related to our
+heavily adjusted xdm Xresources (boo#1130321) 
+
+---

New:

  n_Allow-the-greeter-to-set-the-input-fields-bg-color.patch



Other differences:
--
++ xdm.spec ++
--- /var/tmp/diff_new_pack.QSjHZu/_old  2019-04-03 09:23:15.803681728 +0200
+++ /var/tmp/diff_new_pack.QSjHZu/_new  2019-04-03 09:23:15.807681729 +0200
@@ -52,6 +52,7 @@
 # PATCH-FEATURE-OPENSUSE xdm-with-update-alternative.patch 
dims...@opensuse.org -- Choice of default DM by means of u-a
 Patch2: xdm-with-update-alternative.patch
 # needed for patch0, patch2, patch3, patch4
+Patch3: n_Allow-the-greeter-to-set-the-input-fields-bg-color.patch
 BuildRequires:  libtool
 BuildRequires:  pam-devel
 BuildRequires:  pkgconfig
@@ -129,6 +130,8 @@
 popd
 # Special note: patch 2 is applied in install section; tagging it here for the 
source validator only
 #patch2 -p1
+# reverse apply (boo#1130321)
+%patch3 -p1 -R
 
 %build
 # needed for patch0

++ n_Allow-the-greeter-to-set-the-input-fields-bg-color.patch ++
>From d0e32620bfb3bc8803bffcec3f0f3b1db6440d51 Mon Sep 17 00:00:00 2001
From: Matthieu Herrb 
Date: Sat, 14 Mar 2015 20:05:25 +0100
Subject: [PATCH] Allow the greeter to set the input fields bg color

A new 'inpColor' resource is added for that.

Signed-off-by: Matthieu Herrb 
Reviewed-by: Alan Coopersmith 
---
 config/Xresources.in  |  1 +
 greeter/Login.c   | 26 --
 greeter/Login.h   |  1 +
 greeter/LoginP.h  |  2 ++
 4 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/config/Xresources.in b/config/Xresources.in
index 0a92270..c880db7 100644
--- a/config/Xresources.in
+++ b/config/Xresources.in
@@ -46,6 +46,7 @@ xlogin*innerFramesWidth: 2
 xlogin*shdColor: grey30
 xlogin*hiColor: grey90
 xlogin*background: grey
+xlogin*inpColor: grey80
 !xlogin*foreground: darkgreen
 xlogin*greetColor: Blue3
 xlogin*failColor: red
diff --git a/greeter/Login.c b/greeter/Login.c
index d899376..6a99050 100644
--- a/greeter/Login.c
+++ b/greeter/Login.c
@@ -156,6 +156,8 @@ static XtResource resources[] = {
offset(hipixel), XtRString, XtDefaultForeground},
 {XtNshdColor, XtCForeground, XtRPixel, sizeof (Pixel),
offset(shdpixel), XtRString,XtDefaultForeground},
+{XtNinpColor, XtCForeground, XtRPixel, sizeof (Pixel),
+   offset(inppixel), XtRString,XtDefaultBackground},
 {XtNframeWidth, XtCFrameWidth, XtRInt, sizeof(int),
 offset(outframewidth), XtRImmediate, (XtPointer) 1},
 {XtNinnerFramesWidth, XtCFrameWidth, XtRInt, sizeof(int),
@@ -325,14 +327,14 @@ XmuXftTextWidth(Display *dpy, XftFont *font, FcChar8 
*string, int len);
  F_ASCENT(greet) + Y_INC(w)) + \
 (n * PROMPT_SPACE_Y(w)))
 #define PROMPT_W(w)(w->core.width - (2 * TEXT_X_INC(w)))
-#define PROMPT_H(w)(3 * Y_INC(w) / 2)
+#define PROMPT_H(w)(5 * Y_INC(w) / 4)
 #define VALUE_X(w,n)   (PROMPT_X(w) + CUR_PROMPT_W(w,n))
 #define CURSOR_W   5
 #define MAX_VALUE_W(w,n) (PROMPT_W(w) - VALUE_X (w,n) - CURSOR_W - 1 - \
  (w->login.inframeswidth * 2) - LOGO_W(w))
 #define PROMPT_SPACE_Y(w)  (10 * Y_INC(w) / 5)
 
-#define ERROR_X(w,m)   ((int)(w->core.width - STRING_WIDTH (fail, m)) / 2)
+#define ERROR_X(w,m)   ((int)(w->core.width - LOGO_W(w) - STRING_WIDTH (fail, 
m)) / 2)
 #define FAIL_X(w)  ERROR_X(w, w->login.fail)
 #define FAIL_Y(w)  (PROMPT_Y(w,1) + 2 * FAIL_Y_INC (w) + F_ASCENT(fail))
 
@@ -744,14 +746,15 @@ draw_it (LoginWidget w)
int in_width = PROMPT_W(w) - VALUE_X(w,p) - LOGO_W(w);
int in_height = PROMPT_H(w) + w->login.inframeswidth + 2;
 
-   GC topLeftGC, botRightGC;
+   GC topLeftGC, botRightGC, inpGC;
 
if ((PROMPT_STATE(w, p) == LOGIN_PROMPT_ECHO_ON) ||
(PROMPT_STATE(w, p) == LOGIN_PROMPT_ECHO_OFF)) {
topLeftGC = w->login.shdGC;
botRightGC = w->login.hiGC;
+   inpGC = w->login.inpGC;
} else {
-  

commit xdm for openSUSE:Factory

2019-03-08 Thread root
Hello community,

here is the log from the commit of package xdm for openSUSE:Factory checked in 
at 2019-03-08 11:58:31

Comparing /work/SRC/openSUSE:Factory/xdm (Old)
 and  /work/SRC/openSUSE:Factory/.xdm.new.28833 (New)


Package is "xdm"

Fri Mar  8 11:58:31 2019 rev:75 rq:681076 version:1.1.12

Changes:

--- /work/SRC/openSUSE:Factory/xdm/xdm.changes  2019-02-24 17:06:43.440585472 
+0100
+++ /work/SRC/openSUSE:Factory/.xdm.new.28833/xdm.changes   2019-03-08 
11:58:33.079983854 +0100
@@ -1,0 +2,8 @@
+Sun Mar  3 09:39:22 UTC 2019 - Stefan Dirsch 
+
+- udpate to release 1.1.12
+  * This release collects 7 years worth of bug fixes and code
+cleanups, including the fix for CVE-2013-2179 that was
+previously distributed as a patch against the prior release.
+
+---

Old:

  xdm-1.1.11.tar.bz2

New:

  xdm-1.1.12.tar.bz2



Other differences:
--
++ xdm.spec ++
--- /var/tmp/diff_new_pack.puDsFN/_old  2019-03-08 11:58:33.851983724 +0100
+++ /var/tmp/diff_new_pack.puDsFN/_new  2019-03-08 11:58:33.855983723 +0100
@@ -36,7 +36,7 @@
 %define _unitdir %{_prefix}/lib/systemd/system
 %endif
 Name:   xdm
-Version:1.1.11
+Version:1.1.12
 Release:0
 Summary:X Display Manager
 License:MIT
@@ -186,7 +186,7 @@
 # for FHS compliance (bnc#21857)
 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}
+ln -s xdm.8%{?ext_man} %{buildroot}%{_mandir}/man8/chooser.8%{?ext_man}
 install -D %{SOURCE5} -m 0644 
%{buildroot}%{_datadir}/xsessions/xsession.desktop
 %if 0%{?suse_version} < 1315
 # missing manual page
@@ -257,7 +257,7 @@
 
 %files
 %defattr(-,root,root)
-%doc AUTHORS ChangeLog COPYING README
+%doc AUTHORS ChangeLog COPYING README.md
 %doc HOWTO.xdm
 %dir %{_dminitdir}
 %{_dminitdir}/xdm
@@ -307,8 +307,8 @@
 %{_libdir}/X11/xdm/
 %dir %{_datadir}/X11/app-defaults
 %{_datadir}/X11/app-defaults/Chooser
-%{_mandir}/man1/chooser.1%{?ext_man}
-%{_mandir}/man1/xdm.1%{?ext_man}
+%{_mandir}/man8/chooser.8%{?ext_man}
+%{_mandir}/man8/xdm.8%{?ext_man}
 %if 0%{?suse_version} < 1315
 %{_mandir}/man8/rcxdm.8%{?ext_man}
 %endif

++ xdm-1.1.11.tar.bz2 -> xdm-1.1.12.tar.bz2 ++
 58466 lines of diff (skipped)




commit xdm for openSUSE:Factory

2019-02-24 Thread root
Hello community,

here is the log from the commit of package xdm for openSUSE:Factory checked in 
at 2019-02-24 17:06:40

Comparing /work/SRC/openSUSE:Factory/xdm (Old)
 and  /work/SRC/openSUSE:Factory/.xdm.new.28833 (New)


Package is "xdm"

Sun Feb 24 17:06:40 2019 rev:74 rq:674644 version:1.1.11

Changes:

--- /work/SRC/openSUSE:Factory/xdm/xdm.changes  2018-12-19 13:27:11.445105827 
+0100
+++ /work/SRC/openSUSE:Factory/.xdm.new.28833/xdm.changes   2019-02-24 
17:06:43.440585472 +0100
@@ -1,0 +2,6 @@
+Wed Feb 13 15:47:45 UTC 2019 - sndir...@suse.com
+
+- %post: get rid of DISPLAYMANAGER in /etc/sysconfig/displaymanager
+  (boo#1125040)
+
+---



Other differences:
--
++ xdm.spec ++
--- /var/tmp/diff_new_pack.xmc2ip/_old  2019-02-24 17:06:44.000585205 +0100
+++ /var/tmp/diff_new_pack.xmc2ip/_new  2019-02-24 17:06:44.000585205 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package xdm
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 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
@@ -224,6 +224,8 @@
   default-displaymanager %{_libexecdir}/X11/displaymanagers/console 5
 %{_sbindir}/update-alternatives --install 
%{_libexecdir}/X11/displaymanagers/default-displaymanager \
   default-displaymanager %{_libexecdir}/X11/displaymanagers/xdm 10
+# get rid of DISPLAYMANAGER in /etc/sysconfig/displaymanager (boo#1125040)
+sed -i 's/DISPLAYMANAGER=.*//g' /etc/sysconfig/displaymanager
 %endif
 %if 0%{?suse_version} > 1320
 %firewalld_reload




commit xdm for openSUSE:Factory

2018-12-19 Thread root
Hello community,

here is the log from the commit of package xdm for openSUSE:Factory checked in 
at 2018-12-19 13:27:09

Comparing /work/SRC/openSUSE:Factory/xdm (Old)
 and  /work/SRC/openSUSE:Factory/.xdm.new.28833 (New)


Package is "xdm"

Wed Dec 19 13:27:09 2018 rev:73 rq:657141 version:1.1.11

Changes:

--- /work/SRC/openSUSE:Factory/xdm/xdm.changes  2018-08-02 14:49:13.043374377 
+0200
+++ /work/SRC/openSUSE:Factory/.xdm.new.28833/xdm.changes   2018-12-19 
13:27:11.445105827 +0100
@@ -1,0 +2,6 @@
+Tue Dec 11 08:06:00 UTC 2018 - m...@suse.com
+
+- Add OnFailure=plymouth-quit.service to display-manager service.
+  (bsc#1118121)
+
+---



Other differences:
--
++ display-manager.service ++
--- /var/tmp/diff_new_pack.orK3j9/_old  2018-12-19 13:27:11.937105183 +0100
+++ /var/tmp/diff_new_pack.orK3j9/_new  2018-12-19 13:27:11.937105183 +0100
@@ -5,6 +5,7 @@
 After=ypbind.service gpm.service time-sync.target winbind.service acpid.service
 Wants=remote-fs.target dbus.socket systemd-user-sessions.service 
systemd-logind.service
 After=remote-fs.target dbus.socket systemd-user-sessions.service 
systemd-logind.service getty@tty7.service plymouth-quit.service
+OnFailure=plymouth-quit.service
 
 [Service]
 Type=forking




commit xdm for openSUSE:Factory

2018-08-02 Thread root
Hello community,

here is the log from the commit of package xdm for openSUSE:Factory checked in 
at 2018-08-02 14:49:11

Comparing /work/SRC/openSUSE:Factory/xdm (Old)
 and  /work/SRC/openSUSE:Factory/.xdm.new (New)


Package is "xdm"

Thu Aug  2 14:49:11 2018 rev:72 rq:625428 version:1.1.11

Changes:

--- /work/SRC/openSUSE:Factory/xdm/xdm.changes  2018-07-18 22:36:38.666400627 
+0200
+++ /work/SRC/openSUSE:Factory/.xdm.new/xdm.changes 2018-08-02 
14:49:13.043374377 +0200
@@ -1,0 +2,6 @@
+Thu Jul 26 13:14:57 UTC 2018 - sndir...@suse.com
+
+- display-manager: also quit plymouth when display-manager is set
+  to console (boo#1102584)
+
+---



Other differences:
--
++ xdm.tar.bz2 ++
 2866 lines of diff (skipped)




commit xdm for openSUSE:Factory

2018-07-18 Thread root
Hello community,

here is the log from the commit of package xdm for openSUSE:Factory checked in 
at 2018-07-18 22:36:35

Comparing /work/SRC/openSUSE:Factory/xdm (Old)
 and  /work/SRC/openSUSE:Factory/.xdm.new (New)


Package is "xdm"

Wed Jul 18 22:36:35 2018 rev:71 rq:623596 version:1.1.11

Changes:

--- /work/SRC/openSUSE:Factory/xdm/xdm.changes  2018-04-07 20:50:27.504720315 
+0200
+++ /work/SRC/openSUSE:Factory/.xdm.new/xdm.changes 2018-07-18 
22:36:38.666400627 +0200
@@ -1,0 +2,12 @@
+Tue Jul 17 12:56:35 UTC 2018 - wer...@suse.de
+
+- Change /etc/X11/xdm/scripts/10-gpg-agent to get it work with
+  every gpg version 2.1 and up (boo#1062105)
+
+---
+Wed Jul 11 14:43:26 UTC 2018 - fcro...@suse.com
+
+- Update xdm.tar.bz2, no longer create / update /var/lib/X11/X
+  symlink, it is no used anymore (FATE#325524).
+
+---



Other differences:
--
++ xdm.tar.bz2 ++
 2867 lines of diff (skipped)




commit xdm for openSUSE:Factory

2018-04-07 Thread root
Hello community,

here is the log from the commit of package xdm for openSUSE:Factory checked in 
at 2018-04-07 20:50:23

Comparing /work/SRC/openSUSE:Factory/xdm (Old)
 and  /work/SRC/openSUSE:Factory/.xdm.new (New)


Package is "xdm"

Sat Apr  7 20:50:23 2018 rev:70 rq:593848 version:1.1.11

Changes:

--- /work/SRC/openSUSE:Factory/xdm/xdm.changes  2018-03-24 16:05:48.028217424 
+0100
+++ /work/SRC/openSUSE:Factory/.xdm.new/xdm.changes 2018-04-07 
20:50:27.504720315 +0200
@@ -1,0 +2,8 @@
+Thu Apr  5 12:30:01 UTC 2018 - wer...@suse.de
+
+- systemd-logind integration requires to use -keeptty with X server
+  to hold the controlling tty (and breaks startx!).[boo#1088365]
+- Do not generate an error on not existing shell functions *_vars
+  in /usr/lib/X11/display-manager
+
+---



Other differences:
--
++ xdm-with-update-alternative.patch ++
--- /var/tmp/diff_new_pack.PQuOBz/_old  2018-04-07 20:50:28.260692954 +0200
+++ /var/tmp/diff_new_pack.PQuOBz/_new  2018-04-07 20:50:28.264692810 +0200
@@ -1,7 +1,23 @@
-diff -ur xdm.old/usr/lib/X11/display-manager 
xdm.new/usr/lib/X11/display-manager
 xdm.old/usr/lib/X11/display-manager2017-02-06 14:19:33.541035000 
+0100
-+++ xdm.new/usr/lib/X11/display-manager2017-10-12 15:44:06.592204792 
+0200
-@@ -109,6 +109,8 @@
+---
+ etc/X11/xdm/Xservers  |3 ++-
+ usr/lib/X11/display-manager   |7 +--
+ var/adm/fillup-templates/sysconfig.displaymanager |8 
+ 3 files changed, 7 insertions(+), 11 deletions(-)
+
+--- xdm.old/etc/X11/xdm/Xservers   2018-04-05 14:48:56.669172739 +0200
 xdm.new/etc/X11/xdm/Xservers   2018-04-05 14:45:33.129981406 +0200
+@@ -13,6 +13,7 @@
+ # use such a line to enable the console login option in the kdm menu
+ #:0 local@tty1 /usr/bin/X vt7
+ # "reserve" means that the X server gets only started on request (only kdm)
++# -keeptty implies that controlling tty is not detached (breaks startx!)
+ 
+-:0 local /usr/bin/X -nolisten tcp -br vt7
++:0 local /usr/bin/X -nolisten tcp -br vt7 -keeptty
+ 
+--- xdm.old/usr/lib/X11/display-manager
 xdm.new/usr/lib/X11/display-manager2018-04-05 12:44:11.247521173 
+
+@@ -121,6 +121,8 @@ plymouth_quit()
  
  #set -x
  
@@ -10,17 +26,20 @@
  DM=${DISPLAYMANAGER##*/}
  
  case "$DM" in
-@@ -127,6 +129,7 @@
+@@ -138,8 +140,9 @@ case "$DM" in
+   for i in $DISPLAY_MANAGERS
do
name="${i}_vars"
-   PIDFILE=/var/run/$i.pid;
-+  type $name > /dev/null || continue;
-   $name $DM && break;
+-  PIDFILE=/var/run/$i.pid;
+-  $name $DM && break;
++  type -t $name &> /dev/null || continue
++  PIDFILE=/var/run/$i.pid
++  $name $DM && break
done
if [ -z "$DISPLAYMANAGER" -o ! -x "$DISPLAYMANAGER" ]
-diff -ur xdm.old/var/adm/fillup-templates/sysconfig.displaymanager 
xdm.new/var/adm/fillup-templates/sysconfig.displaymanager
 xdm.old/var/adm/fillup-templates/sysconfig.displaymanager  2017-01-04 
11:15:56.25950 +0100
-+++ xdm.new/var/adm/fillup-templates/sysconfig.displaymanager  2017-10-12 
16:35:23.775259305 +0200
+   then
+--- xdm.old/var/adm/fillup-templates/sysconfig.displaymanager
 xdm.new/var/adm/fillup-templates/sysconfig.displaymanager  2017-10-12 
14:35:23.775259305 +
 @@ -1,14 +1,6 @@
  ## Path:  Desktop/Display manager
  ## Description:   settings to generate a proper displaymanager config




commit xdm for openSUSE:Factory

2018-03-24 Thread root
Hello community,

here is the log from the commit of package xdm for openSUSE:Factory checked in 
at 2018-03-24 16:05:46

Comparing /work/SRC/openSUSE:Factory/xdm (Old)
 and  /work/SRC/openSUSE:Factory/.xdm.new (New)


Package is "xdm"

Sat Mar 24 16:05:46 2018 rev:69 rq:587947 version:1.1.11

Changes:

--- /work/SRC/openSUSE:Factory/xdm/xdm.changes  2018-03-13 10:21:58.890192255 
+0100
+++ /work/SRC/openSUSE:Factory/.xdm.new/xdm.changes 2018-03-24 
16:05:48.028217424 +0100
@@ -1,0 +2,6 @@
+Fri Mar 16 16:44:52 UTC 2018 - sndir...@suse.com
+
+- require xinit, since /etc/X11/xdm/Xsession and /etc/X11/xdm/sys.xsession
+  are sourcing /etc/X11/xinit/xinitrc.common (boo#1084655) 
+
+---



Other differences:
--
++ xdm.spec ++
--- /var/tmp/diff_new_pack.dyj3nz/_old  2018-03-24 16:05:49.072179790 +0100
+++ /var/tmp/diff_new_pack.dyj3nz/_new  2018-03-24 16:05:49.080179502 +0100
@@ -74,6 +74,7 @@
 Requires:   logrotate
 Requires:   sessreg
 Requires:   xconsole
+Requires:   xinit
 Requires:   xli
 Requires:   xmessage
 Requires:   xrdb




commit xdm for openSUSE:Factory

2018-03-13 Thread root
Hello community,

here is the log from the commit of package xdm for openSUSE:Factory checked in 
at 2018-03-13 10:21:56

Comparing /work/SRC/openSUSE:Factory/xdm (Old)
 and  /work/SRC/openSUSE:Factory/.xdm.new (New)


Package is "xdm"

Tue Mar 13 10:21:56 2018 rev:68 rq:585124 version:1.1.11

Changes:

--- /work/SRC/openSUSE:Factory/xdm/xdm.changes  2018-02-28 20:00:40.948412980 
+0100
+++ /work/SRC/openSUSE:Factory/.xdm.new/xdm.changes 2018-03-13 
10:21:58.890192255 +0100
@@ -1,0 +2,7 @@
+Fri Mar  9 16:46:58 UTC 2018 - sndir...@suse.com
+
+- check for available graphics during runtime instead of %post,
+  since %post may already run during image building time in our
+  buildsystem (boo#1039497)
+
+---



Other differences:
--
++ xdm.spec ++
--- /var/tmp/diff_new_pack.jeyefg/_old  2018-03-13 10:22:01.498098824 +0100
+++ /var/tmp/diff_new_pack.jeyefg/_new  2018-03-13 10:22:01.502098681 +0100
@@ -160,6 +160,7 @@
 %endif
 %if 0%{?suse_version} >= 1330
 patch -p1 < %{PATCH2}
+rm -f usr/lib/X11/display-manager.orig
 %endif
 %if "%{_fillupdir}" != "/var/adm/fillup-templates"
   mkdir -p %{buildroot}$(dirname %{_fillupdir})
@@ -217,14 +218,6 @@
 %service_add_post display-manager.service
 %{fillup_only -n displaymanager}
 %endif
-# Do no try to start Xserver on platforms which may ship without
-# graphics card (bsc#1039497)
-%ifarch aarch64 ppc64le
-if ! [ -c /dev/fb* -o -d /dev/dri ]; then
-sed -i -e 
"s+DISPLAYMANAGER_STARTS_XSERVER=.*+DISPLAYMANAGER_STARTS_XSERVER=\"no\"+g" \
-  %{_sysconfdir}/sysconfig/displaymanager
-fi
-%endif
 %if 0%{?suse_version} >= 1330
 %{_sbindir}/update-alternatives --install 
%{_libexecdir}/X11/displaymanagers/default-displaymanager \
   default-displaymanager %{_libexecdir}/X11/displaymanagers/console 5

++ xdm.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/usr/lib/X11/display-manager 
new/usr/lib/X11/display-manager
--- old/usr/lib/X11/display-manager 2017-12-04 12:23:07.871605000 +0100
+++ new/usr/lib/X11/display-manager 2018-03-09 17:41:53.635601000 +0100
@@ -75,12 +75,24 @@
 
 
 xdm_reload_files () {
-test -x /etc/X11/xdm/SuSEconfig.xdm && \
+if [ -x /etc/X11/xdm/SuSEconfig.xdm ]; then
+# Do no try to start Xserver on platforms which may ship without
+# graphics card (bsc#1039497)
+if [ "$(arch)" == "aarch64" -o "$(arch)" == "ppc64le" ]; then
+if ! [ -c /dev/fb* -o -d /dev/dri ]; then
+sed -i -e 
"s+DISPLAYMANAGER_STARTS_XSERVER=.*+DISPLAYMANAGER_STARTS_XSERVER=\"no\"+g" \
+  /etc/sysconfig/displaymanager
+else
+sed -i -e 
"s+DISPLAYMANAGER_STARTS_XSERVER=.*+DISPLAYMANAGER_STARTS_XSERVER=\"yes\"+g" \
+  /etc/sysconfig/displaymanager
+fi
+fi
 MD5DIR="/var/adm/SuSEconfig/md5" \
 /etc/X11/xdm/SuSEconfig.xdm | \
 sed 's+\(.*\)+/etc/init.d/xdm: \1+g' | \
 /bin/logger
return 0
+fi
 }
 
 splashcopy()




commit xdm for openSUSE:Factory

2018-02-28 Thread root
Hello community,

here is the log from the commit of package xdm for openSUSE:Factory checked in 
at 2018-02-28 20:00:39

Comparing /work/SRC/openSUSE:Factory/xdm (Old)
 and  /work/SRC/openSUSE:Factory/.xdm.new (New)


Package is "xdm"

Wed Feb 28 20:00:39 2018 rev:67 rq:580332 version:1.1.11

Changes:

--- /work/SRC/openSUSE:Factory/xdm/xdm.changes  2018-02-22 14:58:52.809701106 
+0100
+++ /work/SRC/openSUSE:Factory/.xdm.new/xdm.changes 2018-02-28 
20:00:40.948412980 +0100
@@ -1,0 +2,5 @@
+Mon Feb 26 19:24:04 UTC 2018 - sndir...@suse.com
+
+- fixed syntax in /usr/lib/firewalld/services/x11.xml (boo#1082890)
+
+---



Other differences:
--
++ xdm.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/usr/lib/firewalld/services/x11.xml 
new/usr/lib/firewalld/services/x11.xml
--- old/usr/lib/firewalld/services/x11.xml  2018-02-21 14:35:47.387523000 
+0100
+++ new/usr/lib/firewalld/services/x11.xml  2018-02-26 20:22:13.33841 
+0100
@@ -1,2 +1,10 @@
+
+
+Legacy Xserver Remote Access
+TCP/UDP ports needed for legacy remote access to Xserver.
+Needs more configuration settings in display manager, e.g.
+DISPLAYMANAGER_XSERVER_TCP_PORT_6000_OPEN in /etc/sysconfig/displaymanager
+for xdm. 
 
 
+




commit xdm for openSUSE:Factory

2018-02-22 Thread root
Hello community,

here is the log from the commit of package xdm for openSUSE:Factory checked in 
at 2018-02-22 14:58:51

Comparing /work/SRC/openSUSE:Factory/xdm (Old)
 and  /work/SRC/openSUSE:Factory/.xdm.new (New)


Package is "xdm"

Thu Feb 22 14:58:51 2018 rev:66 rq:578726 version:1.1.11

Changes:

--- /work/SRC/openSUSE:Factory/xdm/xdm.changes  2018-02-12 10:10:02.428693787 
+0100
+++ /work/SRC/openSUSE:Factory/.xdm.new/xdm.changes 2018-02-22 
14:58:52.809701106 +0100
@@ -1,0 +2,10 @@
+Wed Feb 21 13:52:09 UTC 2018 - sndir...@suse.com
+
+- switch from SUSEfirewall2 to firewalld:
+  /etc/sysconfig/SuSEfirewall2.d/services/xdmcp -->
+  /usr/lib/firewalld/services/x11.xml; only handle Xserver TCP/UDP
+  ports 6000-6063; XDMCP port 177 will be handled by firewalld
+  package itself and pushed upstream by firewalld maintainers
+  (boo#1082033)
+
+---



Other differences:
--
++ xdm.spec ++
--- /var/tmp/diff_new_pack.G9NHBn/_old  2018-02-22 14:58:53.589673044 +0100
+++ /var/tmp/diff_new_pack.G9NHBn/_new  2018-02-22 14:58:53.593672900 +0100
@@ -67,6 +67,9 @@
 BuildRequires:  pkgconfig(xpm)
 BuildRequires:  pkgconfig(xt)
 BuildRequires:  pkgconfig(xtrans)
+%if 0%{?suse_version} > 1320
+BuildRequires:  firewall-macros
+%endif
 Requires:   /sbin/pidof
 Requires:   logrotate
 Requires:   sessreg
@@ -145,6 +148,16 @@
 pushd %{buildroot}
 # SuSE default XDM configuration
 tar xf %{SOURCE1}
+%if 0%{?suse_version} > 1320
+rmetc/sysconfig/SuSEfirewall2.d/services/xdmcp
+rmdir etc/sysconfig/SuSEfirewall2.d/services
+rmdir etc/sysconfig/SuSEfirewall2.d
+rmdir etc/sysconfig
+%else
+rmusr/lib/firewalld/services/x11.xml
+rmdir usr/lib/firewalld/services
+rmdir usr/lib/firewalld
+%endif
 %if 0%{?suse_version} >= 1330
 patch -p1 < %{PATCH2}
 %endif
@@ -218,6 +231,9 @@
 %{_sbindir}/update-alternatives --install 
%{_libexecdir}/X11/displaymanagers/default-displaymanager \
   default-displaymanager %{_libexecdir}/X11/displaymanagers/xdm 10
 %endif
+%if 0%{?suse_version} > 1320
+%firewalld_reload
+%endif
 
 %pre
 %if !0%{?suse_version} < 1315
@@ -264,7 +280,13 @@
 %endif
 %config %{_sysconfdir}/X11/xdm/
 %dir %{_sysconfdir}/X11/xdm/scripts
+%if 0%{?suse_version} > 1320
+%dir %{_libexecdir}/firewalld
+%dir %{_libexecdir}/firewalld/services
+%{_libexecdir}/firewalld/services/x11.xml
+%else
 %config(noreplace) %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/xdmcp
+%endif
 %if 0%{?suse_version} < 1315
 %{_sysconfdir}/init.d/xdm
 %exclude %{_libexecdir}/X11/display-manager

++ xdm.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/usr/lib/firewalld/services/x11.xml 
new/usr/lib/firewalld/services/x11.xml
--- old/usr/lib/firewalld/services/x11.xml  1970-01-01 01:00:00.0 
+0100
+++ new/usr/lib/firewalld/services/x11.xml  2018-02-21 14:35:47.387523000 
+0100
@@ -0,0 +1,2 @@
+
+




commit xdm for openSUSE:Factory

2018-02-12 Thread root
Hello community,

here is the log from the commit of package xdm for openSUSE:Factory checked in 
at 2018-02-12 10:10:00

Comparing /work/SRC/openSUSE:Factory/xdm (Old)
 and  /work/SRC/openSUSE:Factory/.xdm.new (New)


Package is "xdm"

Mon Feb 12 10:10:00 2018 rev:65 rq:574221 version:1.1.11

Changes:

--- /work/SRC/openSUSE:Factory/xdm/xdm.changes  2017-12-08 21:47:39.282381244 
+0100
+++ /work/SRC/openSUSE:Factory/.xdm.new/xdm.changes 2018-02-12 
10:10:02.428693787 +0100
@@ -1,0 +2,7 @@
+Thu Feb  8 11:14:41 UTC 2018 - sndir...@suse.com
+
+- xdm.tar.bz2/Xstartup
+  * reverted workaround for DISPLAY being set to 'null', since the
+bug is supposed to be fixed properly in gdm now (bsc#1068016)
+
+---



Other differences:
--
++ xdm.spec ++
--- /var/tmp/diff_new_pack.Pvc2h7/_old  2018-02-12 10:10:03.492655443 +0100
+++ /var/tmp/diff_new_pack.Pvc2h7/_new  2018-02-12 10:10:03.496655299 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package xdm
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 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

++ xdm.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/etc/X11/xdm/Xstartup new/etc/X11/xdm/Xstartup
--- old/etc/X11/xdm/Xstartup2017-11-23 11:42:33.091615000 +0100
+++ new/etc/X11/xdm/Xstartup2018-02-08 12:14:16.603677000 +0100
@@ -54,9 +54,6 @@
 # 
 # Find out if this is a local or remote connection
 #
-if test $DISPLAY == '(null)' ; then
-DISPLAY=""
-fi
 LOCATION=${DISPLAY%:*}
 LINE=:${DISPLAY#*:}
 if test -z "$LOCATION" ; then




commit xdm for openSUSE:Factory

2017-12-08 Thread root
Hello community,

here is the log from the commit of package xdm for openSUSE:Factory checked in 
at 2017-12-08 21:47:15

Comparing /work/SRC/openSUSE:Factory/xdm (Old)
 and  /work/SRC/openSUSE:Factory/.xdm.new (New)


Package is "xdm"

Fri Dec  8 21:47:15 2017 rev:64 rq:548056 version:1.1.11

Changes:

--- /work/SRC/openSUSE:Factory/xdm/xdm.changes  2017-11-30 12:38:15.665473338 
+0100
+++ /work/SRC/openSUSE:Factory/.xdm.new/xdm.changes 2017-12-08 
21:47:39.282381244 +0100
@@ -1,0 +2,7 @@
+Mon Dec  4 11:24:12 UTC 2017 - sndir...@suse.com
+
+- xdm.tar.bz2/usr/lib/X11/display-manager
+  * Improve error message with "x11failsafe: in kernel commandline, 
+if xorg.conf.install doesn't exist 
(https://github.com/SUSE/kiwi/issues/554)
+
+---



Other differences:
--
++ xdm.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/usr/lib/X11/display-manager 
new/usr/lib/X11/display-manager
--- old/usr/lib/X11/display-manager 2017-10-18 16:59:26.687226000 +0200
+++ new/usr/lib/X11/display-manager 2017-12-04 12:23:07.871605000 +0100
@@ -174,10 +174,9 @@
 else
 echo
 echo "The failsafe X.Org configuration 
/etc/X11/xorg.conf.install no longer exists."
-echo "Either move it back (if still available) or copy 
/etc/X11/xorg.conf to"
-echo "/etc/X11/xorg.conf.install to use the native graphics 
driver instead of the"
-echo "failsafe graphics driver. Of course the latter option no 
longer can be called"
-echo "failsafe."
+echo "Either move it back (if still available) or remove 
\"x11failsafe\" from your"
+echo "kernel commandline to use the native graphics driver 
instead of the failsafe"
+echo "graphics driver. Of course the latter option no longer 
can be called failsafe."
 rc_status -u
 rc_exit
 fi




commit xdm for openSUSE:Factory

2017-11-30 Thread root
Hello community,

here is the log from the commit of package xdm for openSUSE:Factory checked in 
at 2017-11-30 12:38:14

Comparing /work/SRC/openSUSE:Factory/xdm (Old)
 and  /work/SRC/openSUSE:Factory/.xdm.new (New)


Package is "xdm"

Thu Nov 30 12:38:14 2017 rev:63 rq:545302 version:1.1.11

Changes:

--- /work/SRC/openSUSE:Factory/xdm/xdm.changes  2017-11-03 16:21:38.667211259 
+0100
+++ /work/SRC/openSUSE:Factory/.xdm.new/xdm.changes 2017-11-30 
12:38:15.665473338 +0100
@@ -1,0 +2,18 @@
+Thu Nov 23 20:20:50 UTC 2017 - sndir...@suse.com
+
+- move /var/adm/fillup-templates/sysconfig.displaymanager
+  to %_fillupdir on TW and sle15/Leap 15
+
+---
+Thu Nov 23 13:52:48 UTC 2017 - rbr...@suse.com
+
+- Replace references to /var/adm/fillup-templates with new 
+  %_fillupdir macro (boo#1069468)
+
+---
+Thu Nov 23 10:46:29 UTC 2017 - sndir...@suse.com
+
+- xdm.tar.bz2: Fix Xstartup, that couldn't handle env DISPLAY=(null) 
+  (bsc#1068016, patch by xw...@suse.com)
+
+---



Other differences:
--
++ xdm.spec ++
--- /var/tmp/diff_new_pack.vwoRPz/_old  2017-11-30 12:38:16.441445121 +0100
+++ /var/tmp/diff_new_pack.vwoRPz/_new  2017-11-30 12:38:16.441445121 +0100
@@ -16,6 +16,11 @@
 #
 
 
+#Compat macro for new _fillupdir macro introduced in Nov 2017
+%if ! %{defined _fillupdir}
+  %define _fillupdir /var/adm/fillup-templates
+%endif
+
 %define _dminitdir %{_libexecdir}/X11/displaymanagers
 %if 0%{?suse_version} > 1230
 %define with_systemd 1
@@ -143,13 +148,19 @@
 %if 0%{?suse_version} >= 1330
 patch -p1 < %{PATCH2}
 %endif
+%if "%{_fillupdir}" != "/var/adm/fillup-templates"
+  mkdir -p %{buildroot}$(dirname %{_fillupdir})
+  mv %{buildroot}/var/adm/fillup-templates \
+ %{buildroot}$(dirname %{_fillupdir})
+%endif
+
 %if %dm_fallbacks
 tar xf %{SOURCE3}
 %endif
 %ifarch s390 s390x
 sed -i -e 
"s+DISPLAYMANAGER_REMOTE_ACCESS=.*+DISPLAYMANAGER_REMOTE_ACCESS=\"yes\"+g" \
-e 
"s+DISPLAYMANAGER_STARTS_XSERVER=.*+DISPLAYMANAGER_STARTS_XSERVER=\"no\"+g" \
-var/adm/fillup-templates/sysconfig.displaymanager
+%{buildroot}%{_fillupdir}/sysconfig.displaymanager
 %endif
 popd
 
@@ -266,7 +277,7 @@
 %config(noreplace) %{_sysconfdir}/pam.d/xdm
 %config(noreplace) %{_sysconfdir}/pam.d/xdm-np
 %dir %{_localstatedir}/lib/xdm/
-%{_localstatedir}/adm/fillup-templates/sysconfig.displaymanager
+%{_fillupdir}/sysconfig.displaymanager
 %{_localstatedir}/lib/xdm/authdir/
 %ghost %{_localstatedir}/log/xdm.errors
 %{_bindir}/chooser

++ xdm.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/etc/X11/xdm/Xstartup new/etc/X11/xdm/Xstartup
--- old/etc/X11/xdm/Xstartup2014-12-15 19:34:46.0 +0100
+++ new/etc/X11/xdm/Xstartup2017-11-23 11:42:33.091615000 +0100
@@ -54,6 +54,9 @@
 # 
 # Find out if this is a local or remote connection
 #
+if test $DISPLAY == '(null)' ; then
+DISPLAY=""
+fi
 LOCATION=${DISPLAY%:*}
 LINE=:${DISPLAY#*:}
 if test -z "$LOCATION" ; then




commit xdm for openSUSE:Factory

2017-11-03 Thread root
Hello community,

here is the log from the commit of package xdm for openSUSE:Factory checked in 
at 2017-11-03 16:21:35

Comparing /work/SRC/openSUSE:Factory/xdm (Old)
 and  /work/SRC/openSUSE:Factory/.xdm.new (New)


Package is "xdm"

Fri Nov  3 16:21:35 2017 rev:62 rq:537232 version:1.1.11

Changes:

--- /work/SRC/openSUSE:Factory/xdm/xdm.changes  2017-10-20 14:41:40.380022458 
+0200
+++ /work/SRC/openSUSE:Factory/.xdm.new/xdm.changes 2017-11-03 
16:21:38.667211259 +0100
@@ -1,0 +2,6 @@
+Fri Oct 27 12:53:19 UTC 2017 - m...@suse.com
+
+- Use %config(noreplace) for /etc/pam.d/* files. The configuration
+  files from pam package use the same policy. (bnc#1065399)
+
+---



Other differences:
--
++ xdm.spec ++
--- /var/tmp/diff_new_pack.Kt7S6v/_old  2017-11-03 16:21:39.467182143 +0100
+++ /var/tmp/diff_new_pack.Kt7S6v/_new  2017-11-03 16:21:39.471181998 +0100
@@ -263,8 +263,8 @@
 %{_libexecdir}/X11/display-manager
 %endif
 %config %{_sysconfdir}/logrotate.d/xdm
-%config %{_sysconfdir}/pam.d/xdm
-%config %{_sysconfdir}/pam.d/xdm-np
+%config(noreplace) %{_sysconfdir}/pam.d/xdm
+%config(noreplace) %{_sysconfdir}/pam.d/xdm-np
 %dir %{_localstatedir}/lib/xdm/
 %{_localstatedir}/adm/fillup-templates/sysconfig.displaymanager
 %{_localstatedir}/lib/xdm/authdir/




commit xdm for openSUSE:Factory

2017-10-20 Thread root
Hello community,

here is the log from the commit of package xdm for openSUSE:Factory checked in 
at 2017-10-20 14:41:37

Comparing /work/SRC/openSUSE:Factory/xdm (Old)
 and  /work/SRC/openSUSE:Factory/.xdm.new (New)


Package is "xdm"

Fri Oct 20 14:41:37 2017 rev:61 rq:534975 version:1.1.11

Changes:

--- /work/SRC/openSUSE:Factory/xdm/xdm.changes  2017-07-28 09:40:18.398259333 
+0200
+++ /work/SRC/openSUSE:Factory/.xdm.new/xdm.changes 2017-10-20 
14:41:40.380022458 +0200
@@ -1,0 +2,25 @@
+Wed Oct 18 15:01:24 UTC 2017 - sndir...@suse.com
+
+- reintroduced /etc/X11/xdm/keytable script and the hook-up in
+  /usr/lib/X11/display-manager to setup X11 keymaps, since YaST
+  is not able to use localectl already during installation due to
+  dbus and appropriate systemd services not running :-( 
+  (bsc#1046436)
+
+---
+Thu Oct 12 10:08:28 UTC 2017 - dims...@opensuse.org
+
+- Have update-alternatives handle Xinit's integration of the
+  displaymanager, replacing /etc/sysconfig/displaymanager.
+- Add a dummy entry for 'console' - which is special-cased in the
+  display-manager script to 'exit early'. In order for it to become
+  an option for update-alternatives, the target needs to exist.
+- Update /usr/lib/X11/display-manager to get the
+  default-displaymanager from the update-alternative setting
+  instead of reading it from /etc/sysconfig/displaymanager.
+- Remove DISPLAYMANAGER from displaymanager.sysconfig template.
+- Add xdm-with-update-alternative.patch so the needed changes can
+  be applied for suse_version >= 1330 only, not breaking Leap 42.x.
+- All that together solves boo#1053863.
+
+---

New:

  xdm-with-update-alternative.patch



Other differences:
--
++ xdm.spec ++
--- /var/tmp/diff_new_pack.9pqYk1/_old  2017-10-20 14:41:41.019992513 +0200
+++ /var/tmp/diff_new_pack.9pqYk1/_new  2017-10-20 14:41:41.023992326 +0200
@@ -44,10 +44,12 @@
 Source4:display-manager.service
 Source5:xsession.desktop
 Patch1: xdm-tolerant-hostname-changes.diff
+# PATCH-FEATURE-OPENSUSE xdm-with-update-alternative.patch 
dims...@opensuse.org -- Choice of default DM by means of u-a
+Patch2: xdm-with-update-alternative.patch
 # needed for patch0, patch2, patch3, patch4
 BuildRequires:  libtool
 BuildRequires:  pam-devel
-BuildRequires:  pkg-config
+BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(xau)
 BuildRequires:  pkgconfig(xaw7)
@@ -72,7 +74,6 @@
 Recommends: dbus-1-x11
 # This was part of the xorg-x11 package up to version 7.6
 Conflicts:  xorg-x11 <= 7.6
-BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 %if !%with_systemd
 Patch0: xdm-consolekit.diff
 %endif
@@ -117,6 +118,8 @@
 pushd xdm
 %patch1 -p1
 popd
+# Special note: patch 2 is applied in install section; tagging it here for the 
source validator only
+#patch2 -p1
 
 %build
 # needed for patch0
@@ -137,6 +140,9 @@
 pushd %{buildroot}
 # SuSE default XDM configuration
 tar xf %{SOURCE1}
+%if 0%{?suse_version} >= 1330
+patch -p1 < %{PATCH2}
+%endif
 %if %dm_fallbacks
 tar xf %{SOURCE3}
 %endif
@@ -171,6 +177,14 @@
EOF
 chmod 0755 %{buildroot}%{_sbindir}/rcxdm
 %endif
+%if 0%{?suse_version} >= 1330
+# prepare for defaul-dm to be chosen by means of update-alternatives
+mkdir -p %{buildroot}%{_sysconfdir}/alternatives
+touch %{buildroot}%{_sysconfdir}/alternatives/default-displaymanager
+ln -s %{_sysconfdir}/alternatives/default-displaymanager 
%{buildroot}%{_libexecdir}/X11/displaymanagers/default-displaymanager
+# Inject a dummy 'console' selection - which used to be choice in 
/etc/sysconfig/displaymanager
+touch %{buildroot}%{_libexecdir}/X11/displaymanagers/console
+%endif
 
 %post
 %if 0%{?suse_version} < 1315
@@ -184,9 +198,15 @@
 %ifarch aarch64 ppc64le
 if ! [ -c /dev/fb* -o -d /dev/dri ]; then
 sed -i -e 
"s+DISPLAYMANAGER_STARTS_XSERVER=.*+DISPLAYMANAGER_STARTS_XSERVER=\"no\"+g" \
-  /etc/sysconfig/displaymanager
+  %{_sysconfdir}/sysconfig/displaymanager
 fi
 %endif
+%if 0%{?suse_version} >= 1330
+%{_sbindir}/update-alternatives --install 
%{_libexecdir}/X11/displaymanagers/default-displaymanager \
+  default-displaymanager %{_libexecdir}/X11/displaymanagers/console 5
+%{_sbindir}/update-alternatives --install 
%{_libexecdir}/X11/displaymanagers/default-displaymanager \
+  default-displaymanager %{_libexecdir}/X11/displaymanagers/xdm 10
+%endif
 
 %pre
 %if !0%{?suse_version} < 1315
@@ -200,6 +220,12 @@
 # Do not restart DM on update (bnc#886641)
 %service_del_postun -n display-manager.service
 %endif
+%if 0%{?suse_version} >= 1330
+[ -f 

commit xdm for openSUSE:Factory

2017-07-28 Thread root
Hello community,

here is the log from the commit of package xdm for openSUSE:Factory checked in 
at 2017-07-28 09:40:17

Comparing /work/SRC/openSUSE:Factory/xdm (Old)
 and  /work/SRC/openSUSE:Factory/.xdm.new (New)


Package is "xdm"

Fri Jul 28 09:40:17 2017 rev:60 rq:512470 version:1.1.11

Changes:

--- /work/SRC/openSUSE:Factory/xdm/xdm.changes  2017-02-10 09:47:25.743388919 
+0100
+++ /work/SRC/openSUSE:Factory/.xdm.new/xdm.changes 2017-07-28 
09:40:18.398259333 +0200
@@ -1,0 +2,19 @@
+Tue Jul 25 09:58:56 UTC 2017 - sndir...@suse.com
+
+- fix usage of readlink in Xsession (boo#1050328)
+
+---
+Mon Jul 24 14:21:45 UTC 2017 - sndir...@suse.com
+
+- %post
+  * make previous change in /etc/sysconfig/displaymanager instead
+of /var/adm/fillup-templates/sysconfig.displaymanager
+
+---
+Mon Jul 24 13:43:35 UTC 2017 - sndir...@suse.com
+
+- %post
+  * Do no try to start Xserver on platforms which may ship without
+graphics card (bsc#1039497)
+
+---



Other differences:
--
++ xdm.spec ++
--- /var/tmp/diff_new_pack.76NplV/_old  2017-07-28 09:40:18.990175971 +0200
+++ /var/tmp/diff_new_pack.76NplV/_new  2017-07-28 09:40:18.990175971 +0200
@@ -179,6 +179,14 @@
 %service_add_post display-manager.service
 %{fillup_only -n displaymanager}
 %endif
+# Do no try to start Xserver on platforms which may ship without
+# graphics card (bsc#1039497)
+%ifarch aarch64 ppc64le
+if ! [ -c /dev/fb* -o -d /dev/dri ]; then
+sed -i -e 
"s+DISPLAYMANAGER_STARTS_XSERVER=.*+DISPLAYMANAGER_STARTS_XSERVER=\"no\"+g" \
+  /etc/sysconfig/displaymanager
+fi
+%endif
 
 %pre
 %if !0%{?suse_version} < 1315

++ xdm.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/etc/X11/xdm/Xsession new/etc/X11/xdm/Xsession
--- old/etc/X11/xdm/Xsession2016-05-25 12:34:18.0 +0200
+++ new/etc/X11/xdm/Xsession2017-07-25 11:58:00.06708 +0200
@@ -123,7 +123,7 @@
 for errfile in "${HOME}/.xsession-errors" \
"${TMPDIR:-/tmp}/xerr-${USER}-${DISPLAY}"
 do
-stderr=$(readlink -f /dev/stderr 2>/dev/null)
+stderr=$(readlink -fs /dev/stderr)
 
 # Some DM seem to handle this them self
 case "$stderr" in




commit xdm for openSUSE:Factory

2017-02-10 Thread root
Hello community,

here is the log from the commit of package xdm for openSUSE:Factory checked in 
at 2017-02-10 09:47:24

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  2017-01-11 11:52:53.454647033 
+0100
+++ /work/SRC/openSUSE:Factory/.xdm.new/xdm.changes 2017-02-10 
09:47:25.743388919 +0100
@@ -1,0 +2,8 @@
+Mon Feb  6 13:20:21 UTC 2017 - sndir...@suse.com
+
+- no longer try to configure Linux console and X11 keymaps 
+  according to setting in /etc/vconsole.conf; this needs to be done
+  via localectl by YaST itself now; /etc/X11/xdm/keytable removed 
+  and no longer invoked by /usr/lib/X11/display-manager (bnc#1023211)
+
+---



Other differences:
--
++ xdm.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/etc/X11/xdm/keytable new/etc/X11/xdm/keytable
--- old/etc/X11/xdm/keytable2015-01-29 15:56:19.0 +0100
+++ new/etc/X11/xdm/keytable1970-01-01 01:00:00.0 +0100
@@ -1,77 +0,0 @@
-#! /bin/bash
-
-if [ $UID -ne 0 ]; then
-  echo "You need to be root to run this program"
-  exit 0
-fi
-
-vconsole_conf_file=/etc/vconsole.conf
-sysconfig_file=/etc/sysconfig/keyboard
-previous_x11conf_file=/etc/X11/xorg.conf.d/90-keytable.conf
-systemd_x11conf_file=/etc/X11/xorg.conf.d/00-keyboard.conf
-keyboard_map_systemd=/usr/share/systemd/kbd-model-map
-
-function setkeyboard {
-  echo "Command: localectl set-keymap $1"
-  # xorg.conf.d snippet is only written if a valid snippet is already
-  # available, so create an us sample if neccessary
-  if [ ! -f $systemd_x11conf_file ]; then
-localectl set-x11-keymap us
-  fi
-  
-  # check systemd mapping
-  NEWKEYMAP=$(echo "$1" | sed "s/ $//" )
-  opts=$(grep -P "^$NEWKEYMAP\t" "$keyboard_map_systemd" | sed -re 
"s/[^\t]*//" -e "s/[\t]+/ /g" )
-  if [ -z "$opts" ]; then
- echo "W: Cannot find mapping for $NEWKEYMAP in $keyboard_map_systemd"
- echo "W: This will result in an 'us' X keyboard layout as default"
-  else
- echo "I: Using systemd $keyboard_map_systemd mapping"
-  fi
-  
-  localectl set-keymap $1
-  if [ -f $systemd_x11conf_file ]; then
-if [ $systemd_x11conf_file -nt $previous_x11conf_file ]; then
-  rm -f $previous_x11conf_file
-fi
-exit 0
-  else
-echo "$systemd_x11conf_file has not been created!" 
-  fi
-}
-
-if [ -f $vconsole_conf_file ]; then
-  echo "$vconsole_conf_file available"
-  . $vconsole_conf_file
-  if [ ! -z $KEYMAP ]; then
-echo "KEYMAP: $KEYMAP"
-options="$KEYMAP $KEYMAP_TOGGLE"
-setkeyboard "$options"
-  else
-echo "KEYMAP not set"
-  fi 
-else
-  echo "$vconsole_conf_file not available"
-fi
-
-if [ -f $sysconfig_file ]; then
-  echo "$sysconfig_file available"
-  . $sysconfig_file
-  if [ ! -z $KEYTABLE ]; then
-   # KEYTABLE=${KEYTABLE%%.*} can not be used, because 
-   # lt.baltic.map.gz, lt.std.map.gz, lt.l4.map.gz 
-   # and defkeymap_V1.0 have dot before .map.gz
-KEYTABLE=${KEYTABLE%.gz}
-KEYTABLE=${KEYTABLE%.map}
-echo "KEYTABLE: $KEYTABLE"
-options="$KEYTABLE"
-setkeyboard "$options"
-  else
-echo "KEYTABLE not set"
-  fi
-else
-  echo "$sysconfig_file not available"
-fi
-
-echo "Keyboard layout could not be set"
-exit 1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/usr/lib/X11/display-manager 
new/usr/lib/X11/display-manager
--- old/usr/lib/X11/display-manager 2015-10-07 09:25:18.0 +0200
+++ new/usr/lib/X11/display-manager 2017-02-06 14:19:33.541035000 +0100
@@ -144,11 +144,6 @@
 case "$1" in
 start)
 
-   # use system keyboard as global X keyboard configuration
-   if [ -x /etc/X11/xdm/keytable ]; then
-  /etc/X11/xdm/keytable
-   fi
-
[ -n "$STARTPROC" ] && $STARTPROC
echo -n "Starting service $DM"
# Don't start xdm if no Xserver is configured and xdm is not 




commit xdm for openSUSE:Factory

2016-08-31 Thread h_root
Hello community,

here is the log from the commit of package xdm for openSUSE:Factory checked in 
at 2016-08-31 14:27:55

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  2016-06-29 15:03:33.0 
+0200
+++ /work/SRC/openSUSE:Factory/.xdm.new/xdm.changes 2016-08-31 
14:27:56.0 +0200
@@ -1,0 +2,8 @@
+Tue Aug 23 11:51:55 UTC 2016 - e...@suse.com
+
+- spec-file:
+  Move '%fillup_only -n displaymanager' into %else
+  clause of test for initV/systemd as this is only
+  required for systemd.
+
+---



Other differences:
--
++ xdm.spec ++
--- /var/tmp/diff_new_pack.a2D3ns/_old  2016-08-31 14:27:57.0 +0200
+++ /var/tmp/diff_new_pack.a2D3ns/_new  2016-08-31 14:27:57.0 +0200
@@ -177,8 +177,8 @@
 %{fillup_and_insserv -Y xdm}
 %else
 %service_add_post display-manager.service
-%endif
 %{fillup_only -n displaymanager}
+%endif
 
 %pre
 %if !0%{?suse_version} < 1315




commit xdm for openSUSE:Factory

2016-06-29 Thread h_root
Hello community,

here is the log from the commit of package xdm for openSUSE:Factory checked in 
at 2016-06-29 15:03:32

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  2016-06-10 23:58:58.0 
+0200
+++ /work/SRC/openSUSE:Factory/.xdm.new/xdm.changes 2016-06-29 
15:03:33.0 +0200
@@ -1,0 +2,6 @@
+Mon Jun 20 16:45:23 UTC 2016 - e...@suse.com
+
+- Change 'Supplements: xdm' to 'Enhances: xdm'
+  to accomodate the Gnome community (boo#981372).
+
+---



Other differences:
--
++ xdm.spec ++
--- /var/tmp/diff_new_pack.pv0CoA/_old  2016-06-29 15:03:34.0 +0200
+++ /var/tmp/diff_new_pack.pv0CoA/_new  2016-06-29 15:03:34.0 +0200
@@ -101,7 +101,7 @@
 Summary:User/System Xsession Desktop File
 Group:  System/X11/Utilities
 Requires:   xdm
-Supplements:xdm
+Enhances:   xdm
 
 %description xsession
 This package contains the System desktop file which will cause




commit xdm for openSUSE:Factory

2016-06-10 Thread h_root
Hello community,

here is the log from the commit of package xdm for openSUSE:Factory checked in 
at 2016-06-10 23:58:56

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  2016-05-13 09:21:42.0 
+0200
+++ /work/SRC/openSUSE:Factory/.xdm.new/xdm.changes 2016-06-10 
23:58:58.0 +0200
@@ -1,0 +2,22 @@
+Fri Jun 03 13:49:07 UTC 2016 - pjano...@suse.de
+
+- spec-cleaner cleanups
+
+---
+Fri Jun 03 13:48:56 UTC 2016 - e...@suse.com
+
+- xdm.tar.bz2:
+  sys.xsession - factor out scriptlets to add services
+  to start in the context of a desktop session. These
+  scriptlets sould be shipped with their respective
+  services, not with xdm.
+  Check etc/X11/sdm/scripts/xsession-sriptlets.HOWTO for
+  further details (boo#972787).
+
+---
+Wed May 25 10:44:56 UTC 2016 - wer...@suse.de
+
+- Simplify dbus detection to support all kind of (boo#980521) 
+- Avoid option --write-env-file for newer gpg (boo#972787)
+
+---



Other differences:
--
++ xdm.spec ++
--- /var/tmp/diff_new_pack.etsfvt/_old  2016-06-10 23:58:59.0 +0200
+++ /var/tmp/diff_new_pack.etsfvt/_new  2016-06-10 23:58:59.0 +0200
@@ -16,20 +16,20 @@
 #
 
 
+%define _dminitdir %{_libexecdir}/X11/displaymanagers
 %if 0%{?suse_version} > 1230
 %define with_systemd 1
 %else
 %define with_systemd 0
 %endif
-
-%define _dminitdir %{_libexecdir}/X11/displaymanagers
-
 %if 0%{?suse_version} < 01210
 %define dm_fallbacks 1
 %else
 %define dm_fallbacks 0
 %endif
-
+%if !%with_systemd
+%define _unitdir %{_prefix}/lib/systemd/system
+%endif
 Name:   xdm
 Version:1.1.11
 Release:0
@@ -43,14 +43,7 @@
 Source3:xdm-fallbacks.tar.bz2
 Source4:display-manager.service
 Source5:xsession.desktop
-%if !%with_systemd
-Patch0: xdm-consolekit.diff
-%endif
 Patch1: xdm-tolerant-hostname-changes.diff
-%if 0%{?suse_version} >= 01140 && 0%{?suse_version} < 1320
-# Needed to create the man page symlink to init.d
-BuildRequires:  aaa_base-extras
-%endif
 # needed for patch0, patch2, patch3, patch4
 BuildRequires:  libtool
 BuildRequires:  pam-devel
@@ -67,13 +60,6 @@
 BuildRequires:  pkgconfig(xpm)
 BuildRequires:  pkgconfig(xt)
 BuildRequires:  pkgconfig(xtrans)
-%if !%with_systemd
-BuildRequires:  ConsoleKit-devel
-Requires:   ConsoleKit
-%else
-BuildRequires:  systemd-rpm-macros
-%{?systemd_requires}
-%endif
 Requires:   /sbin/pidof
 Requires:   logrotate
 Requires:   sessreg
@@ -83,18 +69,28 @@
 Requires:   xrdb
 Requires:   xset
 Requires:   xsetroot
-%if 0%{?suse_version} > 1320
-Requires:   xterm-bin
-%else
-Requires:   xterm
-%endif
 Recommends: dbus-1-x11
 # This was part of the xorg-x11 package up to version 7.6
 Conflicts:  xorg-x11 <= 7.6
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
-
 %if !%with_systemd
-%define _unitdir /usr/lib/systemd/system
+Patch0: xdm-consolekit.diff
+%endif
+%if 0%{?suse_version} >= 01140 && 0%{?suse_version} < 1320
+# Needed to create the man page symlink to init.d
+BuildRequires:  aaa_base-extras
+%endif
+%if !%with_systemd
+BuildRequires:  ConsoleKit-devel
+Requires:   ConsoleKit
+%else
+BuildRequires:  systemd-rpm-macros
+%{?systemd_requires}
+%endif
+%if 0%{?suse_version} > 1320
+Requires:   xterm-bin
+%else
+Requires:   xterm
 %endif
 
 %description
@@ -110,7 +106,7 @@
 %description xsession
 This package contains the System desktop file which will cause 
 the execution of a user provided $HOME/.xsession script or pick 
-the system wide DM default set in /etc/sysconfig/displaymanager.
+the system wide DM default set in %{_sysconfdir}/sysconfig/displaymanager.
 
 %prep
 %setup -q
@@ -159,7 +155,7 @@
 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}
-%__install -D %{S:5} -m 0644 %{buildroot}%{_datadir}/xsessions/xsession.desktop
+install -D %{SOURCE5} -m 0644 
%{buildroot}%{_datadir}/xsessions/xsession.desktop
 %if 0%{?suse_version} < 1315
 # missing manual page
 mkdir -p %{buildroot}%{_mandir}/man8
@@ -167,7 +163,7 @@
 ln -sf %{_sysconfdir}/init.d/xdm %{buildroot}%{_sbindir}/rcxdm
 %else
 rm -f %{buildroot}%{_sbindir}/rcxdm
-%__install -D %{S:4} -m 0444 %{buildroot}%{_unitdir}/display-manager.service
+install -D %{SOURCE4} -m 0444 

commit xdm for openSUSE:Factory

2016-05-13 Thread h_root
Hello community,

here is the log from the commit of package xdm for openSUSE:Factory checked in 
at 2016-05-13 09:21:41

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  2016-04-05 10:41:34.0 
+0200
+++ /work/SRC/openSUSE:Factory/.xdm.new/xdm.changes 2016-05-13 
09:21:42.0 +0200
@@ -1,0 +2,13 @@
+Fri May  6 21:14:31 UTC 2016 - e...@suse.com
+
+- Make SUSEconfig handler for DISPLAYMANAGER_XSERVER_TCP_PORT_6000_OPEN
+  robust against changes to the default setting of -listen/-nolisten tcp
+  (boo#978262).
+
+---
+Wed May  4 12:55:38 UTC 2016 - e...@suse.com
+
+- Prevent xdm.service from being built. We've got display-manager.service
+  instead (bsc#978458).
+
+---



Other differences:
--
++ xdm.spec ++
--- /var/tmp/diff_new_pack.NM2khi/_old  2016-05-13 09:21:43.0 +0200
+++ /var/tmp/diff_new_pack.NM2khi/_new  2016-05-13 09:21:43.0 +0200
@@ -129,7 +129,8 @@
 --disable-static \
 --with-pam \
 --with-xdmconfigdir=%{_sysconfdir}/X11/xdm \
---with-xdmscriptdir=%{_sysconfdir}/X11/xdm
+--with-xdmscriptdir=%{_sysconfdir}/X11/xdm \
+   --with-systemdsystemunitdir=no
 make %{?_smp_mflags}
 
 %install

++ xdm.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/etc/X11/xdm/SUSEconfig.xdm 
new/etc/X11/xdm/SUSEconfig.xdm
--- old/etc/X11/xdm/SUSEconfig.xdm  2014-03-04 13:53:31.0 +0100
+++ new/etc/X11/xdm/SUSEconfig.xdm  2016-05-07 07:53:41.0 +0200
@@ -78,9 +78,15 @@
sed -ri 's/^#[[:blank:]]*(:[0-9][[:blank:]]+local[[:blank:]]+)/\1/g' 
${file}.SuSEconfig
 fi
 if   test "$DISPLAYMANAGER_XSERVER_TCP_PORT_6000_OPEN" = "no" ; then
-sed -ri 
's%(.*/usr/bin/X)[[:blank:]]*(-nolisten[[:blank:]]*tcp[[:blank:]]*|)%\1 
-nolisten tcp %g' ${file}.SuSEconfig
+sed -ri 
's%(.*/usr/bin/X)[[:blank:]]*(-(no|)listen[[:blank:]]*tcp[[:blank:]]*|)%\1 
-nolisten tcp %g' ${file}.SuSEconfig
 elif test "$DISPLAYMANAGER_XSERVER_TCP_PORT_6000_OPEN" = "yes" ; then
-sed -ri 's%(.*/usr/bin/X)[[:blank:]]*-nolisten tcp[[:blank:]]*%\1 %g' 
${file}.SuSEconfig
+   eval $(/usr/bin/Xorg -version 2>&1| grep "^X.Org" | sed -e 's%.* 
\([0-9]\+\)\.\([0-9]\+\).*%{ max=\1; min=\2; }%')
+   if [ -n "$max" -a -n "$min" ] && [ $max -gt 1 -o $min -ge 17 ]
+   then
+sed -ri 
's%(.*/usr/bin/X)[[:blank:]]*(-(no|)listen[[:blank:]]*tcp[[:blank:]]*|)%\1 
-listen tcp %g' ${file}.SuSEconfig
+   else
+sed -ri 
's%(.*/usr/bin/X)[[:blank:]]*(-(no|)listen[[:blank:]]*tcp[[:blank:]]*|)%\1 %g' 
${file}.SuSEconfig
+   fi
 fi
 check_md5_and_move $file
 fi




commit xdm for openSUSE:Factory

2016-04-05 Thread h_root
Hello community,

here is the log from the commit of package xdm for openSUSE:Factory checked in 
at 2016-04-05 10:41:33

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  2016-03-07 15:02:31.0 
+0100
+++ /work/SRC/openSUSE:Factory/.xdm.new/xdm.changes 2016-04-05 
10:41:34.0 +0200
@@ -1,0 +2,15 @@
+Wed Mar 30 13:42:53 UTC 2016 - e...@suse.com
+
+- xsession.desktop file:
+  * created xsession sub-package for this file.
+  * changed descriptive message to "User/System Default"
+  (boo#971852).
+
+---
+Wed Mar 30 13:40:00 UTC 2016 - e...@suse.com
+
+- xdm.tar.bz:
+  Fixed Xsession script to cull the locale form the arguments before
+  passing them on (boo#973045).
+
+---

New:

  xsession.desktop



Other differences:
--
++ xdm.spec ++
--- /var/tmp/diff_new_pack.k6YFfr/_old  2016-04-05 10:41:36.0 +0200
+++ /var/tmp/diff_new_pack.k6YFfr/_new  2016-04-05 10:41:36.0 +0200
@@ -42,6 +42,7 @@
 Source2:HOWTO.xdm
 Source3:xdm-fallbacks.tar.bz2
 Source4:display-manager.service
+Source5:xsession.desktop
 %if !%with_systemd
 Patch0: xdm-consolekit.diff
 %endif
@@ -100,6 +101,17 @@
 Xdm manages a collection of X displays, which may be on the local host
 or remote servers.
 
+%package xsession
+Summary:User/System Xsession Desktop File
+Group:  System/X11/Utilities
+Requires:   xdm
+Supplements:xdm
+
+%description xsession
+This package contains the System desktop file which will cause 
+the execution of a user provided $HOME/.xsession script or pick 
+the system wide DM default set in /etc/sysconfig/displaymanager.
+
 %prep
 %setup -q
 cp %{SOURCE2} .
@@ -146,6 +158,7 @@
 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}
+%__install -D %{S:5} -m 0644 %{buildroot}%{_datadir}/xsessions/xsession.desktop
 %if 0%{?suse_version} < 1315
 # missing manual page
 mkdir -p %{buildroot}%{_mandir}/man8
@@ -228,8 +241,6 @@
 %{_libdir}/X11/xdm/
 %dir %{_datadir}/X11/app-defaults
 %{_datadir}/X11/app-defaults/Chooser
-%dir %{_datadir}/xsessions
-%{_datadir}/xsessions/xsession.desktop
 %{_mandir}/man1/chooser.1%{?ext_man}
 %{_mandir}/man1/xdm.1%{?ext_man}
 %if 0%{?suse_version} < 1315
@@ -239,4 +250,8 @@
 %dir %{_libdir}/X11
 %endif
 
+%files xsession
+%dir %{_datadir}/xsessions
+%{_datadir}/xsessions/xsession.desktop
+
 %changelog

++ xdm.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/etc/X11/xdm/Xsession new/etc/X11/xdm/Xsession
--- old/etc/X11/xdm/Xsession2016-03-01 16:02:42.0 +0100
+++ new/etc/X11/xdm/Xsession2016-03-30 14:56:14.0 +0200
@@ -216,6 +216,7 @@
 ;;
[a-z][a-z]_[A-Z][A-Z]*)
export GDM_LANG=$l
+unset argv[$argc] # remove from command line: not an argument
test $extra_env_settings = yes && parse_error=1
 ;;
 *)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/usr/share/xsessions/xsession.desktop 
new/usr/share/xsessions/xsession.desktop
--- old/usr/share/xsessions/xsession.desktop2016-02-27 12:51:11.0 
+0100
+++ new/usr/share/xsessions/xsession.desktop1970-01-01 01:00:00.0 
+0100
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Name=User Xsession
-Type=Xsession
-Encoding=UTF-8
-Exec=default

++ xsession.desktop ++
[Desktop Entry]
Name=User/System Default
Type=Xsession
Encoding=UTF-8
Exec=default



commit xdm for openSUSE:Factory

2016-03-07 Thread h_root
Hello community,

here is the log from the commit of package xdm for openSUSE:Factory checked in 
at 2016-03-07 15:02:29

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  2016-02-23 16:52:40.0 
+0100
+++ /work/SRC/openSUSE:Factory/.xdm.new/xdm.changes 2016-03-07 
15:02:31.0 +0100
@@ -1,0 +2,28 @@
+Thu Mar  3 15:31:51 UTC 2016 - e...@suse.com
+
+- After boo#968405 got fixed in /etc/rpm/macros.systemd, resurrect the old 
+  behavior of %postun (boo#968405).
+
+---
+Sat Feb 27 11:53:42 UTC 2016 - e...@suse.com
+
+- xdm.tar.bz:
+  * /etc/X11/xdm/sys.xsession: 
+fix regression from fix for boo#967002 (boo#968172).
+  * /etc/X11/xdm/Xsession:
++ Add comments for documentation
++ Fix semantics
++ Don't use $HOME/.xinitrc as session script. Let sys.xession
+  handle this.
++ Make argument parser more robust:
+  add parse error detection.
+  * Add an 'xsession' desktop file: this should offer a session 
+where the $HOME/.xsession is used (boo#968631).
+  
+---
+Fri Feb 26 12:46:53 UTC 2016 - e...@suse.com
+
+- Remove %service_del_postun display-manager.service
+  from %postun macro (boo#968405). 
+
+---



Other differences:
--
++ xdm.spec ++
--- /var/tmp/diff_new_pack.RjOUrZ/_old  2016-03-07 15:02:32.0 +0100
+++ /var/tmp/diff_new_pack.RjOUrZ/_new  2016-03-07 15:02:32.0 +0100
@@ -180,8 +180,7 @@
 %{insserv_cleanup}
 %else
 # Do not restart DM on update (bnc#886641)
-export DISABLE_RESTART_ON_UPDATE=yes
-%service_del_postun display-manager.service
+%service_del_postun -n display-manager.service
 %endif
 
 %preun
@@ -229,6 +228,8 @@
 %{_libdir}/X11/xdm/
 %dir %{_datadir}/X11/app-defaults
 %{_datadir}/X11/app-defaults/Chooser
+%dir %{_datadir}/xsessions
+%{_datadir}/xsessions/xsession.desktop
 %{_mandir}/man1/chooser.1%{?ext_man}
 %{_mandir}/man1/xdm.1%{?ext_man}
 %if 0%{?suse_version} < 1315

++ xdm.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/etc/X11/xdm/Xsession new/etc/X11/xdm/Xsession
--- old/etc/X11/xdm/Xsession2014-12-03 10:57:43.0 +0100
+++ new/etc/X11/xdm/Xsession2016-03-01 16:02:42.0 +0100
@@ -46,6 +46,7 @@
 # `set' in their profile files.
 #
 argv=("$@")
+cmdln="$@"
 
 #
 # Handle the NoChange option of wdm 
@@ -179,6 +180,11 @@
 export WINDOWMANAGER
 
 #
+# Some traditional system X sessions
+#
+sessions=( $XDMDIR/sys.xsession $XINITDIR/xinitrc )
+
+#
 # By default we set system defaults for the language
 #
 . /etc/profile.d/lang.sh
@@ -187,12 +193,18 @@
 # Handle arguments given by xdm/kdm/gdm.
 #
 forced=no
+parse_error=no
+extra_env_settings=no
+#
+# Parse commandline of the form:
+# env [ FOO=bar ... ] startwm [args1 ..] [ab_AB.UTF-8] [args2 ..]
 if test ${#argv[@]} -gt 0 ; then
 typeset -i argc=0
 for l in ${argv[@]} ; do
case "$l" in
 # extra environment variables settings
 "env")
+   test $extra_env_settings = yes && parse_error=1
 extra_env_settings="yes"
 unset argv[$argc]
 ;;
@@ -203,8 +215,8 @@
 fi
 ;;
[a-z][a-z]_[A-Z][A-Z]*)
-   GDM_LANG=$l
-   break
+   export GDM_LANG=$l
+   test $extra_env_settings = yes && parse_error=1
 ;;
 *)
 # stop extracting env info after the first one that's not an 
ENV
@@ -217,25 +229,41 @@
 # argv is an array with index starting from 0
let argc++ || :
 done
-unset argv[$argc]
+test $parse_error = yes && echo "Parse error: $cmdln" >&2
+unset cmdln
 unset l
 
 # get Window Manager only after the previous argument processing.
 #
-# reset the parameter array for convenience
+# reset the parameter array as some parameters may have been unset
+# and sourced scripts may have done a set -- ...
 argv=("${argv[@]}")
 case "${argv[0]}" in
-failsafe)  exec $failsafe   ;;
-default)   ;;
-custom);;
-*) forced=yes
-   WINDOWMANAGER=${argv[0]} ;;
+failsafe)
+   exec $failsafe   ;;
+default|custom)
+   sessions=( $HOME/.xsession "${sessions[@]}" )
+   ;;
+*)
+   forced=yes
+   WINDOWMANAGER="${argv[0]}"
 esac
-
+else
+#
+# Xdm does 

commit xdm for openSUSE:Factory

2016-02-23 Thread h_root
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.0 
+0100
+++ /work/SRC/openSUSE:Factory/.xdm.new/xdm.changes 2016-02-23 
16:52:40.0 +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.0 +0100
+++ /var/tmp/diff_new_pack.vlOeUM/_new  2016-02-23 16:52:41.0 +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.xsession2014-10-08 11:42:23.0 +0200
+++ new/etc/X11/xdm/sys.xsession2016-02-17 12:32:37.0 +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")

commit xdm for openSUSE:Factory

2015-11-08 Thread h_root
Hello community,

here is the log from the commit of package xdm for openSUSE:Factory checked in 
at 2015-11-08 11:25:14

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-10-22 12:57:32.0 
+0200
+++ /work/SRC/openSUSE:Factory/.xdm.new/xdm.changes 2015-11-08 
11:25:16.0 +0100
@@ -1,0 +2,7 @@
+Wed Nov  4 12:51:56 UTC 2015 - e...@suse.com
+
+- rename SuSEconfig.xdm
+  * /etc/X11/xdm/SuSEconfig.xdm -> /etc/X11/xdm/SUSEconfig.xdm
+  * created a symlink for the old file (bsc#953563).
+
+---



Other differences:
--
++ xdm.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/etc/X11/xdm/SUSEconfig.xdm 
new/etc/X11/xdm/SUSEconfig.xdm
--- old/etc/X11/xdm/SUSEconfig.xdm  1970-01-01 01:00:00.0 +0100
+++ new/etc/X11/xdm/SUSEconfig.xdm  2014-03-04 13:53:31.0 +0100
@@ -0,0 +1,107 @@
+#!/bin/bash
+#
+# Copyright (c) 2001 SuSE GmbH Nuernberg, Germany.
+# Copyright (c) 2008 SuSE LINUX Products GmbH, Germany.
+# Author: Werner Fink  
+
+check_md5_and_move() # Usage: check_md5_and_move file_name-without.SuSEconfig
+{
+# This function checks the existence of a file (specified without the
+# extension .SuSEconfig and without "$r") and a corresponding md5 checksum
+# and tests whether the time stamp of the file has changed.
+# If it has, nothing further will happen. If not, the "file.SuSEconfig"
+# will be moved to "file".
+
+FILE=$1
+if test -n "$r" ; then
+RELPATH=`echo $FILE | sed -e"s:^$r::"`
+else
+RELPATH=$FILE
+fi
+MD5FILE=$MD5DIR/$RELPATH
+#
+# make sure that the directory exists
+mkdir -p `dirname $MD5FILE`
+NEWMD5SUM="`cat $FILE.SuSEconfig | grep -v "^#" | md5sum`"
+if test ! -s $FILE ; then
+touch $FILE
+rm -f $MD5FILE
+fi
+if test "$FORCE_REPLACE" = true ; then
+cp -p $FILE.SuSEconfig $FILE
+fi
+USERMD5SUM="`cat $FILE | grep -v "^#" | md5sum`"
+test -e $MD5FILE || echo "$USERMD5SUM" > $MD5FILE
+OLDMD5SUM="`cat $MD5FILE`"
+if test "$USERMD5SUM" != "$OLDMD5SUM" -a \
+"$USERMD5SUM" != "$NEWMD5SUM" ; then
+echo
+echo "ATTENTION: You have modified $RELPATH.  Leaving it untouched..."
+echo "You can find my version in $FILE.SuSEconfig..."
+echo
+else
+if test "$USERMD5SUM" != "$NEWMD5SUM" -o "$FORCE_REPLACE" = true ; then
+echo "Installing new $RELPATH"
+cp -p $FILE.SuSEconfig $FILE
+else
+test "$VERBOSE" = false || echo "No changes for $RELPATH"
+fi
+rm -f $FILE.SuSEconfig
+fi
+rm -f $MD5FILE
+echo "$NEWMD5SUM" > $MD5FILE
+}
+
+type -p sed  &> /dev/null || {
+echo "${0##*/}: No sed  in PATH ... skipping"
+exit 0
+}
+
+r=$ROOT
+test -f $r/etc/sysconfig/displaymanager || {
+echo "${0##*/}: No $r/etc/sysconfig/displaymanager found."
+exit 1
+}
+. $r/etc/sysconfig/displaymanager
+
+test -z "$MD5DIR" && {
+MD5DIR=/var/adm/SuSEconfig/md5
+echo "Using MD5DIR=\"$MD5DIR\"..."
+}
+
+if test -r $r/etc/X11/xdm/Xservers -a $r/etc/sysconfig/displaymanager -nt 
$r/etc/X11/xdm/Xservers; then
+file=$r/etc/X11/xdm/Xservers
+cp -p $file ${file}.SuSEconfig
+if   test "$DISPLAYMANAGER_STARTS_XSERVER" = "no"  ; then
+   sed -ri 's/^(:[0-9][[:blank:]]+local[[:blank:]]+)/#\1/g' 
${file}.SuSEconfig
+elif test "$DISPLAYMANAGER_STARTS_XSERVER" = "yes" ; then
+   sed -ri 's/^#[[:blank:]]*(:[0-9][[:blank:]]+local[[:blank:]]+)/\1/g' 
${file}.SuSEconfig
+fi
+if   test "$DISPLAYMANAGER_XSERVER_TCP_PORT_6000_OPEN" = "no" ; then
+sed -ri 
's%(.*/usr/bin/X)[[:blank:]]*(-nolisten[[:blank:]]*tcp[[:blank:]]*|)%\1 
-nolisten tcp %g' ${file}.SuSEconfig
+elif test "$DISPLAYMANAGER_XSERVER_TCP_PORT_6000_OPEN" = "yes" ; then
+sed -ri 's%(.*/usr/bin/X)[[:blank:]]*-nolisten tcp[[:blank:]]*%\1 %g' 
${file}.SuSEconfig
+fi
+check_md5_and_move $file
+fi
+
+if test -n "$DISPLAYMANAGER_XSERVER" -a -x "/usr/bin/$DISPLAYMANAGER_XSERVER" 
; then
+test -d /var/lib/X11 && ln -snf "/usr/bin/$DISPLAYMANAGER_XSERVER" 
/var/lib/X11/X
+else
+test -d /var/lib/X11 && ln -snf /usr/bin/Xorg /var/lib/X11/X
+fi
+
+if test -r $r/etc/X11/xdm/xdm-config -a $r/etc/sysconfig/displaymanager -nt 
$r/etc/X11/xdm/xdm-config; then
+file=$r/etc/X11/xdm/xdm-config
+cp -p $file ${file}.SuSEconfig
+if   test "$DISPLAYMANAGER_REMOTE_ACCESS" = "yes"  ; then
+   sed -ri 

commit xdm for openSUSE:Factory

2015-10-22 Thread h_root
Hello community,

here is the log from the commit of package xdm for openSUSE:Factory checked in 
at 2015-10-22 12:57:30

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-10-03 20:29:44.0 
+0200
+++ /work/SRC/openSUSE:Factory/.xdm.new/xdm.changes 2015-10-22 
12:57:32.0 +0200
@@ -1,0 +2,10 @@
+Wed Oct  7 07:25:37 UTC 2015 - dims...@opensuse.org
+
+- Fix display-manager wrapper: only call TakeDevices in case $DM
+  actually fails to start. This was the reason why gdm often failed
+  to start with permission denied (depending on timing, gdm might
+  fired up X before TakeDevices passed, X would receive the tty7
+  by means of logind and TakeDevices reset the permissions again)
+  (boo#939594).
+
+---



Other differences:
--
++ xdm.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/usr/lib/X11/display-manager 
new/usr/lib/X11/display-manager
--- old/usr/lib/X11/display-manager 2015-07-31 12:34:37.0 +0200
+++ new/usr/lib/X11/display-manager 2015-10-07 09:25:18.0 +0200
@@ -183,16 +183,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
;;




commit xdm for openSUSE:Factory

2015-10-03 Thread h_root
Hello community,

here is the log from the commit of package xdm for openSUSE:Factory checked in 
at 2015-10-03 20:29:32

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-08-19 13:41:32.0 
+0200
+++ /work/SRC/openSUSE:Factory/.xdm.new/xdm.changes 2015-10-03 
20:29:44.0 +0200
@@ -1,0 +2,8 @@
+Mon Sep 14 11:48:31 UTC 2015 - dims...@opensuse.org
+
+- display-manager.service: require and conflict getty@tty7.service:
+  this is copied from gdm.service and is hopefully helping with
+  the race condition, where X is often not able to start up on
+  VT7 due to missing permissions. (boo#939594)
+
+---
@@ -28,0 +37,5 @@
+
+---
+Mon Jul 20 12:52:59 UTC 2015 - sndir...@suse.com
+
+- rename README.SuSE file to README.SUSE (bnc#938737, FATE#316521)



Other differences:
--
++ xdm.spec ++
--- /var/tmp/diff_new_pack.hg6q57/_old  2015-10-03 20:29:45.0 +0200
+++ /var/tmp/diff_new_pack.hg6q57/_new  2015-10-03 20:29:45.0 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package xdm
 #
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 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

++ display-manager.service ++
--- /var/tmp/diff_new_pack.hg6q57/_old  2015-10-03 20:29:45.0 +0200
+++ /var/tmp/diff_new_pack.hg6q57/_new  2015-10-03 20:29:45.0 +0200
@@ -1,9 +1,10 @@
 [Unit]
 Description=X Display Manager
 Requires=var-run.mount
+Conflicts=getty@tty7.service plymouth-quit.service
 After=ypbind.service gpm.service time-sync.target winbind.service acpid.service
 Wants=remote-fs.target dbus.socket systemd-user-sessions.service
-After=remote-fs.target dbus.socket systemd-user-sessions.service
+After=remote-fs.target dbus.socket systemd-user-sessions.service 
getty@tty7.service plymouth-quit.service
 
 [Service]
 Type=forking

++ xdm.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/etc/X11/xdm/README.SUSE new/etc/X11/xdm/README.SUSE
--- old/etc/X11/xdm/README.SUSE 1970-01-01 01:00:00.0 +0100
+++ new/etc/X11/xdm/README.SUSE 2014-03-04 13:53:31.0 +0100
@@ -0,0 +1,61 @@
+
+ XDM configuration for SuSE Linux
+ 
+
+
+ xdm-config:   The configuration of xdm.
+   `authName' should be in general MIT-MAGIC-COOKIE-1 --
+   for XDM-AUTHENTICATION-1 which is default for xterminals
+   see man page of xdm and the manual coming with the
+   specific xterminal.
+   NOTE:   In order to use XDMCP this feature the resource
+   DisplayManager.requestPort in xdm-config should
+   be commented out to enable XDMCP.
+
+ Xaccess:  The XDMCP access control file, see note above.
+
+ Xsetup:   Handle all local and remote X Window System consoles.
+   For BackGround pictures go here and read.
+
+ RunChooser:   Handle the remote chooser call. For BackGround pictures
+   go here and read.
+
+ Xstartup: Do log on of the (remote) user. Write utmp/wtmp/lastlog
+   entries for the session.  If system console is used
+   give to the current virtual console to the user
+
+ GiveDevices:   Give the current virtual and logging consoles over
+to the user.  Any other device which should be given
+the user of display :0 should be added herein.
+Called by Xstartup.
+
+ Xreset:   Do log off of the (remote) user. Reset utmp/wtmp/lastlog
+   entries for the session. If system console was used
+   Take back the current virtual console.
+
+ TakeDevices:   Take the current virtual and and logging console back.
+Any other device which was given away should be taken
+back herein. Called by Xreset.
+
+ Xresources:   Disable the possibility to abort the xdm display
+   for any user. They can use --
+
+ Xsession: Setup the xsession and start the xsession script of
+   the user.
+
+ sys.xsession: Fallback for Xsession script
+
+ Xservers: The X server(s) for e.g. local console.
+
+ Xservers.fs:  An alternate Xservers file for system without display
+   being server for X terminals. It is a replacment for
+   Xservers in xdm-config.
+
+ 

commit xdm for openSUSE:Factory

2015-08-19 Thread h_root
Hello community,

here is the log from the commit of package xdm for openSUSE:Factory checked in 
at 2015-08-19 13:41:31

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-08-10 09:14:20.0 
+0200
+++ /work/SRC/openSUSE:Factory/.xdm.new/xdm.changes 2015-08-19 
13:41:32.0 +0200
@@ -1,0 +2,16 @@
+Tue Aug  4 10:00:09 UTC 2015 - e...@suse.com
+
+- Replaced font resources for login screen with font face names.
+  Since xdm is now built with Xft support, it uses face names for
+  client side rendered fonts. The settings for screen widths = 800
+  are the xdm defaults. For smaller screens the sizes are reduced
+  so they fit the screen better (bsc#940263).
+
+---
+Sat Aug  1 08:04:15 UTC 2015 - e...@suse.com
+
+- Avoid confusion of user: add '-' to font names in etc/X11/xdm/Xresources.
+  This is not required for the font names used in the file but some others.
+  (bsc#940263).
+
+---



Other differences:
--
++ xdm.spec ++
--- /var/tmp/diff_new_pack.P4wJrw/_old  2015-08-19 13:41:33.0 +0200
+++ /var/tmp/diff_new_pack.P4wJrw/_new  2015-08-19 13:41:33.0 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package xdm
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed

++ xdm.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/etc/X11/xdm/Xresources new/etc/X11/xdm/Xresources
--- old/etc/X11/xdm/Xresources  2014-03-04 13:53:31.0 +0100
+++ new/etc/X11/xdm/Xresources  2015-08-04 12:13:36.0 +0200
@@ -14,21 +14,19 @@
 xlogin*namePrompt: \040\040\040\040\040\040\040Login:
 xlogin*fail:   Login incorrect
 
-#define FAMILY helvetica
-#define SLANT   o
+#define FAMILY Serif
 #if(WIDTH  800)
-xlogin*login.failFont: *-FAMILY-bold-SLANT-normal--*-120-*-*-*-*-iso8859-1
-xlogin*login.greetFont:
*-FAMILY-bold-SLANT-normal--*-140-*-*-*-*-iso8859-1
-xlogin*login.promptFont:*-FAMILY-bold-r-normal--*-120-*-*-*-*-iso8859-1
-xlogin*login.Font:   *-FAMILY-medium-r-normal--*-120-*-*-*-*-iso8859-1
+xlogin*login.failFace: FAMILY-16:bold
+xlogin*login.greetFace: FAMILY-18:italic
+xlogin*login.promptFace:FAMILY-16:bold
+xlogin*login.Font:   FAMILY-16
 #else
-xlogin*login.failFont: *-FAMILY-bold-SLANT-normal--*-180-*-*-*-*-iso8859-1
-xlogin*login.greetFont:
*-FAMILY-bold-SLANT-normal--*-240-*-*-*-*-iso8859-1
-xlogin*login.promptFont:*-FAMILY-bold-r-normal--*-180-*-*-*-*-iso8859-1
-xlogin*login.Font:   *-FAMILY-medium-r-normal--*-180-*-*-*-*-iso8859-1
+xlogin*login.failFace: FAMILY-18:bold
+xlogin*login.greetFace:FAMILY-24:italic
+xlogin*login.promptFace:FAMILY-18:bold
+xlogin*login.face:   FAMILY-18
 #endif
 #undef  FAMILY
-#undef  SLANT
 
 #ifdef COLOR
 xlogin*useShape:   true
@@ -94,10 +92,10 @@
 Chooser*geometry:  700x500+300+200
 Chooser*allowShellResize:  false
 Chooser*viewport.forceBars:true
-Chooser*label.font:*-new century schoolbook-bold-i-normal-*-240-*
+Chooser*label.font:-*-new century schoolbook-bold-i-normal-*-240-*
 Chooser*label.label:   XDMCP Host Menu from CLIENTHOST
 Chooser*list.font: -*-*-medium-r-normal-*-*-230-*-*-c-*-iso8859-1
-Chooser*Command.font:  *-new century schoolbook-bold-r-normal-*-180-*
+Chooser*Command.font:  -*-new century schoolbook-bold-r-normal-*-180-*
 
 !
 ! Include system wide Xresources




commit xdm for openSUSE:Factory

2015-08-10 Thread h_root
Hello community,

here is the log from the commit of package xdm for openSUSE:Factory checked in 
at 2015-08-10 09:14:18

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-03-18 13:08:03.0 
+0100
+++ /work/SRC/openSUSE:Factory/.xdm.new/xdm.changes 2015-08-10 
09:14:20.0 +0200
@@ -1,0 +2,13 @@
+Fri Jul 31 10:35:19 UTC 2015 - sndir...@suse.com
+
+- display-manager: don't try to kill DM if it's no longer running
+  (bsc#939843)
+
+---
+Wed Jul 29 12:48:28 UTC 2015 - wer...@suse.de
+
+- Add some used programs to the requirement of xdm
+- Use xli aka xsetbg if xpmroot is not available (hint from
+  jemor...@novell.com) 
+
+---



Other differences:
--
++ xdm.spec ++
--- /var/tmp/diff_new_pack.G0iT8C/_old  2015-08-10 09:14:21.0 +0200
+++ /var/tmp/diff_new_pack.G0iT8C/_new  2015-08-10 09:14:21.0 +0200
@@ -76,7 +76,12 @@
 Requires:   /sbin/pidof
 Requires:   logrotate
 Requires:   sessreg
+Requires:   xconsole
+Requires:   xli
+Requires:   xmessage
 Requires:   xrdb
+Requires:   xset
+Requires:   xsetroot
 %if 0%{?suse_version}  1320
 Requires:   xterm-bin
 %else

++ xdm.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/etc/X11/xdm/RunChooser new/etc/X11/xdm/RunChooser
--- old/etc/X11/xdm/RunChooser  2014-12-15 19:34:46.0 +0100
+++ new/etc/X11/xdm/RunChooser  2015-07-29 14:46:22.0 +0200
@@ -53,12 +53,14 @@
 xkbmap=${BINDIR}/setxkbmap
xkbcomp=${BINDIR}/xkbcomp
xpmroot=${BINDIR}/xpmroot
+xsetbg=${BINDIR}/xsetbg
   xsetroot=${BINDIR}/xsetroot
 kdmdesktop=/opt/kde/bin/kdmdesktop
chooser=${BINDIR}/chooser
   xmessage=${BINDIR}/xmessage
   xrdb=${BINDIR}/xrdb
backprg=${BINDIR}/BackGround
+   qiv=${BINDIR}/qiv
 
 #
 # Check if kdm is running and does its own background
@@ -131,6 +133,10 @@
 $xpmroot ${background}.gz
 elif test -s ${background}-a -x $xpmroot ; then
 $xpmroot $background
+elif test -s ${background}-a -x $xsetbg ; then
+$xsetbg $background
+elif test -s ${background}-a -x $qiv ; then
+$qiv  -x $background
 elif test -x $backprg ; then
 $backprg
 else
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/etc/X11/xdm/Xsetup new/etc/X11/xdm/Xsetup
--- old/etc/X11/xdm/Xsetup  2014-12-15 19:34:46.0 +0100
+++ new/etc/X11/xdm/Xsetup  2015-07-29 14:43:57.0 +0200
@@ -61,6 +61,7 @@
 xkbmap=${BINDIR}/setxkbmap
xkbcomp=${BINDIR}/xkbcomp
xpmroot=${BINDIR}/xpmroot
+xsetbg=${BINDIR}/xsetbg
   xsetroot=${BINDIR}/xsetroot
   xconsole=${BINDIR}/xconsole
   xmessage=${BINDIR}/xmessage
@@ -138,6 +139,8 @@
 $xpmroot ${background}.gz
 elif test -s ${background}-a -x $xpmroot ; then
 $xpmroot $background
+elif test -s ${background}-a -x $xsetbg ; then
+$xsetbg $background
 elif test -s ${background}-a -x $qiv ; then
 $qiv  -x $background
 elif test -x $backprg ; then
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/usr/lib/X11/display-manager 
new/usr/lib/X11/display-manager
--- old/usr/lib/X11/display-manager 2014-03-21 10:44:27.0 +0100
+++ new/usr/lib/X11/display-manager 2015-07-31 12:34:37.0 +0200
@@ -211,15 +211,14 @@
rm -f $PIDFILELNK
fi
 
-   test -n $DISPLAYMANAGER_BIN  \
+   if test -n $DISPLAYMANAGER_BIN; then
echo -n Shutting down service ${DISPLAYMANAGER_BIN##*/}
-
-   # 
-   # killproc(8) sleep upto five seconds and sends
-   # SIGKILL if xdm does not terminate within
-   #
-
-   killproc -p $PIDFILE -TERM $DISPLAYMANAGER_BIN
+   # 
+# killproc(8) sleep upto five seconds and sends
+   # SIGKILL if xdm does not terminate within
+   #
+   killproc -p $PIDFILE -TERM $DISPLAYMANAGER_BIN
+   fi
rm -f $PIDFILELNK $PIDFILE
rc_status -v
;;




commit xdm for openSUSE:Factory

2015-03-18 Thread h_root
Hello community,

here is the log from the commit of package xdm for openSUSE:Factory checked in 
at 2015-03-18 13:08:01

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-01-30 23:57:53.0 
+0100
+++ /work/SRC/openSUSE:Factory/.xdm.new/xdm.changes 2015-03-18 
13:08:03.0 +0100
@@ -1,0 +2,6 @@
+Tue Mar 17 13:12:32 UTC 2015 - dvla...@suse.com
+
+- We do have graphics on Power with KVM, so remove ppc64le from
+  changing displaymanager sysconfig 
+
+---



Other differences:
--
++ xdm.spec ++
--- /var/tmp/diff_new_pack.nHuuzf/_old  2015-03-18 13:08:04.0 +0100
+++ /var/tmp/diff_new_pack.nHuuzf/_new  2015-03-18 13:08:04.0 +0100
@@ -126,7 +126,7 @@
 %if %dm_fallbacks
 tar xf %{SOURCE3}
 %endif
-%ifarch s390 s390x ppc64le
+%ifarch s390 s390x
 sed -i -e 
s+DISPLAYMANAGER_REMOTE_ACCESS=.*+DISPLAYMANAGER_REMOTE_ACCESS=\yes\+g \
-e 
s+DISPLAYMANAGER_STARTS_XSERVER=.*+DISPLAYMANAGER_STARTS_XSERVER=\no\+g \
 var/adm/fillup-templates/sysconfig.displaymanager

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit xdm for openSUSE:Factory

2015-01-30 Thread h_root
Hello community,

here is the log from the commit of package xdm for openSUSE:Factory checked in 
at 2015-01-30 23:57:52

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-01-22 21:48:48.0 
+0100
+++ /work/SRC/openSUSE:Factory/.xdm.new/xdm.changes 2015-01-30 
23:57:53.0 +0100
@@ -1,0 +2,7 @@
+Thu Jan 29 14:54:47 UTC 2015 - sndir...@suse.com
+
+- /etc/X11/xdm/keytable
+  * improved warning message, when mapping for console keyboard
+doesn't exist (bnc#914880) 
+
+---



Other differences:
--
++ xdm.spec ++
--- /var/tmp/diff_new_pack.qa7cnN/_old  2015-01-30 23:57:54.0 +0100
+++ /var/tmp/diff_new_pack.qa7cnN/_new  2015-01-30 23:57:54.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package xdm
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 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

++ xdm.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/etc/X11/xdm/keytable new/etc/X11/xdm/keytable
--- old/etc/X11/xdm/keytable2015-01-19 23:56:09.0 +0100
+++ new/etc/X11/xdm/keytable2015-01-29 15:56:19.0 +0100
@@ -23,8 +23,8 @@
   NEWKEYMAP=$(echo $1 | sed s/ $// )
   opts=$(grep -P ^$NEWKEYMAP\t $keyboard_map_systemd | sed -re 
s/[^\t]*// -e s/[\t]+/ /g )
   if [ -z $opts ]; then
- echo W: Can not found mapping for $NEWKEYMAP in $keyboard_map_systemd
- echo W: Please report bug of systemd. 
+ echo W: Cannot find mapping for $NEWKEYMAP in $keyboard_map_systemd
+ echo W: This will result in an 'us' X keyboard layout as default
   else
  echo I: Using systemd $keyboard_map_systemd mapping
   fi

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit xdm for openSUSE:Factory

2015-01-22 Thread h_root
Hello community,

here is the log from the commit of package xdm for openSUSE:Factory checked in 
at 2015-01-22 21:48:41

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  2014-12-22 12:52:40.0 
+0100
+++ /work/SRC/openSUSE:Factory/.xdm.new/xdm.changes 2015-01-22 
21:48:48.0 +0100
@@ -1,0 +2,6 @@
+Sun Jan 18 11:37:29 UTC 2015 - opensuse.lietuviu.ka...@gmail.com
+
+- Don't truncate filenames of lt.baltic.map.gz, lt.std.map.gz, 
+  lt.l4.map.gz and defkeymap_V1.0 too much (bnc#897803).
+
+---



Other differences:
--
++ xdm.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/etc/X11/xdm/keytable new/etc/X11/xdm/keytable
--- old/etc/X11/xdm/keytable2014-03-04 13:53:31.0 +0100
+++ new/etc/X11/xdm/keytable2015-01-19 23:56:09.0 +0100
@@ -9,6 +9,7 @@
 sysconfig_file=/etc/sysconfig/keyboard
 previous_x11conf_file=/etc/X11/xorg.conf.d/90-keytable.conf
 systemd_x11conf_file=/etc/X11/xorg.conf.d/00-keyboard.conf
+keyboard_map_systemd=/usr/share/systemd/kbd-model-map
 
 function setkeyboard {
   echo Command: localectl set-keymap $1
@@ -17,6 +18,17 @@
   if [ ! -f $systemd_x11conf_file ]; then
 localectl set-x11-keymap us
   fi
+  
+  # check systemd mapping
+  NEWKEYMAP=$(echo $1 | sed s/ $// )
+  opts=$(grep -P ^$NEWKEYMAP\t $keyboard_map_systemd | sed -re 
s/[^\t]*// -e s/[\t]+/ /g )
+  if [ -z $opts ]; then
+ echo W: Can not found mapping for $NEWKEYMAP in $keyboard_map_systemd
+ echo W: Please report bug of systemd. 
+  else
+ echo I: Using systemd $keyboard_map_systemd mapping
+  fi
+  
   localectl set-keymap $1
   if [ -f $systemd_x11conf_file ]; then
 if [ $systemd_x11conf_file -nt $previous_x11conf_file ]; then
@@ -46,7 +58,11 @@
   echo $sysconfig_file available
   . $sysconfig_file
   if [ ! -z $KEYTABLE ]; then
-KEYTABLE=${KEYTABLE%%.*}
+   # KEYTABLE=${KEYTABLE%%.*} can not be used, because 
+   # lt.baltic.map.gz, lt.std.map.gz, lt.l4.map.gz 
+   # and defkeymap_V1.0 have dot before .map.gz
+KEYTABLE=${KEYTABLE%.gz}
+KEYTABLE=${KEYTABLE%.map}
 echo KEYTABLE: $KEYTABLE
 options=$KEYTABLE
 setkeyboard $options
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/usr/sbin/rcxdm new/usr/sbin/rcxdm
--- old/usr/sbin/rcxdm  2015-01-22 21:48:49.0 +0100
+++ new/usr/sbin/rcxdm  1970-01-01 01:00:00.0 +0100
@@ -1 +0,0 @@
-symbolic link to /etc/init.d/xdm

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit xdm for openSUSE:Factory

2014-12-22 Thread h_root
Hello community,

here is the log from the commit of package xdm for openSUSE:Factory checked in 
at 2014-12-22 12:54:06

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  2014-12-17 19:14:38.0 
+0100
+++ /work/SRC/openSUSE:Factory/.xdm.new/xdm.changes 2014-12-22 
12:52:40.0 +0100
@@ -1,0 +2,7 @@
+Wed Dec 17 20:38:54 UTC 2014 - dims...@opensuse.org
+
+- On openSUSE  13.2, xterm has been split into xterm-bin for the
+  program and xterm for the app launcher. We only need the program,
+  so conditionall Require xterm-bin.
+
+---



Other differences:
--
++ xdm.spec ++
--- /var/tmp/diff_new_pack.GdMxOK/_old  2014-12-22 12:52:41.0 +0100
+++ /var/tmp/diff_new_pack.GdMxOK/_new  2014-12-22 12:52:41.0 +0100
@@ -77,7 +77,11 @@
 Requires:   logrotate
 Requires:   sessreg
 Requires:   xrdb
+%if 0%{?suse_version}  1320
+Requires:   xterm-bin
+%else
 Requires:   xterm
+%endif
 Recommends: dbus-1-x11
 # This was part of the xorg-x11 package up to version 7.6
 Conflicts:  xorg-x11 = 7.6

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit xdm for openSUSE:Factory

2014-12-17 Thread h_root
Hello community,

here is the log from the commit of package xdm for openSUSE:Factory checked in 
at 2014-12-17 19:15:27

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  2014-10-11 19:25:54.0 
+0200
+++ /work/SRC/openSUSE:Factory/.xdm.new/xdm.changes 2014-12-17 
19:14:38.0 +0100
@@ -1,0 +2,12 @@
+Mon Dec 15 18:37:00 UTC 2014 - Led led...@gmail.com
+
+- fix bashisms in /etc/X11/xdm/* scripts
+
+---
+Wed Dec  3 09:59:41 UTC 2014 - g...@opensuse.org
+
+- unset TMPDIR before executing the final user scripts/shell
+  (boo#907041)
+- start a login shell when using lksh/mksh
+
+---



Other differences:
--
++ xdm.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/etc/X11/xdm/GiveDevices new/etc/X11/xdm/GiveDevices
--- old/etc/X11/xdm/GiveDevices 2014-03-04 13:53:31.0 +0100
+++ new/etc/X11/xdm/GiveDevices 2014-12-15 19:34:46.0 +0100
@@ -11,7 +11,7 @@
 # Author: Werner Fink,   wer...@suse.de
 #
 
-if test -c /dev/tty0  type -p showconsole  /dev/null 21 ; then
+if test -c /dev/tty0  type showconsole /dev/null 21; then
 device=`(showconsole  /dev/tty0) 2/dev/null`
 if test -n $device -a -c $device ; then
chown ${USER}:tty  $device
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/etc/X11/xdm/RunChooser new/etc/X11/xdm/RunChooser
--- old/etc/X11/xdm/RunChooser  2014-03-04 13:53:31.0 +0100
+++ new/etc/X11/xdm/RunChooser  2014-12-15 19:34:46.0 +0100
@@ -13,8 +13,8 @@
  BINDIR=/usr/bin
 
 no_exit_on_failed_exec=1
-type shopt  /dev/null  shopt -s execfail
-set +e  /dev/null
+type shopt 2/dev/null 21  shopt -s execfail
+set +e /dev/null 21
 
 #
 # Background picture:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/etc/X11/xdm/TakeDevices new/etc/X11/xdm/TakeDevices
--- old/etc/X11/xdm/TakeDevices 2014-03-04 13:53:31.0 +0100
+++ new/etc/X11/xdm/TakeDevices 2014-12-15 19:34:46.0 +0100
@@ -10,7 +10,7 @@
 # Author: Werner Fink,   wer...@suse.de
 #
 
-if test -c /dev/tty0  type -p showconsole  /dev/null 21 ; then
+if test -c /dev/tty0  type showconsole /dev/null 21; then
 device=`(exec showconsole  /dev/tty0) 2/dev/null`
 if test -n $device -a -c $device ; then
chown root:tty  $device
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/etc/X11/xdm/Xreset new/etc/X11/xdm/Xreset
--- old/etc/X11/xdm/Xreset  2014-03-04 13:53:31.0 +0100
+++ new/etc/X11/xdm/Xreset  2014-12-15 19:34:46.0 +0100
@@ -16,8 +16,8 @@
 xconsole=${BINDIR}/xconsole
 
 no_exit_on_failed_exec=1
-type shopt  /dev/null  shopt -s execfail
-set +e  /dev/null
+type shopt /dev/null 21  shopt -s execfail
+set +e /dev/null 21
 
 # 
 # Find out if this is a local or remote connection
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/etc/X11/xdm/Xsession new/etc/X11/xdm/Xsession
--- old/etc/X11/xdm/Xsession2014-03-10 09:17:14.0 +0100
+++ new/etc/X11/xdm/Xsession2014-12-03 10:57:43.0 +0100
@@ -102,12 +102,14 @@
 : ${HOSTNAME:=$(hostname -f)}
 export HOSTNAME
 
+unset TMPDIR
+
 case ${cmd} in
 csh|tcsh)
exec -l -a ${cmd} ${shell} -c 'exec $argv:q'  ${@};;
 bash*|zsh)
exec -l -a ${cmd} ${shell} --login -c 'exec ${@}' - ${@};;
-dash|pdksh|*pcksh|ksh*)
+dash|lksh|mksh|*pcksh|ksh*)
exec -l -a ${cmd} ${shell} -l  -c 'exec ${@}' - ${@};;
 *)
exec -l -a ${cmd} ${shell} -c 'exec ${@}' - ${@};;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/etc/X11/xdm/Xsetup new/etc/X11/xdm/Xsetup
--- old/etc/X11/xdm/Xsetup  2014-03-04 13:53:31.0 +0100
+++ new/etc/X11/xdm/Xsetup  2014-12-15 19:34:46.0 +0100
@@ -13,8 +13,8 @@
  BINDIR=/usr/bin
 
 no_exit_on_failed_exec=1
-type shopt  /dev/null  shopt -s execfail
-set +e  /dev/null
+type shopt /dev/null 21  shopt -s execfail
+set +e /dev/null 21
 
 . /etc/sysconfig/displaymanager
 
@@ -22,7 +22,7 @@
 # Check for cpp
 #
 cpp=-nocpp
-type -p cpp  /dev/null  cpp=
+type cpp /dev/null 21  cpp=
 
 #
 # Background picture for plain xdm:
@@ -79,7 +79,7 @@
  xdm=no
 
 test -x ${xdmroot}/xdm  \
-  /sbin/checkproc -p $xdmpid ${xdmroot}/xdm  /dev/null  xdm=yes
+  /sbin/checkproc -p $xdmpid ${xdmroot}/xdm 

commit xdm for openSUSE:Factory

2014-10-11 Thread h_root
Hello community,

here is the log from the commit of package xdm for openSUSE:Factory checked in 
at 2014-10-11 19:25:51

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  2014-10-05 20:30:28.0 
+0200
+++ /work/SRC/openSUSE:Factory/.xdm.new/xdm.changes 2014-10-11 
19:25:54.0 +0200
@@ -1,0 +2,6 @@
+Wed Oct  8 10:15:03 UTC 2014 - wer...@suse.de
+
+- Use the option (--)enable-ssh-support of the gpg-agent if the
+  user has configured this (boo#899647)
+
+---



Other differences:
--
++ 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.xsession2014-05-14 19:46:27.0 +0200
+++ new/etc/X11/xdm/sys.xsession2014-10-08 11:42:23.0 +0200
@@ -7,6 +7,7 @@
 
 #
 # If ssh is configured and ssh-agent is wanted set yes
+# or gpg-agent *with* ssh support is wanted set gpg
 #
 usessh=yes
 
@@ -16,6 +17,26 @@
 usegpg=yes
 
 #
+# Use the file ~/.myagents to overide the defaults
+# and if this does not exist check for enable-ssh-support
+# in ~/.gnupg/gpg-agent.conf
+#
+# Be warned: If usessh=gpg is used then read the manual
+# page gpg-agent below the option --enable-ssh-support
+# and do not forget to use
+#
+#   gpg-connect-agent /bye
+#
+# as otherwise no of the commands ssh/slogin/scp will
+# work!
+#
+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
+fi
+
+#
 # What we do if we fail at least ... emergency fall back.
 #
 failsafe=xterm -ls -T Failsafe -n Failsafe -bg purple -fg white -geometry 
80x24+0+0
@@ -49,15 +70,6 @@
 set --
 
 #
-# No ssh-agent if a ssh session is already provided by an other agent.
-#
-if test $usessh = yes -a -n $GNOME_KEYRING_PID ; then
-if test -S $GNOME_KEYRING_SOCKET -o -d $GNOME_KEYRING_CONTROL; then
-   usessh=no
-fi
-fi
-
-#
 # No gpg-agent if a gpg session is already provided by an other agent.
 #
 if test $usegpg = yes -a -n $GNOME_KEYRING_PID ; then
@@ -82,6 +94,66 @@
 fi
 
 #
+# No ssh-agent if a ssh session is already provided by an other agent.
+#
+if test $usessh = yes -a -n $GNOME_KEYRING_PID ; then
+if test -S $GNOME_KEYRING_SOCKET -o -d $GNOME_KEYRING_CONTROL; then
+   usessh=no
+fi
+fi
+
+#
+# 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
+found=no
+
+for GPG_AGENT_FILE in $HOME/.gnupg/agent.info \
+   $HOME/.gnupg/agent.info-${HOSTNAME:-$(hostname -f)}:${DISPLAY#*:}
+do
+   test -s $gpg_agent  . $gpg_agent
+   if test -n $GPG_AGENT_INFO ; then
+   GPG_AGENT_PID=${GPG_AGENT_INFO#*:}
+   GPG_AGENT_PID=${GPG_AGENT_PID%%:*}
+   if test -n $GPG_AGENT_PID  checkproc -p $GPG_AGENT_PID 
$gpgagent ; then
+   found=yes
+   break
+   fi
+   fi
+done
+
+if test $found = yes ; then
+   export GPG_AGENT_INFO
+   if test -n $SSH_AUTH_SOCK -a $usessh = yes ; then
+   export SSH_AUTH_SOCK
+   fi
+else
+   unset GPG_AGENT_INFO
+   if test -n $SSH_AUTH_SOCK -a $usessh != yes ; then
+   unset SSH_AUTH_SOCK
+   fi
+fi
+
+if test -z $GPG_AGENT_INFO ; then
+   if test $usessh = gpg -a -z $SSH_AUTH_SOCK ; then
+   set -- $gpgagent --sh --daemon --enable-ssh-support --keep-display 
--write-env-file $GPG_AGENT_FILE ${1+$@}
+   if test -x /usr/lib/ssh/ssh-askpass ; then
+   SSH_ASKPASS=/usr/lib/ssh/ssh-askpass
+   export SSH_ASKPASS
+   elif test -x /usr/lib64/ssh/ssh-askpass ; then
+   SSH_ASKPASS=/usr/lib64/ssh/ssh-askpass
+   export SSH_ASKPASS
+   fi
+   usessh=no
+   else
+   set -- $gpgagent --sh --daemon --keep-display --write-env-file 
$GPG_AGENT_FILE ${1+$@}
+   fi
+fi
+fi
+
+#
 # Run ssh-agent only if ssh service is configured and avaliable.
 # Check if there is already a running ssh-agent and if use this.
 #
@@ -114,29 +186,6 @@
 fi
 
 #
-# 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
-

commit xdm for openSUSE:Factory

2014-10-05 Thread h_root
Hello community,

here is the log from the commit of package xdm for openSUSE:Factory checked in 
at 2014-10-05 20:30:26

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  2014-08-06 11:41:37.0 
+0200
+++ /work/SRC/openSUSE:Factory/.xdm.new/xdm.changes 2014-10-05 
20:30:28.0 +0200
@@ -1,0 +2,6 @@
+Thu Oct  2 09:37:54 UTC 2014 - sndir...@suse.com
+
+- sysconfig.displaymanager/DM list: added lightdm,sddm; removed
+  kdm3,kdm4 (bnc#898876)
+
+---



Other differences:
--
++ xdm.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/var/adm/fillup-templates/sysconfig.displaymanager 
new/var/adm/fillup-templates/sysconfig.displaymanager
--- old/var/adm/fillup-templates/sysconfig.displaymanager   2014-03-04 
13:53:31.0 +0100
+++ new/var/adm/fillup-templates/sysconfig.displaymanager   2014-10-02 
11:37:16.0 +0200
@@ -1,7 +1,7 @@
 ## Path:   Desktop/Display manager
 ## Description:settings to generate a proper displaymanager config
 
-## Type:   string(kdm,kdm3,kdm4,xdm,gdm,wdm,entrance,console)
+## Type:   string(kdm,xdm,gdm,wdm,entrance,console,lightdm,sddm)
 ## Default:
 #
 # Here you can set the default Display manager 
(kdm/xdm/gdm/wdm/entrance/console).

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit xdm for openSUSE:Factory

2014-08-06 Thread h_root
Hello community,

here is the log from the commit of package xdm for openSUSE:Factory checked in 
at 2014-08-06 11:41:37

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  2014-07-21 10:35:34.0 
+0200
+++ /work/SRC/openSUSE:Factory/.xdm.new/xdm.changes 2014-08-06 
11:41:37.0 +0200
@@ -1,0 +2,9 @@
+Tue Aug  5 14:48:30 UTC 2014 - sndir...@suse.com
+
+- replaced 'Also=' by 'Alias=' in display-manager.service 
+  (bnc#890413)
+- make sure not to restart DM on package update; remove confusing
+  comment about no longer existing %%stop_on_removal,
+  %restart_on_update macros from specfile (bnc#886641) 
+
+---



Other differences:
--
++ xdm.spec ++
--- /var/tmp/diff_new_pack.MZLnMW/_old  2014-08-06 11:41:38.0 +0200
+++ /var/tmp/diff_new_pack.MZLnMW/_new  2014-08-06 11:41:38.0 +0200
@@ -153,11 +153,6 @@
 chmod 0755 %{buildroot}%{_sbindir}/rcxdm
 %endif
 
-# Note:
-#   no %%stop_on_removal in %%preun
-#   no %%restart_on_update in %%postun
-# = we don't want to end an existing session
-
 %post
 %if 0%{?suse_version}  1320
 %{fillup_and_insserv -Y xdm}
@@ -175,6 +170,8 @@
 %if 0%{?suse_version}  1320
 %{insserv_cleanup}
 %else
+# Do not restart DM on update (bnc#886641)
+export DISABLE_RESTART_ON_UPDATE=yes
 %service_del_postun display-manager.service
 %endif
 

++ display-manager.service ++
--- /var/tmp/diff_new_pack.MZLnMW/_old  2014-08-06 11:41:38.0 +0200
+++ /var/tmp/diff_new_pack.MZLnMW/_new  2014-08-06 11:41:38.0 +0200
@@ -15,4 +15,4 @@
 
 [Install]
 WantedBy=graphical.target
-Also=xdm.service
+Alias=xdm.service

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit xdm for openSUSE:Factory

2014-07-21 Thread h_root
Hello community,

here is the log from the commit of package xdm for openSUSE:Factory checked in 
at 2014-07-21 10:35:32

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  2014-06-01 18:54:58.0 
+0200
+++ /work/SRC/openSUSE:Factory/.xdm.new/xdm.changes 2014-07-21 
10:35:34.0 +0200
@@ -1,0 +2,10 @@
+Tue Jul 15 14:32:21 UTC 2014 - sndir...@suse.com
+
+- udpate to release 1.1.11
+- refreshed xdm-tolerant-hostname-changes.diff, xdm-consolekit.diff
+- supersedes the following patches:
+  U_xdm_config-AC_LIBTOOL_DLOPEN-is-required-for-dynamic-lin.patch,
+  U_xdm_Fix-missing-linking-dependency-on-ldl.patch,
+  U_xdm_config-use-libtool-export-dynamic-option-for-reverse.patch
+
+---

Old:

  U_xdm_Fix-missing-linking-dependency-on-ldl.patch
  U_xdm_config-AC_LIBTOOL_DLOPEN-is-required-for-dynamic-lin.patch
  U_xdm_config-use-libtool-export-dynamic-option-for-reverse.patch
  xdm-1.1.10.tar.bz2

New:

  xdm-1.1.11.tar.bz2



Other differences:
--
++ xdm.spec ++
--- /var/tmp/diff_new_pack.KUcrTd/_old  2014-07-21 10:35:34.0 +0200
+++ /var/tmp/diff_new_pack.KUcrTd/_new  2014-07-21 10:35:34.0 +0200
@@ -31,7 +31,7 @@
 %endif
 
 Name:   xdm
-Version:1.1.10
+Version:1.1.11
 Release:0
 Summary:X Display Manager
 License:MIT
@@ -46,9 +46,6 @@
 Patch0: xdm-consolekit.diff
 %endif
 Patch1: xdm-tolerant-hostname-changes.diff
-Patch2: 
U_xdm_config-AC_LIBTOOL_DLOPEN-is-required-for-dynamic-lin.patch
-Patch3: 
U_xdm_config-use-libtool-export-dynamic-option-for-reverse.patch
-Patch4: U_xdm_Fix-missing-linking-dependency-on-ldl.patch
 %if 0%{?suse_version} = 01140  0%{?suse_version}  1320
 # Needed to create the man page symlink to init.d
 BuildRequires:  aaa_base-extras
@@ -100,14 +97,13 @@
 %if !%with_systemd
 %patch0 -p1
 %endif
+pushd xdm
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-# needed for patch0, patch2, patch3, patch4
-autoreconf -fi
+popd
 
 %build
+# needed for patch0
+autoreconf -fi
 %configure \
 --disable-static \
 --with-pam \
@@ -220,7 +216,6 @@
 %ghost %{_localstatedir}/log/xdm.errors
 %{_bindir}/chooser
 %{_bindir}/xdm
-%{_bindir}/xdmshell
 %{_sbindir}/rcxdm
 %if 0%{?suse_version} = 1320
 %{_sbindir}/rcdisplay-manager

++ xdm-1.1.10.tar.bz2 - xdm-1.1.11.tar.bz2 ++
 90700 lines of diff (skipped)

++ xdm-consolekit.diff ++
--- /var/tmp/diff_new_pack.KUcrTd/_old  2014-07-21 10:35:35.0 +0200
+++ /var/tmp/diff_new_pack.KUcrTd/_new  2014-07-21 10:35:35.0 +0200
@@ -1,40 +1,15 @@
 ---
- configure.ac |   14 
  dm.h |3 +
  resource.c   |   13 +++
  session.c|  100 
+++
  xdm.man.cpp  |6 +++
+ configure.ac |   14 
  5 files changed, 135 insertions(+), 1 deletion(-)
 
-Index: xdm-1.1.10/configure.ac
-===
 xdm-1.1.10.orig/configure.ac
-+++ xdm-1.1.10/configure.ac
-@@ -434,6 +434,20 @@ fi
- 
- AM_CONDITIONAL(DYNAMIC_GREETER, test x$DYNAMIC_GREETER = xyes)
- 
-+# ConsoleKit support
-+AC_ARG_WITH(consolekit, AC_HELP_STRING([--with-consolekit], [Use ConsoleKit]),
-+  [USE_CONSOLEKIT=$withval], [USE_CONSOLEKIT=yes])
-+if test x$USE_CONSOLEKIT != xno; then
-+  PKG_CHECK_MODULES(CK_CONNECTOR, ck-connector,
-+  [USE_CONSOLEKIT=yes], [USE_CONSOLEKIT=no])
-+  if test x$USE_CONSOLEKIT = xyes; then
-+  AC_DEFINE([USE_CONSOLEKIT], 1, [Define to 1 to use ConsoleKit])
-+  XDM_CFLAGS=$XDM_CFLAGS $CK_CONNECTOR_CFLAGS
-+  XDM_LIBS=$XDM_LIBS $CK_CONNECTOR_LIBS
-+  fi
-+fi
-+dnl AM_CONDITIONAL(USE_CONSOLEKIT, test$USE_CONSOLEKIT = xyes)
-+
- #
- #  XDM
- #
 Index: xdm-1.1.10/session.c
 ===
 --- xdm-1.1.10.orig/session.c
-+++ xdm-1.1.10/session.c
 xdm-1.1.10/xdm/session.c
 @@ -67,6 +67,11 @@ extern int key_setnet(struct key_netstar
  # endif
  #endif /* USE_PAM */
@@ -168,7 +143,7 @@
 Index: xdm-1.1.10/dm.h
 ===
 --- xdm-1.1.10.orig/dm.h
-+++ xdm-1.1.10/dm.h
 xdm-1.1.10/include/dm.h
 @@ -323,6 +323,9 @@ extern char*randomFile;
  extern char   *prngdSocket;
  extern intprngdPort;
@@ -182,7 +157,7 @@
 Index: xdm-1.1.10/resource.c
 ===
 --- xdm-1.1.10.orig/resource.c
-+++ xdm-1.1.10/resource.c
 

commit xdm for openSUSE:Factory

2014-06-01 Thread h_root
Hello community,

here is the log from the commit of package xdm for openSUSE:Factory checked in 
at 2014-06-01 18:54:53

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  2014-05-26 10:28:07.0 
+0200
+++ /work/SRC/openSUSE:Factory/.xdm.new/xdm.changes 2014-06-01 
18:54:58.0 +0200
@@ -1,0 +2,8 @@
+Wed May 28 16:00:23 UTC 2014 - fcro...@suse.com
+
+- Use KillMode=process for systemd service, this ensures Xorg won't
+  receive SIGKILL while switching to runlevel 3 [bnc#871808].
+- Add Also=xdm.service to display-manager.service to better
+  handle migration.
+
+---



Other differences:
--
++ display-manager.service ++
--- /var/tmp/diff_new_pack.jvmBLU/_old  2014-06-01 18:54:58.0 +0200
+++ /var/tmp/diff_new_pack.jvmBLU/_new  2014-06-01 18:54:58.0 +0200
@@ -11,6 +11,8 @@
 ExecStart=/usr/lib/X11/display-manager start
 ExecStop=/usr/lib/X11/display-manager stop
 ExecReload=/usr/lib/X11/display-manager reload
+KillMode=process
 
 [Install]
 WantedBy=graphical.target
+Also=xdm.service

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit xdm for openSUSE:Factory

2014-05-26 Thread h_root
Hello community,

here is the log from the commit of package xdm for openSUSE:Factory checked in 
at 2014-05-26 10:28:05

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  2014-05-22 20:38:34.0 
+0200
+++ /work/SRC/openSUSE:Factory/.xdm.new/xdm.changes 2014-05-26 
10:28:07.0 +0200
@@ -1,0 +2,5 @@
+Fri May 23 13:01:21 UTC 2014 - jseg...@novell.com
+
+- added necessary macros for systemd files
+
+---



Other differences:
--
++ xdm.spec ++
--- /var/tmp/diff_new_pack.sZyWIC/_old  2014-05-26 10:28:07.0 +0200
+++ /var/tmp/diff_new_pack.sZyWIC/_new  2014-05-26 10:28:07.0 +0200
@@ -170,6 +170,11 @@
 %endif
 %{fillup_only -n displaymanager}
 
+%pre
+%if !0%{?suse_version}  1320
+  %service_add_pre display-manager.service
+%endif
+
 %postun
 %if 0%{?suse_version}  1320
 %{insserv_cleanup}
@@ -177,6 +182,11 @@
 %service_del_postun display-manager.service
 %endif
 
+%preun
+%if !0%{?suse_version}  1320
+  %service_del_preun display-manager.service
+%endif
+
 %files
 %defattr(-,root,root)
 %doc AUTHORS ChangeLog COPYING README

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit xdm for openSUSE:Factory

2014-05-22 Thread h_root
Hello community,

here is the log from the commit of package xdm for openSUSE:Factory checked in 
at 2014-05-22 20:38:13

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  2014-03-27 06:17:04.0 
+0100
+++ /work/SRC/openSUSE:Factory/.xdm.new/xdm.changes 2014-05-22 
20:38:34.0 +0200
@@ -1,0 +2,13 @@
+Thu May 15 11:01:55 UTC 2014 - arichardson@gmail.com
+
+- Don't run dbus-launch if the socket /run/user/uid/bus exists, since
+  this means that dbus is already handled by systemd  
+
+---
+Tue May 13 05:31:18 UTC 2014 - co...@suse.com
+
+- just don't package pid file. It's called xdm.pid, so it's pretty
+  obvious what package it is from
+- take the pid file out of the xdm.tar
+
+---



Other differences:
--
++ xdm.spec ++
--- /var/tmp/diff_new_pack.4DNhUo/_old  2014-05-22 20:38:35.0 +0200
+++ /var/tmp/diff_new_pack.4DNhUo/_new  2014-05-22 20:38:35.0 +0200
@@ -16,7 +16,7 @@
 #
 
 
-%if 0%{?suse_version}  1220
+%if 0%{?suse_version}  1230
 %define with_systemd 1
 %else
 %define with_systemd 0
@@ -208,7 +208,6 @@
 %{_localstatedir}/adm/fillup-templates/sysconfig.displaymanager
 %{_localstatedir}/lib/xdm/authdir/
 %ghost %{_localstatedir}/log/xdm.errors
-%ghost %{_localstatedir}/run/xdm.pid
 %{_bindir}/chooser
 %{_bindir}/xdm
 %{_bindir}/xdmshell

++ 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.xsession2014-03-04 13:53:31.0 +0100
+++ new/etc/X11/xdm/sys.xsession2014-05-14 19:46:27.0 +0200
@@ -139,7 +139,12 @@
 #
 # Check if a dbus is required for e.g. plain xdm sessions
 #
-if dbusdaemon=$(type -p dbus-daemon)  dbuslaunch=$(type -p dbus-launch) ; 
then
+if test -S $XDG_RUNTIME_DIR/bus ; then
+# socket /run/user/uid/bus exists, this means dbus is managed by systemd
+# all we have to do now is make sure $DBUS_SESSION_BUS_ADDRESS is set 
correctly
+DBUS_SESSION_BUS_ADDRESS=unix:path=$XDG_RUNTIME_DIR/bus
+export DBUS_SESSION_BUS_ADDRESS
+elif dbusdaemon=$(type -p dbus-daemon)  dbuslaunch=$(type -p dbus-launch) ; 
then
 if test -s /var/lib/dbus/machine-id ; then
read -t1 mid  /var/lib/dbus/machine-id
 elif test -s /etc/machine-id ; then

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit xdm for openSUSE:Factory

2014-03-26 Thread h_root
Hello community,

here is the log from the commit of package xdm for openSUSE:Factory checked in 
at 2014-03-27 06:17:02

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  2014-03-22 19:46:17.0 
+0100
+++ /work/SRC/openSUSE:Factory/.xdm.new/xdm.changes 2014-03-27 
06:17:04.0 +0100
@@ -1,0 +2,6 @@
+Mon Mar 24 12:01:16 UTC 2014 - sndir...@suse.com
+
+- DISPLAYMANAGER_STARTS_XSERVER needs to be set to no on s390x
+  and ppc64le (bnc#869267)
+
+---



Other differences:
--
++ xdm.spec ++
--- /var/tmp/diff_new_pack.z0rptU/_old  2014-03-27 06:17:04.0 +0100
+++ /var/tmp/diff_new_pack.z0rptU/_new  2014-03-27 06:17:04.0 +0100
@@ -126,9 +126,9 @@
 %if %dm_fallbacks
 tar xf %{SOURCE3}
 %endif
-%ifarch s390 s390x
+%ifarch s390 s390x ppc64le
 sed -i -e 
s+DISPLAYMANAGER_REMOTE_ACCESS=.*+DISPLAYMANAGER_REMOTE_ACCESS=\yes\+g \
-   -e 
s+DISPLAYMANAGER_REMOTE_ACCESS=.*+DISPLAYMANAGER_REMOTE_ACCESS=\no\+g \
+   -e 
s+DISPLAYMANAGER_STARTS_XSERVER=.*+DISPLAYMANAGER_STARTS_XSERVER=\no\+g \
 var/adm/fillup-templates/sysconfig.displaymanager
 %endif
 popd

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit xdm for openSUSE:Factory

2014-03-22 Thread h_root
Hello community,

here is the log from the commit of package xdm for openSUSE:Factory checked in 
at 2014-03-22 19:46:14

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  2014-03-15 17:35:57.0 
+0100
+++ /work/SRC/openSUSE:Factory/.xdm.new/xdm.changes 2014-03-22 
19:46:17.0 +0100
@@ -1,0 +2,5 @@
+Fri Mar 21 10:50:02 UTC 2014 - wer...@suse.de
+
+- Move forward to systemd, that is use a real service unit file  (bnc#869260)
+
+---

New:

  display-manager.service



Other differences:
--
++ xdm.spec ++
--- /var/tmp/diff_new_pack.Akn094/_old  2014-03-22 19:46:18.0 +0100
+++ /var/tmp/diff_new_pack.Akn094/_new  2014-03-22 19:46:18.0 +0100
@@ -41,6 +41,7 @@
 Source1:xdm.tar.bz2
 Source2:HOWTO.xdm
 Source3:xdm-fallbacks.tar.bz2
+Source4:display-manager.service
 %if !%with_systemd
 Patch0: xdm-consolekit.diff
 %endif
@@ -48,7 +49,7 @@
 Patch2: 
U_xdm_config-AC_LIBTOOL_DLOPEN-is-required-for-dynamic-lin.patch
 Patch3: 
U_xdm_config-use-libtool-export-dynamic-option-for-reverse.patch
 Patch4: U_xdm_Fix-missing-linking-dependency-on-ldl.patch
-%if 0%{?suse_version} = 01140
+%if 0%{?suse_version} = 01140  0%{?suse_version}  1320
 # Needed to create the man page symlink to init.d
 BuildRequires:  aaa_base-extras
 %endif
@@ -71,6 +72,9 @@
 %if !%with_systemd
 BuildRequires:  ConsoleKit-devel
 Requires:   ConsoleKit
+%else
+BuildRequires:  systemd-rpm-macros
+%{?systemd_requires}
 %endif
 Requires:   /sbin/pidof
 Requires:   logrotate
@@ -82,6 +86,10 @@
 Conflicts:  xorg-x11 = 7.6
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 
+%if !%with_systemd
+%define _unitdir /usr/lib/systemd/system
+%endif
+
 %description
 Xdm manages a collection of X displays, which may be on the local host
 or remote servers.
@@ -133,9 +141,21 @@
 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
 # 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
+ln -sf service %{buildroot}%{_sbindir}/rcdisplay-manager
+cat  %{buildroot}%{_sbindir}/rcxdm -'EOF'
+   #!/bin/bash
+   exec -a rcdisplay-manager %{_sbindir}/rcdisplay-manager ${1+$@}
+   EOF
+chmod 0755 %{buildroot}%{_sbindir}/rcxdm
+%endif
 
 # Note:
 #   no %%stop_on_removal in %%preun
@@ -143,11 +163,19 @@
 # = we don't want to end an existing session
 
 %post
+%if 0%{?suse_version}  1320
 %{fillup_and_insserv -Y xdm}
+%else
+%service_add_post display-manager.service
+%endif
 %{fillup_only -n displaymanager}
 
 %postun
+%if 0%{?suse_version}  1320
 %{insserv_cleanup}
+%else
+%service_del_postun display-manager.service
+%endif
 
 %files
 %defattr(-,root,root)
@@ -165,7 +193,14 @@
 %endif
 %config %{_sysconfdir}/X11/xdm/
 %config(noreplace) %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/xdmcp
+%if 0%{?suse_version}  1320
 %{_sysconfdir}/init.d/xdm
+%exclude %{_libexecdir}/X11/display-manager
+%else
+%exclude %{_sysconfdir}/init.d/xdm
+%{_unitdir}/display-manager.service
+%{_libexecdir}/X11/display-manager
+%endif
 %config %{_sysconfdir}/logrotate.d/xdm
 %config %{_sysconfdir}/pam.d/xdm
 %config %{_sysconfdir}/pam.d/xdm-np
@@ -178,12 +213,17 @@
 %{_bindir}/xdm
 %{_bindir}/xdmshell
 %{_sbindir}/rcxdm
+%if 0%{?suse_version} = 1320
+%{_sbindir}/rcdisplay-manager
+%endif
 %{_libdir}/X11/xdm/
 %dir %{_datadir}/X11/app-defaults
 %{_datadir}/X11/app-defaults/Chooser
 %{_mandir}/man1/chooser.1%{?ext_man}
 %{_mandir}/man1/xdm.1%{?ext_man}
+%if 0%{?suse_version}  1320
 %{_mandir}/man8/rcxdm.8%{?ext_man}
+%endif
 %ifnarch %ix86
 %dir %{_libdir}/X11
 %endif

++ display-manager.service ++
[Unit]
Description=X Display Manager
Requires=var-run.mount
After=ypbind.service gpm.service time-sync.target winbind.service acpid.service
Wants=remote-fs.target dbus.socket systemd-user-sessions.service
After=remote-fs.target dbus.socket systemd-user-sessions.service

[Service]
Type=forking
PIDFile=/var/run/displaymanager.pid
ExecStart=/usr/lib/X11/display-manager start
ExecStop=/usr/lib/X11/display-manager stop
ExecReload=/usr/lib/X11/display-manager reload

[Install]
WantedBy=graphical.target

commit xdm for openSUSE:Factory

2014-03-15 Thread h_root
Hello community,

here is the log from the commit of package xdm for openSUSE:Factory checked in 
at 2014-03-15 17:35:56

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  2014-03-11 09:23:57.0 
+0100
+++ /work/SRC/openSUSE:Factory/.xdm.new/xdm.changes 2014-03-15 
17:35:57.0 +0100
@@ -1,0 +2,10 @@
+Wed Mar  5 08:40:58 UTC 2014 - cxi...@suse.com
+
+- Add support for in-line environment variable settings
+
+  Handling case like:
+  Exec=env GNOME_SHELL_SESSION_MODE=classic gnome --session gnome-classic
+  
+  For now, this is only needed to fix session management issue as in 
bnc#863709.
+
+---
@@ -4 +14 @@
-- fix two array iteration bug
+- fix two array iteration bug in etc/X11/xdm/Xsession (xdm.tar.bz2)
@@ -6,2 +16,2 @@
-  1. ${#argv[@]} is just the size of the array instead of all the elements, 
i.e.
-  ${argv[@]}, no sharp # sign.
+  1. ${#argv[@]} is just the size of the array instead of all the elements, 
+ i.e. ${argv[@]}, no sharp # sign.
@@ -9,2 +19,2 @@
-  2. index of array starting from 0, so argc should be increased at the end 
of
-  iteration loop.
+  2. index of array starting from 0, so argc should be increased at the end 
+ of iteration loop. (bnc#866874)



Other differences:
--
++ xdm.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/etc/X11/xdm/Xsession new/etc/X11/xdm/Xsession
--- old/etc/X11/xdm/Xsession2014-03-05 09:34:38.0 +0100
+++ new/etc/X11/xdm/Xsession2014-03-10 09:17:14.0 +0100
@@ -186,19 +186,30 @@
 #
 forced=no
 if test ${#argv[@]} -gt 0 ; then
-case ${argv[0]} in
-failsafe)  exec $failsafe   ;;
-default)   ;;
-custom);;
-*) forced=yes
-   WINDOWMANAGER=${argv[0]} ;;
-esac
 typeset -i argc=0
 for l in ${argv[@]} ; do
case $l in
-   [a-z][a-z]_[A-Z][A-Z]*)
-   GDM_LANG=$l
-   break
+# extra environment variables settings
+env)
+extra_env_settings=yes
+unset argv[$argc]
+;;
+*=*)
+if test $extra_env_settings = yes; then
+eval export $l || :
+unset argv[$argc]
+fi
+;;
+   [a-z][a-z]_[A-Z][A-Z]*)
+   GDM_LANG=$l
+   break
+;;
+*)
+# stop extracting env info after the first one that's not an 
ENV
+# setting. This is needed to prevent messing command line
+# arguments with the form: XXX=XX
+extra_env_settings=no
+;;
esac
 
 # argv is an array with index starting from 0
@@ -206,6 +217,19 @@
 done
 unset argv[$argc]
 unset l
+
+# get Window Manager only after the previous argument processing.
+#
+# reset the parameter array for convenience
+argv=(${argv[@]})
+case ${argv[0]} in
+failsafe)  exec $failsafe   ;;
+default)   ;;
+custom);;
+*) forced=yes
+   WINDOWMANAGER=${argv[0]} ;;
+esac
+
 fi
 readonly argv
 

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit xdm for openSUSE:Factory

2014-03-11 Thread h_root
Hello community,

here is the log from the commit of package xdm for openSUSE:Factory checked in 
at 2014-03-11 09:23:55

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  2014-02-15 17:24:21.0 
+0100
+++ /work/SRC/openSUSE:Factory/.xdm.new/xdm.changes 2014-03-11 
09:23:57.0 +0100
@@ -1,0 +2,19 @@
+Wed Mar  5 08:36:01 UTC 2014 - cxi...@suse.com
+
+- fix two array iteration bug
+
+  1. ${#argv[@]} is just the size of the array instead of all the elements, 
i.e.
+  ${argv[@]}, no sharp # sign.
+
+  2. index of array starting from 0, so argc should be increased at the end 
of
+  iteration loop.
+
+---
+Wed Feb 19 10:33:21 UTC 2014 - sndir...@suse.com
+
+- /etc/X11/xdm/keytable: make use of systemd's localectl to
+  generate Xserver's configuration snippet for keyboard layout;
+  rely on systemd's kbd -- X keyboard mapping; the old mapping
+  table originating from SaX2 is no longer being used (bnc#861819)
+
+---



Other differences:
--
++ xdm.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/etc/X11/xdm/Xsession new/etc/X11/xdm/Xsession
--- old/etc/X11/xdm/Xsession2014-02-13 07:56:23.0 +0100
+++ new/etc/X11/xdm/Xsession2014-03-05 09:34:38.0 +0100
@@ -194,13 +194,15 @@
WINDOWMANAGER=${argv[0]} ;;
 esac
 typeset -i argc=0
-for l in ${#argv[@]} ; do
-   let argc++ || :
+for l in ${argv[@]} ; do
case $l in
[a-z][a-z]_[A-Z][A-Z]*)
GDM_LANG=$l
break
esac
+
+# argv is an array with index starting from 0
+   let argc++ || :
 done
 unset argv[$argc]
 unset l
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/etc/X11/xdm/keytable new/etc/X11/xdm/keytable
--- old/etc/X11/xdm/keytable2010-06-19 14:36:24.0 +0200
+++ new/etc/X11/xdm/keytable2014-02-19 11:32:35.0 +0100
@@ -1,68 +1,61 @@
-#!/bin/sh
+#! /bin/bash
 
 if [ $UID -ne 0 ]; then
   echo You need to be root to run this program
   exit 0
 fi
 
-configfile=/etc/sysconfig/keyboard
-cachedir=/var/cache/xdm
-cachefile=keyboard.last
-conffile=/etc/X11/xorg.conf.d/90-keytable.conf
-mapfile=/etc/X11/xdm/Keyboard.map
-
-. ${configfile}
-
-if [ -e $cachedir/$cachefile -a -e $conffile ]
-then
-. $cachedir/$cachefile
-[ $KEYTABLE = $cache_keytable ]  exit 1;
-fi
-
-# layout is mandatory - but $keytable may be bogus
-layout=us
-variant=x
-options=x
-
-keytable=$(basename $KEYTABLE .map.gz)
-
-# if no mapping is available, fall back to us (bnc #606063)
-if ! grep -q ^$keytable *: $mapfile; then
-mkdir -p $(dirname $conffile)
-cat  $conffile  EOF
-Section InputClass
-   Identifier LocalKeyboard
-   MatchIsKeyboard on
-   Option  XkbLayout us
-EndSection
-EOF
+vconsole_conf_file=/etc/vconsole.conf
+sysconfig_file=/etc/sysconfig/keyboard
+previous_x11conf_file=/etc/X11/xorg.conf.d/90-keytable.conf
+systemd_x11conf_file=/etc/X11/xorg.conf.d/00-keyboard.conf
+
+function setkeyboard {
+  echo Command: localectl set-keymap $1
+  # xorg.conf.d snippet is only written if a valid snippet is already
+  # available, so create an us sample if neccessary
+  if [ ! -f $systemd_x11conf_file ]; then
+localectl set-x11-keymap us
+  fi
+  localectl set-keymap $1
+  if [ -f $systemd_x11conf_file ]; then
+if [ $systemd_x11conf_file -nt $previous_x11conf_file ]; then
+  rm -f $previous_x11conf_file
+fi
 exit 0
+  else
+echo $systemd_x11conf_file has not been created! 
+  fi
+}
+
+if [ -f $vconsole_conf_file ]; then
+  echo $vconsole_conf_file available
+  . $vconsole_conf_file
+  if [ ! -z $KEYMAP ]; then
+echo KEYMAP: $KEYMAP
+options=$KEYMAP $KEYMAP_TOGGLE
+setkeyboard $options
+  else
+echo KEYMAP not set
+  fi 
+else
+  echo $vconsole_conf_file not available
 fi
 
-layout=$(grep ^$keytable *: $mapfile | cut -d : -f 3|sed 's/ //g')
-variant=$(grep ^$keytable *: $mapfile | cut -d : -f 4|sed 's/ //g')
-options=$(grep ^$keytable *: $mapfile | cut -d : -f 10-12|sed 's/ //g')
-
-mkdir -p $(dirname $conffile)
-cat  $conffile  EOF
-Section InputClass
-   Identifier LocalKeyboard
-   MatchIsKeyboard on
-   Option  XkbLayout $layout
-EOF
-
-if [ $variant != x ]; then
-echo  Option  \XkbVariant\  \$variant\  $conffile
+if [ -f $sysconfig_file ]; then
+  echo $sysconfig_file available
+  . $sysconfig_file
+  if [ ! -z $KEYTABLE ]; then
+

commit xdm for openSUSE:Factory

2014-02-15 Thread h_root
Hello community,

here is the log from the commit of package xdm for openSUSE:Factory checked in 
at 2014-02-15 17:24:20

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  2014-02-06 09:17:21.0 
+0100
+++ /work/SRC/openSUSE:Factory/.xdm.new/xdm.changes 2014-02-15 
17:24:21.0 +0100
@@ -1,0 +2,7 @@
+Tue Feb 11 09:18:13 UTC 2014 - dli...@suse.com
+
+- Change the default /etc/X11/xdm/Xsession, (fate#316129)
+  don't save standard output information to ~/.xsession-errors
+  Modify the xdm.tar.bz2
+
+---



Other differences:
--
++ xdm.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/etc/X11/xdm/Xsession new/etc/X11/xdm/Xsession
--- old/etc/X11/xdm/Xsession2013-06-07 11:09:00.0 +0200
+++ new/etc/X11/xdm/Xsession2014-02-13 07:56:23.0 +0100
@@ -152,13 +152,15 @@
tmpfile=$(mktemp -q $errfile.) || break
mv -fT $tmpfile $errfile || break
fi
-   exec  $errfile 21
+   #exec  $errfile 21
+   #fate#316129: only put the error message to the logfile
+   exec  /dev/null
+   exec 2 $errfile
break
;;
 esac
 done
 unset tmpfile errfile
-
 #
 # Check for X11R6 in execution path
 #

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit xdm for openSUSE:Factory

2014-02-06 Thread h_root
Hello community,

here is the log from the commit of package xdm for openSUSE:Factory checked in 
at 2014-02-06 09:17:20

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  2014-01-08 20:10:06.0 
+0100
+++ /work/SRC/openSUSE:Factory/.xdm.new/xdm.changes 2014-02-06 
09:17:21.0 +0100
@@ -1,0 +2,5 @@
+Tue Feb  4 21:06:34 UTC 2014 - co...@suse.com
+
+- /etc/X11/xdm/RunChooser calls pidof, so require it
+
+---



Other differences:
--
++ xdm.spec ++
--- /var/tmp/diff_new_pack.tYzzdv/_old  2014-02-06 09:17:22.0 +0100
+++ /var/tmp/diff_new_pack.tYzzdv/_new  2014-02-06 09:17:22.0 +0100
@@ -72,6 +72,7 @@
 BuildRequires:  ConsoleKit-devel
 Requires:   ConsoleKit
 %endif
+Requires:   /sbin/pidof
 Requires:   logrotate
 Requires:   sessreg
 Requires:   xrdb

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit xdm for openSUSE:Factory

2014-01-08 Thread h_root
Hello community,

here is the log from the commit of package xdm for openSUSE:Factory checked in 
at 2014-01-08 20:10:05

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  2013-12-02 15:24:06.0 
+0100
+++ /work/SRC/openSUSE:Factory/.xdm.new/xdm.changes 2014-01-08 
20:10:06.0 +0100
@@ -1,0 +2,6 @@
+Wed Jan  8 14:58:43 UTC 2014 - lnus...@suse.de
+
+- don't set twm as hardcoded default if DEFAULT_WM is empty, rely on
+  the detection in xinitrc.common instead
+
+---



Other differences:
--
++ xdm.spec ++
--- /var/tmp/diff_new_pack.Gekv1T/_old  2014-01-08 20:10:06.0 +0100
+++ /var/tmp/diff_new_pack.Gekv1T/_new  2014-01-08 20:10:06.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package xdm
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed

++ xdm.tar.bz2 ++
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  2013-03-01 13:43:48.0 +0100
+++ new/etc/init.d/xdm  2014-01-08 15:58:16.0 +0100
@@ -71,9 +71,7 @@
 done
 unset lc val
 
-test -z $DEFAULT_WM  DEFAULT_WM=twm
-
-if test -z $WINDOWMANAGER ; then
+if test -z $WINDOWMANAGER -a -n $DEFAULT_WM ; then
 SAVEPATH=$PATH
 PATH=$PATH:/usr/X11R6/bin:/usr/openwin/bin
 desktop=/usr/share/xsessions/${DEFAULT_WM}.desktop

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit xdm for openSUSE:Factory

2013-12-02 Thread h_root
Hello community,

here is the log from the commit of package xdm for openSUSE:Factory checked in 
at 2013-12-02 15:24:05

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  2013-10-18 14:52:08.0 
+0200
+++ /work/SRC/openSUSE:Factory/.xdm.new/xdm.changes 2013-12-02 
15:24:06.0 +0100
@@ -1,0 +2,6 @@
+Mon Dec  2 11:08:39 UTC 2013 - sndir...@suse.com
+
+- removed u_xdm-sig11-bug-598422.diff
+  * problem has been resolved differently 
+
+---

Old:

  u_xdm-sig11-bug-598422.diff



Other differences:
--
++ xdm.spec ++
--- /var/tmp/diff_new_pack.3ZpH1V/_old  2013-12-02 15:24:06.0 +0100
+++ /var/tmp/diff_new_pack.3ZpH1V/_new  2013-12-02 15:24:07.0 +0100
@@ -48,7 +48,6 @@
 Patch2: 
U_xdm_config-AC_LIBTOOL_DLOPEN-is-required-for-dynamic-lin.patch
 Patch3: 
U_xdm_config-use-libtool-export-dynamic-option-for-reverse.patch
 Patch4: U_xdm_Fix-missing-linking-dependency-on-ldl.patch
-Patch5: u_xdm-sig11-bug-598422.diff
 %if 0%{?suse_version} = 01140
 # Needed to create the man page symlink to init.d
 BuildRequires:  aaa_base-extras
@@ -96,7 +95,6 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
 # needed for patch0, patch2, patch3, patch4
 autoreconf -fi
 

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit xdm for openSUSE:Factory

2013-10-18 Thread h_root
Hello community,

here is the log from the commit of package xdm for openSUSE:Factory checked in 
at 2013-10-18 14:51:08

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  2013-09-17 15:04:49.0 
+0200
+++ /work/SRC/openSUSE:Factory/.xdm.new/xdm.changes 2013-10-18 
14:52:08.0 +0200
@@ -1,0 +2,5 @@
+Fri Oct 18 09:34:08 CEST 2013 - ferenc...@gmail.com
+
+- Added support for qiv in /etc/X11/xdm/Xsetup 
+
+---



Other differences:
--
++ xdm.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/etc/X11/xdm/Xsetup new/etc/X11/xdm/Xsetup
--- old/etc/X11/xdm/Xsetup  2013-09-16 21:17:05.0 +0200
+++ new/etc/X11/xdm/Xsetup  2013-10-18 09:31:58.0 +0200
@@ -66,6 +66,7 @@
   xmessage=${BINDIR}/xmessage
   xrdb=${BINDIR}/xrdb
backprg=${BINDIR}/BackGround
+   qiv=${BINDIR}/qiv
 #   halporp=/usr/bin/hal-find-by-property
  xvkbd=${BINDIR}/xvkbd
  xvkbdargs=-compact -geometry -0-0 -xdm -always-on-top -keyfile 
/usr/share/X11/app-defaults/xvkbd.default
@@ -137,6 +138,8 @@
 $xpmroot ${background}.gz
 elif test -s ${background}-a -x $xpmroot ; then
 $xpmroot $background
+elif test -s ${background}-a -x $qiv ; then
+$qiv  -x $background
 elif test -x $backprg ; then
 $backprg
 else

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit xdm for openSUSE:Factory

2013-09-17 Thread h_root
Hello community,

here is the log from the commit of package xdm for openSUSE:Factory checked in 
at 2013-09-17 15:04:48

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  2013-08-23 11:08:54.0 
+0200
+++ /work/SRC/openSUSE:Factory/.xdm.new/xdm.changes 2013-09-17 
15:04:49.0 +0200
@@ -1,0 +2,10 @@
+Mon Sep 16 19:17:39 UTC 2013 - sndir...@suse.com
+
+- fixed typo in /etc/X11/xdm/Xsetup 
+
+---
+Mon Sep 16 11:38:10 UTC 2013 - sndir...@suse.com
+
+- fixed loading of .xkb files (bnc#840408)
+
+---



Other differences:
--
++ xdm.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/etc/X11/xdm/RunChooser new/etc/X11/xdm/RunChooser
--- old/etc/X11/xdm/RunChooser  2006-08-22 16:20:19.0 +0200
+++ new/etc/X11/xdm/RunChooser  2013-09-16 13:33:27.0 +0200
@@ -50,7 +50,8 @@
 hostxkbmap=${ETCDIR}/Xkbmap.${DISPLAY%:*}
   xset=${BINDIR}/xset
xmodmap=${BINDIR}/xmodmap
-xkbmap=${BINDIR}/xkbmap
+xkbmap=${BINDIR}/setxkbmap
+   xkbcomp=${BINDIR}/xkbcomp
xpmroot=${BINDIR}/xpmroot
   xsetroot=${BINDIR}/xsetroot
 kdmdesktop=/opt/kde/bin/kdmdesktop
@@ -97,23 +98,23 @@
 #
 # Set keymap for various displays
 #
-if test -x $xmodmap -o -x $xkbmap ; then
+if test -x $xmodmap -o -x $xkbcomp ; then
 if test -z ${DISPLAY%:*} ; then
# local connection
-   if test -s $sysxkbmap -a -x $xkbmap ; then
-   cat $sysxkbmap | $xkbmap
+   if test -s $sysxkbmap -a -x $xkbcomp ; then
+   cat $sysxkbmap | $xkbcomp - $DISPLAY
elif test -r $sysmodmap ; then
$xmodmap $sysmodmap
fi
 else
# TCP/IP connection (remote or local)
-   if test -s $defxkbmap -a -x $xkbmap ; then
-   cat $defxkbmap | $xkbmap
+   if test -s $defxkbmap -a -x $xkbcomp ; then
+   cat $defxkbmap | $xkbcomp - $DISPLAY
elif test -r $defmodmap ; then
$xmodmap $defmodmap
fi
-   if test -s $hostxkbmap -a -x $xkbmap ; then
-   cat $hostxkbmap | $xkbmap
+   if test -s $hostxkbmap -a -x $xkbcomp ; then
+   cat $hostxkbmap | $xkbcomp - $DISPLAY
elif test -r $hostmodmap ; then
$xmodmap $hostmodmap
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/etc/X11/xdm/Xsetup new/etc/X11/xdm/Xsetup
--- old/etc/X11/xdm/Xsetup  2011-10-11 15:42:22.0 +0200
+++ new/etc/X11/xdm/Xsetup  2013-09-16 21:17:05.0 +0200
@@ -59,6 +59,7 @@
   xset=${BINDIR}/xset
xmodmap=${BINDIR}/xmodmap
 xkbmap=${BINDIR}/setxkbmap
+   xkbcomp=${BINDIR}/xkbcomp
xpmroot=${BINDIR}/xpmroot
   xsetroot=${BINDIR}/xsetroot
   xconsole=${BINDIR}/xconsole
@@ -192,23 +193,23 @@
 #
 # Set keymap for various displays
 #
-if test -x $xmodmap -o -x $xkbmap ; then
+if test -x $xmodmap -o -x $xkbcomp ; then
 if test -z ${DISPLAY%:*} ; then
# local connection
-   if test -s $sysxkbmap -a -x $xkbmap ; then
-   cat $sysxkbmap | $xkbmap
+   if test -s $sysxkbmap -a -x $xkbcomp ; then
+   cat $sysxkbmap | $xkbcomp - $DISPLAY
elif test -r $sysmodmap ; then
$xmodmap $sysmodmap
fi
 else
# TCP/IP connection (remote or local)
-   if test -s $defxkbmap -a -x $xkbmap ; then
-   cat $defxkbmap | $xkbmap
+   if test -s $defxkbmap -a -x $xkbcomp ; then
+   cat $defxkbmap | $xkbcomp - $DISPLAY
elif test -r $defmodmap ; then
$xmodmap $defmodmap
fi
-   if test -s $hostxkbmap -a -x $xkbmap ; then
-   cat $hostxkbmap | $xkbmap
+   if test -s $hostxkbmap -a -x $xkbcomp ; then
+   cat $hostxkbmap | $xkbcomp - $DISPLAY
elif test -r $hostmodmap ; then
$xmodmap $hostmodmap
fi

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit xdm for openSUSE:Factory

2013-08-23 Thread h_root
Hello community,

here is the log from the commit of package xdm for openSUSE:Factory checked in 
at 2013-08-23 11:08:54

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  2013-07-29 21:12:10.0 
+0200
+++ /work/SRC/openSUSE:Factory/.xdm.new/xdm.changes 2013-08-23 
11:08:54.0 +0200
@@ -1,0 +2,6 @@
+Tue Aug 13 16:35:01 UTC 2013 - sndir...@suse.com
+
+- adjusted u_xdm-sig11-bug-598422.diff for openSUSE 12.2 build
+  (which still applies xdm-consolekit.diff)
+
+---



Other differences:
--
++ u_xdm-sig11-bug-598422.diff ++
--- /var/tmp/diff_new_pack.b9sQ1u/_old  2013-08-23 11:08:55.0 +0200
+++ /var/tmp/diff_new_pack.b9sQ1u/_new  2013-08-23 11:08:55.0 +0200
@@ -47,8 +47,7 @@
SessionExit (d, RESERVER_DISPLAY, FALSE);
  }
  Debug (XGrabKeyboard succeeded %s\n, d-name);
-@@ -515,8 +520,7 @@ UnsecureDisplay (struct display *d, Disp
- }
+@@ -516,7 +521,6 @@ UnsecureDisplay (struct display *d, Disp
  
  void
 -SessionExit (struct display *d, int status, int removeAuth)
@@ -57,10 +56,7 @@
  #ifdef USE_PAM
  pam_handle_t *pamh = thepamh();
  
-@@ -527,7 +531,11 @@ SessionExit (struct display *d, int stat
-   pamh = NULL;
- }
- #endif
+@@ -530,4 +534,8 @@ SessionExit (struct display *d, int stat
 +}
  
 +void

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit xdm for openSUSE:Factory

2013-07-29 Thread h_root
Hello community,

here is the log from the commit of package xdm for openSUSE:Factory checked in 
at 2013-07-29 21:12:09

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  2013-06-11 09:38:32.0 
+0200
+++ /work/SRC/openSUSE:Factory/.xdm.new/xdm.changes 2013-07-29 
21:12:10.0 +0200
@@ -1,0 +2,6 @@
+Mon Jul 29 09:25:40 UTC 2013 - sndir...@suse.com
+
+- u_xdm-sig11-bug-598422.diff
+  * fix Sig11 in xdm when pressing Ctr-c (bnc#598422, bnc#831870)
+
+---

New:

  u_xdm-sig11-bug-598422.diff



Other differences:
--
++ xdm.spec ++
--- /var/tmp/diff_new_pack.AY58KK/_old  2013-07-29 21:12:11.0 +0200
+++ /var/tmp/diff_new_pack.AY58KK/_new  2013-07-29 21:12:11.0 +0200
@@ -48,6 +48,7 @@
 Patch2: 
U_xdm_config-AC_LIBTOOL_DLOPEN-is-required-for-dynamic-lin.patch
 Patch3: 
U_xdm_config-use-libtool-export-dynamic-option-for-reverse.patch
 Patch4: U_xdm_Fix-missing-linking-dependency-on-ldl.patch
+Patch5: u_xdm-sig11-bug-598422.diff
 %if 0%{?suse_version} = 01140
 # Needed to create the man page symlink to init.d
 BuildRequires:  aaa_base-extras
@@ -95,6 +96,7 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 # needed for patch0, patch2, patch3, patch4
 autoreconf -fi
 

++ u_xdm-sig11-bug-598422.diff ++
Index: xdm-1.1.10/dm.h
===
--- xdm-1.1.10.orig/dm.h
+++ xdm-1.1.10/dm.h
@@ -434,6 +434,7 @@ extern void DeleteXloginResources (struc
 extern void LoadXloginResources (struct display *d);
 extern void ManageSession (struct display *d);
 extern void SecureDisplay (struct display *d, Display *dpy);
+extern void PamCloseSession(void);
 extern void SessionExit (struct display *d, int status, int removeAuth);
 extern void SessionPingFailed (struct display *d);
 extern void SetupDisplay (struct display *d);
Index: xdm-1.1.10/session.c
===
--- xdm-1.1.10.orig/session.c
+++ xdm-1.1.10/session.c
@@ -290,6 +290,8 @@ SessionPingFailed (struct display *d)
AbortClient (clientPid);
source (verify.systemEnviron, d-reset);
 }
+
+PamCloseSession();
 SessionExit (d, RESERVER_DISPLAY, TRUE);
 }
 
@@ -417,6 +419,7 @@ ManageSession (struct display *d)
  */
 Debug (Source reset program %s\n, d-reset);
 source (verify.systemEnviron, d-reset);
+PamCloseSession();
 SessionExit (d, OBEYSESS_DISPLAY, TRUE);
 }
 
@@ -480,6 +483,7 @@ SecureDisplay (struct display *d, Displa
 if (Setjmp (syncJump)) {
LogError (WARNING: display %s could not be secured\n,
   d-name);
+   PamCloseSession();
SessionExit (d, RESERVER_DISPLAY, FALSE);
 }
 (void) alarm ((unsigned) d-grabTimeout);
@@ -491,6 +495,7 @@ SecureDisplay (struct display *d, Displa
(void) Signal (SIGALRM, SIG_DFL);
LogError (WARNING: keyboard on display %s could not be secured\n,
  d-name);
+   PamCloseSession();
SessionExit (d, RESERVER_DISPLAY, FALSE);
 }
 Debug (XGrabKeyboard succeeded %s\n, d-name);
@@ -515,8 +520,7 @@ UnsecureDisplay (struct display *d, Disp
 }
 
 void
-SessionExit (struct display *d, int status, int removeAuth)
-{
+PamCloseSession(void) {
 #ifdef USE_PAM
 pam_handle_t *pamh = thepamh();
 
@@ -527,7 +531,11 @@ SessionExit (struct display *d, int stat
pamh = NULL;
 }
 #endif
+}
 
+void
+SessionExit (struct display *d, int status, int removeAuth)
+{
 /* make sure the server gets reset after the session is over */
 if (d-serverPid = 2  d-resetSignal)
kill (d-serverPid, d-resetSignal);
Index: xdm-1.1.10/greeter/greet.c
===
--- xdm-1.1.10.orig/greeter/greet.c
+++ xdm-1.1.10/greeter/greet.c
@@ -582,6 +582,7 @@ greet_user_rtn GreetUser(
   pam_done:
if (code != 0)
{
+   PamCloseSession();
CloseGreet (d);
SessionExit (d, code, FALSE);
}
@@ -610,6 +611,7 @@ greet_user_rtn GreetUser(
code = Greet (d, greet);
if (code != 0)
{
+   PamCloseSession();
CloseGreet (d);
SessionExit (d, code, FALSE);
}
@@ -632,6 +634,7 @@ greet_user_rtn GreetUser(
 {
Debug (Startup program %s exited with non-zero status\n,
d-startup);
+   PamCloseSession();
SessionExit (d, OBEYSESS_DISPLAY, FALSE);
 }
 /*
-- 
To unsubscribe, e-mail: 

commit xdm for openSUSE:Factory

2013-06-11 Thread h_root
Hello community,

here is the log from the commit of package xdm for openSUSE:Factory checked in 
at 2013-06-11 06:40:15

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  2013-05-27 10:11:10.0 
+0200
+++ /work/SRC/openSUSE:Factory/.xdm.new/xdm.changes 2013-06-11 
09:38:32.0 +0200
@@ -1,0 +2,6 @@
+Fri Jun  7 10:25:15 UTC 2013 - wer...@suse.de
+
+- Add some GNOME specifiv magics to Xsession to allow that ~/.i18n
+  is always sourced (bnc#567324)
+
+---



Other differences:
--
++ xdm.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/etc/X11/xdm/Xsession new/etc/X11/xdm/Xsession
--- old/etc/X11/xdm/Xsession2013-05-24 14:53:01.0 +0200
+++ new/etc/X11/xdm/Xsession2013-06-07 11:09:00.0 +0200
@@ -4,7 +4,7 @@
 #  script of the user for logon.
 #  
 # Copyright (c) 1998-2000 SuSE GmbH Nuernberg, Germany.
-# Copyright (c) 2005 SUSE LINUX Products GmbH
+# Copyright (c) 2005-2013 SUSE LINUX Products GmbH
 # please report bugfixes or comments at http://www.suse.de/feedback.
 #
 # Author: Werner Fink wer...@suse.de
@@ -120,11 +120,14 @@
 for errfile in ${HOME}/.xsession-errors \
${TMPDIR:-/tmp}/xerr-${USER}-${DISPLAY}
 do
-# GDM seems to handle this its self
-test -z $GDMSESSION || break
+stderr=$(readlink -f /dev/stderr 2/dev/null)
 
-# Once if KDM does handle this its self
-#test -z $KDMSESSION || break
+# Some DM seem to handle this them self
+case $stderr in
+/var/*|/tmp/*|/dev/*)
+   ;;
+*) break
+esac
 
 # Avoid bad symbolic links
 # mv(1) uses rename(2) on the *same* file system
@@ -172,6 +175,11 @@
 export WINDOWMANAGER
 
 #
+# By default we set system defaults for the language
+#
+. /etc/profile.d/lang.sh
+
+#
 # Handle arguments given by xdm/kdm/gdm.
 #
 forced=no
@@ -188,26 +196,36 @@
let argc++ || :
case $l in
[a-z][a-z]_[A-Z][A-Z]*)
-   LANG=$l
-   export LANG
+   GDM_LANG=$l
break
esac
 done
 unset argv[$argc]
 unset l
-readonly argv
-# get the system default locale settings:
-if test -z $LANG -a -f /etc/profile.d/lang.sh ; then
-   . /etc/profile.d/lang.sh
-fi
-else
-readonly argv
 fi
+readonly argv
 
-# If LANG is still not set, get the system default locale settings:
 #
-if test -z $LANG -a -f /etc/profile.d/lang.sh ; then
-. /etc/profile.d/lang.sh
+# If GDM had set GDM_LANG then override LANG:
+#
+if test -n $GDM_LANG ; then
+LANG=$GDM_LANG
+export LANG
+if test -n $LC_ALL ; then
+   test $LC_ALL   = $LANG || LC_ALL=$LANG
+else
+   unset LC_ALL
+fi
+if test -n $LANGUAGE ; then
+   test $LANGUAGE = $LANG || LANGUAGE=$LANG
+else
+   unset LANGUAGE
+fi
+if test -n $LINGUAS ; then
+   test $LINGUAS  = $LANG || LINGUAS=$LANG
+else
+   unset LINGUAS
+fi
 fi
 
 #

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit xdm for openSUSE:Factory

2013-05-27 Thread h_root
Hello community,

here is the log from the commit of package xdm for openSUSE:Factory checked in 
at 2013-05-27 10:11:08

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  2013-04-14 16:12:33.0 
+0200
+++ /work/SRC/openSUSE:Factory/.xdm.new/xdm.changes 2013-05-27 
10:11:10.0 +0200
@@ -1,0 +2,11 @@
+Fri May 24 12:59:46 UTC 2013 - wer...@suse.de
+
+- Some shells do not know about HOSTNAME variable and print error
+  messages therefore export this variable 
+- Make check for dbus smart, that is check if threre is already
+  an active session and use this if possible
+- Be aware that one user may use several X sessions in parallel
+  on the same system as well as on several systems with HOME on
+  an NFS based share. That is do not override ~/.xsession-errors
+
+---



Other differences:
--
++ xdm.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/etc/X11/xdm/Xsession new/etc/X11/xdm/Xsession
--- old/etc/X11/xdm/Xsession2012-12-07 13:46:59.0 +0100
+++ new/etc/X11/xdm/Xsession2013-05-24 14:53:01.0 +0200
@@ -99,6 +99,9 @@
 
 test -f $1 -a ! -x $1  set -- /bin/bash $@
 
+: ${HOSTNAME:=$(hostname -f)}
+export HOSTNAME
+
 case ${cmd} in
 csh|tcsh)
exec -l -a ${cmd} ${shell} -c 'exec $argv:q'  ${@};;
@@ -114,9 +117,8 @@
 #
 # Redirect errors to the standard user log files.
 #
-for errfile in $HOME/.xsession-errors \
-   $TMPDIR/xses-$USER \
-   /tmp/xses-$USER
+for errfile in ${HOME}/.xsession-errors \
+   ${TMPDIR:-/tmp}/xerr-${USER}-${DISPLAY}
 do
 # GDM seems to handle this its self
 test -z $GDMSESSION || break
@@ -126,8 +128,8 @@
 
 # Avoid bad symbolic links
 # mv(1) uses rename(2) on the *same* file system
-case $errfile in
-   /tmp/*|$TMPDIR/*)
+case ${errfile##*/} in
+   xerr-*)
if rm -f -- $errfile ; then
tmpfile=$(mktemp -q $errfile.) || break
mv -fT $tmpfile $errfile || break
@@ -136,12 +138,17 @@
fi
;;
*)
-   if test -e $errfile ; then
-   exec  $errfile 21
-   break
+   # Should we catch also e.g. vboxsf?
+   if test $(stat -fc '%T' ${errfile%/.*} 2/dev/null) = nfs
+   then
+   errfile=${errfile}-${HOSTNAME:-$(hostname -f)}:${DISPLAY#*:}
+   else
+   errfile=${errfile}-${DISPLAY}
+   fi
+   if test ! -e $errfile ; then
+   tmpfile=$(mktemp -q $errfile.) || break
+   mv -fT $tmpfile $errfile || break
fi
-   tmpfile=$(mktemp -q $errfile.) || break
-   mv -fT $tmpfile $errfile || break
exec  $errfile 21
break
;;
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.xsession2013-04-11 11:47:20.0 +0200
+++ new/etc/X11/xdm/sys.xsession2013-05-24 13:13:00.0 +0200
@@ -139,12 +139,55 @@
 #
 # Check if a dbus is required for e.g. plain xdm sessions
 #
-if test -z $DBUS_SESSION_BUS_ADDRESS  dbuslaunch=$(type -p dbus-launch) ; 
then
-set -- $dbuslaunch --sh-syntax --exit-with-session ${1+$@}
+if dbusdaemon=$(type -p dbus-daemon)  dbuslaunch=$(type -p dbus-launch) ; 
then
+if test -s /var/lib/dbus/machine-id ; then
+   read -t1 mid  /var/lib/dbus/machine-id
+elif test -s /etc/machine-id ; then
+   read -t1 mid  /etc/machine-id
+else
+   mid=
+fi
+if test -n $DBUS_SESSION_BUS_ADDRESS ; then
+   # Determine dbus identifier
+   for guid in ${DBUS_SESSION_BUS_ADDRESS//,/ } ; do
+   case $guid in
+   guid=*) break
+   esac
+   done
+   # Check if dbus-daemon is active
+   dpid=
+   for suid in ${HOME}/.dbus/session-bus/${mid}* ; do
+   test -e $suid || break
+   grep -q $guid $suid || continue
+   dpid=$(grep -E '^DBUS_SESSION_BUS_PID=[[:digit:]]+' $suid)
+   test /proc/${dpid#*=}/exe -ef $dbusdaemon  continue
+   unset DBUS_SESSION_BUS_ADDRESS
+   break
+   done
+   test -n $dpid || unset DBUS_SESSION_BUS_ADDRESS
+fi
+# Find a valid dbus-daemon if active
+if test -z $DBUS_SESSION_BUS_ADDRESS ; then
+   for suid in ${HOME}/.dbus/session-bus/${mid}* ; do
+   test -e $suid || break
+  

commit xdm for openSUSE:Factory

2013-04-14 Thread h_root
Hello community,

here is the log from the commit of package xdm for openSUSE:Factory checked in 
at 2013-04-14 16:12:32

Comparing /work/SRC/openSUSE:Factory/xdm (Old)
 and  /work/SRC/openSUSE:Factory/.xdm.new (New)


Package is xdm, Maintainer is 

Changes:

--- /work/SRC/openSUSE:Factory/xdm/xdm.changes  2013-03-01 21:03:23.0 
+0100
+++ /work/SRC/openSUSE:Factory/.xdm.new/xdm.changes 2013-04-14 
16:12:33.0 +0200
@@ -1,0 +2,7 @@
+Thu Apr 11 09:55:57 UTC 2013 - sndir...@suse.com
+
+- do not use '-k' option for checkproc for ssh-agent since
+  /proc/pid/exe link is apparently not readable by the user
+  used for that program (bnc#812783)
+
+---



Other differences:
--
++ 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.xsession2012-09-25 12:17:12.0 +0200
+++ new/etc/X11/xdm/sys.xsession2013-04-11 11:47:20.0 +0200
@@ -39,7 +39,7 @@
 #
 checkproc ()
 {
-/sbin/checkproc -k ${1+$@}
+/sbin/checkproc ${1+$@}
 }
 
 #

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit xdm for openSUSE:Factory

2013-03-01 Thread h_root
Hello community,

here is the log from the commit of package xdm for openSUSE:Factory checked in 
at 2013-03-01 14:02:30

Comparing /work/SRC/openSUSE:Factory/xdm (Old)
 and  /work/SRC/openSUSE:Factory/.xdm.new (New)


Package is xdm, Maintainer is 

Changes:

--- /work/SRC/openSUSE:Factory/xdm/xdm.changes  2013-01-08 15:08:25.0 
+0100
+++ /work/SRC/openSUSE:Factory/.xdm.new/xdm.changes 2013-03-01 
14:02:31.0 +0100
@@ -1,0 +2,7 @@
+Fri Mar  1 11:31:52 UTC 2013 - sndir...@suse.com
+
+- /etc/X11/xdm/SuSEconfig.xdm: copied required function from old
+  /lib/YaST/SuSEconfig.functions, which no longer exists since
+  openSUSE 12.3 (bnc#806738)
+
+---



Other differences:
--
++ xdm.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/etc/X11/xdm/SuSEconfig.xdm 
new/etc/X11/xdm/SuSEconfig.xdm
--- old/etc/X11/xdm/SuSEconfig.xdm  2009-02-16 08:53:46.0 +0100
+++ new/etc/X11/xdm/SuSEconfig.xdm  2013-03-01 12:30:36.0 +0100
@@ -4,6 +4,54 @@
 # Copyright (c) 2008 SuSE LINUX Products GmbH, Germany.
 # Author: Werner Fink  wer...@suse.de
 
+check_md5_and_move() # Usage: check_md5_and_move file_name-without.SuSEconfig
+{
+# This function checks the existence of a file (specified without the
+# extension .SuSEconfig and without $r) and a corresponding md5 checksum
+# and tests whether the time stamp of the file has changed.
+# If it has, nothing further will happen. If not, the file.SuSEconfig
+# will be moved to file.
+
+FILE=$1
+if test -n $r ; then
+RELPATH=`echo $FILE | sed -es:^$r::`
+else
+RELPATH=$FILE
+fi
+MD5FILE=$MD5DIR/$RELPATH
+#
+# make sure that the directory exists
+mkdir -p `dirname $MD5FILE`
+NEWMD5SUM=`cat $FILE.SuSEconfig | grep -v ^# | md5sum`
+if test ! -s $FILE ; then
+touch $FILE
+rm -f $MD5FILE
+fi
+if test $FORCE_REPLACE = true ; then
+cp -p $FILE.SuSEconfig $FILE
+fi
+USERMD5SUM=`cat $FILE | grep -v ^# | md5sum`
+test -e $MD5FILE || echo $USERMD5SUM  $MD5FILE
+OLDMD5SUM=`cat $MD5FILE`
+if test $USERMD5SUM != $OLDMD5SUM -a \
+$USERMD5SUM != $NEWMD5SUM ; then
+echo
+echo ATTENTION: You have modified $RELPATH.  Leaving it untouched...
+echo You can find my version in $FILE.SuSEconfig...
+echo
+else
+if test $USERMD5SUM != $NEWMD5SUM -o $FORCE_REPLACE = true ; then
+echo Installing new $RELPATH
+cp -p $FILE.SuSEconfig $FILE
+else
+test $VERBOSE = false || echo No changes for $RELPATH
+fi
+rm -f $FILE.SuSEconfig
+fi
+rm -f $MD5FILE
+echo $NEWMD5SUM  $MD5FILE
+}
+
 type -p sed   /dev/null || {
 echo ${0##*/}: No sed  in PATH ... skipping
 exit 0
@@ -16,12 +64,10 @@
 }
 . $r/etc/sysconfig/displaymanager
 
-test -f $r/lib/YaST/SuSEconfig.functions || {
-echo ${0##*/}: ERROR - can not find $r'/lib/YaST/SuSEconfig.functions!!'
-echo ${0##*/}: This should not happen.  Exit...
-exit 1
+test -z $MD5DIR  {
+MD5DIR=/var/adm/SuSEconfig/md5
+echo Using MD5DIR=\$MD5DIR\...
 }
-. $r/lib/YaST/SuSEconfig.functions
 
 if test -r $r/etc/X11/xdm/Xservers -a $r/etc/sysconfig/displaymanager -nt 
$r/etc/X11/xdm/Xservers; then
 file=$r/etc/X11/xdm/Xservers

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit xdm for openSUSE:Factory

2013-03-01 Thread h_root
Hello community,

here is the log from the commit of package xdm for openSUSE:Factory checked in 
at 2013-03-01 20:45:53

Comparing /work/SRC/openSUSE:Factory/xdm (Old)
 and  /work/SRC/openSUSE:Factory/.xdm.new (New)


Package is xdm, Maintainer is 

Changes:

--- /work/SRC/openSUSE:Factory/xdm/xdm.changes  2013-03-01 14:02:31.0 
+0100
+++ /work/SRC/openSUSE:Factory/.xdm.new/xdm.changes 2013-03-01 
20:45:54.0 +0100
@@ -1,0 +2,6 @@
+Fri Mar  1 12:44:10 UTC 2013 - fcro...@suse.com
+
+- Add systemd-user-sessions to xdm initscript X-Should-Start, to
+  ensure user login is available when xdm is started.
+
+---



Other differences:
--
++ xdm.tar.bz2 ++
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  2012-11-19 17:30:45.0 +0100
+++ new/etc/init.d/xdm  2013-03-01 13:43:48.0 +0100
@@ -15,7 +15,7 @@
 # Provides:  xdm display-manager
 # Required-Start:$remote_fs dbus
 # Required-Stop: $remote_fs
-# Should-Start: ypbind $syslog gpm firstboot kbd resmgr earlyxdm winbind acpid 
ntp
+# Should-Start: ypbind $syslog gpm firstboot kbd resmgr earlyxdm winbind acpid 
ntp systemd-user-sessions
 # Should-Stop:  ypbind $syslog gpm firstboot kbd resmgr earlyxdm winbind acpid 
ntp
 # Default-Start: 5
 # Default-Stop:

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit xdm for openSUSE:Factory

2013-01-08 Thread h_root
Hello community,

here is the log from the commit of package xdm for openSUSE:Factory checked in 
at 2013-01-08 15:08:24

Comparing /work/SRC/openSUSE:Factory/xdm (Old)
 and  /work/SRC/openSUSE:Factory/.xdm.new (New)


Package is xdm, Maintainer is 

Changes:

--- /work/SRC/openSUSE:Factory/xdm/xdm.changes  2012-12-14 11:24:22.0 
+0100
+++ /work/SRC/openSUSE:Factory/.xdm.new/xdm.changes 2013-01-08 
15:08:25.0 +0100
@@ -1,0 +2,6 @@
+Tue Jan  8 11:01:51 UTC 2013 - sndir...@suse.com
+
+- /etc/X11/xdm/Keyboard.map:
+  * added missing mac-dvorak entry (bnc#796170)
+
+---



Other differences:
--
++ xdm.spec ++
--- /var/tmp/diff_new_pack.6D3InR/_old  2013-01-08 15:08:26.0 +0100
+++ /var/tmp/diff_new_pack.6D3InR/_new  2013-01-08 15:08:26.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package xdm
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed

++ xdm.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/etc/X11/xdm/Keyboard.map new/etc/X11/xdm/Keyboard.map
--- old/etc/X11/xdm/Keyboard.map2011-08-08 14:46:42.0 +0200
+++ new/etc/X11/xdm/Keyboard.map2013-01-08 12:01:27.0 +0100
@@ -35,6 +35,7 @@
 dvorak-l: microsoftpro : dvorak   : x: xfree86 : x : x 
: x : x : x
 dvorak-r: microsoftpro : dvorak   : x: xfree86 : x : x 
: x : x : x
 dvorak  : microsoftpro : dvorak   : x: xfree86 : x : x 
: x : x : x
+mac-dvorak  : microsoftpro : dvorak   : x: xfree86 : x : x 
: x : x : x
 emacs   : microsoftpro : us   : x: xfree86 : x : x 
: x : x : x
 emacs2  : microsoftpro : us   : x: xfree86 : x : x 
: x : x : x
 es  : microsoftpro : es   : x: xfree86 : x : x 
: x : x : x

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit xdm for openSUSE:Factory

2012-12-14 Thread h_root
Hello community,

here is the log from the commit of package xdm for openSUSE:Factory checked in 
at 2012-12-14 11:24:21

Comparing /work/SRC/openSUSE:Factory/xdm (Old)
 and  /work/SRC/openSUSE:Factory/.xdm.new (New)


Package is xdm, Maintainer is 

Changes:

--- /work/SRC/openSUSE:Factory/xdm/xdm.changes  2012-12-07 14:52:34.0 
+0100
+++ /work/SRC/openSUSE:Factory/.xdm.new/xdm.changes 2012-12-14 
11:24:22.0 +0100
@@ -1,0 +2,7 @@
+Fri Dec  7 13:03:15 UTC 2012 - wer...@suse.de
+
+- Be aware the mktemp(1) without XX will do exactly nothing,
+  therefore use mv(1) which uses rename(2) on the same file system
+  to use the files created by mktemp(1) to the log output file 
+
+---



Other differences:
--
++ xdm.tar.bz2 ++
 2289 lines of diff (skipped)

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit xdm for openSUSE:Factory

2012-12-07 Thread h_root
Hello community,

here is the log from the commit of package xdm for openSUSE:Factory checked in 
at 2012-12-07 14:52:32

Comparing /work/SRC/openSUSE:Factory/xdm (Old)
 and  /work/SRC/openSUSE:Factory/.xdm.new (New)


Package is xdm, Maintainer is 

Changes:

--- /work/SRC/openSUSE:Factory/xdm/xdm.changes  2012-11-30 12:32:11.0 
+0100
+++ /work/SRC/openSUSE:Factory/.xdm.new/xdm.changes 2012-12-07 
14:52:34.0 +0100
@@ -1,0 +2,6 @@
+Mon Nov 19 17:31:17 CET 2012 - fcro...@suse.com
+
+- Add display-manager as provides to xdm initscript, to comply with
+  systemd defaults.
+
+---



Other differences:
--
++ xdm.spec ++
--- /var/tmp/diff_new_pack.SpXAX1/_old  2012-12-07 14:52:37.0 +0100
+++ /var/tmp/diff_new_pack.SpXAX1/_new  2012-12-07 14:52:37.0 +0100
@@ -15,6 +15,7 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
 %if 0%{?suse_version}  1220
 %define with_systemd 1
 %else

++ xdm.tar.bz2 ++

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit xdm for openSUSE:Factory

2012-11-30 Thread h_root
Hello community,

here is the log from the commit of package xdm for openSUSE:Factory checked in 
at 2012-11-30 12:30:06

Comparing /work/SRC/openSUSE:Factory/xdm (Old)
 and  /work/SRC/openSUSE:Factory/.xdm.new (New)


Package is xdm, Maintainer is 

Changes:

--- /work/SRC/openSUSE:Factory/xdm/xdm.changes  2012-09-26 16:29:47.0 
+0200
+++ /work/SRC/openSUSE:Factory/.xdm.new/xdm.changes 2012-11-30 
12:32:11.0 +0100
@@ -1,0 +2,7 @@
+Thu Nov 15 20:21:24 UTC 2012 - tittiatc...@gmail.com
+
+- Added a switch to enable building against systemd-logind and 
+  to remove the dependency on ConsoleKit
+- Enabled the systemd switch already for Factory
+
+---



Other differences:
--
++ xdm.spec ++
--- /var/tmp/diff_new_pack.ZPtaLg/_old  2012-11-30 12:32:12.0 +0100
+++ /var/tmp/diff_new_pack.ZPtaLg/_new  2012-11-30 12:32:12.0 +0100
@@ -15,6 +15,11 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+%if 0%{?suse_version}  1220
+%define with_systemd 1
+%else
+%define with_systemd 0
+%endif
 
 %define _dminitdir %{_libexecdir}/X11/displaymanagers
 
@@ -35,12 +40,13 @@
 Source1:xdm.tar.bz2
 Source2:HOWTO.xdm
 Source3:xdm-fallbacks.tar.bz2
+%if !%with_systemd
 Patch0: xdm-consolekit.diff
+%endif
 Patch1: xdm-tolerant-hostname-changes.diff
 Patch2: 
U_xdm_config-AC_LIBTOOL_DLOPEN-is-required-for-dynamic-lin.patch
 Patch3: 
U_xdm_config-use-libtool-export-dynamic-option-for-reverse.patch
 Patch4: U_xdm_Fix-missing-linking-dependency-on-ldl.patch
-BuildRequires:  ConsoleKit-devel
 %if 0%{?suse_version} = 01140
 # Needed to create the man page symlink to init.d
 BuildRequires:  aaa_base-extras
@@ -61,7 +67,10 @@
 BuildRequires:  pkgconfig(xpm)
 BuildRequires:  pkgconfig(xt)
 BuildRequires:  pkgconfig(xtrans)
+%if !%with_systemd
+BuildRequires:  ConsoleKit-devel
 Requires:   ConsoleKit
+%endif
 Requires:   logrotate
 Requires:   sessreg
 Requires:   xrdb
@@ -78,7 +87,9 @@
 %prep
 %setup -q
 cp %{SOURCE2} .
+%if !%with_systemd
 %patch0 -p1
+%endif
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit xdm for openSUSE:Factory

2012-09-26 Thread h_root
Hello community,

here is the log from the commit of package xdm for openSUSE:Factory checked in 
at 2012-09-26 16:29:45

Comparing /work/SRC/openSUSE:Factory/xdm (Old)
 and  /work/SRC/openSUSE:Factory/.xdm.new (New)


Package is xdm, Maintainer is 

Changes:

--- /work/SRC/openSUSE:Factory/xdm/xdm.changes  2012-09-17 14:17:11.0 
+0200
+++ /work/SRC/openSUSE:Factory/.xdm.new/xdm.changes 2012-09-26 
16:29:47.0 +0200
@@ -1,0 +2,7 @@
+Tue Sep 25 10:21:24 UTC 2012 - wer...@suse.de
+
+- Make failsafe work after a failed exec bash builtin
+- Add dbus-launch and ck-launch-session to final session command
+  line for case of using xdm
+
+---



Other differences:
--
++ xdm.tar.bz2 ++
 2245 lines of diff (skipped)

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit xdm for openSUSE:Factory

2012-09-17 Thread h_root
Hello community,

here is the log from the commit of package xdm for openSUSE:Factory checked in 
at 2012-09-17 14:17:10

Comparing /work/SRC/openSUSE:Factory/xdm (Old)
 and  /work/SRC/openSUSE:Factory/.xdm.new (New)


Package is xdm, Maintainer is 

Changes:

--- /work/SRC/openSUSE:Factory/xdm/xdm.changes  2012-08-23 15:32:01.0 
+0200
+++ /work/SRC/openSUSE:Factory/.xdm.new/xdm.changes 2012-09-17 
14:17:11.0 +0200
@@ -1,0 +2,6 @@
+Thu Sep 13 13:06:38 UTC 2012 - sndir...@suse.com
+
+- add dependency on xtrans, otherwise TCP is not supported for
+  xdmcp (bnc#780122)
+
+---



Other differences:
--
++ xdm.spec ++
--- /var/tmp/diff_new_pack.IGhFaa/_old  2012-09-17 14:17:13.0 +0200
+++ /var/tmp/diff_new_pack.IGhFaa/_new  2012-09-17 14:17:13.0 +0200
@@ -60,6 +60,7 @@
 BuildRequires:  pkgconfig(xorg-macros) = 1.4
 BuildRequires:  pkgconfig(xpm)
 BuildRequires:  pkgconfig(xt)
+BuildRequires:  pkgconfig(xtrans)
 Requires:   ConsoleKit
 Requires:   logrotate
 Requires:   sessreg

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit xdm for openSUSE:Factory

2012-08-23 Thread h_root
Hello community,

here is the log from the commit of package xdm for openSUSE:Factory checked in 
at 2012-08-23 15:31:54

Comparing /work/SRC/openSUSE:Factory/xdm (Old)
 and  /work/SRC/openSUSE:Factory/.xdm.new (New)


Package is xdm, Maintainer is 

Changes:

--- /work/SRC/openSUSE:Factory/xdm/xdm.changes  2012-08-08 11:44:53.0 
+0200
+++ /work/SRC/openSUSE:Factory/.xdm.new/xdm.changes 2012-08-23 
15:32:01.0 +0200
@@ -1,0 +2,13 @@
+Thu Aug 16 17:41:12 CEST 2012 - m...@suse.cz
+
+- separate *.fallback displaymanager files from xdm.tar.bz2 into
+  xdm-fallbacks.tar.bz2 and build only suse version  1210.
+  (bnc#714003)
+
+---
+Thu Aug 16 15:15:12 CEST 2012 - m...@suse.cz
+
+- /etc/init.d/xdm: add plymouth_quit function, use it in xdm
+  displaymanager file (bnc#775548)
+
+---

New:

  xdm-fallbacks.tar.bz2



Other differences:
--
++ xdm.spec ++
--- /var/tmp/diff_new_pack.aTDdYn/_old  2012-08-23 15:32:05.0 +0200
+++ /var/tmp/diff_new_pack.aTDdYn/_new  2012-08-23 15:32:05.0 +0200
@@ -18,6 +18,12 @@
 
 %define _dminitdir %{_libexecdir}/X11/displaymanagers
 
+%if 0%{?suse_version}  01210
+%define dm_fallbacks 1
+%else
+%define dm_fallbacks 0
+%endif
+
 Name:   xdm
 Version:1.1.10
 Release:0
@@ -28,6 +34,7 @@
 Source0:
http://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.tar.bz2
 Source1:xdm.tar.bz2
 Source2:HOWTO.xdm
+Source3:xdm-fallbacks.tar.bz2
 Patch0: xdm-consolekit.diff
 Patch1: xdm-tolerant-hostname-changes.diff
 Patch2: 
U_xdm_config-AC_LIBTOOL_DLOPEN-is-required-for-dynamic-lin.patch
@@ -94,6 +101,9 @@
 pushd %{buildroot}
 # SuSE default XDM configuration
 tar xf %{SOURCE1}
+%if %dm_fallbacks
+tar xf %{SOURCE3}
+%endif
 %ifarch s390 s390x
 sed -i -e 
s+DISPLAYMANAGER_REMOTE_ACCESS=.*+DISPLAYMANAGER_REMOTE_ACCESS=\yes\+g \
-e 
s+DISPLAYMANAGER_REMOTE_ACCESS=.*+DISPLAYMANAGER_REMOTE_ACCESS=\no\+g \
@@ -131,12 +141,14 @@
 %doc HOWTO.xdm
 %dir %{_dminitdir}
 %{_dminitdir}/xdm
+%if %dm_fallbacks
 %{_dminitdir}/entrance.fallback
 %{_dminitdir}/gdm.fallback
 %{_dminitdir}/kdm.fallback
 %{_dminitdir}/lxdm.fallback
 %{_dminitdir}/slim.fallback
 %{_dminitdir}/wdm.fallback
+%endif
 %config %{_sysconfdir}/X11/xdm/
 %config(noreplace) %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/xdmcp
 %{_sysconfdir}/init.d/xdm

++ xdm.tar.bz2 ++
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  2012-08-07 11:11:20.0 +0200
+++ new/etc/init.d/xdm  2012-08-17 14:42:34.0 +0200
@@ -125,6 +125,14 @@
 fi
 }
 
+plymouth_quit()
+{
+if [ -x /usr/bin/plymouth ]; then
+plymouth quit
+plymouth --wait
+fi
+}
+
 #set -x
 
 DM=${DISPLAYMANAGER##*/}
@@ -200,17 +208,6 @@
 rc_exit
 fi
fi
-   case $DM in
-   kdm|gdm)
-   # KDE and GNOME have own plymouth integration
-   ;;
-   *)
-   if [ -x /usr/bin/plymouth ]; then
-   plymouth quit
-   plymouth --wait
-   fi
-   ;;
-   esac
startproc -p $PIDFILE $DISPLAYMANAGER $XDMOPTIONS || rc_failed
# After a crash or a kill signal we may have
# a wrong ownership of /dev/xconsole
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/usr/lib/X11/displaymanagers/entrance.fallback 
new/usr/lib/X11/displaymanagers/entrance.fallback
--- old/usr/lib/X11/displaymanagers/entrance.fallback   2011-09-26 
15:10:04.0 +0200
+++ new/usr/lib/X11/displaymanagers/entrance.fallback   1970-01-01 
01:00:00.0 +0100
@@ -1,10 +0,0 @@
-entrance_vars () {
-case $1 in
-entrance)
-   DISPLAYMANAGER=/usr/sbin/entranced
-   ;;
-   *)
-   return 1
-esac
-return 0
-}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/usr/lib/X11/displaymanagers/gdm.fallback 
new/usr/lib/X11/displaymanagers/gdm.fallback
--- old/usr/lib/X11/displaymanagers/gdm.fallback2011-09-07 
11:38:33.0 +0200
+++ new/usr/lib/X11/displaymanagers/gdm.fallback1970-01-01 
01:00:00.0 +0100
@@ -1,24 +0,0 @@
-gdm_start_proc () {
-if [  $DISPLAYMANAGER_REMOTE_ACCESS = yes  -a \
-   $DISPLAYMANAGER_STARTS_XSERVER = no ]; then
-   XDMOPTIONS=--no-console
-fi
-splashcopy 0 6
-return 0
-}
-
-gdm_vars() {
-case ${DISPLAYMANAGER##*/} in
-   gdm|GDM|Gnome|GNOME) 
-  

commit xdm for openSUSE:Factory

2012-08-08 Thread h_root
Hello community,

here is the log from the commit of package xdm for openSUSE:Factory checked in 
at 2012-08-08 11:44:39

Comparing /work/SRC/openSUSE:Factory/xdm (Old)
 and  /work/SRC/openSUSE:Factory/.xdm.new (New)


Package is xdm, Maintainer is 

Changes:

--- /work/SRC/openSUSE:Factory/xdm/xdm.changes  2012-07-02 11:20:43.0 
+0200
+++ /work/SRC/openSUSE:Factory/.xdm.new/xdm.changes 2012-08-08 
11:44:53.0 +0200
@@ -1,0 +2,6 @@
+Tue Aug  7 09:11:51 UTC 2012 - sndir...@suse.com
+
+- /etc/init.d/xdm: overwrite displaymanager's PIDFILE symlink if
+  neccessary (bnc#774555)
+
+---



Other differences:
--
++ xdm.tar.bz2 ++
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  2012-07-01 09:47:02.0 +0200
+++ new/etc/init.d/xdm  2012-08-07 11:11:20.0 +0200
@@ -221,7 +221,7 @@
chown root:tty /dev/xconsole /dev/tty0
chmod 622  /dev/xconsole /dev/tty0
fi
-   ln -s $PIDFILE $PIDFILELNK
+   ln -snf $PIDFILE $PIDFILELNK
fi
rc_status -v
;;

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit xdm for openSUSE:Factory

2012-07-02 Thread h_root
Hello community,

here is the log from the commit of package xdm for openSUSE:Factory checked in 
at 2012-07-02 11:20:42

Comparing /work/SRC/openSUSE:Factory/xdm (Old)
 and  /work/SRC/openSUSE:Factory/.xdm.new (New)


Package is xdm, Maintainer is 

Changes:

--- /work/SRC/openSUSE:Factory/xdm/xdm.changes  2012-05-16 12:26:50.0 
+0200
+++ /work/SRC/openSUSE:Factory/.xdm.new/xdm.changes 2012-07-02 
11:20:43.0 +0200
@@ -1,0 +2,22 @@
+Sat Jun 30 21:29:37 CEST 2012 - ti...@suse.de
+
+- avoid plymouth quit for kdm and gdm (bnc#762909)
+
+---
+Fri Jun 29 16:23:12 CEST 2012 - ti...@suse.de
+
+- remove --retain-splash option from plymouth quit (bnc#769209)
+
+---
+Fri Jun 29 14:11:47 UTC 2012 - sndir...@suse.com
+
+- /etc/init.d/xdm
+  * quit plymouth properly before starting displaymanager
+(bnc#769209)
+
+---
+Mon Jun 18 13:38:34 UTC 2012 - wer...@suse.de
+
+- Skip LANG argument from command line of session managers (bnc#661946) 
+
+---



Other differences:
--
++ xdm.spec ++
--- /var/tmp/diff_new_pack.eIkQBy/_old  2012-07-02 11:20:44.0 +0200
+++ /var/tmp/diff_new_pack.eIkQBy/_new  2012-07-02 11:20:44.0 +0200
@@ -21,10 +21,10 @@
 Name:   xdm
 Version:1.1.10
 Release:0
-License:MIT
 Summary:X Display Manager
-Url:http://xorg.freedesktop.org/
+License:MIT
 Group:  System/X11/Utilities
+Url:http://xorg.freedesktop.org/
 Source0:
http://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.tar.bz2
 Source1:xdm.tar.bz2
 Source2:HOWTO.xdm

++ xdm.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/etc/X11/xdm/Xsession new/etc/X11/xdm/Xsession
--- old/etc/X11/xdm/Xsession2010-12-03 18:42:07.0 +0100
+++ new/etc/X11/xdm/Xsession2012-06-18 15:36:04.0 +0200
@@ -64,8 +64,6 @@
 IFS=$OIFS
 fi
 
-readonly argv
-
 #
 # Disable graphical login if normal login is disabled
 #
@@ -170,7 +168,9 @@
 *) forced=yes
WINDOWMANAGER=${argv[0]} ;;
 esac
-for l ; do
+typeset -i argc=0
+for l in ${#argv[@]} ; do
+   let argc++ || :
case $l in
[a-z][a-z]_[A-Z][A-Z]*)
LANG=$l
@@ -178,11 +178,15 @@
break
esac
 done
+unset argv[$argc]
 unset l
+readonly argv
 # get the system default locale settings:
 if test -z $LANG -a -f /etc/profile.d/lang.sh ; then
. /etc/profile.d/lang.sh
 fi
+else
+readonly argv
 fi
 
 # If LANG is still not set, get the system default locale settings:
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  2011-11-08 10:21:56.0 +0100
+++ new/etc/init.d/xdm  2012-07-01 09:47:02.0 +0200
@@ -200,6 +200,17 @@
 rc_exit
 fi
fi
+   case $DM in
+   kdm|gdm)
+   # KDE and GNOME have own plymouth integration
+   ;;
+   *)
+   if [ -x /usr/bin/plymouth ]; then
+   plymouth quit
+   plymouth --wait
+   fi
+   ;;
+   esac
startproc -p $PIDFILE $DISPLAYMANAGER $XDMOPTIONS || rc_failed
# After a crash or a kill signal we may have
# a wrong ownership of /dev/xconsole

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit xdm for openSUSE:Factory

2012-05-16 Thread h_root
Hello community,

here is the log from the commit of package xdm for openSUSE:Factory checked in 
at 2012-05-16 12:26:48

Comparing /work/SRC/openSUSE:Factory/xdm (Old)
 and  /work/SRC/openSUSE:Factory/.xdm.new (New)


Package is xdm, Maintainer is 

Changes:

--- /work/SRC/openSUSE:Factory/xdm/xdm.changes  2012-05-08 12:02:23.0 
+0200
+++ /work/SRC/openSUSE:Factory/.xdm.new/xdm.changes 2012-05-16 
12:26:50.0 +0200
@@ -1,0 +2,6 @@
+Thu May 10 13:58:38 UTC 2012 - sndir...@suse.com
+
+- /etc/pam.d/xdm-np: add session require to pam_loginuid.so in
+  order to fix running commands via sudo (bnc #746704)
+
+---



Other differences:
--
++ xdm.spec ++
--- /var/tmp/diff_new_pack.fCJPBR/_old  2012-05-16 12:26:51.0 +0200
+++ /var/tmp/diff_new_pack.fCJPBR/_new  2012-05-16 12:26:51.0 +0200
@@ -15,6 +15,7 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
 %define _dminitdir %{_libexecdir}/X11/displaymanagers
 
 Name:   xdm

++ xdm.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/etc/pam.d/xdm-np new/etc/pam.d/xdm-np
--- old/etc/pam.d/xdm-np2008-09-03 17:45:45.0 +0200
+++ new/etc/pam.d/xdm-np2012-05-10 15:57:58.0 +0200
@@ -2,4 +2,5 @@
 auth required   pam_permit.so
 account  includecommon-account
 password includecommon-password
+session  required   pam_loginuid.so
 session  includecommon-session

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org