Module Name: src
Committed By: nia
Date: Tue Nov 16 09:25:52 UTC 2021
Modified Files:
src/external/mit/xorg/bin/xterm: Makefile
src/external/mit/xorg/lib/freetype: Makefile
src/external/mit/xorg/lib/libX11/dynamic: Makefile
src/external/mit/xorg/lib/libX11/static: Makefile
src/external/mit/xorg/lib/libXfont: Makefile
src/external/mit/xorg/lib/libXfont2: Makefile
src/external/mit/xorg/lib/libXpm: Makefile
src/external/mit/xorg/server/xorg-server: Makefile.common
Makefile.serverlib Makefile.servermod
src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg: Makefile
Log Message:
xorg: sprinkle a little bit of USE_FORT around
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/external/mit/xorg/bin/xterm/Makefile
cvs rdiff -u -r1.22 -r1.23 src/external/mit/xorg/lib/freetype/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/libX11/dynamic/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/libX11/static/Makefile
cvs rdiff -u -r1.12 -r1.13 src/external/mit/xorg/lib/libXfont/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/lib/libXfont2/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/libXpm/Makefile
cvs rdiff -u -r1.29 -r1.30 \
src/external/mit/xorg/server/xorg-server/Makefile.common
cvs rdiff -u -r1.14 -r1.15 \
src/external/mit/xorg/server/xorg-server/Makefile.serverlib
cvs rdiff -u -r1.7 -r1.8 \
src/external/mit/xorg/server/xorg-server/Makefile.servermod
cvs rdiff -u -r1.20 -r1.21 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xterm/Makefile
diff -u src/external/mit/xorg/bin/xterm/Makefile:1.22 src/external/mit/xorg/bin/xterm/Makefile:1.23
--- src/external/mit/xorg/bin/xterm/Makefile:1.22 Tue Apr 27 02:11:55 2021
+++ src/external/mit/xorg/bin/xterm/Makefile Tue Nov 16 09:25:51 2021
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.22 2021/04/27 02:11:55 mrg Exp $
+# $NetBSD: Makefile,v 1.23 2021/11/16 09:25:51 nia Exp $
+
+USE_FORT?= yes # data-driven bugs?
.include <bsd.own.mk>
Index: src/external/mit/xorg/lib/freetype/Makefile
diff -u src/external/mit/xorg/lib/freetype/Makefile:1.22 src/external/mit/xorg/lib/freetype/Makefile:1.23
--- src/external/mit/xorg/lib/freetype/Makefile:1.22 Sat Jul 20 02:06:12 2019
+++ src/external/mit/xorg/lib/freetype/Makefile Tue Nov 16 09:25:51 2021
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.22 2019/07/20 02:06:12 mrg Exp $
+# $NetBSD: Makefile,v 1.23 2021/11/16 09:25:51 nia Exp $
+
+USE_FORT?= yes # data-driven bugs?
.include <bsd.own.mk>
Index: src/external/mit/xorg/lib/libX11/dynamic/Makefile
diff -u src/external/mit/xorg/lib/libX11/dynamic/Makefile:1.4 src/external/mit/xorg/lib/libX11/dynamic/Makefile:1.5
--- src/external/mit/xorg/lib/libX11/dynamic/Makefile:1.4 Tue Jul 13 05:53:12 2021
+++ src/external/mit/xorg/lib/libX11/dynamic/Makefile Tue Nov 16 09:25:51 2021
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.4 2021/07/13 05:53:12 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2021/11/16 09:25:51 nia Exp $
NOLINT= 1
NOPROFILE= 1
NOSTATICLIB= 1
+USE_FORT?= yes # data-driven bugs?
+
.include <bsd.own.mk>
.include "../Makefile.libx11"
Index: src/external/mit/xorg/lib/libX11/static/Makefile
diff -u src/external/mit/xorg/lib/libX11/static/Makefile:1.4 src/external/mit/xorg/lib/libX11/static/Makefile:1.5
--- src/external/mit/xorg/lib/libX11/static/Makefile:1.4 Tue Jul 13 05:53:13 2021
+++ src/external/mit/xorg/lib/libX11/static/Makefile Tue Nov 16 09:25:51 2021
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2021/07/13 05:53:13 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2021/11/16 09:25:51 nia Exp $
NOPIC= 1
+USE_FORT?= yes # data-driven bugs?
+
.include <bsd.own.mk>
.include "../Makefile.libx11"
Index: src/external/mit/xorg/lib/libXfont/Makefile
diff -u src/external/mit/xorg/lib/libXfont/Makefile:1.12 src/external/mit/xorg/lib/libXfont/Makefile:1.13
--- src/external/mit/xorg/lib/libXfont/Makefile:1.12 Tue Apr 13 04:59:00 2021
+++ src/external/mit/xorg/lib/libXfont/Makefile Tue Nov 16 09:25:51 2021
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2021/04/13 04:59:00 mrg Exp $
+# $NetBSD: Makefile,v 1.13 2021/11/16 09:25:51 nia Exp $
+
+USE_FORT?= yes # data-driven bugs?
.include <bsd.own.mk>
Index: src/external/mit/xorg/lib/libXfont2/Makefile
diff -u src/external/mit/xorg/lib/libXfont2/Makefile:1.7 src/external/mit/xorg/lib/libXfont2/Makefile:1.8
--- src/external/mit/xorg/lib/libXfont2/Makefile:1.7 Tue Apr 13 04:59:00 2021
+++ src/external/mit/xorg/lib/libXfont2/Makefile Tue Nov 16 09:25:51 2021
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2021/04/13 04:59:00 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2021/11/16 09:25:51 nia Exp $
+
+USE_FORT?= yes # data-driven bugs?
.include <bsd.own.mk>
Index: src/external/mit/xorg/lib/libXpm/Makefile
diff -u src/external/mit/xorg/lib/libXpm/Makefile:1.2 src/external/mit/xorg/lib/libXpm/Makefile:1.3
--- src/external/mit/xorg/lib/libXpm/Makefile:1.2 Sat Sep 13 04:32:30 2008
+++ src/external/mit/xorg/lib/libXpm/Makefile Tue Nov 16 09:25:52 2021
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2008/09/13 04:32:30 cube Exp $
+# $NetBSD: Makefile,v 1.3 2021/11/16 09:25:52 nia Exp $
+
+USE_FORT?= yes # data-driven bugs?
.include <bsd.own.mk>
Index: src/external/mit/xorg/server/xorg-server/Makefile.common
diff -u src/external/mit/xorg/server/xorg-server/Makefile.common:1.29 src/external/mit/xorg/server/xorg-server/Makefile.common:1.30
--- src/external/mit/xorg/server/xorg-server/Makefile.common:1.29 Thu Jul 23 09:09:12 2020
+++ src/external/mit/xorg/server/xorg-server/Makefile.common Tue Nov 16 09:25:52 2021
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile.common,v 1.29 2020/07/23 09:09:12 tsutsui Exp $
+# $NetBSD: Makefile.common,v 1.30 2021/11/16 09:25:52 nia Exp $
# These define parts of the Xserver tree that are to be
# conditionally compiled for different platforms. See
# below for descriptions of each variable.
+USE_FORT?= yes # network server *and* setuid
+
.include <bsd.own.mk>
Index: src/external/mit/xorg/server/xorg-server/Makefile.serverlib
diff -u src/external/mit/xorg/server/xorg-server/Makefile.serverlib:1.14 src/external/mit/xorg/server/xorg-server/Makefile.serverlib:1.15
--- src/external/mit/xorg/server/xorg-server/Makefile.serverlib:1.14 Mon Nov 1 10:05:19 2021
+++ src/external/mit/xorg/server/xorg-server/Makefile.serverlib Tue Nov 16 09:25:52 2021
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile.serverlib,v 1.14 2021/11/01 10:05:19 nia Exp $
+# $NetBSD: Makefile.serverlib,v 1.15 2021/11/16 09:25:52 nia Exp $
NOFULLRELRO= yes
+USE_FORT?= yes # network server *and* setuid
+
.include <bsd.own.mk> # for NETBSDSRCDIR and mk.conf processing
# We can't use LIBISPRIVATE here as we need the ".so" installed.
Index: src/external/mit/xorg/server/xorg-server/Makefile.servermod
diff -u src/external/mit/xorg/server/xorg-server/Makefile.servermod:1.7 src/external/mit/xorg/server/xorg-server/Makefile.servermod:1.8
--- src/external/mit/xorg/server/xorg-server/Makefile.servermod:1.7 Mon Nov 1 10:05:19 2021
+++ src/external/mit/xorg/server/xorg-server/Makefile.servermod Tue Nov 16 09:25:52 2021
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile.servermod,v 1.7 2021/11/01 10:05:19 nia Exp $
+# $NetBSD: Makefile.servermod,v 1.8 2021/11/16 09:25:52 nia Exp $
NOFULLRELRO= yes
+USE_FORT?= yes # network server *and* setuid
+
.include <bsd.own.mk> # For /etc/mk.conf processing
.if defined(XMODULEDIR)
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.20 src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.21
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.20 Thu Aug 19 11:03:04 2021
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile Tue Nov 16 09:25:52 2021
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.20 2021/08/19 11:03:04 mrg Exp $
+# $NetBSD: Makefile,v 1.21 2021/11/16 09:25:52 nia Exp $
+
+USE_FORT?= yes # network server *and* setuid
.include <bsd.own.mk>
