July 2017 - tor-commits - lists.torproject.org

[tor-messenger-build/master] Update build file for Tor Messenger
by sukhbir＠torproject.org 31 Jul '17

31 Jul '17

commit 1971693a0e4beac5ebf983d786991bf16e77a165 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Wed Jul 19 17:03:31 2017 -0400 Update build file for Tor Messenger --- projects/tor-messenger/config | 2 -- 1 file changed, 2 deletions(-) diff --git a/projects/tor-messenger/config b/projects/tor-messenger/config index 4395fc8..a6c8a6b 100644 --- a/projects/tor-messenger/config +++ b/projects/tor-messenger/config @@ -77,8 +77,6 @@ targets: var: bundle_filename: 'tor-messenger-linux32-[% c("version") %]_en-US.tar.xz' mar_osname: linux32 - arch_deps: - - libc6-i386 linux-x86_64: var: bundle_filename: 'tor-messenger-linux64-[% c("version") %]_en-US.tar.xz'

1 0

[tor-messenger-build/master] Update Tor Messenger build for OS X
by sukhbir＠torproject.org 31 Jul '17

31 Jul '17

commit c0a6a06fd219930b5ec6f27b1ab209b98caa7979 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon Jul 24 10:30:49 2017 -0400 Update Tor Messenger build for OS X --- projects/tor-messenger/config | 3 --- 1 file changed, 3 deletions(-) diff --git a/projects/tor-messenger/config b/projects/tor-messenger/config index a6c8a6b..6e9310d 100644 --- a/projects/tor-messenger/config +++ b/projects/tor-messenger/config @@ -46,7 +46,6 @@ input_files: enable: '[% c("var/osx") %]' - project: container-image -distribution: Debian-7.11 var: deps: - p7zip-full @@ -56,7 +55,6 @@ var: use_container: 1 targets: windows-i686: - distribution: Ubuntu-14.10 var: bundle_filename: 'tormessenger-install-[% c("version") %]_en-US.exe' mar_osname: win32 @@ -66,7 +64,6 @@ targets: - python-dev - build-essential osx-x86_64: - distribution: Ubuntu-12.04 var: bundle_filename: 'TorMessenger-[% c("version") %]-osx64_en-US.dmg' mar_osname: osx64

1 0

[tor-messenger-build/master] Update the keyring
by sukhbir＠torproject.org 31 Jul '17

31 Jul '17

commit 65d8f70377d65a5283e48fe5493e08d34b001eb7 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon Jul 24 10:32:55 2017 -0400 Update the keyring --- keyring/cmake.gpg | 1 + keyring/llvm.gpg | 1 + 2 files changed, 2 insertions(+) diff --git a/keyring/cmake.gpg b/keyring/cmake.gpg new file mode 120000 index 0000000..ed86f80 --- /dev/null +++ b/keyring/cmake.gpg @@ -0,0 +1 @@ +../tor-browser-build/keyring/cmake.gpg \ No newline at end of file diff --git a/keyring/llvm.gpg b/keyring/llvm.gpg new file mode 120000 index 0000000..1ef2c45 --- /dev/null +++ b/keyring/llvm.gpg @@ -0,0 +1 @@ +../tor-browser-build/keyring/llvm.gpg \ No newline at end of file

1 0

