packages: xorg-app-xdm/xorg-app-xdm-config.patch, xorg-app-xdm/xorg-app-xdm...

arekm arekm at pld-linux.org
Sun Sep 20 08:03:19 CEST 2009


Author: arekm                        Date: Sun Sep 20 06:03:19 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 1.1.9

---- Files affected:
packages/xorg-app-xdm:
   xorg-app-xdm-config.patch (1.2 -> 1.3) , xorg-app-xdm-pam_tty.patch (1.2 -> 1.3) , xorg-app-xdm.spec (1.39 -> 1.40) , xorg-app-xdm-xaw.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/xorg-app-xdm/xorg-app-xdm-config.patch
diff -u packages/xorg-app-xdm/xorg-app-xdm-config.patch:1.2 packages/xorg-app-xdm/xorg-app-xdm-config.patch:1.3
--- packages/xorg-app-xdm/xorg-app-xdm-config.patch:1.2	Wed Nov 15 09:55:37 2006
+++ packages/xorg-app-xdm/xorg-app-xdm-config.patch	Sun Sep 20 08:03:14 2009
@@ -1,19 +1,3 @@
---- xdm-1.1.1/config/Xreset.cpp.orig	2006-11-06 22:02:49.000000000 +0000
-+++ xdm-1.1.1/config/Xreset.cpp	2006-11-15 08:45:26.669505000 +0000
-@@ -2,4 +2,4 @@
- XCOMM Deregister a login. (Derived from TakeConsole as follows:)
- XCOMM
- BINDIR/sessreg -d -w "/var/log/wtmp" -u "/var/run/utmp" \
--	-x "XDMCONFIGDIR/Xservers" -l $DISPLAY -h "" $USER
-+	-x XDMCONFIGDIR/Xservers -l $DISPLAY -h "" $USER
---- xdm-1.1.1/config/Xstartup.cpp.orig	2006-11-06 22:02:40.000000000 +0000
-+++ xdm-1.1.1/config/Xstartup.cpp	2006-11-15 08:45:34.609505000 +0000
-@@ -2,4 +2,4 @@
- XCOMM Register a login (derived from GiveConsole as follows:)
- XCOMM
- BINDIR/sessreg  -a -w "/var/log/wtmp" -u "/var/run/utmp" \
--	-x "XDMCONFIGDIR/Xservers" -l $DISPLAY -h "" $USER
-+	-x XDMCONFIGDIR/Xservers -l $DISPLAY -h "" $USER
 --- 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
 @@ -78,7 +78,7 @@
@@ -41,26 +25,4 @@
  chown root /dev/console
 -/usr/X11R6/bin/sessreg -d -x "/etc/X11/xdm/Xservers" -l $DISPLAY -h "" $USER
 +/usr/bin/sessreg -d -x "/etc/X11/xdm/Xservers" -l $DISPLAY -h "" $USER
---- xdm-1.1.0/configure.ac.orig	2006-10-04 03:11:27.000000000 +0200
-+++ xdm-1.1.0/configure.ac	2006-10-15 02:17:10.495970500 +0200
-@@ -216,6 +216,11 @@
- 	[XDMPIDDIR="$withval"], [XDMPIDDIR="/var/run"])
- AC_SUBST(XDMPIDDIR)
- 
-+AC_ARG_WITH(xdmauthdir,
-+	AC_HELP_STRING([--with-xdmauthdir=<pathname>],
-+	  [specify directory for authentication cookie files (default=configdir)]),
-+	[XDMAUTHDIR="$withval"], [XDMAUTHDIR="$XDMCONFIGDIR"])
-+
- AC_ARG_WITH(default-vt,
- 	AC_HELP_STRING([--with-default-vt=<vtname>],
- 	  [specify default vt to start xdm on (default=none)]),
-@@ -494,7 +499,7 @@
- 
- # -DDEF_AUTH_DIR="$(XDMDIR)"
- 
--AC_DEFINE_DIR(DEF_AUTH_DIR, XDMCONFIGDIR, 
-+AC_DEFINE_DIR(DEF_AUTH_DIR, XDMAUTHDIR, 
- 	[Define to pathname where authentication cookie files should be stored])
- 
- # -DDEF_GREETER_LIB="$(XDMDIR)/libXdmGreet.so"
+

================================================================
Index: packages/xorg-app-xdm/xorg-app-xdm-pam_tty.patch
diff -u packages/xorg-app-xdm/xorg-app-xdm-pam_tty.patch:1.2 packages/xorg-app-xdm/xorg-app-xdm-pam_tty.patch:1.3
--- packages/xorg-app-xdm/xorg-app-xdm-pam_tty.patch:1.2	Wed Nov 15 09:55:24 2006
+++ packages/xorg-app-xdm/xorg-app-xdm-pam_tty.patch	Sun Sep 20 08:03:14 2009
@@ -1,14 +1,13 @@
 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
-@@ -540,8 +540,8 @@
+@@ -545,8 +545,7 @@
  					(*pamhp, PAM_RHOST, hostname));
  		free(hostname);
  	    }
 -	} else
 -	    RUN_AND_CHECK_PAM_ERROR(pam_set_item, (*pamhp, PAM_TTY, d->name));
 +	}
-+	RUN_AND_CHECK_PAM_ERROR(pam_set_item, (*pamhp, PAM_TTY, d->name));
-  
+ 
  	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.39 packages/xorg-app-xdm/xorg-app-xdm.spec:1.40
--- packages/xorg-app-xdm/xorg-app-xdm.spec:1.39	Tue Nov 11 17:57:24 2008
+++ packages/xorg-app-xdm/xorg-app-xdm.spec	Sun Sep 20 08:03:14 2009
@@ -7,12 +7,12 @@
 Summary(ru.UTF-8):	Менеджер дисплея X
 Summary(uk.UTF-8):	Менеджер дисплею X
 Name:		xorg-app-xdm
-Version:	1.1.8
-Release:	3
+Version:	1.1.9
+Release:	1
 License:	MIT
 Group:		X11/Applications
 Source0:	http://xorg.freedesktop.org/releases/individual/app/xdm-%{version}.tar.bz2
-# Source0-md5:	cc1816bc62a3722ad509373b0b7f30fe
+# Source0-md5:	030ae4bd9b8d428749d68bfdf56ce8a5
 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}-xaw.patch
 URL:		http://xorg.freedesktop.org/
 BuildRequires:	autoconf >= 2.57
 BuildRequires:	automake
@@ -78,7 +77,6 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 %build
 %{__libtoolize}
@@ -94,7 +92,7 @@
 	--with-color-pixmap=xdm-pld-logo.xpm \
 	--with-default-vt=vt9 \
 	--with-pixmapdir=%{_sysconfdir}/X11/xdm/pixmaps \
-	--with-xdmauthdir=/var/lib/xdm \
+	--with-authdir=/var/lib/xdm \
 	--with-xdmconfigdir=%{_sysconfdir}/X11/xdm \
 	--with-xdmscriptdir=%{_sysconfdir}/X11/xdm
 
@@ -177,6 +175,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.40  2009/09/20 06:03:14  arekm
+- up to 1.1.9
+
 Revision 1.39  2008/11/11 16:57:24  arekm
 - rel 3; fix xaw related build
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xorg-app-xdm/xorg-app-xdm-config.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xorg-app-xdm/xorg-app-xdm-pam_tty.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xorg-app-xdm/xorg-app-xdm.spec?r1=1.39&r2=1.40&f=u



More information about the pld-cvs-commit mailing list