From 0edad80fe06a7e041c6c27472490fdbb9f35a217 Mon Sep 17 00:00:00 2001
From: Eric Anholt <anholt@FreeBSD.org>
Date: Thu, 5 Sep 2002 03:48:31 +0000
Subject: 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).

---
 x11/XFree86-4-clients/Makefile | 22 ++++++++++++++--------
 x11/XFree86-4-clients/distinfo |  1 +
 2 files changed, 15 insertions(+), 8 deletions(-)

(limited to 'x11/XFree86-4-clients')

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
-- 
cgit v1.2.3