Update XFree86-4-clients, -Servers, and -libraries to 4.2.1.

The most notable update is fixing what appears to be possible privelege
escalation with libX11 and setuid clients (xterm is one).

9 files changed, 54 insertions, 61 deletions

diff --git a/x11-servers/XFree86-4-Server-snap/Makefile b/x11-servers/XFree86-4-Server-snap/Makefile
index 3f48c5911e17..625430f2db34 100644
--- a/x11-servers/XFree86-4-Server-snap/Makefile
+++ b/x11-servers/XFree86-4-Server-snap/Makefile
@@ -6,16 +6,19 @@
 #
 
 PORTNAME=	Server
-PORTVERSION=	4.2.0
-PORTREVISION=	6
+PORTVERSION=	4.2.1
 CATEGORIES=	x11-servers
 MASTER_SITES=	${MASTER_SITE_XFREE:S/$/:x/} \
+		${MASTER_SITE_XFREE:S/source//g:S/$/:x421patch/} \
 		${MASTER_SITE_LOCAL:S/$/:local/}
-MASTER_SITE_SUBDIR=	${PORTVERSION}/:x \
+MASTER_SITE_SUBDIR=	4.2.0/:x \
+			${PORTVERSION}/patches/:x421patch \
 			anholt/:local
 PKGNAMEPREFIX=	XFree86-
-DISTFILES=	X${PORTVERSION:S/.//g}src-1.tgz:x Wraphelp.gz:local
-EXTRACT_ONLY=	X${PORTVERSION:S/.//g}src-1.tgz
+DISTFILES=	X420src-1.tgz:x \
+		4.2.0-4.2.1.diff.gz:x421patch \
+		Wraphelp.gz:local
+EXTRACT_ONLY=	X420src-1.tgz
 
 PATCH_SITES=		${MASTER_SITE_LOCAL}
 PATCH_SITE_SUBDIR=	anholt/patches-4.2.0/
@@ -197,6 +200,10 @@ post-extract::
 	${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/Wraphelp.gz > \
 		${WRKSRC}/lib/Xdmcp/Wraphelp.c
 
+pre-patch::
+	-@${GZCAT} ${DISTDIR}/${DIST_SUBDIR}/4.2.0-4.2.1.diff.gz \
+		| ${PATCH} -d ${PATCH_WRKSRC} --forward --quiet -E -p1 --batch
+
 do-configure:
 	cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
 	@cd ${WRKSRC}; ${MAKE} FreeBSDPortsConfigure
diff --git a/x11-servers/XFree86-4-Server-snap/distinfo b/x11-servers/XFree86-4-Server-snap/distinfo
index 02d42ee001d0..18a2a3eda403 100644
--- a/x11-servers/XFree86-4-Server-snap/distinfo
+++ b/x11-servers/XFree86-4-Server-snap/distinfo
@@ -1,4 +1,5 @@
 MD5 (xc/X420src-1.tgz) = ad43a8e9e39703322005cd6f7145b77f
+MD5 (xc/4.2.0-4.2.1.diff.gz) = 38adc94a4953a6b29e8619c25dda4887
 MD5 (xc/Wraphelp.gz) = 7ee30e397359e8d64ab23f29aa551659
 MD5 (xc/freebsd-glide3headers.tar.gz) = 2bb614c909898a17c05e43e60cfb8e3b
 MD5 (xc/mgadrivers-2.0-src.tgz) = 877db503967ae837c147953dbcd8ee6d
diff --git a/x11-servers/XFree86-4-Server/Makefile b/x11-servers/XFree86-4-Server/Makefile
index 3f48c5911e17..625430f2db34 100644
--- a/x11-servers/XFree86-4-Server/Makefile
+++ b/x11-servers/XFree86-4-Server/Makefile
@@ -6,16 +6,19 @@
 #
 
 PORTNAME=	Server
-PORTVERSION=	4.2.0
-PORTREVISION=	6
+PORTVERSION=	4.2.1
 CATEGORIES=	x11-servers
 MASTER_SITES=	${MASTER_SITE_XFREE:S/$/:x/} \
+		${MASTER_SITE_XFREE:S/source//g:S/$/:x421patch/} \
 		${MASTER_SITE_LOCAL:S/$/:local/}
-MASTER_SITE_SUBDIR=	${PORTVERSION}/:x \
+MASTER_SITE_SUBDIR=	4.2.0/:x \
+			${PORTVERSION}/patches/:x421patch \
 			anholt/:local
 PKGNAMEPREFIX=	XFree86-
-DISTFILES=	X${PORTVERSION:S/.//g}src-1.tgz:x Wraphelp.gz:local
-EXTRACT_ONLY=	X${PORTVERSION:S/.//g}src-1.tgz
+DISTFILES=	X420src-1.tgz:x \
+		4.2.0-4.2.1.diff.gz:x421patch \
+		Wraphelp.gz:local
+EXTRACT_ONLY=	X420src-1.tgz
 
 PATCH_SITES=		${MASTER_SITE_LOCAL}
 PATCH_SITE_SUBDIR=	anholt/patches-4.2.0/
@@ -197,6 +200,10 @@ post-extract::
 	${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/Wraphelp.gz > \
 		${WRKSRC}/lib/Xdmcp/Wraphelp.c
 
+pre-patch::
+	-@${GZCAT} ${DISTDIR}/${DIST_SUBDIR}/4.2.0-4.2.1.diff.gz \
+		| ${PATCH} -d ${PATCH_WRKSRC} --forward --quiet -E -p1 --batch
+
 do-configure:
 	cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
 	@cd ${WRKSRC}; ${MAKE} FreeBSDPortsConfigure
diff --git a/x11-servers/XFree86-4-Server/distinfo b/x11-servers/XFree86-4-Server/distinfo
index 02d42ee001d0..18a2a3eda403 100644
--- a/x11-servers/XFree86-4-Server/distinfo
+++ b/x11-servers/XFree86-4-Server/distinfo
@@ -1,4 +1,5 @@
 MD5 (xc/X420src-1.tgz) = ad43a8e9e39703322005cd6f7145b77f
+MD5 (xc/4.2.0-4.2.1.diff.gz) = 38adc94a4953a6b29e8619c25dda4887
 MD5 (xc/Wraphelp.gz) = 7ee30e397359e8d64ab23f29aa551659
 MD5 (xc/freebsd-glide3headers.tar.gz) = 2bb614c909898a17c05e43e60cfb8e3b
 MD5 (xc/mgadrivers-2.0-src.tgz) = 877db503967ae837c147953dbcd8ee6d
diff --git a/x11/XFree86-4-clients/Makefile b/x11/XFree86-4-clients/Makefile
index 55388ad7db15..959798ed7cd2 100644
--- a/x11/XFree86-4-clients/Makefile
+++ b/x11/XFree86-4-clients/Makefile
@@ -6,18 +6,22 @@
 #
 
 PORTNAME=	clients
-PORTVERSION=	4.2.0
-PORTREVISION=	5
+PORTVERSION=	4.2.1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XFREE:S/$/:x/} \
+		${MASTER_SITE_XFREE:S/source//g:S/$/:x421patch/} \
 		${MASTER_SITE_LOCAL:S/$/:local/}
-MASTER_SITE_SUBDIR=	${PORTVERSION}/:x \
+MASTER_SITE_SUBDIR=	4.2.0/:x \
+			${PORTVERSION}/patches/:x421patch \
 			anholt/:local
 PKGNAMEPREFIX=	XFree86-
-DISTFILES=	X${PORTVERSION:S/.//g}src-1.tgz:x \
-		X${PORTVERSION:S/.//g}src-2.tgz:x \
+DISTFILES=	X420src-1.tgz:x \
+		X420src-2.tgz:x \
+		4.2.0-4.2.1.diff.gz:x421patch \
 		Wraphelp.gz:local
-EXTRACT_ONLY=	X${PORTVERSION:S/.//g}src-1.tgz
+EXTRACT_ONLY=	X420src-1.tgz
+
+PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	anholt@freebsd.org
 
@@ -61,10 +65,13 @@ HasPam?=		DEFAULT
 post-extract:
 	( cd ${WRKDIR} && \
 	 ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \
-	   ${DISTDIR}/${DIST_SUBDIR}/X${PORTVERSION:S/.//g}src-2.tgz \
+	   ${DISTDIR}/${DIST_SUBDIR}/X420src-2.tgz \
 	    | ${TAR} -xf - xc/fonts/util )
 	${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/Wraphelp.gz > \
 		${WRKSRC}/lib/Xdmcp/Wraphelp.c
+pre-patch:
+	-@${GZCAT} ${DISTDIR}/${DIST_SUBDIR}/4.2.0-4.2.1.diff.gz \
+		| ${PATCH} ${PATCH_DIST_ARGS} --batch
 
 post-patch:
 	cd ${WRKSRC}/nls; \
@@ -72,7 +79,6 @@ post-patch:
 		${LN} -s zh_TW.big5 $$i/zh_TW.Big5; \
 	done
 
-
 do-configure:
 	cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
 	@cd ${WRKSRC}; ${MAKE} FreeBSDPortsConfigure
diff --git a/x11/XFree86-4-clients/distinfo b/x11/XFree86-4-clients/distinfo
index 4bad434cd929..b55c970ec727 100644
--- a/x11/XFree86-4-clients/distinfo
+++ b/x11/XFree86-4-clients/distinfo
@@ -1,3 +1,4 @@
 MD5 (xc/X420src-1.tgz) = ad43a8e9e39703322005cd6f7145b77f
 MD5 (xc/X420src-2.tgz) = dae33268a9f2735b9678a81fb23e8d3e
+MD5 (xc/4.2.0-4.2.1.diff.gz) = 38adc94a4953a6b29e8619c25dda4887
 MD5 (xc/Wraphelp.gz) = 7ee30e397359e8d64ab23f29aa551659
diff --git a/x11/XFree86-4-libraries/Makefile b/x11/XFree86-4-libraries/Makefile
index 70607f1e8fd2..7ba9227c93d6 100644
--- a/x11/XFree86-4-libraries/Makefile
+++ b/x11/XFree86-4-libraries/Makefile
@@ -6,23 +6,20 @@
 #
 
 PORTNAME=	libraries
-PORTVERSION=	4.2.0
-PORTREVISION=	3
+PORTVERSION=	4.2.1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XFREE:S/$/:x/} \
+		${MASTER_SITE_XFREE:S/source//g:S/$/:x421patch/} \
 		${MASTER_SITE_LOCAL:S/$/:local/}
-MASTER_SITE_SUBDIR=	${PORTVERSION}/:x \
+MASTER_SITE_SUBDIR=	4.2.0/:x \
+			${PORTVERSION}/patches/:x421patch \
 			anholt/:local
 PKGNAMEPREFIX=	XFree86-
-DISTFILES=	X${PORTVERSION:S/.//g}src-1.tgz:x Wraphelp.gz:local
-EXTRACT_ONLY=	X${PORTVERSION:S/.//g}src-1.tgz
+DISTFILES=	X420src-1.tgz:x \
+		4.2.0-4.2.1.diff.gz:x421patch \
+		Wraphelp.gz:local
+EXTRACT_ONLY=	X420src-1.tgz
 
-PATCH_SITES=		${MASTER_SITE_XFREE:S/source//g:S/$/:x/} \
-			${MASTER_SITE_LOCAL:S/$/:patch420/}
-PATCH_SITE_SUBDIR=	${PORTVERSION}/fixes/:x \
-			anholt/patches-4.2.0/:patch420
-PATCHFILES=		patch-XlcDL.c.gz:patch420 \
-			4.2.0-libGLU-bad-extern.patch:x
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	anholt@freebsd.org
@@ -90,6 +87,10 @@ post-extract:
 	${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/Wraphelp.gz > \
 		${WRKSRC}/lib/Xdmcp/Wraphelp.c
 
+pre-patch:
+	-@${GZCAT} ${DISTDIR}/${DIST_SUBDIR}/4.2.0-4.2.1.diff.gz \
+		| ${PATCH} ${PATCH_DIST_ARGS} --batch
+
 post-patch:
 	cd ${WRKSRC}/nls; \
 	for i in Compose XI18N_OBJS XLC_LOCALE; do \
diff --git a/x11/XFree86-4-libraries/distinfo b/x11/XFree86-4-libraries/distinfo
index 6fa05c01ecbf..70ec99893759 100644
--- a/x11/XFree86-4-libraries/distinfo
+++ b/x11/XFree86-4-libraries/distinfo
@@ -1,4 +1,3 @@
 MD5 (xc/X420src-1.tgz) = ad43a8e9e39703322005cd6f7145b77f
 MD5 (xc/Wraphelp.gz) = 7ee30e397359e8d64ab23f29aa551659
-MD5 (xc/patch-XlcDL.c.gz) = 35449682c3807ab0dfcb12dc987d09cd
-MD5 (xc/4.2.0-libGLU-bad-extern.patch) = 2d5c738854c7cc0378ae457b09a029f4
+MD5 (xc/4.2.0-4.2.1.diff.gz) = 38adc94a4953a6b29e8619c25dda4887
diff --git a/x11/XFree86-4-libraries/files/patch-us_intl b/x11/XFree86-4-libraries/files/patch-us_intl
deleted file mode 100644
index e5aced531906..000000000000
--- a/x11/XFree86-4-libraries/files/patch-us_intl
+++ /dev/null
@@ -1,30 +0,0 @@
---- programs/xkbcomp/symbols/us_intl	Fri Aug 16 08:49:48 2002
-+++ programs/xkbcomp/symbols/us_intl	Fri Aug 16 08:50:58 2002
-@@ -41,21 +41,21 @@
-     key <AC11> {	[ dead_acute,	dead_diaeresis	],
- 			[ apostrophe,	quotedbl	]	};
- 			
--    key <AE09> {	[	  9,	parenleft	]
-+    key <AE09> {	[	  9,	parenleft	],
- 			[      dead_breve,	dead_breve	]	};
--    key <AE10> {	[	  0,	parenright	]
-+    key <AE10> {	[	  0,	parenright	],
- 			[      dead_abovering, dead_abovering	]	};
-     key <AE11> {	[     minus,	underscore	],
- 			[      dead_macron,	dead_belowdot	]	};
-     key <AE12> {	[     equal,	plus		],
- 			[      dead_doubleacute,	dead_horn	]	};
--    key <AC10> {	[ semicolon,	colon		]
-+    key <AC10> {	[ semicolon,	colon		],
- 			[      dead_ogonek,	dead_diaeresis	]	};
--    key <AB08> {	[     comma,	less		]
-+    key <AB08> {	[     comma,	less		],
- 			[      dead_cedilla,	dead_caron	]	};
--    key <AB09> {	[    period,	greater		]
-+    key <AB09> {	[    period,	greater		],
- 			[      dead_abovedot,	dead_circumflex	]	};
--    key <AB10> {	[     slash,	question	]
-+    key <AB10> {	[     slash,	question	],
- 			[      dead_hook,	dead_hook	]	};
- 
-