Index: head/x11/xdm/Makefile =================================================================== --- head/x11/xdm/Makefile (revision 420920) +++ head/x11/xdm/Makefile (revision 420921) @@ -1,50 +1,50 @@ # $FreeBSD$ PORTNAME= xdm PORTVERSION= 1.1.11 -PORTREVISION= 3 +PORTREVISION= 4 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=${PREFIX}/lib/X11/xdm \ --with-xdmscriptdir=${PREFIX}/lib/X11/xdm USES= cpe libtool CPE_PRODUCT= x_display_manager CPE_VENDOR= x CFFILES= GiveConsole TakeConsole Xaccess Xreset Xresources \ Xservers Xsession Xsetup_0 Xstartup Xwilling xdm-config OPTIONS_SUB= yes OPTIONS_DEFINE= XDMSHELL XDMSHELL_DESC= Install xdmshell XDMSHELL_CONFIGURE_ENABLE= xdmshell INSTALL_TARGET= install-strip post-patch: @${REINPLACE_CMD} 's/test.*-traditional.*;/true;/' \ ${WRKSRC}/configure @${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-install: .for f in ${CFFILES} @${MV} ${STAGEDIR}${PREFIX}/lib/X11/xdm/${f} ${STAGEDIR}${PREFIX}/lib/X11/xdm/${f}.sample .endfor @${MKDIR} ${STAGEDIR}/var/lib/xdm/authdir @${LN} -sf /var/lib/xdm/authdir ${STAGEDIR}${PREFIX}/lib/X11/xdm/authdir .include Index: head/x11/xdm/files/patch-config-Makefile.in =================================================================== --- head/x11/xdm/files/patch-config-Makefile.in (revision 420920) +++ head/x11/xdm/files/patch-config-Makefile.in (revision 420921) @@ -1,11 +1,11 @@ ---- config/Makefile.in.orig 2012-09-27 10:37:59.000000000 +0200 -+++ config/Makefile.in 2012-09-27 10:38:41.000000000 +0200 -@@ -296,7 +296,7 @@ +--- config/Makefile.in.orig 2011-09-25 07:42:16 UTC ++++ config/Makefile.in +@@ -296,7 +296,7 @@ WCHAR32_FLAGS = -DWCHAR32=@WCHAR32@ # output lines with trailing backslashes. # Allow XHASH to always be substituted, even in cases where XCOMM isn't. CPP_SED_MAGIC = $(SED) -e '/^\# *[0-9][0-9]* *.*$$/d' \ - -e '/^\#line *[0-9][0-9]* *.*$$/d' \ + -e '/^$$/d' \ -e '/^[ ]*XCOMM$$/s/XCOMM/\#/' \ -e '/^[ ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \ -e '/^[ ]*XHASH/s/XHASH/\#/' \ Index: head/x11/xdm/files/patch-config-Xresources.cpp =================================================================== --- head/x11/xdm/files/patch-config-Xresources.cpp (revision 420920) +++ head/x11/xdm/files/patch-config-Xresources.cpp (revision 420921) @@ -1,14 +1,14 @@ ---- config/Xresources.cpp.orig 2012-09-27 10:41:28.000000000 +0200 -+++ config/Xresources.cpp 2012-09-27 10:41:56.000000000 +0200 -@@ -60,9 +60,9 @@ +--- config/Xresources.cpp.orig 2011-09-25 07:35:47 UTC ++++ config/Xresources.cpp +@@ -60,9 +60,9 @@ xlogin*hiColor: black XHASHendif #ifdef XPM XHASHif PLANES >= 8 -xlogin*logoFileName: BITMAPDIR/**//XDM_PIXMAP +xlogin*logoFileName: BITMAPDIR/XDM_PIXMAP XHASHelse -xlogin*logoFileName: BITMAPDIR/**//XDM_BWPIXMAP +xlogin*logoFileName: BITMAPDIR/XDM_BWPIXMAP XHASHendif xlogin*useShape: true xlogin*logoPadding: 10 Index: head/x11/xdm/files/patch-config_xdm-config.cpp =================================================================== --- head/x11/xdm/files/patch-config_xdm-config.cpp (nonexistent) +++ head/x11/xdm/files/patch-config_xdm-config.cpp (revision 420921) @@ -0,0 +1,40 @@ +--- config/xdm-config.cpp.orig 2011-09-25 07:35:47 UTC ++++ config/xdm-config.cpp +@@ -12,25 +12,26 @@ + DisplayManager.authDir: XDMXAUTHDIR + DisplayManager.errorLogFile: XDMLOGDIR/xdm.log + DisplayManager.pidFile: XDMPIDDIR/xdm.pid +-DisplayManager.keyFile: XDMCONFIGDIR/xdm-keys +-DisplayManager.servers: XDMCONFIGDIR/Xservers +-DisplayManager.accessFile: XDMCONFIGDIR/Xaccess +-DisplayManager*resources: XDMCONFIGDIR/Xresources +-DisplayManager.willing: SU nobody -s /bin/sh -c XDMSCRIPTDIR/Xwilling ++DisplayManager.keyFile: /usr/local/lib/X11/xdm/xdm-keys ++DisplayManager.servers: /usr/local/lib/X11/xdm/Xservers ++DisplayManager.accessFile: /usr/local/lib/X11/xdm/Xaccess ++DisplayManager*resources: /usr/local/lib/X11/xdm/Xresources ++DisplayManager.willing: SU nobody -s /bin/sh -c /usr/local/lib/X11/xdm/Xwilling + ! All displays should use authorization, but we cannot be sure + ! X terminals may not be configured that way, so they will require + ! individual resource settings. + DisplayManager*authorize: true + ! + DisplayManager*chooser: CHOOSERPATH +-DisplayManager*startup: XDMSCRIPTDIR/Xstartup +-DisplayManager*session: XDMSCRIPTDIR/Xsession +-DisplayManager*reset: XDMSCRIPTDIR/Xreset ++DisplayManager*startup: /usr/local/lib/X11/xdm/Xstartup ++DisplayManager*session: /usr/local/lib/X11/xdm/Xsession ++DisplayManager*reset: /usr/local/lib/X11/xdm/Xreset + DisplayManager*authComplain: true + ! The following three resources set up display :0 as the console. +-DisplayManager._0.setup: XDMSCRIPTDIR/Xsetup_0 +-DisplayManager._0.startup: XDMSCRIPTDIR/GiveConsole +-DisplayManager._0.reset: XDMSCRIPTDIR/TakeConsole ++DisplayManager._0.setup: /usr/local/lib/X11/xdm/Xsetup_0 ++DisplayManager._0.startup: /usr/local/lib/X11/xdm/GiveConsole ++DisplayManager._0.reset: /usr/local/lib/X11/xdm/TakeConsole ++DisplayManager.*.authName: MIT-MAGIC-COOKIE-1 + #ifdef XPM + DisplayManager*loginmoveInterval: 10 + #endif /* XPM */ Property changes on: head/x11/xdm/files/patch-config_xdm-config.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11/xdm/files/patch-greeter-greet.c =================================================================== --- head/x11/xdm/files/patch-greeter-greet.c (revision 420920) +++ head/x11/xdm/files/patch-greeter-greet.c (revision 420921) @@ -1,19 +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( +--- greeter/greet.c.orig 2011-09-25 07:35:47 UTC ++++ greeter/greet.c +@@ -639,6 +639,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; +@@ -729,6 +730,8 @@ static int pamconv(int num_msg, + goto pam_error; + } + if (login == NULL) goto pam_error; + for (i = 0; i < num_msg; i++ , m++ , r++) { char *username; int promptId = 0; Index: head/x11/xdm/files/patch-xdm_session.c =================================================================== --- head/x11/xdm/files/patch-xdm_session.c (revision 420920) +++ head/x11/xdm/files/patch-xdm_session.c (revision 420921) @@ -1,27 +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 @@ +--- xdm/session.c.orig 2011-09-25 07:35:47 UTC ++++ xdm/session.c +@@ -575,6 +575,7 @@ StartClient ( pid_t pid; - #ifdef HAS_SETUSERCONTEXT + #ifdef HAVE_SETUSERCONTEXT struct passwd* pwd; + extern char **environ; #endif #ifdef USE_PAM pam_handle_t *pamh = thepamh (); -@@ -657,6 +660,8 @@ +@@ -695,6 +696,8 @@ StartClient ( * 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); +@@ -702,6 +705,7 @@ StartClient ( + name, _SysErrorMsg (errno)); return (0); } + verify->userEnviron = environ; endpwent(); } else { - LogError ("getpwnam for \"%s\" failed, errno=%d\n", name, errno); + LogError ("getpwnam for \"%s\" failed: %s\n",