diff options
| author | Eric Anholt <anholt@FreeBSD.org> | 2002-09-19 06:37:28 +0000 |
|---|---|---|
| committer | Eric Anholt <anholt@FreeBSD.org> | 2002-09-19 06:37:28 +0000 |
| commit | 6d000f4c6f59ed1ad700bd2ab248bbf38a07d766 (patch) | |
| tree | 4751f0c9f1f8168661991cb83792c98b5207dbd9 /x11-servers/XFree86-4-NestServer | |
| parent | Upgrade to 5.9.6. (diff) | |
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).
Notes
Notes:
svn path=/head/; revision=66685
Diffstat (limited to 'x11-servers/XFree86-4-NestServer')
| -rw-r--r-- | x11-servers/XFree86-4-NestServer/Makefile | 21 | ||||
| -rw-r--r-- | x11-servers/XFree86-4-NestServer/distinfo | 2 |
2 files changed, 19 insertions, 4 deletions
diff --git a/x11-servers/XFree86-4-NestServer/Makefile b/x11-servers/XFree86-4-NestServer/Makefile index f7a348973303..8689bfa925c2 100644 --- a/x11-servers/XFree86-4-NestServer/Makefile +++ b/x11-servers/XFree86-4-NestServer/Makefile @@ -6,15 +6,22 @@ # PORTNAME= NestServer -PORTVERSION= 4.2.0 +PORTVERSION= 4.2.1 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= ${PORTVERSION}/:x \ +MASTER_SITE_SUBDIR= 4.2.0/:x \ + ${PORTVERSION}/patches/:x421patch \ + ${PORTVERSION}/fixes/:x421fixes \ 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 \ + 4.2.1-mit-shm-security.patch:x421fixes \ + Wraphelp.gz:local +EXTRACT_ONLY= X420src-1.tgz MAINTAINER= anholt@freebsd.org @@ -34,5 +41,11 @@ 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 + -@${CAT} ${DISTDIR}/${DIST_SUBDIR}/4.2.1-mit-shm-security.patch \ + | ${PATCH} -d ${PATCH_WRKSRC} --forward --quiet -E -p1 --batch + .include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc" .include <bsd.port.mk> diff --git a/x11-servers/XFree86-4-NestServer/distinfo b/x11-servers/XFree86-4-NestServer/distinfo index 62b0b3a56cf9..95b76fbc1ab0 100644 --- a/x11-servers/XFree86-4-NestServer/distinfo +++ b/x11-servers/XFree86-4-NestServer/distinfo @@ -1,2 +1,4 @@ MD5 (xc/X420src-1.tgz) = ad43a8e9e39703322005cd6f7145b77f +MD5 (xc/4.2.0-4.2.1.diff.gz) = 38adc94a4953a6b29e8619c25dda4887 +MD5 (xc/4.2.1-mit-shm-security.patch) = 18eb56110c7f66895111bd9f3513b54e MD5 (xc/Wraphelp.gz) = 7ee30e397359e8d64ab23f29aa551659 |