January 2014 - tor-commits - lists.torproject.org

[tor-browser-bundle/master] Add GPG key for Ubuntu Wine Team.
by mikeperry＠torproject.org 21 Jan '14

21 Jan '14

commit 46b33fc00bbe0cc10978d83cfa4c6af26cdfa3e5 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Nov 23 21:33:54 2013 +0000 Add GPG key for Ubuntu Wine Team. https://launchpad.net/~ubuntu-wine/+archive/ppa http://keyserver.ubuntu.com:11371/pks/lookup?op=get&search=0x5A9A06AEF9CB8D…. gpg --output gpg/ubuntu-wine.gpg --export --export-options export-minimal 0x5A9A06AEF9CB8DB0 --- gitian/gpg/ubuntu-wine.gpg | Bin 0 -> 363 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gitian/gpg/ubuntu-wine.gpg b/gitian/gpg/ubuntu-wine.gpg new file mode 100644 index 0000000..b9f150a Binary files /dev/null and b/gitian/gpg/ubuntu-wine.gpg differ

1 0

[tor-browser-bundle/master] Install Windows Python MSI package.
by mikeperry＠torproject.org 21 Jan '14

21 Jan '14

commit 10489d505d910a6450e253e54b4488019153acc1 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Nov 24 19:19:06 2013 +0000 Install Windows Python MSI package. --- gitian/descriptors/windows/gitian-pluggable-transports.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gitian/descriptors/windows/gitian-pluggable-transports.yml b/gitian/descriptors/windows/gitian-pluggable-transports.yml index 28f64ff..35dac91 100644 --- a/gitian/descriptors/windows/gitian-pluggable-transports.yml +++ b/gitian/descriptors/windows/gitian-pluggable-transports.yml @@ -16,6 +16,7 @@ remotes: "dir": "openssl" files: - "ubuntu-wine.gpg" +- "python.msi" - "dzip.sh" script: | INSTDIR="$HOME/install" @@ -54,6 +55,11 @@ script: | # http://bugs.winehq.org/show_bug.cgi?id=31237 LD_PRELOAD= wineboot -i # + # http://wiki.winehq.org/msiexec + # /qn disables user interface; /i installs. + LD_PRELOAD= msiexec /qn /i python.msi TARGETDIR=$INSTDIR/python + INSTPYTHON="wine $INSTDIR/python/python.exe" + # cd openssl find -type f | xargs touch --date="$REFERENCE_DATETIME" ./Configure -shared --cross-compile-prefix=i686-w64-mingw32- mingw --prefix=$INSTDIR/openssl

1 0

[tor-browser-bundle/master] Install newer wine from Ubuntu PPA.
by mikeperry＠torproject.org 21 Jan '14

21 Jan '14

