Author: qboosh Date: Mon Sep 26 15:05:19 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- updated to 1.1.11
- fixed and updated pam_tty patch
- updated consolekit patch
- removed obsolete selinux patch
---- Files affected:
packages/xorg-app-xdm:
xorg-app-xdm-consolekit.patch (1.1 -> 1.2) , xorg-app-xdm-pam_tty.patch (1.3
-> 1.4) , xorg-app-xdm.spec (1.43 -> 1.44) , xorg-app-xdm-selinux.patch (1.1 ->
NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/xorg-app-xdm/xorg-app-xdm-consolekit.patch
diff -u packages/xorg-app-xdm/xorg-app-xdm-consolekit.patch:1.1
packages/xorg-app-xdm/xorg-app-xdm-consolekit.patch:1.2
--- packages/xorg-app-xdm/xorg-app-xdm-consolekit.patch:1.1 Wed Dec 22
19:29:20 2010
+++ packages/xorg-app-xdm/xorg-app-xdm-consolekit.patch Mon Sep 26 17:05:14 2011
@@ -31,10 +31,8 @@
#
# 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 @@
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 @@
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 @@
};
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
================================================================
Index: packages/xorg-app-xdm/xorg-app-xdm-pam_tty.patch
diff -u packages/xorg-app-xdm/xorg-app-xdm-pam_tty.patch:1.3
packages/xorg-app-xdm/xorg-app-xdm-pam_tty.patch:1.4
--- packages/xorg-app-xdm/xorg-app-xdm-pam_tty.patch:1.3 Sun Sep 20
08:03:14 2009
+++ packages/xorg-app-xdm/xorg-app-xdm-pam_tty.patch Mon Sep 26 17:05:14 2011
@@ -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;
================================================================
Index: packages/xorg-app-xdm/xorg-app-xdm.spec
diff -u packages/xorg-app-xdm/xorg-app-xdm.spec:1.43
packages/xorg-app-xdm/xorg-app-xdm.spec:1.44
--- packages/xorg-app-xdm/xorg-app-xdm.spec:1.43 Wed Dec 22 19:29:20 2010
+++ packages/xorg-app-xdm/xorg-app-xdm.spec Mon Sep 26 17:05:14 2011
@@ -7,12 +7,12 @@
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
@@ -22,7 +22,6 @@
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
@@ -32,16 +31,18 @@
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
@@ -82,7 +83,6 @@
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch4 -p1
%build
%{__libtoolize}
@@ -94,6 +94,7 @@
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 \
@@ -114,10 +115,10 @@
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
@@ -176,6 +177,7 @@
%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*
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -183,6 +185,12 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.44 2011/09/26 15:05:14 qboosh
+- updated to 1.1.11
+- fixed and updated pam_tty patch
+- updated consolekit patch
+- removed obsolete selinux patch
+
Revision 1.43 2010/12/22 18:29:20 kosmo
- use ConsoleKit.
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xorg-app-xdm/xorg-app-xdm-consolekit.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xorg-app-xdm/xorg-app-xdm-pam_tty.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xorg-app-xdm/xorg-app-xdm.spec?r1=1.43&r2=1.44&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
