summaryrefslogtreecommitdiffstats
path: root/x11-servers/XFree86-4-Server
diff options
context:
space:
mode:
authoranholt <anholt@FreeBSD.org>2002-09-19 06:37:28 +0000
committeranholt <anholt@FreeBSD.org>2002-09-19 06:37:28 +0000
commit4bb05d0cadf2e4d468cd961ea8a5a9f123f7cbff (patch)
tree2fd0e147152a7b17c8c0f23d85f3b66163a7581c /x11-servers/XFree86-4-Server
parent798a439736b44f7812a46cb2db2ac690c8e190ae (diff)
downloadFreeBSD-ports-4bb05d0cadf2e4d468cd961ea8a5a9f123f7cbff.zip
FreeBSD-ports-4bb05d0cadf2e4d468cd961ea8a5a9f123f7cbff.tar.gz
Update XFree86 Servers ports to 4.2.1 + the second SHM security fix (for
XFree86-4-Servers, this fixes the case where the X Server is started by xdm).
Diffstat (limited to 'x11-servers/XFree86-4-Server')
-rw-r--r--x11-servers/XFree86-4-Server/Makefile7
-rw-r--r--x11-servers/XFree86-4-Server/distinfo1
2 files changed, 7 insertions, 1 deletions
diff --git a/x11-servers/XFree86-4-Server/Makefile b/x11-servers/XFree86-4-Server/Makefile
index 10eb5a6..7a81fe3 100644
--- a/x11-servers/XFree86-4-Server/Makefile
+++ b/x11-servers/XFree86-4-Server/Makefile
@@ -7,17 +7,20 @@
PORTNAME= Server
PORTVERSION= 4.2.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-servers
MASTER_SITES= ${MASTER_SITE_XFREE:S/$/:x/} \
${MASTER_SITE_XFREE:S/source//g:S/$/:x421patch/} \
+ ${MASTER_SITE_XFREE:S/source//g:S/$/:x421fixes/} \
${MASTER_SITE_LOCAL:S/$/:local/}
MASTER_SITE_SUBDIR= 4.2.0/:x \
${PORTVERSION}/patches/:x421patch \
+ ${PORTVERSION}/fixes/:x421fixes \
anholt/:local
PKGNAMEPREFIX= XFree86-
DISTFILES= X420src-1.tgz:x \
4.2.0-4.2.1.diff.gz:x421patch \
+ 4.2.1-mit-shm-security.patch:x421fixes \
Wraphelp.gz:local
EXTRACT_ONLY= X420src-1.tgz
@@ -206,6 +209,8 @@ post-extract::
pre-patch::
-@${GZCAT} ${DISTDIR}/${DIST_SUBDIR}/4.2.0-4.2.1.diff.gz \
| ${PATCH} -d ${PATCH_WRKSRC} --forward --quiet -E -p1 --batch
+ -@${CAT} ${DISTDIR}/${DIST_SUBDIR}/4.2.1-mit-shm-security.patch \
+ | ${PATCH} -d ${PATCH_WRKSRC} --forward --quiet -E -p1 --batch
post-build:
@${RM} -f ${PKGMESSAGE}
diff --git a/x11-servers/XFree86-4-Server/distinfo b/x11-servers/XFree86-4-Server/distinfo
index 18a2a3e..068c83b 100644
--- a/x11-servers/XFree86-4-Server/distinfo
+++ b/x11-servers/XFree86-4-Server/distinfo
@@ -3,4 +3,5 @@ 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
+MD5 (xc/4.2.1-mit-shm-security.patch) = 18eb56110c7f66895111bd9f3513b54e
MD5 (xc/patch-nvchips.gz) = bcb190d3f2c26d993a3a3c1512cf9bc9
OpenPOWER on IntegriCloud