commit e9ce6c530647849ea6205f5ed01f44f2ae32b7d1 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Nov 24 02:55:10 2013 +0000 Install newer wine from Ubuntu PPA. The main reason for a newer wine is to work around an issue in the Ubuntu's standard wine1.4 that often manifests when running Python code, leading to a page fault. "blender 2.61 crashes on start (python3.2) http://bugs.winehq.org/show_bug.cgi?id=29764 "EVE Online crashes when viewing certain ship models (T3 ships)" http://bugs.winehq.org/show_bug.cgi?id=30515 The crash is triggered by the _PyVerify_fd function, which peeks at a Windows-internal data structure, implicitly expecting it to have been allocated on the heap. http://hg.python.org/cpython/file/694e2708b4a8/Modules/posixmodule.c#l1078 Wine 1.4 doesn't do this structure in the way Python expects, leading to the page fault. _PyVerify_fd is called by many Python functions that deal with file descriptor numbers, such as io.open and os.fstat. This is sufficient to crash Python run under Wine 1.4: >>> import os >>> os.fstat(4) (The crash is actually at RtlHeapSize, called by _msize, called by _PyVerify_fd.) I initially tried to patch around such problematic calls, but they are too pervasive. When running wineboot or any other Wine command, it is necessary to remove libfaketime from LD_PRELOAD. "[Bug 31237] New: libfaketime: integrate with libfaketime to allow running a program with a fake time" http://bugs.winehq.org/show_bug.cgi?id=31237 My experience matches what appears in the bug report. With libfaketime in LD_PRELOAD, I got this error every time I ran a Wine command: wine: created the configuration directory '/home/ubuntu/.wine' wine: Unhandled page fault on read access to 0x00000000 at address (nil) (thread 000b), err:seh:start_debugger Couldn't start debugger ("winedbg --auto 10 104") (2) Read the Wine Developers Guide on how to set up winedbg or another debugger wine: Unhandled page fault on read access to 0x00000000 at address (nil) (thread 0011), err:seh:start_debugger Couldn't start debugger ("winedbg --auto 16 68") (2) Read the Wine Developers Guide on how to set up winedbg or another debugger --- .../windows/gitian-pluggable-transports.yml | 18 ++++++++++++++++++ gitian/mkbundle-windows.sh | 1 + 2 files changed, 19 insertions(+) diff --git a/gitian/descriptors/windows/gitian-pluggable-transports.yml b/gitian/descriptors/windows/gitian-pluggable-transports.yml index bc2e3f6..28f64ff 100644 --- a/gitian/descriptors/windows/gitian-pluggable-transports.yml +++ b/gitian/descriptors/windows/gitian-pluggable-transports.yml @@ -15,6 +15,7 @@ remotes: - "url": "https://github.com/nmathewson/openssl.git" "dir": "openssl" files: +- "ubuntu-wine.gpg" - "dzip.sh" script: | INSTDIR="$HOME/install" @@ -26,6 +27,8 @@ script: | export LC_ALL=C export CFLAGS="-mwindows" export LDFLAGS="-mwindows" + # This is correct only for kvm. + MIRROR_HOST=10.0.2.2 # XXX: Hardening options cause the exe's to crash.. not sure why #export CFLAGS="-mwindows -fstack-protector-all -fPIE -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat-security" #export LDFLAGS="-mwindows -Wl,--dynamicbase -Wl,--nxcompat -lssp -L/usr/lib/gcc/i686-w64-mingw32/4.6/" @@ -36,6 +39,21 @@ script: | mkdir -p $INSTDIR/Data/Tor/ mkdir -p $OUTDIR/ # + # Install a Wine new enough to have a fix for http://bugs.winehq.org/show_bug.cgi?id=29764; + # otherwise Python run under Wine constantly crashes in _PyVerify_fd, which is + # called by such common operations as io.open and os.fstat (anything involving + # a file descriptor number). Ubuntu's main repository only has wine1.4, and + # the issue was fixed in 1.5.29. + sudo -s sh -c "echo deb http://$MIRROR_HOST:3142/ppa.launchpad.net/ubuntu-wine/ppa/ubuntu precise main >> /etc/apt/sources.list" + # This key is from https://launchpad.net/~ubuntu-wine/+archive/ppa and + # http://keyserver.ubuntu.com:11371/pks/lookup?op=get&search=0x5A9A06AEF9CB8D…. + sudo apt-key add ubuntu-wine.gpg + sudo apt-get update + sudo apt-get --no-install-recommends -y install wine + # libfaketime causes all Wine commands to crash; remove it from LD_PRELOAD. + # http://bugs.winehq.org/show_bug.cgi?id=31237 + LD_PRELOAD= wineboot -i + # cd openssl find -type f | xargs touch --date="$REFERENCE_DATETIME" ./Configure -shared --cross-compile-prefix=i686-w64-mingw32- mingw --prefix=$INSTDIR/openssl diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh index 989c2a9..33e8a2b 100755 --- a/gitian/mkbundle-windows.sh +++ b/gitian/mkbundle-windows.sh @@ -43,6 +43,7 @@ echo "$TORBROWSER_VERSION" > $GITIAN_DIR/inputs/bare-version cp -a $WRAPPER_DIR/$VERSIONS_FILE $GITIAN_DIR/inputs/versions cp $WRAPPER_DIR/build-helpers/* $GITIAN_DIR/inputs/ +cp $WRAPPER_DIR/gpg/ubuntu-wine.gpg $GITIAN_DIR/inputs/ cd $WRAPPER_DIR/.. rm -f $GITIAN_DIR/inputs/relativelink-src.zip

1 0

