X Strike Force XFree86 SVN commit: r1926 - trunk/debian
Author: branden
Date: 2004-10-08 16:11:22 -0500 (Fri, 08 Oct 2004)
New Revision: 1926
Modified:
trunk/debian/CHANGESETS
trunk/debian/changelog
trunk/debian/xfree86-common.init
trunk/debian/xfs.init
Log:
If the restorecon command is available, restore SELinux file security
contexts after setting up X server and ICE socket directories
(xfree86-common) and font server socket directories (xfs) after creating
them in the init scripts. (Closes: #268812, #271030)
Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS 2004-10-08 07:52:44 UTC (rev 1925)
+++ trunk/debian/CHANGESETS 2004-10-08 21:11:22 UTC (rev 1926)
@@ -61,4 +61,10 @@
described here http://www.probo.com/timr/savage40.html.
1925
+If the restorecon command is available, restore SELinux file security
+contexts after setting up X server and ICE socket directories
+(xfree86-common) and font server socket directories (xfs) after creating
+them in the init scripts. (Closes: #268812, #271030)
+ 1926
+
vim:set ai et sts=4 sw=4 tw=80:
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-10-08 07:52:44 UTC (rev 1925)
+++ trunk/debian/changelog 2004-10-08 21:11:22 UTC (rev 1926)
@@ -15,6 +15,11 @@
since xlibs is an architecture "all" package. Now the script will
actually be shipped.
+ * If the restorecon command is available, restore SELinux file security
+ contexts after setting up X server and ICE socket directories
+ (xfree86-common) and font server socket directories (xfs) after creating
+ them in the init scripts. (Closes: #268812, #271030)
+
Changes by Denis Barbier and Fabio M. Di Nitto:
* Edit xc/programs/xkbcomp/symbols/pc/Imakefile so that the new pc/us_intl
@@ -51,7 +56,7 @@
+ Set UseBios default to "no" for PROSAVAGE_DDR and PROSAVAGE_DDRK, as
described here http://www.probo.com/timr/savage40.html.
- -- Branden Robinson <branden@debian.org> Thu, 7 Oct 2004 23:58:53 -0500
+ -- Branden Robinson <branden@debian.org> Fri, 8 Oct 2004 16:09:00 -0500
xfree86 (4.3.0.dfsg.1-8) unstable; urgency=high
Modified: trunk/debian/xfree86-common.init
===================================================================
--- trunk/debian/xfree86-common.init 2004-10-08 07:52:44 UTC (rev 1925)
+++ trunk/debian/xfree86-common.init 2004-10-08 21:11:22 UTC (rev 1926)
@@ -1,6 +1,5 @@
#!/bin/sh
-# /etc/init.d/xfree86-common: set up the X server socket directory
-# 10-4-2003: Now sets up .ICE-unix ICE IPC directory. -DS
+# /etc/init.d/xfree86-common: set up the X server and ICE socket directories
set -e
@@ -8,6 +7,13 @@
SOCKET_DIR=/tmp/.X11-unix
ICE_DIR=/tmp/.ICE-unix
+do_restorecon () {
+ # Restore file security context (SELinux).
+ if which restorecon >dev/null 2>&1; then
+ restorecon "$1"
+ fi
+}
+
set_up_socket_dir () {
echo -n "Setting up X server socket directory $SOCKET_DIR..."
if [ -e $SOCKET_DIR -a ! -d $SOCKET_DIR ]; then
@@ -16,6 +22,7 @@
mkdir -p $SOCKET_DIR
chown 0:0 $SOCKET_DIR
chmod 1777 $SOCKET_DIR
+ do_restorecon $SOCKET_DIR
echo "done."
}
@@ -27,6 +34,7 @@
mkdir -p $ICE_DIR
chown 0:0 $ICE_DIR
chmod 1777 $ICE_DIR
+ do_restorecon $ICE_DIR
echo "done."
}
Modified: trunk/debian/xfs.init
===================================================================
--- trunk/debian/xfs.init 2004-10-08 07:52:44 UTC (rev 1925)
+++ trunk/debian/xfs.init 2004-10-08 21:11:22 UTC (rev 1926)
@@ -11,6 +11,13 @@
test -x $DAEMON || exit 0
+do_restorecon () {
+ # Restore file security context (SELinux).
+ if which restorecon >dev/null 2>&1; then
+ restorecon "$1"
+ fi
+}
+
set_up_socket_dir () {
echo -n "Setting up X font server socket directory $SOCKET_DIR..."
if [ -e $SOCKET_DIR -a ! -d $SOCKET_DIR ]; then
@@ -19,6 +26,7 @@
mkdir -p $SOCKET_DIR
chown 0:0 $SOCKET_DIR
chmod 1777 $SOCKET_DIR
+ do_restorecon $SOCKET_DIR
echo "done."
}
Reply to: