- updated to 1.1.12

- updated config,consolekit patches

diff --git a/xorg-app-xdm-config.patch b/xorg-app-xdm-config.patch
index de012caf5cf47272774d08316905d296b94d8d73..67faebc724ed2fecef5a5504da1382ebb3d09d56 100644 (file)
--- a/xorg-app-xdm-config.patch
+++ b/xorg-app-xdm-config.patch
@@ -1,5 +1,5 @@
---- xdm-1.1.0/config/Xresources.cpp.orig       2006-08-14 20:12:34.000000000 +0200
-+++ xdm-1.1.0/config/Xresources.cpp    2006-10-15 02:18:19.860305500 +0200
+--- xdm-1.1.12/config/Xresources.in.orig       2006-08-14 20:12:34.000000000 +0200
++++ xdm-1.1.12/config/Xresources.in    2006-10-15 02:18:19.860305500 +0200
 @@ -78,7 +78,7 @@
  #endif /* XPM */
  XHASHendif

diff --git a/xorg-app-xdm-consolekit.patch b/xorg-app-xdm-consolekit.patch
index f81a2dc7016c1fd4b11cf48143c286dce0b881f6..885ac6f4e95c49861e5208c4b5b954c9be96d155 100644 (file)
--- a/xorg-app-xdm-consolekit.patch
+++ b/xorg-app-xdm-consolekit.patch
@@ -31,9 +31,9 @@ Index: xdm-1.1.10/configure.ac
  #
  #  XDM
  #
---- xdm-1.1.11.orig/xdm/session.c
-+++ xdm-1.1.11/xdm/session.c
-@@ -67,6 +67,11 @@ extern int key_setnet(struct key_netstar
+--- xdm-1.1.12/xdm/session.c.orig      2019-03-02 23:06:13.000000000 +0100
++++ xdm-1.1.12/xdm/session.c   2019-03-05 18:55:19.964592706 +0100
+@@ -73,6 +73,11 @@ extern int key_setnet(struct key_netstar
  # endif
  #endif /* USE_PAM */
  
@@ -42,10 +42,10 @@ Index: xdm-1.1.10/configure.ac
 +#include <dbus/dbus.h>
 +#endif
 +
- #ifdef __SCO__
- # include <prot.h>
- #endif
-@@ -514,6 +519,97 @@ UnsecureDisplay (struct display *d, Disp
+ #ifdef USE_SELINUX
+ #include <selinux/selinux.h>
+ #include <selinux/get_context_list.h>
+@@ -523,6 +528,97 @@ UnsecureDisplay (struct display *d, Disp
      }
  }
  
@@ -143,7 +143,7 @@ Index: xdm-1.1.10/configure.ac
  void
  SessionExit (struct display *d, int status, int removeAuth)
  {
-@@ -528,6 +624,8 @@ SessionExit (struct display *d, int stat
+@@ -537,6 +633,8 @@ SessionExit (struct display *d, int stat
      }
  #endif
  
@@ -152,7 +152,7 @@ Index: xdm-1.1.10/configure.ac
      /* make sure the server gets reset after the session is over */
      if (d->serverPid >= 2 && d->resetSignal)
        kill (d->serverPid, d->resetSignal);
-@@ -610,6 +708,10 @@ StartClient (
+@@ -614,6 +712,10 @@ StartClient (
  #ifdef USE_PAM
      if (pamh) pam_open_session(pamh, 0);
  #endif

diff --git a/xorg-app-xdm.spec b/xorg-app-xdm.spec
index 1129364ab59bcd1bbce7317a645cc041c6d0f913..7745b7d9732639728e919d1be0a61883c51ec9ad 100644 (file)
--- a/xorg-app-xdm.spec
+++ b/xorg-app-xdm.spec
@@ -6,12 +6,12 @@ Summary(pl.UTF-8):    XDM - zarządca ekranów z obsługą XDMCP i wybieraniem host
 Summary(ru.UTF-8):     Менеджер дисплея X
 Summary(uk.UTF-8):     Менеджер дисплею X
 Name:          xorg-app-xdm
-Version:       1.1.11
-Release:       5
+Version:       1.1.12
+Release:       1
 License:       MIT
 Group:         X11/Applications
-Source0:       http://xorg.freedesktop.org/releases/individual/app/xdm-%{version}.tar.bz2
-# Source0-md5: 64a1af1f7eb69feae12e75d4cc3aaf19
+Source0:       https://xorg.freedesktop.org/releases/individual/app/xdm-%{version}.tar.bz2
+# Source0-md5: 47c4c3bf8d59b64b64d134df8b5e5ec5
 Source1:       ftp://ftp.pld-linux.org/software/xinit/xdm-xinitrc-0.2.tar.bz2
 # Source1-md5: 0a15b1c374256b5cad7961807baa3896
 Source2:       xdm.pamd
@@ -21,11 +21,12 @@ Patch0:             %{name}-Xsession.patch
 Patch1:                %{name}-pam_tty.patch
 Patch2:                %{name}-config.patch
 Patch3:                %{name}-consolekit.patch
-URL:           http://xorg.freedesktop.org/
+URL:           https://xorg.freedesktop.org/
 BuildRequires: ConsoleKit-devel
 BuildRequires: autoconf >= 2.60
 BuildRequires: automake
 BuildRequires: cpp
+BuildRequires: libbsd-devel
 BuildRequires: libselinux-devel
 BuildRequires: libtool
 BuildRequires: pam-devel
@@ -40,10 +41,14 @@ BuildRequires:      xorg-lib-libXft-devel
 BuildRequires: xorg-lib-libXinerama-devel
 BuildRequires: xorg-lib-libXmu-devel
 BuildRequires: xorg-lib-libXpm-devel
+BuildRequires: xorg-lib-libXrender-devel
 BuildRequires: xorg-lib-libXt-devel >= 1.0.0
 BuildRequires: xorg-lib-xtrans-devel
+BuildRequires: xorg-proto-xproto-devel >= 7.0.17
 BuildRequires: xorg-util-util-macros >= 1.8
 BuildRequires: systemd-units >= 38
+#libsystemd-daemon for startup notification
+#BuildRequires:        systemd-devel < 1:209
 Requires(post,preun):  /sbin/chkconfig
 Requires:      mktemp
 Requires:      pam >= 0.99.7.1
@@ -153,7 +158,7 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS COPYING ChangeLog README
+%doc AUTHORS COPYING ChangeLog README.md
 %attr(755,root,root) %{_bindir}/xdm
 %attr(755,root,root) %{_bindir}/xdmshell
 %{_datadir}/X11/app-defaults/Chooser
@@ -182,5 +187,5 @@ fi
 %{systemdunitdir}/xdm.service
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/xdm
 %dir /var/lib/xdm
-%{_mandir}/man1/xdm.1*
-%{_mandir}/man1/xdmshell.1*
+%{_mandir}/man8/xdm.8*
+%{_mandir}/man8/xdmshell.8*