[tor-browser-bundle/master] Install py2exe for windows.
by mikeperry＠torproject.org 21 Jan '14

21 Jan '14

commit 95581f816baf90c43e81ac14ae7f1501da839863 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Nov 24 19:55:45 2013 +0000 Install py2exe for windows. The only binary distribution is a self-installing executable, and I couldn't find a way to make it run from the command line. So extract it with 7z and copy its contents. --- gitian/descriptors/windows/gitian-pluggable-transports.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gitian/descriptors/windows/gitian-pluggable-transports.yml b/gitian/descriptors/windows/gitian-pluggable-transports.yml index 35dac91..6869af9 100644 --- a/gitian/descriptors/windows/gitian-pluggable-transports.yml +++ b/gitian/descriptors/windows/gitian-pluggable-transports.yml @@ -7,6 +7,7 @@ architectures: packages: - "git-core" - "zip" +- "p7zip-full" - "mingw-w64" - "faketime" - "libtool" @@ -17,6 +18,7 @@ remotes: files: - "ubuntu-wine.gpg" - "python.msi" +- "py2exe.exe" - "dzip.sh" script: | INSTDIR="$HOME/install" @@ -60,6 +62,9 @@ script: | LD_PRELOAD= msiexec /qn /i python.msi TARGETDIR=$INSTDIR/python INSTPYTHON="wine $INSTDIR/python/python.exe" # + 7z x py2exe.exe + cp -a PLATLIB/* $INSTDIR/python/Lib/site-packages/ + # cd openssl find -type f | xargs touch --date="$REFERENCE_DATETIME" ./Configure -shared --cross-compile-prefix=i686-w64-mingw32- mingw --prefix=$INSTDIR/openssl

1 0

[tor-browser-bundle/master] Add gcc, dllwrap, and swig wrappers for Wine.
by mikeperry＠torproject.org 21 Jan '14

21 Jan '14

