Date: Sun, 18 Aug 2019 17:04:42 +0000 (UTC) From: Niclas Zeising <zeising@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r509229 - in branches/2019Q3/x11/xdm: . files Message-ID: <201908181704.x7IH4gIt002501@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: zeising Date: Sun Aug 18 17:04:42 2019 New Revision: 509229 URL: https://svnweb.freebsd.org/changeset/ports/509229 Log: MFH: r509218 r509225 x11/xdm: Update to 1.1.12 Update x11/xdm to 1.1.12. This is a big release, incorporating over 7 years worth of changes. Changelog: https://lists.x.org/archives/xorg-announce/2019-March/002959.html Obtained from: FreeBSD Graphics Team development repo https://github.com/FreeBSDDesktop/freebsd-ports/tree/feature/xorglibs Seucrity: CVE-2013-2179 Sponsored by: B3 Init x11/xdm: Remove patch file Remove patch file, this should have been done in r509218, but was missed when moving from git to SVN. PR: 239942 Reported by: Martin Birgmeier X-MFH-with: 509218 Sponsored by: B3 Init Approved by: ports-secteam (joneum) Added: branches/2019Q3/x11/xdm/files/patch-config_Xresources.in - copied unchanged from r509218, head/x11/xdm/files/patch-config_Xresources.in branches/2019Q3/x11/xdm/files/patch-config_xdm-config.in - copied unchanged from r509218, head/x11/xdm/files/patch-config_xdm-config.in Deleted: branches/2019Q3/x11/xdm/files/patch-config-Makefile.in branches/2019Q3/x11/xdm/files/patch-config-Xresources.cpp branches/2019Q3/x11/xdm/files/patch-config_xdm-config.cpp Modified: branches/2019Q3/x11/xdm/Makefile branches/2019Q3/x11/xdm/distinfo branches/2019Q3/x11/xdm/files/patch-xdm_session.c branches/2019Q3/x11/xdm/pkg-plist Directory Properties: branches/2019Q3/ (props changed) Modified: branches/2019Q3/x11/xdm/Makefile ============================================================================== --- branches/2019Q3/x11/xdm/Makefile Sun Aug 18 17:04:34 2019 (r509228) +++ branches/2019Q3/x11/xdm/Makefile Sun Aug 18 17:04:42 2019 (r509229) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= xdm -PORTVERSION= 1.1.11 -PORTREVISION= 8 +PORTVERSION= 1.1.12 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org @@ -13,7 +12,7 @@ LICENSE= MIT XORG_CAT= app USES= cpe libtool USE_LDCONFIG= yes -USE_XORG= x11 xau xaw xdmcp xext xinerama xmu xpm xt +USE_XORG= x11 xau xaw xdmcp xext xinerama xmu xpm xrender xt CPE_PRODUCT= x_display_manager CPE_VENDOR= x Modified: branches/2019Q3/x11/xdm/distinfo ============================================================================== --- branches/2019Q3/x11/xdm/distinfo Sun Aug 18 17:04:34 2019 (r509228) +++ branches/2019Q3/x11/xdm/distinfo Sun Aug 18 17:04:42 2019 (r509229) @@ -1,2 +1,3 @@ -SHA256 (xorg/app/xdm-1.1.11.tar.bz2) = d4da426ddea0124279a3f2e00a26db61944690628ee818a64df9d27352081c47 -SIZE (xorg/app/xdm-1.1.11.tar.bz2) = 446612 +TIMESTAMP = 1560812972 +SHA256 (xorg/app/xdm-1.1.12.tar.bz2) = 0dd283f72dda098d09e2925b9278c95e21551e693a5802ab442d1b577d8327f4 +SIZE (xorg/app/xdm-1.1.12.tar.bz2) = 512074 Copied: branches/2019Q3/x11/xdm/files/patch-config_Xresources.in (from r509218, head/x11/xdm/files/patch-config_Xresources.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2019Q3/x11/xdm/files/patch-config_Xresources.in Sun Aug 18 17:04:42 2019 (r509229, copy of r509218, head/x11/xdm/files/patch-config_Xresources.in) @@ -0,0 +1,14 @@ +--- config/Xresources.in.orig 2019-03-02 22:06:13 UTC ++++ config/Xresources.in +@@ -59,9 +59,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 Copied: branches/2019Q3/x11/xdm/files/patch-config_xdm-config.in (from r509218, head/x11/xdm/files/patch-config_xdm-config.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2019Q3/x11/xdm/files/patch-config_xdm-config.in Sun Aug 18 17:04:42 2019 (r509229, copy of r509218, head/x11/xdm/files/patch-config_xdm-config.in) @@ -0,0 +1,10 @@ +--- config/xdm-config.in.orig 2019-03-02 22:06:13 UTC ++++ config/xdm-config.in +@@ -25,6 +25,7 @@ DisplayManager*authComplain: true + DisplayManager._0.setup: XDMSCRIPTDIR/Xsetup_0 + DisplayManager._0.startup: XDMSCRIPTDIR/GiveConsole + DisplayManager._0.reset: XDMSCRIPTDIR/TakeConsole ++DisplayManager.*.authName: MIT-MAGIC-COOKIE-1 + #ifdef XPM + DisplayManager*loginmoveInterval: 10 + #endif /* XPM */ Modified: branches/2019Q3/x11/xdm/files/patch-xdm_session.c ============================================================================== --- branches/2019Q3/x11/xdm/files/patch-xdm_session.c Sun Aug 18 17:04:34 2019 (r509228) +++ branches/2019Q3/x11/xdm/files/patch-xdm_session.c Sun Aug 18 17:04:42 2019 (r509229) @@ -1,6 +1,6 @@ ---- xdm/session.c.orig 2011-09-25 07:35:47 UTC +--- xdm/session.c.orig 2019-03-02 22:06:13 UTC +++ xdm/session.c -@@ -575,6 +575,7 @@ StartClient ( +@@ -594,6 +594,7 @@ StartClient ( pid_t pid; #ifdef HAVE_SETUSERCONTEXT struct passwd* pwd; @@ -8,7 +8,7 @@ #endif #ifdef USE_PAM pam_handle_t *pamh = thepamh (); -@@ -695,6 +696,8 @@ StartClient ( +@@ -678,6 +679,8 @@ StartClient ( * Set the user's credentials: uid, gid, groups, * environment variables, resource limits, and umask. */ @@ -17,7 +17,7 @@ pwd = getpwnam(name); if (pwd) { if (setusercontext(NULL, pwd, pwd->pw_uid, LOGIN_SETALL) < 0) { -@@ -702,6 +705,7 @@ StartClient ( +@@ -685,6 +688,7 @@ StartClient ( name, _SysErrorMsg (errno)); return (0); } Modified: branches/2019Q3/x11/xdm/pkg-plist ============================================================================== --- branches/2019Q3/x11/xdm/pkg-plist Sun Aug 18 17:04:34 2019 (r509228) +++ branches/2019Q3/x11/xdm/pkg-plist Sun Aug 18 17:04:42 2019 (r509229) @@ -13,7 +13,7 @@ bin/xdm @sample etc/X11/xdm/xdm-config.sample lib/X11/xdm/chooser lib/X11/xdm/libXdmGreet.so -man/man1/xdm.1.gz +man/man8/xdm.8.gz %%XDMSHELL%%man/man1/xdmshell.1.gz share/X11/app-defaults/Chooser share/pixmaps/xorg-bw.xpm
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201908181704.x7IH4gIt002501>