On May  3 06:59, Achim Gratz wrote:
> In addition, there should be a "picket fence" in front of those expression(s),
> too.  Otherwise they match other lines that are not supposed to be deleted 
> (the
> DLL lines are probably safe, but could be changed defensively as well).

Sounds good to me.

Jason, I would suggest the following patch to apply to the next rebase
release, courtesy Achim:

Index: rebaseall.in
===================================================================
RCS file: /sourceware/projects/cygwin-apps-home/cvsfiles/rebase/rebaseall.in,v
retrieving revision 1.8
diff -u -p -r1.8 rebaseall.in
--- rebaseall.in        30 Apr 2012 13:37:15 -0000      1.8
+++ rebaseall.in        3 May 2012 07:47:36 -0000
@@ -202,9 +202,9 @@ case $Platform in
   cygwin)
     find /etc/setup -name '*.lst.gz' | xargs gzip -d -c |
       grep -E "\.($Suffixes)\$" |
-      sed -e '/cygwin1\.dll$/d' -e '/cyglsa.*\.dll$/d' \
+      sed -e '/\/cygwin1\.dll$/d' -e '/\/cyglsa.*\.dll$/d' \
           -e '/sys-root\/mingw/d' -e 's/^/\//' \
-          -e '/d?ash\.exe$/d' -e '/rebase\.exe$/d' >"${TmpFile}"
+          -e '/\/d\?ash\.exe$/d' -e '/\/rebase\.exe$/d' >"${TmpFile}"
       # Unconditionally add the -n flag so rebased DLLs get the
       # dynamicbase flag removed.
       NoDyn='-n'
@@ -214,9 +214,9 @@ case $Platform in
     do
       find $f -type f |
         grep -E "\.($Suffixes)\$" |
-       sed -e '/msys-1\.0.*\.dll$/d' -e '/cygwin1\.dll$/d' \
-           -e '/cyglsa.*\.dll$/d' -e '/d?ash\.exe$/d' \
-           -e '/rebase\.exe$/d' >>"$TmpFile"
+       sed -e '/\/msys-1\.0.*\.dll$/d' -e '/\/cygwin1\.dll$/d' \
+           -e '/\/cyglsa.*\.dll$/d' -e '/\/d\?ash\.exe$/d' \
+           -e '/\/rebase\.exe$/d' >>"$TmpFile"
     done
     ;;
 esac


Thanks,
Corinna

-- 
Corinna Vinschen                  Please, send mails regarding Cygwin to
Cygwin Project Co-Leader          cygwin AT cygwin DOT com
Red Hat

--
Problem reports:       http://cygwin.com/problems.html
FAQ:                   http://cygwin.com/faq/
Documentation:         http://cygwin.com/docs.html
Unsubscribe info:      http://cygwin.com/ml/#unsubscribe-simple

Reply via email to