commit 87142112db32e1999de9ab2a213f5521d37a1e94 Author: David Fifield <david(a)bamsoftware.com> Date: Fri Nov 22 17:22:42 2013 +0000 Add gcc, dllwrap, and swig wrappers for Wine. Python distutils, with the "mingw32" compiler profile, is inflexible. It hardcodes the names "gcc.exe" and "dllwrap.exe", and passes them fixed options. It's not possible to control it with environment variables like CC and CFLAGS. Before Python 2.7.6, distutils always passes the option -mno-cygwin to gcc, which causes an error. Additionally, when distutils is run under Wine, it passes Windows-style paths with backslashes to our unsuspecting i686-w64-mingw32-gcc. These wrapper programs strip -mno-cygwin, and convert Windows paths to Unix paths. They also set LD_PRELOAD and FAKETIME, because those can't be set for the outer Wine process. Doing a subprocess.Popen of a Unix program from within Wine mostly works. For example, subprocess.Popen(["/usr/bin/i686-w64-mingw32-gcc"]) starts a new compiler process. However, if you .wait() on the process object, you get a "WindowsError: [Error 6] Invalid handle". The same goes for the implicit wait in subprocess.call and subprocess.check_output. The .pid of such processes is 0. What you can do, however, is read from one of the process's output streams--it will be closed when the process terminates. Because we know we are dealing with gcc subprocesses, we read its stderr and look for the string " error: ". If it appears, we return a non-zero status code. We don't return non-zero merely on a non-empty stderr, because warnings don't usually cause that. The difficulty doesn't exist when running native Windows binaries. That's why we can do subprocess.call(["winepath", ...]): because winepath.exe is a native binary that comes with Wine. --- gitian/build-helpers/wine-wrappers/common.py | 27 ++++++++++++++++++ gitian/build-helpers/wine-wrappers/dllwrap.py | 36 ++++++++++++++++++++++++ gitian/build-helpers/wine-wrappers/gcc.py | 36 ++++++++++++++++++++++++ gitian/build-helpers/wine-wrappers/settings.py | 2 ++ gitian/build-helpers/wine-wrappers/setup.py | 7 +++++ gitian/build-helpers/wine-wrappers/swig.py | 33 ++++++++++++++++++++++ gitian/mkbundle-linux.sh | 2 +- gitian/mkbundle-mac.sh | 2 +- gitian/mkbundle-windows.sh | 2 +- 9 files changed, 144 insertions(+), 3 deletions(-) diff --git a/gitian/build-helpers/wine-wrappers/common.py b/gitian/build-helpers/wine-wrappers/common.py new file mode 100644 index 0000000..19e994b --- /dev/null +++ b/gitian/build-helpers/wine-wrappers/common.py @@ -0,0 +1,27 @@ +import os +import subprocess + +import settings + +def winepath(windowspath): + """Convert a Windows path to a Unix path.""" + return subprocess.check_output(["winepath", "-u", windowspath])[:-1] + +def search_startswith(a, elems): + """Search for the first element of the array a that startswith any of the + members of elems, and return it. Return None if no match was found.""" + for e in elems: + if a.startswith(e): + return e + return None + +def popen_faketime(*args, **kwargs): + """Does subprocess.Popen after setting faketime environment variables.""" + ld_preload = os.getenv("LD_PRELOAD") + if ld_preload: + # ld.so(8): "The items of [LD_PRELOAD] can be separated by spaces or colons." + ld_preload += ":" + ld_preload += settings.LD_PRELOAD + os.putenv("LD_PRELOAD", ld_preload) + os.putenv("FAKETIME", settings.FAKETIME) + return subprocess.Popen(*args, **kwargs) diff --git a/gitian/build-helpers/wine-wrappers/dllwrap.py b/gitian/build-helpers/wine-wrappers/dllwrap.py new file mode 100755 index 0000000..fdff035 --- /dev/null +++ b/gitian/build-helpers/wine-wrappers/dllwrap.py @@ -0,0 +1,36 @@ +#!/usr/bin/env python + +# A wrapper for i686-w64-mingw32-dllwrap that removes -mno-cygwin and converts +# Windows paths to Unix paths, so that the w64-mingw32 dllwrap can be called by +# Python distutils. + +import os +import subprocess +import sys + +import common + +args = ["/usr/bin/i686-w64-mingw32-dllwrap"] +sys.argv.pop(0) +while sys.argv: + a = sys.argv.pop(0) + if not a.startswith("-"): + args.append(common.winepath(a)) + continue + if a == "-mno-cygwin": + continue + if a in ("-I", "-L", "-s", "--def", "--output-lib"): + args.append(a) + args.append(common.winepath(sys.argv.pop(0))) + continue + o = common.search_startswith(a, ("-I", "-L", "--def=", "--output-lib=")) + if o is not None: + path = a[len(o):] + args.append("%s%s" % (o, common.winepath(path))) + continue + args.append(a) +p = common.popen_faketime(args, stderr=subprocess.PIPE) +stderr = p.stderr.read() +sys.stderr.write(stderr) +if " error: " in stderr: + sys.exit(1) diff --git a/gitian/build-helpers/wine-wrappers/gcc.py b/gitian/build-helpers/wine-wrappers/gcc.py new file mode 100755 index 0000000..493b27b --- /dev/null +++ b/gitian/build-helpers/wine-wrappers/gcc.py @@ -0,0 +1,36 @@ +#!/usr/bin/env python + +# A wrapper for i686-w64-mingw32-gcc that removes -mno-cygwin and converts +# Windows paths to Unix paths, so that the w64-mingw32 gcc can be called by +# Python distutils. + +import os +import subprocess +import sys + +import common + +args = ["/usr/bin/i686-w64-mingw32-gcc"] +sys.argv.pop(0) +while sys.argv: + a = sys.argv.pop(0) + if not a.startswith("-"): + args.append(common.winepath(a)) + continue + if a == "-mno-cygwin": + continue + if a in ("-I", "-L"): + args.append(a) + args.append(common.winepath(sys.argv.pop(0))) + continue + o = common.search_startswith(a, ("-I", "-L")) + if o is not None: + path = a[len(o):] + args.append("%s%s" % (o, common.winepath(path))) + continue + args.append(a) +p = common.popen_faketime(args, stderr=subprocess.PIPE) +stderr = p.stderr.read() +sys.stderr.write(stderr) +if " error: " in stderr: + sys.exit(1) diff --git a/gitian/build-helpers/wine-wrappers/settings.py b/gitian/build-helpers/wine-wrappers/settings.py new file mode 100644 index 0000000..f395433 --- /dev/null +++ b/gitian/build-helpers/wine-wrappers/settings.py @@ -0,0 +1,2 @@ +LD_PRELOAD = "/usr/lib/faketime/libfaketime.so.1" +FAKETIME = "2000-01-01 00:00:00" diff --git a/gitian/build-helpers/wine-wrappers/setup.py b/gitian/build-helpers/wine-wrappers/setup.py new file mode 100644 index 0000000..797015e --- /dev/null +++ b/gitian/build-helpers/wine-wrappers/setup.py @@ -0,0 +1,7 @@ +from distutils.core import setup +import py2exe +setup( + console=["gcc.py", "dllwrap.py", "swig.py"], + zipfile=None, + options={"py2exe": {"bundle_files": 1, "compressed": True}} +) diff --git a/gitian/build-helpers/wine-wrappers/swig.py b/gitian/build-helpers/wine-wrappers/swig.py new file mode 100755 index 0000000..45941f4 --- /dev/null +++ b/gitian/build-helpers/wine-wrappers/swig.py @@ -0,0 +1,33 @@ +#!/usr/bin/env python + +# A wrapper for swig that converts Windows paths to Unix paths, so that swig can +# be called by Python distutils. + +import os +import subprocess +import sys + +import common + +args = ["/usr/bin/swig"] +sys.argv.pop(0) +while sys.argv: + a = sys.argv.pop(0) + if not a.startswith("-"): + args.append(common.winepath(a)) + continue + if a in ("-I",): + args.append(a) + args.append(common.winepath(sys.argv.pop(0))) + continue + o = common.search_startswith(a, ("-I",)) + if o is not None: + path = a[len(o):] + args.append("%s%s" % (o, common.winepath(path))) + continue + args.append(a) +p = common.popen_faketime(args, stderr=subprocess.PIPE) +stderr = p.stderr.read() +sys.stderr.write(stderr) +if " Error: " in stderr: + sys.exit(1) diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index 9ef0910..3b92216 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -41,7 +41,7 @@ echo "pref(\"torbrowser.version\", \"$TORBROWSER_VERSION-Linux\");" > $GITIAN_DI echo "$TORBROWSER_VERSION" > $GITIAN_DIR/inputs/bare-version cp -a $WRAPPER_DIR/$VERSIONS_FILE $GITIAN_DIR/inputs/versions -cp $WRAPPER_DIR/build-helpers/* $GITIAN_DIR/inputs/ +cp -r $WRAPPER_DIR/build-helpers/* $GITIAN_DIR/inputs/ cd $WRAPPER_DIR/.. rm -f $GITIAN_DIR/inputs/relativelink-src.zip diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index 8e4da79..69ef3ed 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -41,7 +41,7 @@ echo "pref(\"torbrowser.version\", \"$TORBROWSER_VERSION-MacOS\");" > $GITIAN_DI echo "$TORBROWSER_VERSION" > $GITIAN_DIR/inputs/bare-version cp -a $WRAPPER_DIR/$VERSIONS_FILE $GITIAN_DIR/inputs/versions -cp $WRAPPER_DIR/build-helpers/* $GITIAN_DIR/inputs/ +cp -r $WRAPPER_DIR/build-helpers/* $GITIAN_DIR/inputs/ cd $WRAPPER_DIR/.. rm -f $GITIAN_DIR/inputs/relativelink-src.zip diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh index 33e8a2b..9542604 100755 --- a/gitian/mkbundle-windows.sh +++ b/gitian/mkbundle-windows.sh @@ -42,7 +42,7 @@ echo "pref(\"torbrowser.version\", \"$TORBROWSER_VERSION-Windows\");" > $GITIAN_ echo "$TORBROWSER_VERSION" > $GITIAN_DIR/inputs/bare-version cp -a $WRAPPER_DIR/$VERSIONS_FILE $GITIAN_DIR/inputs/versions -cp $WRAPPER_DIR/build-helpers/* $GITIAN_DIR/inputs/ +cp -r $WRAPPER_DIR/build-helpers/* $GITIAN_DIR/inputs/ cp $WRAPPER_DIR/gpg/ubuntu-wine.gpg $GITIAN_DIR/inputs/ cd $WRAPPER_DIR/..

