summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--x11-servers/XFree86-4-NestServer/Makefile21
-rw-r--r--x11-servers/XFree86-4-NestServer/distinfo2
-rw-r--r--x11-servers/XFree86-4-PrintServer/Makefile21
-rw-r--r--x11-servers/XFree86-4-PrintServer/distinfo2
-rw-r--r--x11-servers/XFree86-4-Server-snap/Makefile7
-rw-r--r--x11-servers/XFree86-4-Server-snap/distinfo1
-rw-r--r--x11-servers/XFree86-4-Server/Makefile7
-rw-r--r--x11-servers/XFree86-4-Server/distinfo1
-rw-r--r--x11-servers/XFree86-4-VirtualFramebufferServer/Makefile22
-rw-r--r--x11-servers/XFree86-4-VirtualFramebufferServer/distinfo2
10 files changed, 71 insertions, 15 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
diff --git a/x11-servers/XFree86-4-PrintServer/Makefile b/x11-servers/XFree86-4-PrintServer/Makefile
index 1553f3e63944..0e1ee41698c1 100644
--- a/x11-servers/XFree86-4-PrintServer/Makefile
+++ b/x11-servers/XFree86-4-PrintServer/Makefile
@@ -6,15 +6,22 @@
#
PORTNAME= PrintServer
-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
@@ -31,6 +38,12 @@ 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
+
do-install:
$(INSTALL_PROGRAM) ${WRKSRC}/programs/Xserver/Xprt ${PREFIX}/bin/Xprt
diff --git a/x11-servers/XFree86-4-PrintServer/distinfo b/x11-servers/XFree86-4-PrintServer/distinfo
index 62b0b3a56cf9..95b76fbc1ab0 100644
--- a/x11-servers/XFree86-4-PrintServer/distinfo
+++ b/x11-servers/XFree86-4-PrintServer/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
diff --git a/x11-servers/XFree86-4-Server-snap/Makefile b/x11-servers/XFree86-4-Server-snap/Makefile
index 10eb5a67b5e2..7a81fe31d4f1 100644
--- a/x11-servers/XFree86-4-Server-snap/Makefile
+++ b/x11-servers/XFree86-4-Server-snap/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-snap/distinfo b/x11-servers/XFree86-4-Server-snap/distinfo
index 18a2a3eda403..068c83b6dc13 100644
--- a/x11-servers/XFree86-4-Server-snap/distinfo
+++ b/x11-servers/XFree86-4-Server-snap/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
diff --git a/x11-servers/XFree86-4-Server/Makefile b/x11-servers/XFree86-4-Server/Makefile
index 10eb5a67b5e2..7a81fe31d4f1 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 18a2a3eda403..068c83b6dc13 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
diff --git a/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile b/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile
index ec41d619b12f..19ef8ba27a77 100644
--- a/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile
+++ b/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile
@@ -6,16 +6,22 @@
#
PORTNAME= VirtualFramebufferServer
-PORTVERSION= 4.2.0
-PORTREVISION= 1
+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
@@ -38,5 +44,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-VirtualFramebufferServer/distinfo b/x11-servers/XFree86-4-VirtualFramebufferServer/distinfo
index 62b0b3a56cf9..95b76fbc1ab0 100644
--- a/x11-servers/XFree86-4-VirtualFramebufferServer/distinfo
+++ b/x11-servers/XFree86-4-VirtualFramebufferServer/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
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-11 01:05:52 +0000