diff options
| author | Eric Anholt <anholt@FreeBSD.org> | 2002-09-05 03:48:31 +0000 |
|---|---|---|
| committer | Eric Anholt <anholt@FreeBSD.org> | 2002-09-05 03:48:31 +0000 |
| commit | 0edad80fe06a7e041c6c27472490fdbb9f35a217 (patch) | |
| tree | 47d4be033a40625257c9a0639dd8d7a352f5e26f /x11-servers/XFree86-4-Server-snap/Makefile | |
| parent | Fix build on -current by removing an obsoleted patch and setting NO_WERROR (diff) | |
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).
Notes
Notes:
svn path=/head/; revision=65652
Diffstat (limited to 'x11-servers/XFree86-4-Server-snap/Makefile')
| -rw-r--r-- | x11-servers/XFree86-4-Server-snap/Makefile | 17 |
1 files changed, 12 insertions, 5 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 |