1 0

[tor-browser-bundle/master] Compile and install wine-wrappers.
by mikeperry＠torproject.org 21 Jan '14

21 Jan '14

commit 6521aadaea29baadbcd9982a5c85439bacf5f5ad Author: David Fifield <david(a)bamsoftware.com> Date: Mon Dec 2 02:25:03 2013 +0000 Compile and install wine-wrappers. gcc.exe, dllwrap.exe, and swig.exe need to be actual executables. If you merely rename gcc.py and dllwrap.py, the programs run, but they immediately detach themselves from the shell and run in the background. So when py2exe calls a bunch of programs in series: gcc -o file1.o file1.c dllwrap file1.o gcc -o file2.o file2.c dllwrap file2.o gcc -o file3.o file3.c dllwrap file3.o all the programs would run essentially simultaneously. dllwrap wasn't waiting for gcc to finish writing the object file that it (dllwrap) needed as input. (You could actually get a successful build out of this, if you ran build_ext once, waiting a few seconds for all the gccs to finish, then ran it again. The second time, distutils would notice that the object files already existed, and run only the dllwrap commands, which would succeed because the object files were already in place.) --- .../descriptors/windows/gitian-pluggable-transports.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/gitian/descriptors/windows/gitian-pluggable-transports.yml b/gitian/descriptors/windows/gitian-pluggable-transports.yml index 6869af9..b7f3100 100644 --- a/gitian/descriptors/windows/gitian-pluggable-transports.yml +++ b/gitian/descriptors/windows/gitian-pluggable-transports.yml @@ -17,6 +17,7 @@ remotes: "dir": "openssl" files: - "ubuntu-wine.gpg" +- "wine-wrappers" - "python.msi" - "py2exe.exe" - "dzip.sh" @@ -32,6 +33,7 @@ script: | export LDFLAGS="-mwindows" # This is correct only for kvm. MIRROR_HOST=10.0.2.2 + WINEROOT=$HOME/.wine/drive_c # XXX: Hardening options cause the exe's to crash.. not sure why #export CFLAGS="-mwindows -fstack-protector-all -fPIE -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat-security" #export LDFLAGS="-mwindows -Wl,--dynamicbase -Wl,--nxcompat -lssp -L/usr/lib/gcc/i686-w64-mingw32/4.6/" @@ -65,6 +67,18 @@ script: | 7z x py2exe.exe cp -a PLATLIB/* $INSTDIR/python/Lib/site-packages/ # + cd wine-wrappers + # Push our config into wine-wrappers. + > settings.py + echo "LD_PRELOAD = \"$LD_PRELOAD\"" >> settings.py + echo "FAKETIME = \"$FAKETIME\"" >> settings.py + # Must pre-copy python27.dll into the build directory, or else py2exe can't find it. + mkdir -p build/bdist.win32/winexe/bundle-2.7/ + cp -a $INSTDIR/python/python27.dll build/bdist.win32/winexe/bundle-2.7/ + LD_PRELOAD= $INSTPYTHON setup.py py2exe + cp -a dist/gcc.exe dist/dllwrap.exe dist/swig.exe $WINEROOT/windows/ + cd .. + # cd openssl find -type f | xargs touch --date="$REFERENCE_DATETIME" ./Configure -shared --cross-compile-prefix=i686-w64-mingw32- mingw --prefix=$INSTDIR/openssl

