Date: Thu, 30 Dec 2004 12:04:01 +0100 (CET) From: Jose M Rodriguez <josemi@freebsd.jazztel.es> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/75652: Ad a x11cleartmp.sh script to safe use X Message-ID: <200412301104.iBUB41Qe003475@redesjm.local> Resent-Message-ID: <200412301110.iBUBAPxV044314@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 75652
>Category: ports
>Synopsis: Ad a x11cleartmp.sh script to safe use X
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Thu Dec 30 11:10:25 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: Jose M Rodriguez
>Release: FreeBSD 5.3-STABLE i386
>Organization:
Redes JM
>Environment:
System: FreeBSD orion.redesjm.local 5.3-STABLE FreeBSD 5.3-STABLE #0: Wed Dec 29 19:50:11 CET 2004 root@antares.redesjm.local:/usr/obj/usr/src/sys/ORION i386
>Description:
merge ports/75650 in XFree86-4 for safety
Note: got this during portlint
FATAL: Makefile [111]: use a tab (not space) after a variable name
FATAL: Makefile [123]: MACHINE_ARCH should never be tested directly; use ARCH
Also port submit guest a bad origin (XFree86-)
>How-To-Repeat:
>Fix:
--- patch-xFree86-4-libraries begins here ---
diff -Nru /usr/HEAD/ports/x11/XFree86-4-libraries/Makefile x11/XFree86-4-libraries/Makefile
--- /usr/HEAD/ports/x11/XFree86-4-libraries/Makefile Thu Dec 23 06:31:03 2004
+++ x11/XFree86-4-libraries/Makefile Thu Dec 30 11:47:12 2004
@@ -140,5 +140,7 @@
${MKDIR} ${PREFIX}/libdata/pkgconfig
${INSTALL_DATA} ${WRKSRC}/lib/Xcursor/xcursor.pc \
${PREFIX}/libdata/pkgconfig
+ ${INSTALL_SCRIPT} ${FILESDIR}/x11cleartmp.sh \
+ ${PREFIX}/etc/rc.d/000.x11cleartmp.sh
.include <bsd.port.post.mk>
diff -Nru /usr/HEAD/ports/x11/XFree86-4-libraries/files/x11cleartmp.sh x11/XFree86-4-libraries/files/x11cleartmp.sh
--- /usr/HEAD/ports/x11/XFree86-4-libraries/files/x11cleartmp.sh Thu Jan 1 01:00:00 1970
+++ x11/XFree86-4-libraries/files/x11cleartmp.sh Thu Dec 30 11:45:02 2004
@@ -0,0 +1,23 @@
+#!/bin/sh
+#
+
+# /usr/X11R6/etc/rc.d/000.cleartmp.sh
+# force correct entries on /tmp for safe use of X
+
+case "$1" in
+ start)
+ # remove X lock files that will prevent Xserver launch
+ rm -f /tmp/.X[0-9]-lock
+ # new versions of XFree86/xorg will need correct dirs on /tmp
+ rm -fr /tmp/.X11-unix /tmp/.ICE-unix /tmp/.font-unix
+ mkdir -m 1777 /tmp/.X11-unix /tmp/.ICE-unix /tmp/.font-unix
+ ;;
+ stop)
+ ;;
+ *)
+ echo ""
+ echo "Usage: `basename $0` { start | stop }"
+ echo ""
+ exit 64
+ ;;
+esac
diff -Nru /usr/HEAD/ports/x11/XFree86-4-libraries/pkg-plist x11/XFree86-4-libraries/pkg-plist
--- /usr/HEAD/ports/x11/XFree86-4-libraries/pkg-plist Tue Aug 10 03:29:16 2004
+++ x11/XFree86-4-libraries/pkg-plist Thu Dec 30 11:47:35 2004
@@ -1,4 +1,5 @@
bin/xcursor-config
+etc/rc.d/000.x11cleartmp.sh
include/DPS/ColorSB.h
include/DPS/ColorSBP.h
include/DPS/DPSScrollW.h
--- patch-xFree86-4-libraries ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200412301104.iBUB41Qe003475>