debian/changelog         |    8 ++++++++
 debian/xfs.README.Debian |   12 ------------
 debian/xfs.init          |    8 ++++----
 3 files changed, 12 insertions(+), 16 deletions(-)

New commits:
commit eb24ff1028c969c7c8f8e858291295d7ce81ac94
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Thu Jul 19 15:44:45 2007 +0200

    Remove obsolete information from README.Debian.

diff --git a/debian/changelog b/debian/changelog
index 7cce7b0..fe54530 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ xfs (1:1.0.4-2) unstable; urgency=high
 
   * High urgency upload for security fix.
   * Fix race condition in the xfs init script (CVE-2007-3103).
+  * Remove obsolete information from README.Debian (closes: #376763).
 
- -- Julien Cristau <[EMAIL PROTECTED]>  Thu, 19 Jul 2007 14:42:48 +0200
+ -- Julien Cristau <[EMAIL PROTECTED]>  Thu, 19 Jul 2007 15:24:35 +0200
 
 xfs (1:1.0.4-1) unstable; urgency=low
 
diff --git a/debian/xfs.README.Debian b/debian/xfs.README.Debian
index d351333..5d9ab78 100644
--- a/debian/xfs.README.Debian
+++ b/debian/xfs.README.Debian
@@ -1,16 +1,6 @@
 Debian README for xfs package
 =============================
 
-Newcomers to the X Window System should first read the Debian X FAQ
-(Frequently Asked Questions list): /usr/share/doc/x11-common/FAQ.gz.
-You can view this file with your favorite pager program after decompressing
-it.  For example:
-    $ zcat /usr/share/doc/x11-common/FAQ.gz | pager
-
-Upgraders from Debian GNU/Linux 2.0 or earlier should be aware that the
-/etc/X11/config file is no longer used; its xfs-specific options are now in
-/etc/X11/fs/xfs.options.
-
 The default font catalogue for xfs as shipped with Debian GNU/Linux
 searches the "misc" font directory before searching "cyrillic".  Some fonts
 in both of these directories claim the same font alias names (like
@@ -35,6 +25,4 @@ EndSection
 For information on the /etc/X11/fs/config file, see the xfs(1)
 manual page.
 
-$Id: xfs.README.Debian 428 2005-07-28 04:30:44Z dnusinow $
-
 vim:set ai et sts=4 sw=4 tw=80:

commit 662cd4c0a67d218832dc154ef898b9d39481ea6c
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Thu Jul 19 14:51:01 2007 +0200

    Fix race condition in the xfs init script (CVE-2007-3103).
    
    Patch based on 
https://issues.rpath.com/secure/attachment/11719/xfs.init.patch

diff --git a/debian/changelog b/debian/changelog
index 8779b7e..7cce7b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xfs (1:1.0.4-2) unstable; urgency=high
+
+  * High urgency upload for security fix.
+  * Fix race condition in the xfs init script (CVE-2007-3103).
+
+ -- Julien Cristau <[EMAIL PROTECTED]>  Thu, 19 Jul 2007 14:42:48 +0200
+
 xfs (1:1.0.4-1) unstable; urgency=low
 
   [ Julien Cristau ]
diff --git a/debian/xfs.init b/debian/xfs.init
index 2ac00a7..172b8ff 100644
--- a/debian/xfs.init
+++ b/debian/xfs.init
@@ -51,10 +51,10 @@ set_up_socket_dir () {
   if [ -e $SOCKET_DIR ] && ! [ -d $SOCKET_DIR ]; then
     mv $SOCKET_DIR $SOCKET_DIR.$$
   fi
-  mkdir -p $SOCKET_DIR
-  chown 0:0 $SOCKET_DIR
-  chmod 1777 $SOCKET_DIR
-  do_restorecon $SOCKET_DIR
+  if ! [ -d $SOCKET_DIR ]; then
+    mkdir -m 1777 $SOCKET_DIR || :
+    do_restorecon $SOCKET_DIR || :
+  fi
   echo "done."
 }
 


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to