- updated to 1.1.11

- fixed and updated pam_tty patch
- updated consolekit patch
- removed obsolete selinux patch

Changed files:
    xorg-app-xdm-consolekit.patch -> 1.2
    xorg-app-xdm-pam_tty.patch -> 1.4
    xorg-app-xdm-selinux.patch -> 1.2
    xorg-app-xdm.spec -> 1.44

diff --git a/xorg-app-xdm-consolekit.patch b/xorg-app-xdm-consolekit.patch
index 819f69151c61dd1debdc7fb95c824c8d8c5f6df7..f81a2dc7016c1fd4b11cf48143c286dce0b881f6 100644 (file)
--- a/xorg-app-xdm-consolekit.patch
+++ b/xorg-app-xdm-consolekit.patch
@@ -31,10 +31,8 @@ Index: xdm-1.1.10/configure.ac
  #
  #  XDM
  #
-Index: xdm-1.1.10/session.c
-===================================================================
---- xdm-1.1.10.orig/session.c
-+++ xdm-1.1.10/session.c
+--- 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
  # endif
  #endif /* USE_PAM */
@@ -165,10 +163,8 @@ Index: xdm-1.1.10/session.c
      switch (pid = fork ()) {
      case 0:
        CleanUpChild ();
-Index: xdm-1.1.10/dm.h
-===================================================================
---- xdm-1.1.10.orig/dm.h
-+++ xdm-1.1.10/dm.h
+--- xdm-1.1.11.orig/include/dm.h
++++ xdm-1.1.11/include/dm.h
 @@ -323,6 +323,9 @@ extern char        *randomFile;
  extern char   *prngdSocket;
  extern int    prngdPort;
@@ -179,10 +175,8 @@ Index: xdm-1.1.10/dm.h
  
  extern char   *greeterLib;
  extern char   *willing;
-Index: xdm-1.1.10/resource.c
-===================================================================
---- xdm-1.1.10.orig/resource.c
-+++ xdm-1.1.10/resource.c
+--- xdm-1.1.11.orig/xdm/resource.c
++++ xdm-1.1.11/xdm/resource.c
 @@ -65,6 +65,9 @@ char *randomDevice;
  char  *prngdSocket;
  int   prngdPort;
@@ -217,10 +211,8 @@ Index: xdm-1.1.10/resource.c
  };
  
  static int    originalArgc;
-Index: xdm-1.1.10/xdm.man.cpp
-===================================================================
---- xdm-1.1.10.orig/xdm.man.cpp
-+++ xdm-1.1.10/xdm.man.cpp
+--- xdm-1.1.10.orig/man/xdm.man
++++ xdm-1.1.10/man/xdm.man
 @@ -48,6 +48,8 @@ xdm \- X Display Manager with support fo
  ] [
  .B \-session

diff --git a/xorg-app-xdm-pam_tty.patch b/xorg-app-xdm-pam_tty.patch
index 33989e11c80120c39443b4c9f99c2c029a802294..0d5fcb2585da2c207922237c8c64c51908893f96 100644 (file)
--- a/xorg-app-xdm-pam_tty.patch
+++ b/xorg-app-xdm-pam_tty.patch
@@ -1,13 +1,16 @@
 Set PAM_TTY for remote displays too (used e.g. by pam_time)
---- xdm-1.1.1/greeter/greet.c.orig     2006-10-19 01:55:50.000000000 +0000
-+++ xdm-1.1.1/greeter/greet.c  2006-11-15 08:39:41.739505000 +0000
-@@ -545,8 +545,7 @@
+--- xdm-1.1.11/greeter/greet.c.orig    2011-09-25 09:35:47.000000000 +0200
++++ xdm-1.1.11/greeter/greet.c 2011-09-26 16:43:55.211132926 +0200
+@@ -535,6 +535,12 @@
                                        (*pamhp, PAM_RHOST, hostname));
                free(hostname);
            }
--      } else
--          RUN_AND_CHECK_PAM_ERROR(pam_set_item, (*pamhp, PAM_TTY, d->name));
-+      }
++
++          /* "for graphical, X-based, applications the value for this
++           * item should be the $DISPLAY variable." (pam_appl docs)
++           */
++          RUN_AND_CHECK_PAM_ERROR(pam_set_item,
++                                  (*pamhp, PAM_TTY, d->name));
+       } else {                        /* Displaying on local host */
+           const char *ttyname = NULL;
  
-       if (!greet->allow_null_passwd) {
-           pam_flags |= PAM_DISALLOW_NULL_AUTHTOK;

diff --git a/xorg-app-xdm-selinux.patch b/xorg-app-xdm-selinux.patch
deleted file mode 100644 (file)
index bf95503..0000000
--- a/xorg-app-xdm-selinux.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- xdm-1.1.10/configure.ac.orig       2010-04-10 03:49:03.000000000 +0200
-+++ xdm-1.1.10/configure.ac    2010-05-27 08:38:08.765531633 +0200
-@@ -144,7 +144,7 @@
-               [if test "x$USE_SELINUX" != "xtry" ; then
-                       AC_MSG_ERROR(["selinux support requested, but is_selinux_enabled not found."])
-                fi])
--      XDM_LIBS="$XDM_LIBS $LIBS"
-+      XDM_SELINUX_LIBS="$LIBS"
-       LIBS="$old_LIBS"
- fi
- 
-@@ -311,7 +311,7 @@
- 
- PKG_CHECK_MODULES(XDM, xmu x11 xau)
- 
--XDM_LIBS="$XDM_LIBS $XDM_OS_LIBS"
-+XDM_LIBS="$XDM_LIBS $XDM_SELINUX_LIBS $XDM_OS_LIBS"
- 
- PKG_CHECK_EXISTS(xinerama, [
-       AC_DEFINE([USE_XINERAMA], 1, 

diff --git a/xorg-app-xdm.spec b/xorg-app-xdm.spec
index 5aaf9e840727da322e5e0dfb7c444ec68ec17032..a53f46f8e8d9e91526266fe7728f46957d68687e 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.10
+Version:       1.1.11
 Release:       1
 License:       MIT
 Group:         X11/Applications
 Source0:       http://xorg.freedesktop.org/releases/individual/app/xdm-%{version}.tar.bz2
-# Source0-md5: 329383040cdbda5b5c8ce6c7e1120c97
+# Source0-md5: 64a1af1f7eb69feae12e75d4cc3aaf19
 Source1:       ftp://ftp.pld-linux.org/software/xinit/xdm-xinitrc-0.2.tar.bz2
 # Source1-md5: 0a15b1c374256b5cad7961807baa3896
 Source2:       xdm.pamd
@@ -21,7 +21,6 @@ Patch0:               %{name}-Xsession.patch
 Patch1:                %{name}-pam_tty.patch
 Patch2:                %{name}-config.patch
 Patch3:                %{name}-consolekit.patch
-Patch4:                %{name}-selinux.patch
 URL:           http://xorg.freedesktop.org/
 BuildRequires: ConsoleKit-devel
 BuildRequires: autoconf >= 2.60
@@ -31,16 +30,18 @@ BuildRequires:      libselinux-devel
 BuildRequires: libtool
 BuildRequires: pam-devel
 BuildRequires: pkgconfig >= 1:0.19
+BuildRequires: xorg-lib-libX11-devel
 BuildRequires: xorg-lib-libXau-devel
 BuildRequires: xorg-lib-libXaw-devel
 BuildRequires: xorg-lib-libXdmcp-devel
+BuildRequires: xorg-lib-libXext-devel
 BuildRequires: xorg-lib-libXft-devel
 BuildRequires: xorg-lib-libXinerama-devel
 BuildRequires: xorg-lib-libXmu-devel
 BuildRequires: xorg-lib-libXpm-devel
 BuildRequires: xorg-lib-libXt-devel >= 1.0.0
 BuildRequires: xorg-lib-xtrans-devel
-BuildRequires: xorg-util-util-macros >= 1.4
+BuildRequires: xorg-util-util-macros >= 1.8
 Requires(post,preun):  /sbin/chkconfig
 Requires:      mktemp
 Requires:      pam >= 0.99.7.1
@@ -81,7 +82,6 @@ terminali oraz standardem X Consortium XDMCP.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
 
 %build
 %{__libtoolize}
@@ -93,6 +93,7 @@ terminali oraz standardem X Consortium XDMCP.
        DEF_SYSTEM_PATH="/usr/local/sbin:/usr/sbin:/sbin:/usr/local/bin:/usr/bin:/bin" \
        DEF_USER_PATH="/usr/local/bin:/usr/bin:/bin" \
        --disable-static \
+       --enable-xdmshell \
        --with-authdir=/var/lib/xdm \
        --with-bw-pixmap=xdm-pld-logo-bw.xpm \
        --with-color-pixmap=xdm-pld-logo.xpm \
@@ -113,10 +114,10 @@ install -d $RPM_BUILD_ROOT/var/lib/xdm
        DESTDIR=$RPM_BUILD_ROOT \
        appdefaultdir=%{_datadir}/X11/app-defaults
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/X11/xdm/libXdmGreet.la
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/X11/xdm/libXdmGreet.la
 
 # set up PLD xdm config
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/X11/xdm/{*Console,Xaccess,Xsession,Xsetup*}
+%{__rm} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xdm/{*Console,Xaccess,Xsession,Xsetup*}
 install xdm-xinitrc-*/pixmaps/* $RPM_BUILD_ROOT%{_sysconfdir}/X11/xdm/pixmaps
 install xdm-xinitrc-*/{*Console,Xaccess,Xsession,Xsetup*} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xdm
 
@@ -175,3 +176,4 @@ fi
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/xdm
 %dir /var/lib/xdm
 %{_mandir}/man1/xdm.1x*
+%{_mandir}/man1/xdmshell.1x*