X Strike Force SVN commit: rev 422 - trunk/debian
Author: branden
Date: 2003-08-23 17:46:41 -0500 (Sat, 23 Aug 2003)
New Revision: 422
Modified:
trunk/debian/changelog
trunk/debian/xserver-common.postinst.in
trunk/debian/xserver-common.preinst.in
trunk/debian/xserver-xfree86.postinst.in
trunk/debian/xserver-xfree86.preinst.in
Log:
debian/xserver-{common,xfree86}.postinst.in: if the configuration file
checksum/roster directory doesn't exist when it's time to create/update
a roster file, create it; if it does exist but isn't a directory, issue
a warning and move on (assume the admin is being fiendishly clever)
(Closes: #206790)
debian/xserver-{common,xfree86}.preinst.in: (cosmetic) update comments
regarding checksum/roster directory to be more accurate
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2003-08-21 21:41:10 UTC (rev 421)
+++ trunk/debian/changelog 2003-08-23 22:46:41 UTC (rev 422)
@@ -1,13 +1,22 @@
-xfree86 (4.2.1-11) unstable; urgency=low
+xfree86 (4.2.1-11) unstable; urgency=medium
+ * urgency set to medium because bug #206790 bites a lot of people (but,
+ contrary to most submitters' belief, not everyone)
+
* debian/control: add gcc's epoch to versioned Build-Conflict on gcc-3.3
(thanks, James Troup)
* debian/local/Xsession{,.options}.5: further clarify the X session startup
procedure in the manpages, per suggestion from Frank Murphy
- -- Branden Robinson <branden@debian.org> Thu, 21 Aug 2003 16:18:00 -0500
+ * debian/xserver-{common,xfree86}.postinst.in: if the configuration file
+ checksum/roster directory doesn't exist when it's time to create/update
+ a roster file, create it; if it does exist but isn't a directory, issue
+ a warning and move on (assume the admin is being fiendishly clever)
+ (Closes: #206790)
+ -- Branden Robinson <branden@debian.org> Sat, 23 Aug 2003 17:42:09 -0500
+
xfree86 (4.2.1-10) unstable; urgency=medium
* patch #000_stolen_from_HEAD_xlib: fix for buffer overflow in
Modified: trunk/debian/xserver-common.postinst.in
===================================================================
--- trunk/debian/xserver-common.postinst.in 2003-08-21 21:41:10 UTC (rev 421)
+++ trunk/debian/xserver-common.postinst.in 2003-08-23 22:46:41 UTC (rev 422)
@@ -33,8 +33,18 @@
# register this package as a (potential) handler of the X server wrapper config
# file
-if ! fgrep -qsx "$THIS_PACKAGE" "$XWRAPPER_CONFIG_ROSTER" ]; then
- echo "$THIS_PACKAGE" >> "$XWRAPPER_CONFIG_ROSTER"
+if [ ! -e "$CHECKSUM_DIR" ]; then
+ mkdir --mode=755 --parents "$CHECKSUM_DIR"
+ if ! fgrep -qsx "$THIS_PACKAGE" "$XWRAPPER_CONFIG_ROSTER" ]; then
+ echo "$THIS_PACKAGE" >> "$XWRAPPER_CONFIG_ROSTER"
+ fi
+else
+ # if the checksum pathname does exist but is not a directory, give up; we
+ # will assume the user has reasons for setting things up this way
+ if [ ! -d "$CHECKSUM_DIR" ]; then
+ message "Warning: cannot register $THIS_PACKAGE package as an owner of" \
+ "$XWRAPPER_CONFIG; $CHECKSUM_DIR exists but is not a directory."
+ fi
fi
# only mess with config file if it exists; if it does not, assume that's the
Modified: trunk/debian/xserver-common.preinst.in
===================================================================
--- trunk/debian/xserver-common.preinst.in 2003-08-21 21:41:10 UTC (rev 421)
+++ trunk/debian/xserver-common.preinst.in 2003-08-23 22:46:41 UTC (rev 422)
@@ -54,7 +54,8 @@
mkdir --mode=755 "$CHECKSUM_DIR"
else
# if the checksum pathname does exist but is not a directory, give
- # up; dpkg will probably vomit on unpack anyway
+ # up; we will assume the user has reasons for setting things up
+ # this way
if [ ! -d "$CHECKSUM_DIR" ]; then
message "Warning: cannot store MD5 checksum of" \
"$XWRAPPER_CONFIG; $CHECKSUM_DIR exists but is not a" \
Modified: trunk/debian/xserver-xfree86.postinst.in
===================================================================
--- trunk/debian/xserver-xfree86.postinst.in 2003-08-21 21:41:10 UTC (rev 421)
+++ trunk/debian/xserver-xfree86.postinst.in 2003-08-23 22:46:41 UTC (rev 422)
@@ -30,11 +30,22 @@
# register this package as a (potential) handler of the X server symlink and
# XFree86 4.x X server configuration file
-for ROSTER in "$SERVER_SYMLINK_ROSTER" "$XF86CONFIG_ROSTER"; do
- if ! fgrep -qsx "$THIS_PACKAGE" "$ROSTER"; then
- echo "$THIS_PACKAGE" >> "$ROSTER"
+if [ ! -e "$CHECKSUM_DIR" ]; then
+ mkdir --mode=755 --parents "$CHECKSUM_DIR"
+ for ROSTER in "$SERVER_SYMLINK_ROSTER" "$XF86CONFIG_ROSTER"; do
+ if ! fgrep -qsx "$THIS_PACKAGE" "$ROSTER"; then
+ echo "$THIS_PACKAGE" >> "$ROSTER"
+ fi
+ done
+else
+ # if the checksum pathname does exist but is not a directory, give up; we
+ # will assume the user has reasons for setting things up this way
+ if [ ! -d "$CHECKSUM_DIR" ]; then
+ message "Warning: cannot register $THIS_PACKAGE package as an owner of" \
+ "$SERVER_SYMLINK or $XF86CONFIG; $CHECKSUM_DIR exists but is not" \
+ "a directory."
fi
-done
+fi
# only mess with server symlink config file if it exists; if it does not,
# assume that's the way the user wants it
Modified: trunk/debian/xserver-xfree86.preinst.in
===================================================================
--- trunk/debian/xserver-xfree86.preinst.in 2003-08-21 21:41:10 UTC (rev 421)
+++ trunk/debian/xserver-xfree86.preinst.in 2003-08-23 22:46:41 UTC (rev 422)
@@ -85,6 +85,8 @@
fi
else
+ # the checksum pathname does exist but is not a directory; we assume
+ # the user has reasons for setting things up this way
message "Warning: cannot store MD5 checksums of $THIS_PACKAGE's" \
"configuration files; $CHECKSUM_DIR exists but is not a" \
"directory."
Reply to: