Date: Fri, 26 Aug 2016 17:52:08 +0300 From: Alex Kozlov <ak@FreeBSD.org> To: Kurt Jaeger <pi@FreeBSD.org> Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r420921 - in head/x11/xdm: . files Message-ID: <20160826145208.GA21079@ravenloft.kiev.ua> In-Reply-To: <201608261357.u7QDvDkt034771@repo.freebsd.org> References: <201608261357.u7QDvDkt034771@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Fri, Aug 26, 2016 at 01:57:13PM +0000, Kurt Jaeger wrote: > Author: pi > Date: Fri Aug 26 13:57:13 2016 > New Revision: 420921 > URL: https://svnweb.freebsd.org/changeset/ports/420921 > > Log: > x11/xdm: Use MIT-MAGIC-COOKIE-1 by default > > - It is more useful that way > - pet portlint for the patches > > PR: 211624 > MFH: 2016Q3 > Submitted by: Tobias Kortkamp <t@tobik.me> > > Added: > head/x11/xdm/files/patch-config_xdm-config.cpp (contents, props changed) > Modified: > head/x11/xdm/Makefile > head/x11/xdm/files/patch-config-Makefile.in > head/x11/xdm/files/patch-config-Xresources.cpp > head/x11/xdm/files/patch-greeter-greet.c > head/x11/xdm/files/patch-xdm_session.c > > Modified: head/x11/xdm/Makefile > ============================================================================== > --- head/x11/xdm/Makefile Fri Aug 26 13:49:02 2016 (r420920) > +++ head/x11/xdm/Makefile Fri Aug 26 13:57:13 2016 (r420921) > @@ -2,7 +2,7 @@ > > PORTNAME= xdm > PORTVERSION= 1.1.11 > -PORTREVISION= 3 > +PORTREVISION= 4 > CATEGORIES= x11 > > MAINTAINER= x11@FreeBSD.org > > Modified: head/x11/xdm/files/patch-config-Makefile.in > ============================================================================== > --- head/x11/xdm/files/patch-config-Makefile.in Fri Aug 26 13:49:02 2016 (r420920) > +++ head/x11/xdm/files/patch-config-Makefile.in Fri Aug 26 13:57:13 2016 (r420921) > @@ -1,6 +1,6 @@ > ---- 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' \ > > Modified: head/x11/xdm/files/patch-config-Xresources.cpp > ============================================================================== > --- head/x11/xdm/files/patch-config-Xresources.cpp Fri Aug 26 13:49:02 2016 (r420920) > +++ head/x11/xdm/files/patch-config-Xresources.cpp Fri Aug 26 13:57:13 2016 (r420921) > @@ -1,6 +1,6 @@ > ---- 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 > > Added: head/x11/xdm/files/patch-config_xdm-config.cpp > ============================================================================== > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/x11/xdm/files/patch-config_xdm-config.cpp Fri Aug 26 13:57:13 2016 (r420921) > @@ -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 Are you sure that replacing XDMCONFIGDIR with /usr/local/lib/X11/xdm/ is a good idea? > ++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 Same with XDMSCRIPTDIR. > ++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 */ > > Modified: head/x11/xdm/files/patch-greeter-greet.c > ============================================================================== > --- head/x11/xdm/files/patch-greeter-greet.c Fri Aug 26 13:49:02 2016 (r420920) > +++ head/x11/xdm/files/patch-greeter-greet.c Fri Aug 26 13:57:13 2016 (r420921) > @@ -1,6 +1,6 @@ > ---- 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); > @@ -8,9 +8,9 @@ > 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; > + > > Modified: head/x11/xdm/files/patch-xdm_session.c > ============================================================================== > --- head/x11/xdm/files/patch-xdm_session.c Fri Aug 26 13:49:02 2016 (r420920) > +++ head/x11/xdm/files/patch-xdm_session.c Fri Aug 26 13:57:13 2016 (r420921) > @@ -1,14 +1,14 @@ > ---- 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. > */ > @@ -17,11 +17,11 @@ > 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", You're not only 'pet portlint', but also modified patches, which was not mentioned in the commit message nor in the pr. -- Alex
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20160826145208.GA21079>