summaryrefslogtreecommitdiffstats
path: root/x11-servers/XFree86-4-Server
diff options
context:
space:
mode:
authoranholt <anholt@FreeBSD.org>2002-09-05 03:48:31 +0000
committeranholt <anholt@FreeBSD.org>2002-09-05 03:48:31 +0000
commit8437407eeb8dcc29d5356f628e7f27498da5dbe6 (patch)
treea9485722a39e51daa2745896f8a126a32c34a9dd /x11-servers/XFree86-4-Server
parent7b83de2800b597625b03019097aa9c41c62aca5d (diff)
downloadFreeBSD-ports-8437407eeb8dcc29d5356f628e7f27498da5dbe6.zip
FreeBSD-ports-8437407eeb8dcc29d5356f628e7f27498da5dbe6.tar.gz
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).
Diffstat (limited to 'x11-servers/XFree86-4-Server')
-rw-r--r--x11-servers/XFree86-4-Server/Makefile17
-rw-r--r--x11-servers/XFree86-4-Server/distinfo1
2 files changed, 13 insertions, 5 deletions
diff --git a/x11-servers/XFree86-4-Server/Makefile b/x11-servers/XFree86-4-Server/Makefile
index 3f48c59..625430f 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 02d42ee..18a2a3e 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
OpenPOWER on IntegriCloud