From 53ce8a4621159d950b1328cf9da649b725ecb92b0a7845b1666e5da465ad93d9 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Wed, 4 May 2016 13:02:08 +0000 Subject: [PATCH 1/3] - Prevent xdm.service from being built. We've got display-manager.service instead (bsc#978458). OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xdm?expand=0&rev=127 --- xdm.changes | 6 ++++++ xdm.spec | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/xdm.changes b/xdm.changes index 67eb7ca..3361fe5 100644 --- a/xdm.changes +++ b/xdm.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed May 4 12:55:38 UTC 2016 - eich@suse.com + +- Prevent xdm.service from being built. We've got display-manager.service + instead (bsc#978458). + ------------------------------------------------------------------- Wed Mar 30 13:42:53 UTC 2016 - eich@suse.com diff --git a/xdm.spec b/xdm.spec index a4ace6a..f10e3c6 100644 --- a/xdm.spec +++ b/xdm.spec @@ -129,7 +129,8 @@ autoreconf -fi --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 From 80630905fa8cf80da06726330056825815dcb8bef49a046bddca54ee6946d626 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Fri, 6 May 2016 22:20:17 +0000 Subject: [PATCH 2/3] - Make SUSEconfig handler for DISPLAYMANAGER_XSERVER_TCP_PORT_6000_OPEN robust against changes to the default setting of -listen/-nolisten tcp (boo#978262). OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xdm?expand=0&rev=128 --- xdm.changes | 7 +++++++ xdm.tar.bz2 | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/xdm.changes b/xdm.changes index 3361fe5..fa64f65 100644 --- a/xdm.changes +++ b/xdm.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri May 6 21:14:31 UTC 2016 - eich@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 - eich@suse.com diff --git a/xdm.tar.bz2 b/xdm.tar.bz2 index 2d1a4b8..6d1a766 100644 --- a/xdm.tar.bz2 +++ b/xdm.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ed5bcd338ce457861ef5350c2bc3a2a30cdd050be0e8f082845406251456c706 -size 22523 +oid sha256:59c04e110d592e5dc88110ce5e4f6d45342c88587881cc4b5d305710af5121df +size 22434 From 5c8573530fced10dbb00a5290f59fc7f51e773d8e0ebd6525d33fa43e819ded9 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Sat, 7 May 2016 06:05:28 +0000 Subject: [PATCH 3/3] Updated fix for -nolisten tcp: Add Xserver version checking. OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xdm?expand=0&rev=129 --- xdm.tar.bz2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xdm.tar.bz2 b/xdm.tar.bz2 index 6d1a766..bd892ac 100644 --- a/xdm.tar.bz2 +++ b/xdm.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:59c04e110d592e5dc88110ce5e4f6d45342c88587881cc4b5d305710af5121df -size 22434 +oid sha256:38777b09a28f19fd77012bd68d83e398ab64457581a7baf9d38f42e89784d285 +size 22583