[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

X Strike Force XFree86 SVN commit: r1072 - trunk/debian



Author: branden
Date: 2004-02-19 14:55:10 -0500 (Thu, 19 Feb 2004)
New Revision: 1072

Modified:
   trunk/debian/changelog
   trunk/debian/shell-lib.sh
Log:
Fix missing second argument to fgrep in deregister_x_lib_dir_with_ld_so(),
which can cause it to block, attempting to read from standard input.


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2004-02-19 17:38:29 UTC (rev 1071)
+++ trunk/debian/changelog	2004-02-19 19:55:10 UTC (rev 1072)
@@ -1,5 +1,8 @@
-xfree86 (4.3.0-3) unstable; urgency=low
+xfree86 (4.3.0-3) unstable; urgency=medium
 
+  * Urgency due to fix for serious bug which frustrates removal of library
+    packages.
+
   * Fix missing line-continuation character.
     - debian/xdm.config.in
 
@@ -21,8 +24,12 @@
   * Fix typo in libxmuu-dev's dependencies (thanks, Petr Salinger).
     - debian/control
 
- -- Branden Robinson <branden@debian.org>  Thu, 19 Feb 2004 12:37:22 -0500
+  * Fix missing second argument to fgrep in deregister_x_lib_dir_with_ld_so(),
+    which can cause it to block, attempting to read from standard input.
+    - debian/shell-lib.sh
 
+ -- Branden Robinson <branden@debian.org>  Thu, 19 Feb 2004 14:52:33 -0500
+
 xfree86 (4.3.0-2) unstable; urgency=low
 
   * The "It's like I have a shotgun in my mouth, I've got my finger on the

Modified: trunk/debian/shell-lib.sh
===================================================================
--- trunk/debian/shell-lib.sh	2004-02-19 17:38:29 UTC (rev 1071)
+++ trunk/debian/shell-lib.sh	2004-02-19 19:55:10 UTC (rev 1072)
@@ -564,7 +564,7 @@
     if [ "$(echo "$dir"/lib*.so.*.*)" = "$dir/lib*.so.*.*" ]; then
       # glob expansion produced nothing, so no shared libraries are present
       observe "removing $dir directory from $ldsoconf"
-      fgrep -qsvx "$dir" > "$ldsoconf.dpkg-tmp"
+      fgrep -qsvx "$dir" "$ldsoconf" > "$ldsoconf.dpkg-tmp"
       mv "$ldsoconf.dpkg-tmp" "$ldsoconf"
     fi
   fi



Reply to: