[tor-commits] [tor-browser-bundle/master] Comment out some binary sed hacks.

[mikeperry@xxxxxxxxxxxxxx]

commit 95446ee9fef932ba2c443968a90b650a36cd2182
Author: Mike Perry <mikeperry-git@xxxxxxxxxxxxxx>
Date:   Sat Nov 16 17:18:39 2013 -0800

    Comment out some binary sed hacks.
    
    Should be obsoleted by patching binutils.
---
 gitian/descriptors/windows/gitian-firefox.yml |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/gitian/descriptors/windows/gitian-firefox.yml b/gitian/descriptors/windows/gitian-firefox.yml
index a83b410..31e782f 100644
--- a/gitian/descriptors/windows/gitian-firefox.yml
+++ b/gitian/descriptors/windows/gitian-firefox.yml
@@ -166,9 +166,11 @@ script: |
   cp -a /usr/i686-w64-mingw32/lib/libstdc*dll $INSTDIR/Browser/
   cp -a ~/build/msvcr100.dll $INSTDIR/Browser/
   #
-  # XXX: What the hell are these three bytes anyways?
-  sed 's/\x94\x0C\xE7\x6A\xB8\x0C\xE7\x6A\x08...\x04\xBA\xCB\x7E/\x94\x0c\xe7\x6a\xb8\x0c\xe7\x6a\x08\x23\x23\x23\x04\xba\xcb\x7e/M' -i $INSTDIR/Browser/xul.dll
-  sed 's/\x94\xb1\x24\x65\xb8\xb1\x24\x65\xf8...\x04\xba\xcb\x7e/\x94\xb1\x24\x65\xb8\xb1\x24\x65\xf8\x23\x23\x23\x04\xba\xcb\x7e/M' -i $INSTDIR/Browser/gkmedias.dll
+  # What the hell are these three bytes anyways?
+  # FIXME: This was probably fixed by patching binutils. If we get matching
+  # builds without it, remove these two:
+  #sed 's/\x94\x0C\xE7\x6A\xB8\x0C\xE7\x6A\x08...\x04\xBA\xCB\x7E/\x94\x0c\xe7\x6a\xb8\x0c\xe7\x6a\x08\x23\x23\x23\x04\xba\xcb\x7e/M' -i $INSTDIR/Browser/xul.dll
+  #sed 's/\x94\xb1\x24\x65\xb8\xb1\x24\x65\xf8...\x04\xba\xcb\x7e/\x94\xb1\x24\x65\xb8\xb1\x24\x65\xf8\x23\x23\x23\x04\xba\xcb\x7e/M' -i $INSTDIR/Browser/gkmedias.dll
   # Stripping again updates the PE header checksums to be correct
   i686-w64-mingw32-strip $INSTDIR/Browser/gkmedias.dll
   i686-w64-mingw32-strip $INSTDIR/Browser/xul.dll

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits