Add wrapper, a program that runs an X server after sanity-checking

the environment and any options passed to it.  It is meant to
enhance security on multi-user systems running XFree86 4.x, where
the ability to use a startx script is needed.

If you have XFree86 3.x, do not install this, you do not need it
and it will not work.

PR:		21352
Submitted by:	Trevor Johnson <trevor@jpj.net>

6 files changed, 49 insertions, 0 deletions

diff --git a/x11/Makefile b/x11/Makefile
index 65de6fb..cb81637 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -71,6 +71,7 @@
     SUBDIR += wdm
     SUBDIR += wmbutton
     SUBDIR += wmmatrix
+    SUBDIR += wrapper
     SUBDIR += wterm
     SUBDIR += x3270
     SUBDIR += xaniroc
diff --git a/x11/wrapper/Makefile b/x11/wrapper/Makefile
new file mode 100644
index 0000000..41622918
--- /dev/null
+++ b/x11/wrapper/Makefile
@@ -0,0 +1,32 @@
+# New ports collection makefile for:	wrapper
+# Date created:				2000-09-18
+# Whom:					Trevor Johnson <trevor@jpj.net>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	wrapper
+PORTVERSION= 	1.0
+CATEGORIES=	x11
+MASTER_SITES=	http://jpj.net/~trevor/freebsd/ports/
+EXTRACT_SUFX=	.c.gz
+
+MAINTAINER=	trevor@jpj.net
+
+NO_WRKSUBDIR=	yes
+USE_X_PREFIX=	yes
+
+do-extract:
+	${MKDIR} ${WRKDIR}
+	${GUNZIP_CMD} -c ${_DISTDIR}${DISTFILES} > ${WRKSRC}/wrapper.c
+
+do-build:
+	${CC} -o ${WRKDIR}/Xwrapper ${WRKDIR}/wrapper.c
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/Xwrapper ${PREFIX}/bin/
+	${LN} -sf ${PREFIX}/bin/Xwrapper ${PREFIX}/bin/X
+	${CHMOD} -s ${PREFIX}/bin/XFree86
+	${CHMOD} +s ${PREFIX}/bin/Xwrapper
+
+.include <bsd.port.mk>
diff --git a/x11/wrapper/pkg-comment b/x11/wrapper/pkg-comment
new file mode 100644
index 0000000..39a4a81
--- /dev/null
+++ b/x11/wrapper/pkg-comment
@@ -0,0 +1 @@
+Wrapper for X server
diff --git a/x11/wrapper/pkg-deinstall b/x11/wrapper/pkg-deinstall
new file mode 100644
index 0000000..d2f79fa
--- /dev/null
+++ b/x11/wrapper/pkg-deinstall
@@ -0,0 +1,3 @@
+#!/bin/sh
+ln -sf ${PKG_PREFIX}/bin/XFree86 ${PKG_PREFIX}/bin/X
+chmod +s ${PKG_PREFIX}/bin/XFree86
diff --git a/x11/wrapper/pkg-descr b/x11/wrapper/pkg-descr
new file mode 100644
index 0000000..a1b3313
--- /dev/null
+++ b/x11/wrapper/pkg-descr
@@ -0,0 +1,11 @@
+This program runs an X server after sanity-checking the environment
+and any options passed to it.  It is meant to enhance security on
+multi-user systems running XFree86 4, where the ability to use a
+startx script is needed.  If you have XFree86 3, do not install
+this:  you do not need it and it will not work.  If you have no
+untrusted users or always run the X server from xdm, you do not
+need this (in the latter case, just take the suid bit off your X
+server).
+
+Trevor Johnson
+trevor@jpj.net
diff --git a/x11/wrapper/pkg-plist b/x11/wrapper/pkg-plist
new file mode 100644
index 0000000..f5da007
--- /dev/null
+++ b/x11/wrapper/pkg-plist
@@ -0,0 +1 @@
+bin/Xwrapper