1 0

[tor-browser-bundle/master] Build pyptlib for windows.
by mikeperry＠torproject.org 21 Jan '14

21 Jan '14

commit cf37e9ce8f756f71f4f4f71c60c1800f0f37e8b1 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Nov 17 10:19:46 2013 +0000 Build pyptlib for windows. --- gitian/descriptors/windows/gitian-pluggable-transports.yml | 7 +++++++ gitian/mkbundle-windows.sh | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/gitian/descriptors/windows/gitian-pluggable-transports.yml b/gitian/descriptors/windows/gitian-pluggable-transports.yml index 8a8d4a2..1075277 100644 --- a/gitian/descriptors/windows/gitian-pluggable-transports.yml +++ b/gitian/descriptors/windows/gitian-pluggable-transports.yml @@ -15,6 +15,8 @@ reference_datetime: "2000-01-01 00:00:00" remotes: - "url": "https://github.com/nmathewson/openssl.git" "dir": "openssl" +- "url": "https://git.torproject.org/pluggable-transports/pyptlib.git" + "dir": "pyptlib" files: - "setuptools.tar.gz" - "ubuntu-wine.gpg" @@ -86,6 +88,11 @@ script: | LD_PRELOAD= $INSTPYTHON setup.py install cd .. # + cd pyptlib + find -type f | xargs touch --date="$REFERENCE_DATETIME" + LD_PRELOAD= $INSTPYTHON setup.py install --single-version-externally-managed --record /dev/null + cd .. + # cd openssl find -type f | xargs touch --date="$REFERENCE_DATETIME" ./Configure -shared --cross-compile-prefix=i686-w64-mingw32- mingw --prefix=$INSTDIR/openssl diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh index 9542604..c08b86f 100755 --- a/gitian/mkbundle-windows.sh +++ b/gitian/mkbundle-windows.sh @@ -126,7 +126,7 @@ then echo "****** Starting Pluggable Transports Component of Windows Bundle (3/4 for Windows) ******" echo - ./bin/gbuild -j $NUM_PROCS --commit openssl=$OPENSSL_TAG $DESCRIPTOR_DIR/windows/gitian-pluggable-transports.yml + ./bin/gbuild -j $NUM_PROCS --commit openssl=$OPENSSL_TAG,pyptlib=$PYPTLIB_TAG $DESCRIPTOR_DIR/windows/gitian-pluggable-transports.yml if [ $? -ne 0 ]; then #mv var/build.log ./pluggable-transports-fail-win32.log.`date +%Y%m%d%H%M%S`

1 0

[tor-browser-bundle/master] Build setuptools for windows.
by mikeperry＠torproject.org 21 Jan '14

21 Jan '14

commit 4a990a9a5d97ad7e77edea5d7061c711c557eec8 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Nov 18 07:32:24 2013 +0000 Build setuptools for windows. --- gitian/descriptors/windows/gitian-pluggable-transports.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/gitian/descriptors/windows/gitian-pluggable-transports.yml b/gitian/descriptors/windows/gitian-pluggable-transports.yml index b7f3100..8a8d4a2 100644 --- a/gitian/descriptors/windows/gitian-pluggable-transports.yml +++ b/gitian/descriptors/windows/gitian-pluggable-transports.yml @@ -16,6 +16,7 @@ remotes: - "url": "https://github.com/nmathewson/openssl.git" "dir": "openssl" files: +- "setuptools.tar.gz" - "ubuntu-wine.gpg" - "wine-wrappers" - "python.msi" @@ -79,6 +80,12 @@ script: | cp -a dist/gcc.exe dist/dllwrap.exe dist/swig.exe $WINEROOT/windows/ cd .. # + tar xzf setuptools.tar.gz + cd setuptools-* + find -type f | xargs touch --date="$REFERENCE_DATETIME" + LD_PRELOAD= $INSTPYTHON setup.py install + cd .. + # cd openssl find -type f | xargs touch --date="$REFERENCE_DATETIME" ./Configure -shared --cross-compile-prefix=i686-w64-mingw32- mingw --prefix=$INSTDIR/openssl

1 0

[tor-browser-bundle/master] Build flashproxy for windows.
by mikeperry＠torproject.org 21 Jan '14

21 Jan '14

commit d600b74dec96224bb82828dc8b2a562dd1f3ba00 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Nov 24 17:40:03 2013 +0000 Build flashproxy for windows. --- gitian/descriptors/windows/gitian-pluggable-transports.yml | 10 ++++++++++ gitian/mkbundle-windows.sh | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/gitian/descriptors/windows/gitian-pluggable-transports.yml b/gitian/descriptors/windows/gitian-pluggable-transports.yml index a447b16..5d419ad 100644 --- a/gitian/descriptors/windows/gitian-pluggable-transports.yml +++ b/gitian/descriptors/windows/gitian-pluggable-transports.yml @@ -21,6 +21,8 @@ remotes: "dir": "pyptlib" - "url": "https://git.torproject.org/pluggable-transports/obfsproxy.git" "dir": "obfsproxy" +- "url": "https://git.torproject.org/flashproxy.git" + "dir": "flashproxy" files: - "setuptools.tar.gz" - "pycrypto.tar.gz" @@ -156,6 +158,14 @@ script: | LD_PRELOAD= $INSTPYTHON setup.py install --single-version-externally-managed --record /dev/null cd .. # + cd flashproxy + find -type f | xargs touch --date="$REFERENCE_DATETIME" + make dist-exe DISTNAME=flashproxy-client PYTHON="LD_PRELOAD= $INSTPYTHON" + cp -an dist/flashproxy-client/{*.pyd,*.exe,*.zip} $PTDIR/ + mkdir -p $INSTDIR/Docs/FlashProxy + cp {doc/*,README,LICENSE,ChangeLog} $INSTDIR/Docs/FlashProxy + cd .. + # cd $INSTDIR ~/build/dzip.sh pluggable-transports-win32-gbuilt.zip Tor/ Data/ cp pluggable-transports-win32-gbuilt.zip $OUTDIR/ diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh index 0aa8ff5..c2920d1 100755 --- a/gitian/mkbundle-windows.sh +++ b/gitian/mkbundle-windows.sh @@ -126,7 +126,7 @@ then echo "****** Starting Pluggable Transports Component of Windows Bundle (3/4 for Windows) ******" echo - ./bin/gbuild -j $NUM_PROCS --commit openssl=$OPENSSL_TAG,pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG $DESCRIPTOR_DIR/windows/gitian-pluggable-transports.yml + ./bin/gbuild -j $NUM_PROCS --commit openssl=$OPENSSL_TAG,pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG $DESCRIPTOR_DIR/windows/gitian-pluggable-transports.yml if [ $? -ne 0 ]; then #mv var/build.log ./pluggable-transports-fail-win32.log.`date +%Y%m%d%H%M%S`

1 0

[tor-browser-bundle/master] Build zope.interface for windows.
by mikeperry＠torproject.org 21 Jan '14

21 Jan '14

commit 64c59b9279011f5263e4935d4f814ad37350217f Author: David Fifield <david(a)bamsoftware.com> Date: Mon Nov 18 05:21:31 2013 +0000 Build zope.interface for windows. The step of creating zope/__init__.py is needed so that py2exe can find the package. This need was previous discovered: https://gitweb.torproject.org/pluggable-transports/bundle.git/commitdiff/44… then removed because easy_install made it unnecessary: https://gitweb.torproject.org/pluggable-transports/bundle.git/commitdiff/64… Now we need it back because we're not using easy_install. --- gitian/descriptors/windows/gitian-pluggable-transports.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/gitian/descriptors/windows/gitian-pluggable-transports.yml b/gitian/descriptors/windows/gitian-pluggable-transports.yml index 07c36fc..89cd34a 100644 --- a/gitian/descriptors/windows/gitian-pluggable-transports.yml +++ b/gitian/descriptors/windows/gitian-pluggable-transports.yml @@ -6,6 +6,7 @@ architectures: - "i386" packages: - "git-core" +- "unzip" - "zip" - "p7zip-full" - "mingw-w64" @@ -20,6 +21,7 @@ remotes: files: - "setuptools.tar.gz" - "pycrypto.tar.gz" +- "zope.interface.zip" - "ubuntu-wine.gpg" - "wine-wrappers" - "python.msi" @@ -104,6 +106,15 @@ script: | LD_PRELOAD= $INSTPYTHON setup.py install cd .. # + unzip zope.interface.zip + cd zope.interface-* + find -type f | xargs touch --date="$REFERENCE_DATETIME" + LD_PRELOAD= $INSTPYTHON setup.py build_ext -c mingw32 + LD_PRELOAD= $INSTPYTHON setup.py install --single-version-externally-managed --record /dev/null + # Must create this file in order for py2exe to find the package. + touch $INSTDIR/python/Lib/site-packages/zope/__init__.py + cd .. + # cd openssl find -type f | xargs touch --date="$REFERENCE_DATETIME" ./Configure -shared --cross-compile-prefix=i686-w64-mingw32- mingw --prefix=$INSTDIR/openssl

1 0