[tor-messenger-build/master] Make sure we build NSIS (#17895)
by sukhbir＠torproject.org 31 Jul '17

31 Jul '17

commit 05043c202923b762be4d8c89589f26b5cd8a7027 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Tue Jul 25 09:02:00 2017 -0400 Make sure we build NSIS (#17895) --- projects/tor-messenger/build | 5 +++++ projects/tor-messenger/config | 3 +++ 2 files changed, 8 insertions(+) diff --git a/projects/tor-messenger/build b/projects/tor-messenger/build index ef93e17..fbfbc6a 100755 --- a/projects/tor-messenger/build +++ b/projects/tor-messenger/build @@ -109,6 +109,11 @@ MAR=$MARTOOLS/mar MBSDIFF=$MARTOOLS/mbsdiff[% IF c("var/windows") %].exe[% END % $MARTOOLS/make_full_update.sh \ -q $OUTDIR/$MAR_FILE tor-messenger/Browser +[% IF c("var/windows") %] + tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/nsis') %] + export PATH="/var/tmp/dist/nsis/bin:$PATH" +[% END %] + [% IF c('var/windows') -%] makensis tor-messenger.nsi diff --git a/projects/tor-messenger/config b/projects/tor-messenger/config index bc730c8..d3f15e1 100644 --- a/projects/tor-messenger/config +++ b/projects/tor-messenger/config @@ -36,6 +36,9 @@ input_files: - project: libdmg-hfsplus name: libdmg enable: '[% c("var/osx") %]' + - project: nsis + name: nsis + enable: '[% c("var/windows") %]' - project: container-image var:

1 0

[tor-messenger-build/master] Use a single var/linux option for instantbird/config
by sukhbir＠torproject.org 31 Jul '17

31 Jul '17

commit 3b9ee46df088b4e25be6e73f6b7f6007b41baf9c Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Wed Jul 19 17:19:06 2017 -0400 Use a single var/linux option for instantbird/config --- projects/instantbird/config | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/projects/instantbird/config b/projects/instantbird/config index 40bf243..38142ae 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -20,9 +20,8 @@ targets: var: martools_filename: mar-tools-win32.zip archive_suffix: zip - linux-x86_64: + linux: var: - martools_filename: mar-tools-linux64.zip arch_deps: - libgconf2-dev - libgtk2.0-dev @@ -32,28 +31,16 @@ targets: - libdbus-glib-1-dev - libasound2-dev - libgstreamer-plugins-base0.10-dev + - hardening-wrapper - libpulse-dev - libxt-dev - libx11-xcb-dev - - hardening-wrapper + linux-x86_64: + var: + martools_filename: mar-tools-linux64.zip linux-i686: var: martools_filename: mar-tools-linux32.zip - arch_deps: - - libc6-dev-i386 - - ia32-libs - - lib32z1-dev - - lib32asound2-dev - - libgconf2-dev:i386 - - libgtk2.0-dev:i386 - - libxml2-dev:i386 - - mesa-common-dev:i386 - - libdbus-1-dev:i386 - - libdbus-glib-1-dev:i386 - - libasound2-dev:i386 - - libgstreamer-plugins-base0.10-dev:i386 - - libpulse-dev:i386 - - libxt-dev:i386 osx-x86_64: var: martools_filename: mar-tools-mac64.zip

1 0

[tor-messenger-build/master] Update mozconfig for Windows build
by sukhbir＠torproject.org 31 Jul '17

31 Jul '17

commit d5a573f58fccb79d03d85f750cde2fdee81fa9d7 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Wed Jul 19 22:38:18 2017 -0400 Update mozconfig for Windows build --- projects/instantbird/mozconfig-windows-i686 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/projects/instantbird/mozconfig-windows-i686 b/projects/instantbird/mozconfig-windows-i686 index 8c86142..b6c46ad 100644 --- a/projects/instantbird/mozconfig-windows-i686 +++ b/projects/instantbird/mozconfig-windows-i686 @@ -1,6 +1,8 @@ export CROSS_COMPILE=1 ac_add_options --target=i686-w64-mingw32 +ac_add_options --with-toolchain-prefix=i686-w64-mingw32- + ac_add_options --enable-default-toolkit=cairo-windows ac_add_options --enable-strip

1 0

[tor-messenger-build/master] Remove Python from tor-messenger/ Windows build
by sukhbir＠torproject.org 31 Jul '17

31 Jul '17

commit 38766277cc49ff64e9e7af3fd4acedb192076664 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon Jul 24 19:25:41 2017 -0400 Remove Python from tor-messenger/ Windows build We are no longer building Python or pefile so remove it from the build. --- projects/tor-messenger/build | 10 ---------- projects/tor-messenger/config | 9 +-------- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/projects/tor-messenger/build b/projects/tor-messenger/build index 422da29..ef93e17 100755 --- a/projects/tor-messenger/build +++ b/projects/tor-messenger/build @@ -112,16 +112,6 @@ MAR=$MARTOOLS/mar MBSDIFF=$MARTOOLS/mbsdiff[% IF c("var/windows") %].exe[% END % [% IF c('var/windows') -%] makensis tor-messenger.nsi -tar xf $rootdir/[% c('input_files_by_name/python-future') %] -cd $(echo [% c('input_files_by_name/python-future') %] | sed s/\.tar\.gz$//) -python setup.py install --user -cd .. - -tar xf $rootdir/[% c('input_files_by_name/python-pefile') %] -cd $(echo [% c('input_files_by_name/python-pefile') %] | sed s/\.tar\.gz$//) -python setup.py install --user -cd .. - mv tor-messenger-install.exe tor-messenger-install-tmp.exe python pe_checksum_fix.py mv tor-messenger-install-tmp2.exe tor-messenger-install.exe diff --git a/projects/tor-messenger/config b/projects/tor-messenger/config index 6e9310d..bc730c8 100644 --- a/projects/tor-messenger/config +++ b/projects/tor-messenger/config @@ -26,14 +26,6 @@ input_files: enable: '[% c("var/osx") %]' - filename: tor-messenger.nsi enable: '[% c("var/windows") %]' - - name: python-future - URL: https://pypi.python.org/packages/00/2b/8d082ddfed935f3608cc61140df6dcbf0ede… - sha256sum: e39ced1ab767b5936646cedba8bcce582398233d6a627067d4c6a454c90cfedb - enable: '[% c("var/windows") %]' - - name: python-pefile - URL: https://pypi.python.org/packages/92/c0/8589ce9734ffdba258bd3e5acd4afb2e3586… - sha256sum: f24021085b5c3ef7b0898bb1f1d93eecd3839e03512769e22b0c5a10d9095f7b - enable: '[% c("var/windows") %]' - filename: pe_checksum_fix.py enable: '[% c("var/windows") %]' - filename: fix-info-plist.py @@ -63,6 +55,7 @@ targets: - python - python-dev - build-essential + - python-pefile osx-x86_64: var: bundle_filename: 'TorMessenger-[% c("version") %]-osx64_en-US.dmg'

1 0

[tor-messenger-build/master] Update OS X build to use runc
by sukhbir＠torproject.org 31 Jul '17

31 Jul '17

commit 94ebf2d0de78151b8aaae9c815c047f0199d59ae Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Thu Jul 20 16:33:09 2017 -0400 Update OS X build to use runc --- projects/cmake | 1 + projects/llvm | 1 + projects/macosx-toolchain | 1 + projects/macosx-toolchain/build | 14 -------------- projects/macosx-toolchain/config | 27 --------------------------- projects/yasm | 1 + 6 files changed, 4 insertions(+), 41 deletions(-) diff --git a/projects/cmake b/projects/cmake new file mode 120000 index 0000000..6e43969 --- /dev/null +++ b/projects/cmake @@ -0,0 +1 @@ +../tor-browser-build/projects/cmake \ No newline at end of file diff --git a/projects/llvm b/projects/llvm new file mode 120000 index 0000000..7ab866e --- /dev/null +++ b/projects/llvm @@ -0,0 +1 @@ +../tor-browser-build/projects/llvm \ No newline at end of file diff --git a/projects/macosx-toolchain b/projects/macosx-toolchain new file mode 120000 index 0000000..bb252c7 --- /dev/null +++ b/projects/macosx-toolchain @@ -0,0 +1 @@ +../tor-browser-build/projects/macosx-toolchain \ No newline at end of file diff --git a/projects/macosx-toolchain/build b/projects/macosx-toolchain/build deleted file mode 100644 index c22d8f8..0000000 --- a/projects/macosx-toolchain/build +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh -set -e -rootdir=$(pwd) -distdir="$rootdir/dist/[% project %]" -mkdir -p "$distdir" -tar xzf [% c('input_files_by_name/SDK') %] -mv MacOSX10.7.sdk "$distdir/SDK" -tar xf [% c('input_files_by_name/clang') %] -mv x-tools "$distdir" -cd "$rootdir/dist" -[% c('tar', { - tar_src => [ project ], - tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), -}) %] diff --git a/projects/macosx-toolchain/config b/projects/macosx-toolchain/config deleted file mode 100644 index 32b97e4..0000000 --- a/projects/macosx-toolchain/config +++ /dev/null @@ -1,27 +0,0 @@ -# vim: filetype=yaml sw=2 -filename: '[% project %]-[% c("version") %].tar.gz' -version: 10.7-1 -var: - setup: | - mkdir -p /var/tmp/dist - tar -C /var/tmp/dist -xf [% c("compiler_tarfile") %] - export sysrootdir=/var/tmp/dist/[% project %]/SDK/ - export ccbindir=/var/tmp/dist/[% project %]/x-tools/x86_64-apple-darwin10/bin - export PATH="$ccbindir:$PATH" - CFLAGS="-arch x86_64 -isysroot $sysrootdir" - CXXFLAGS="-arch x86_64 -isysroot $sysrootdir" - CC="$ccbindir/x86_64-apple-darwin10-clang $CFLAGS" - CXX="$ccbindir/x86_64-apple-darwin10-clang++ $CFLAGS" - RANLIB=$ccbindir/x86_64-apple-darwin10-ranlib - AR=$ccbindir/x86_64-apple-darwin10-ar - AS=$ccbindir/x86_64-apple-darwin10-as - LD=$ccbindir/x86_64-apple-darwin10-ld - STRIP=$ccbindir/x86_64-apple-darwin10-strip - -input_files: - - name: clang - URL: https://people.torproject.org/~mikeperry/mirrors/sources/x86_64-apple-darwi… - sha256sum: 7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 - - name: SDK - URL: https://people.torproject.org/~mikeperry/mirrors/sources/MacOSX10.7.sdk.tar… - sha256sum: da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf diff --git a/projects/yasm b/projects/yasm new file mode 120000 index 0000000..599345e --- /dev/null +++ b/projects/yasm @@ -0,0 +1 @@ +../tor-browser-build/projects/yasm \ No newline at end of file

1 0

[tor-messenger-build/master] Update Makefile to reflect rbm.conf changes
by sukhbir＠torproject.org 31 Jul '17

31 Jul '17

commit 778fdc7ef8cd6792ed683d7ad137ffa9dfec88e0 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Wed Jul 19 17:06:52 2017 -0400 Update Makefile to reflect rbm.conf changes --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 9335512..d76b0ac 100644 --- a/Makefile +++ b/Makefile @@ -10,16 +10,16 @@ tor-messenger-release: submodule-update tor-mail: tor-mail-linux-x86_64 tor-mail-linux-i686 tor-messenger-linux-x86_64: submodule-update - $(rbm) build tor-messenger --target tor-messenger --target linux-x86_64 + $(rbm) build tor-messenger --target tor-messenger --target tormessenger-linux-x86_64 tor-messenger-linux-i686: submodule-update - $(rbm) build tor-messenger --target tor-messenger --target linux-i686 + $(rbm) build tor-messenger --target tor-messenger --target tormessenger-linux-i686 tor-messenger-windows-i686: submodule-update - $(rbm) build tor-messenger --target tor-messenger --target windows-i686 + $(rbm) build tor-messenger --target tor-messenger --target tormessenger-windows-i686 tor-messenger-osx-x86_64: submodule-update - $(rbm) build tor-messenger --target tor-messenger --target osx-x86_64 + $(rbm) build tor-messenger --target tor-messenger --target tormessenger-osx-x86_64 tor-mail-linux-x86_64: submodule-update $(rbm) build tor-mail --target tor-mail --target linux-x86_64

1 0

[tor-messenger-build/master] We need to install git as well (for the patches)
by sukhbir＠torproject.org 31 Jul '17

31 Jul '17

commit 2caa9986de60952ed6900d3297fb1aeb32e52ada Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Wed Jul 19 22:38:32 2017 -0400 We need to install git as well (for the patches) --- projects/instantbird/config | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/instantbird/config b/projects/instantbird/config index 38142ae..436cd6c 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -13,6 +13,7 @@ var: - autoconf2.13 - yasm - python + - git container: use_container: 1 targets:

1 0