Update to 1.1.11.

git-svn-id: https://trillian.chruetertee.ch/svn/ports/branches/xorg-dev@326 058c260c-8361-11dd-a0ac-aa2bafec7d09

6 files changed, 160 insertions, 0 deletions

diff --git a/x11/xdm/Makefile b/x11/xdm/Makefile
new file mode 100644
index 0000000..4e8eacf
--- /dev/null
+++ b/x11/xdm/Makefile
@@ -0,0 +1,59 @@
+# New ports collection makefile for:	xdm
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD: ports/x11/xdm/Makefile,v 1.11 2011/09/22 13:51:51 eadler Exp $
+#
+
+PORTNAME=	xdm
+PORTVERSION=	1.1.11
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org X display manager
+
+LICENSE=	MIT
+
+XORG_CAT=	app
+USE_XORG=	xmu x11 xau xinerama xpm xdmcp xt xext xaw
+CONFIGURE_ARGS+=	--with-xdmconfigdir=${EXAMPLESDIR} \
+			--with-xdmscriptdir=${EXAMPLESDIR}
+
+MAN1=		xdm.1
+
+CFFILES=	GiveConsole TakeConsole Xaccess Xreset Xresources \
+		Xservers Xsession Xsetup_0 Xstartup Xwilling xdm-config
+
+OPTIONS=	XDMSHELL "Install xdmshell" off
+
+.include <bsd.port.options.mk>
+
+.if defined(WITH_XDMSHELL)
+CONFIGURE_ARGS+=--enable-xdmshell
+MAN1+=		xdmshell.1
+PLIST_SUB+=	XDMSHELL=""
+.else
+CONFIGURE_ARGS+=--disable-xdmshell
+PLIST_SUB+=	XDMSHELL="@comment "
+.endif
+
+post-patch:
+	@${REINPLACE_CMD} -e "s|XDMCONFIGDIR/|${PREFIX}/lib/X11/xdm/|" \
+		-e "s|XDMSCRIPTDIR/|${PREFIX}/lib/X11/xdm/|" \
+			${WRKSRC}/config/xdm-config.cpp \
+			${WRKSRC}/config/Xstartup.cpp \
+			${WRKSRC}/config/Xreset.cpp
+	@${REINPLACE_CMD} -e "s|@DESTDIR@||" ${WRKSRC}/Makefile.in
+
+post-configure:
+	@${REINPLACE_CMD} -e "s|${EXAMPLESDIR}|${PREFIX}/lib/X11/xdm|" \
+			${WRKSRC}/config.h
+
+post-install:
+.for f in ${CFFILES}
+	${CP} -n ${EXAMPLESDIR}/$f ${PREFIX}/lib/X11/xdm/$f
+.endfor
+	${MKDIR} /var/lib/xdm/authdir
+	${LN} -sf /var/lib/xdm/authdir ${PREFIX}/lib/X11/xdm/authdir
+
+.include <bsd.port.mk>
diff --git a/x11/xdm/distinfo b/x11/xdm/distinfo
new file mode 100644
index 0000000..c67b21b
--- /dev/null
+++ b/x11/xdm/distinfo
@@ -0,0 +1,2 @@
+SHA256 (xorg/app/xdm-1.1.11.tar.bz2) = d4da426ddea0124279a3f2e00a26db61944690628ee818a64df9d27352081c47
+SIZE (xorg/app/xdm-1.1.11.tar.bz2) = 446612
diff --git a/x11/xdm/files/patch-greeter-greet.c b/x11/xdm/files/patch-greeter-greet.c
new file mode 100644
index 0000000..b8a221d
--- /dev/null
+++ b/x11/xdm/files/patch-greeter-greet.c
@@ -0,0 +1,19 @@
+--- greeter/greet.c.orig	Sat Feb  3 01:25:25 2007
++++ greeter/greet.c	Wed Apr  4 14:03:31 2007
+@@ -612,6 +617,7 @@ greet_user_rtn GreetUser(
+     }
+     DeleteXloginResources (d, *dpy);
+     CloseGreet (d);
++    login = NULL;
+     Debug ("Greet loop finished\n");
+     /*
+      * Run system-wide initialization file
+@@ -697,6 +704,8 @@ static int pamconv(int num_msg,
+     m = *msg;
+     r = *response;
+ 
++    if (login == NULL) goto pam_error;
++
+     for (i = 0; i < num_msg; i++ , m++ , r++) {
+ 	char *username;
+ 	int promptId = 0;
diff --git a/x11/xdm/files/patch-xdm_session.c b/x11/xdm/files/patch-xdm_session.c
new file mode 100644
index 0000000..de1c579
--- /dev/null
+++ b/x11/xdm/files/patch-xdm_session.c
@@ -0,0 +1,27 @@
+--- xdm/session.c.orig	Sun Jun  3 22:49:51 2007
++++ xdm/session.c	Sun Jun  3 22:56:06 2007
+@@ -543,6 +543,7 @@
+     pid_t	pid;
+ #ifdef HAS_SETUSERCONTEXT
+     struct passwd* pwd;
++    extern char **environ;
+ #endif
+ #ifdef USE_PAM
+     pam_handle_t *pamh = thepamh ();
+@@ -657,6 +660,8 @@
+ 	 * Set the user's credentials: uid, gid, groups,
+ 	 * environment variables, resource limits, and umask.
+ 	 */
++	/* destroy user environment before calling setusercontext */
++	environ = verify->userEnviron;
+ 	pwd = getpwnam(name);
+ 	if (pwd) {
+ 	    if (setusercontext(NULL, pwd, pwd->pw_uid, LOGIN_SETALL) < 0) {
+@@ -664,6 +669,7 @@
+ 		    errno);
+ 		return (0);
+ 	    }
++	    verify->userEnviron = environ;
+ 	    endpwent();
+ 	} else {
+ 	    LogError ("getpwnam for \"%s\" failed, errno=%d\n", name, errno);
diff --git a/x11/xdm/pkg-descr b/x11/xdm/pkg-descr
new file mode 100644
index 0000000..d87ff4d
--- /dev/null
+++ b/x11/xdm/pkg-descr
@@ -0,0 +1 @@
+This package contains xdm, the X.Org X Display manager.
diff --git a/x11/xdm/pkg-plist b/x11/xdm/pkg-plist
new file mode 100644
index 0000000..5b28dd4
--- /dev/null
+++ b/x11/xdm/pkg-plist
@@ -0,0 +1,52 @@
+bin/xdm
+%%XDMSHELL%%bin/xdmshell
+lib/X11/xdm/authdir
+lib/X11/xdm/chooser
+lib/X11/xdm/libXdmGreet.la
+lib/X11/xdm/libXdmGreet.so
+lib/X11/xdm/pixmaps/xorg-bw.xpm
+lib/X11/xdm/pixmaps/xorg.xpm
+share/X11/app-defaults/Chooser
+@unexec if cmp -s %D/%%EXAMPLESDIR%%/GiveConsole %D/lib/X11/xdm/GiveConsole; then rm -f %D/lib/X11/xdm/GiveConsole; fi
+@unexec if cmp -s %D/%%EXAMPLESDIR%%/TakeConsole %D/lib/X11/xdm/TakeConsole; then rm -f %D/lib/X11/xdm/TakeConsole; fi
+@unexec if cmp -s %D/%%EXAMPLESDIR%%/Xaccess %D/lib/X11/xdm/Xaccess; then rm -f %D/lib/X11/xdm/Xaccess; fi
+@unexec if cmp -s %D/%%EXAMPLESDIR%%/Xreset %D/lib/X11/xdm/Xreset; then rm -f %D/lib/X11/xdm/Xreset; fi
+@unexec if cmp -s %D/%%EXAMPLESDIR%%/Xresources %D/lib/X11/xdm/Xresources; then rm -f %D/lib/X11/xdm/Xresources; fi
+@unexec if cmp -s %D/%%EXAMPLESDIR%%/Xservers %D/lib/X11/xdm/Xservers; then rm -f %D/lib/X11/xdm/Xservers; fi
+@unexec if cmp -s %D/%%EXAMPLESDIR%%/Xsession %D/lib/X11/xdm/Xsession; then rm -f %D/lib/X11/xdm/Xsession; fi
+@unexec if cmp -s %D/%%EXAMPLESDIR%%/Xsetup_0 %D/lib/X11/xdm/Xsetup_0; then rm -f %D/lib/X11/xdm/Xsetup_0; fi
+@unexec if cmp -s %D/%%EXAMPLESDIR%%/Xstartup %D/lib/X11/xdm/Xstartup; then rm -f %D/lib/X11/xdm/Xstartup; fi
+@unexec if cmp -s %D/%%EXAMPLESDIR%%/Xwilling %D/lib/X11/xdm/Xwilling; then rm -f %D/lib/X11/xdm/Xwilling; fi
+@unexec if cmp -s %D/%%EXAMPLESDIR%%/xdm-config %D/lib/X11/xdm/xdm-config; then rm -f %D/lib/X11/xdm/xdm-config; fi
+%%EXAMPLESDIR%%/GiveConsole
+%%EXAMPLESDIR%%/TakeConsole
+%%EXAMPLESDIR%%/Xaccess
+%%EXAMPLESDIR%%/Xreset
+%%EXAMPLESDIR%%/Xresources
+%%EXAMPLESDIR%%/Xservers
+%%EXAMPLESDIR%%/Xsession
+%%EXAMPLESDIR%%/Xsetup_0
+%%EXAMPLESDIR%%/Xstartup
+%%EXAMPLESDIR%%/Xwilling
+%%EXAMPLESDIR%%/xdm-config
+@exec cp -n %D/%%EXAMPLESDIR%%/GiveConsole %D/lib/X11/xdm/GiveConsole
+@exec cp -n %D/%%EXAMPLESDIR%%/TakeConsole %D/lib/X11/xdm/TakeConsole
+@exec cp -n %D/%%EXAMPLESDIR%%/Xaccess %D/lib/X11/xdm/Xaccess
+@exec cp -n %D/%%EXAMPLESDIR%%/Xreset %D/lib/X11/xdm/Xreset
+@exec cp -n %D/%%EXAMPLESDIR%%/Xresources %D/lib/X11/xdm/Xresources
+@exec cp -n %D/%%EXAMPLESDIR%%/Xservers %D/lib/X11/xdm/Xservers
+@exec cp -n %D/%%EXAMPLESDIR%%/Xsession %D/lib/X11/xdm/Xsession
+@exec cp -n %D/%%EXAMPLESDIR%%/Xsetup_0 %D/lib/X11/xdm/Xsetup_0
+@exec cp -n %D/%%EXAMPLESDIR%%/Xstartup %D/lib/X11/xdm/Xstartup
+@exec cp -n %D/%%EXAMPLESDIR%%/Xwilling %D/lib/X11/xdm/Xwilling
+@exec cp -n %D/%%EXAMPLESDIR%%/xdm-config %D/lib/X11/xdm/xdm-config
+@exec mkdir -p /var/lib/xdm/authdir
+@dirrmtry share/X11/app-defaults
+@dirrmtry share/X11
+@unexec rm -f /var/lib/xdm/authdir/authfiles/* 2>/dev/null || true
+@unexec rmdir /var/lib/xdm/authdir/authfiles 2>/dev/null || true
+@unexec rmdir /var/lib/xdm/authdir 2>/dev/null
+@unexec rmdir /var/lib/xdm 2>/dev/null
+@dirrm lib/X11/xdm/pixmaps
+@dirrm lib/X11/xdm
+@dirrm %%EXAMPLESDIR%%