X Strike Force XFree86 SVN commit: r1509 - trunk/debian
Author: branden
Date: 2004-06-03 22:13:55 -0500 (Thu, 03 Jun 2004)
New Revision: 1509
Modified:
trunk/debian/CHANGESETS
trunk/debian/changelog
trunk/debian/control
trunk/debian/xserver-common.postinst.in
trunk/debian/xserver-xfree86.config.in
trunk/debian/xserver-xfree86.postinst.in
Log:
Reduce susceptibility of tempfile(1)-using maintainer scripts to temporary
file race conditions by only appending to temporary files created by
tempfile, instead of recreating them with the shell redirection operator.
Make xserver-xfree86 postinst script use new --stdout option of dexconf,
and increase versioned dependency of xserver-xfree86 on xserver-common
accordingly. (Thanks to Andrew Suffield for pointing out this problem.)
Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS 2004-06-04 03:06:28 UTC (rev 1508)
+++ trunk/debian/CHANGESETS 2004-06-04 03:13:55 UTC (rev 1509)
@@ -71,4 +71,12 @@
stylistic improvements.
1508
+Reduce susceptibility of tempfile(1)-using maintainer scripts to temporary
+file race conditions by only appending to temporary files created by
+tempfile, instead of recreating them with the shell redirection operator.
+Make xserver-xfree86 postinst script use new --stdout option of dexconf,
+and increase versioned dependency of xserver-xfree86 on xserver-common
+accordingly. (Thanks to Andrew Suffield for pointing out this problem.)
+ 1509
+
vim:set ai et sts=4 sw=4 tw=80:
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-06-04 03:06:28 UTC (rev 1508)
+++ trunk/debian/changelog 2004-06-04 03:13:55 UTC (rev 1509)
@@ -77,6 +77,13 @@
session "scriptlets" that are shipped by default. Make other cosmetic and
stylistic improvements.
+ * Reduce susceptibility of tempfile(1)-using maintainer scripts to temporary
+ file race conditions by only appending to temporary files created by
+ tempfile, instead of recreating them with the shell redirection operator.
+ Make xserver-xfree86 postinst script use new --stdout option of dexconf,
+ and increase versioned dependency of xserver-xfree86 on xserver-common
+ accordingly. (Thanks to Andrew Suffield for pointing out this problem.)
+
-- Branden Robinson <branden@debian.org> Thu, 3 Jun 2004 14:14:49 -0500
xfree86 (4.3.0.dfsg.1-4) unstable; urgency=medium
Modified: trunk/debian/control
===================================================================
--- trunk/debian/control 2004-06-04 03:06:28 UTC (rev 1508)
+++ trunk/debian/control 2004-06-04 03:13:55 UTC (rev 1509)
@@ -1590,7 +1590,7 @@
Package: xserver-xfree86
Architecture: alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel netbsd-i386 powerpc sh3 sh4 sparc
-Depends: xserver-common (>= 4.2.1-10), ${shlibs:Depends}, ${misc:Depends}
+Depends: xserver-common (>= 4.3.0.dfsg.1-5), ${shlibs:Depends}, ${misc:Depends}
Suggests: discover, mdetect, read-edid, libglide2 (>> 2001.01.26)
Conflicts: libxfont-xtt
Replaces: xserver-common (<< 4.0), libxfont-xtt
@@ -1624,7 +1624,7 @@
Package: xserver-xfree86-dbg
Priority: extra
Architecture: alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel netbsd-i386 powerpc sh3 sh4 sparc
-Depends: xserver-common (>= 4.2.1-10), ${shlibs:Depends}, ${misc:Depends}
+Depends: xserver-common (>= 4.3.0.dfsg.1-5), ${shlibs:Depends}, ${misc:Depends}
Recommends: xserver-xfree86
Suggests: discover, mdetect, read-edid
Conflicts: libxfont-xtt
Modified: trunk/debian/xserver-common.postinst.in
===================================================================
--- trunk/debian/xserver-common.postinst.in 2004-06-04 03:06:28 UTC (rev 1508)
+++ trunk/debian/xserver-common.postinst.in 2004-06-04 03:13:55 UTC (rev 1509)
@@ -63,7 +63,7 @@
fi
if [ -n "$ALLOWED_USERS" -a -n "$NICE_VALUE" ]; then
NEW_XWRAPPER_CONFIG=$(tempfile)
- cat > "$NEW_XWRAPPER_CONFIG" << EOF
+ cat >>"$NEW_XWRAPPER_CONFIG" << EOF
# Xwrapper.config (Debian X Window System server wrapper configuration file)
#
# This file was generated by the post-installation script of the xserver-common
Modified: trunk/debian/xserver-xfree86.config.in
===================================================================
--- trunk/debian/xserver-xfree86.config.in 2004-06-04 03:06:28 UTC (rev 1508)
+++ trunk/debian/xserver-xfree86.config.in 2004-06-04 03:13:55 UTC (rev 1509)
@@ -56,13 +56,13 @@
DRIVER_FILE=$(tempfile)
CMD="discover --type-summary display"
- eval $CMD > $VENDOR_MODEL_FILE || debug_report_status "$CMD" "$?"
+ eval $CMD >>$VENDOR_MODEL_FILE || debug_report_status "$CMD" "$?"
CMD="discover --data-path=xfree86/server/name \
--data-version=${SOURCE_VERSION%-*} display"
- eval $CMD > $SERVER_FILE || debug_report_status "$CMD" "$?"
+ eval $CMD >>$SERVER_FILE || debug_report_status "$CMD" "$?"
CMD="discover --data-path=xfree86/server/device/driver \
--data-version=${SOURCE_VERSION%-*} display"
- eval $CMD > $DRIVER_FILE || debug_report_status "$CMD" "$?"
+ eval $CMD >>$DRIVER_FILE || debug_report_status "$CMD" "$?"
DISCOVERED_VIDEO=$(paste $VENDOR_MODEL_FILE $SERVER_FILE $DRIVER_FILE)
rm -f $VENDOR_MODEL_FILE $SERVER_FILE $DRIVER_FILE
Modified: trunk/debian/xserver-xfree86.postinst.in
===================================================================
--- trunk/debian/xserver-xfree86.postinst.in 2004-06-04 03:06:28 UTC (rev 1508)
+++ trunk/debian/xserver-xfree86.postinst.in 2004-06-04 03:13:55 UTC (rev 1509)
@@ -103,7 +103,7 @@
if [ "$(md5sum "$XF86CONFIG")" = "$(cat "$XF86CONFIG_CHECKSUM")" ]; then
# they match; prepare a new version of the config file
NEW_XF86CONFIG=$(tempfile)
- if dexconf -o "$NEW_XF86CONFIG"; then
+ if dexconf --stdout >>"$NEW_XF86CONFIG"; then
if ! cmp -s "$XF86CONFIG" "$NEW_XF86CONFIG"; then
cp "$NEW_XF86CONFIG" "$XF86CONFIG.dpkg-new"
mv "$XF86CONFIG.dpkg-new" "$XF86CONFIG"
Reply to: