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
MFH:		2019Q3
Seucrity:	CVE-2013-2179
Sponsored by:	B3 Init

6 files changed, 17 insertions, 17 deletions

diff --git a/x11/xdm/Makefile b/x11/xdm/Makefile
index c9b84462be5c..755e39bc3e49 100644
--- a/x11/xdm/Makefile
+++ b/x11/xdm/Makefile
@@ -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
 
diff --git a/x11/xdm/distinfo b/x11/xdm/distinfo
index c67b21b8ef5d..f59c5cd92659 100644
--- a/x11/xdm/distinfo
+++ b/x11/xdm/distinfo
@@ -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
diff --git a/x11/xdm/files/patch-config-Xresources.cpp b/x11/xdm/files/patch-config_Xresources.in
index 25cbab9e5b9e..bcac0f78731b 100644
--- a/x11/xdm/files/patch-config-Xresources.cpp
+++ b/x11/xdm/files/patch-config_Xresources.in
@@ -1,6 +1,6 @@
---- config/Xresources.cpp.orig	2011-09-25 07:35:47 UTC
-+++ config/Xresources.cpp
-@@ -60,9 +60,9 @@ xlogin*hiColor: black
+--- 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
diff --git a/x11/xdm/files/patch-config_xdm-config.cpp b/x11/xdm/files/patch-config_xdm-config.in
index 9042b8eb0e73..c0d10e79ff0a 100644
--- a/x11/xdm/files/patch-config_xdm-config.cpp
+++ b/x11/xdm/files/patch-config_xdm-config.in
@@ -1,10 +1,10 @@
---- config/xdm-config.cpp.orig	2011-09-25 07:35:47 UTC
-+++ config/xdm-config.cpp
-@@ -31,6 +31,7 @@ DisplayManager*authComplain:	true
+--- 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
++DisplayManager.*.authName:	MIT-MAGIC-COOKIE-1
  #ifdef XPM
  DisplayManager*loginmoveInterval:	10
  #endif /* XPM */
diff --git a/x11/xdm/files/patch-xdm_session.c b/x11/xdm/files/patch-xdm_session.c
index 9ac29aa7c1e3..56b77b05e255 100644
--- a/x11/xdm/files/patch-xdm_session.c
+++ b/x11/xdm/files/patch-xdm_session.c
@@ -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);
  	    }
diff --git a/x11/xdm/pkg-plist b/x11/xdm/pkg-plist
index 8d33341a2ac3..083775233c5b 100644
--- a/x11/xdm/pkg-plist
+++ b/x11/xdm/pkg-plist
@@ -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