[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

Re: [tor-bugs] #24477 [Applications/Tor Browser]: Windows 64 mar files are not generated



#24477: Windows 64 mar files are not generated
--------------------------------------+--------------------------
 Reporter:  boklm                     |          Owner:  tbb-team
     Type:  defect                    |         Status:  new
 Priority:  Medium                    |      Milestone:
Component:  Applications/Tor Browser  |        Version:
 Severity:  Normal                    |     Resolution:
 Keywords:  TorBrowserTeam201711      |  Actual Points:
Parent ID:                            |         Points:
 Reviewer:                            |        Sponsor:
--------------------------------------+--------------------------

Comment (by boklm):

 We can switch to using a 64bit container, installing the 32bit
 dependencies for running nsis:
 {{{
 diff --git a/projects/tor-browser/config b/projects/tor-browser/config
 index c00af05..564dfa6 100644
 --- a/projects/tor-browser/config
 +++ b/projects/tor-browser/config
 @@ -34,10 +34,10 @@ targets:
    windows-x86_64:
      var:
        mar_osname: win64
 -      # We use a 32bit container to be able to use a 32bit nsis and
 -      # pe_checksum_fix.py
 -      container:
 -        arch: i386
 +      arch_deps:
 +        - python-pefile
 +        - libc6-i386
 +        - lib32stdc++6

  input_files:
    - project: container-image
 }}}

 However we then have an error with `pe_checksum_fix.py` which doesn't work
 in 64bit:
 {{{
 Traceback (most recent call last):
   File "/var/tmp/tmp.oYuOVB2u7o/pe_checksum_fix.py", line 55, in <module>
     pef.OPTIONAL_HEADER.CheckSum = pef.generate_checksum()
   File "/usr/lib/python2.7/dist-packages/pefile.py", line 3720, in
 generate_checksum
     dword = struct.unpack('L', self.__data__[ i*4 : i*4+4 ])[0]
 struct.error: unpack requires a string argument of length 8
 }}}

 I think we can fix that by installing a more recent version of python-
 pefile, as done before commit bb32ec91b538ab17d309b645787149ff376d58e9.

--
Ticket URL: <https://trac.torproject.org/projects/tor/ticket/24477#comment:1>
Tor Bug Tracker & Wiki <https://trac.torproject.org/>
The Tor Project: anonymity online
_______________________________________________
tor-bugs mailing list
tor-bugs@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-bugs