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

[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

[tor-messenger-build/master] Rebase mozilla/0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch
by sukhbir＠torproject.org 31 Jul '17

31 Jul '17

commit c5b7ea4535ea602fbbc43df4db85f20afb4a0ebc Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Tue Jul 25 12:21:57 2017 -0400 Rebase mozilla/0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch --- ...0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch | 47 ++++++++++------------ 1 file changed, 22 insertions(+), 25 deletions(-) diff --git a/projects/mozilla/0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch b/projects/mozilla/0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch index 68a4a68..7c1ea1d 100644 --- a/projects/mozilla/0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch +++ b/projects/mozilla/0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch @@ -1,27 +1,23 @@ -From 3d87efd8e803a273e823fb614279dce106c6e025 Mon Sep 17 00:00:00 2001 +From 8129cc5724b13b90ec13fdd3fbe249176fdc578d Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> -Date: Mon, 10 Oct 2016 10:52:52 -0700 -Subject: [PATCH 1/7] Trac 19910: Prevents STARTTLS in XMPP +Date: Tue, 25 Jul 2017 12:17:24 -0400 +Subject: [PATCH] Trac 19910: Prevents STARTTLS in XMPP * Revert "Bug #3875: Use Optimistic Data SOCKS variant." - -This reverts commit 9064546a5e54d94054d944dd910a5db3a67032dc. --- - netwerk/base/nsSocketTransport2.cpp | 43 ++++++++----------------------------- + netwerk/base/nsSocketTransport2.cpp | 44 ++++++++----------------------------- netwerk/base/nsSocketTransport2.h | 4 +--- - netwerk/socket/nsSOCKSIOLayer.cpp | 4 +--- + netwerk/socket/nsSOCKSIOLayer.cpp | 3 +-- 3 files changed, 11 insertions(+), 40 deletions(-) diff --git a/netwerk/base/nsSocketTransport2.cpp b/netwerk/base/nsSocketTransport2.cpp -index c35a587830d8..6a758f9acaad 100644 +index f200b6899d97..cd57ca43aa5c 100644 --- a/netwerk/base/nsSocketTransport2.cpp +++ b/netwerk/base/nsSocketTransport2.cpp -@@ -1887,26 +1887,8 @@ nsSocketTransport::OnSocketReady(PRFileDesc *fd, int16_t outFlags) +@@ -1975,26 +1975,7 @@ nsSocketTransport::OnSocketReady(PRFileDesc *fd, int16_t outFlags) // Update poll timeout in case it was changed mPollTimeout = mTimeouts[TIMEOUT_READ_WRITE]; } -+ else if (mState == STATE_CONNECTING) { - - // Tor 3875: Use optimistic data with SOCKS. - // To accomplish this, two new states were added that are only used with - // SOCKS connections: @@ -40,11 +36,13 @@ index c35a587830d8..6a758f9acaad 100644 - mPollFlags = (PR_POLL_EXCEPT | PR_POLL_READ); - mState = STATE_SENTGET; // Wait for SOCKS handshake response. - } -- else if (mState == STATE_CONNECTING || mState == STATE_SENTGET) { - // We use PRIntervalTime here because we need - // nsIOService::LastOfflineStateChange time and - // nsIOService::LastConectivityChange time to be atomic. -@@ -1926,14 +1908,7 @@ nsSocketTransport::OnSocketReady(PRFileDesc *fd, int16_t outFlags) +- else if (((mState == STATE_CONNECTING) || (mState = STATE_SENTGET)) && +- !gIOService->IsNetTearingDown()) { ++ else if (mState == STATE_CONNECTING) { + // We do not need to do PR_ConnectContinue when we are already + // shutting down. + +@@ -2018,14 +1999,7 @@ nsSocketTransport::OnSocketReady(PRFileDesc *fd, int16_t outFlags) Telemetry::PRCONNECTCONTINUE_BLOCKING_TIME_OFFLINE); } @@ -60,7 +58,7 @@ index c35a587830d8..6a758f9acaad 100644 // // we are connected! // -@@ -1960,17 +1935,17 @@ nsSocketTransport::OnSocketReady(PRFileDesc *fd, int16_t outFlags) +@@ -2052,17 +2026,17 @@ nsSocketTransport::OnSocketReady(PRFileDesc *fd, int16_t outFlags) // If the connect is still not ready, then continue polling... // if ((PR_WOULD_BLOCK_ERROR == code) || (PR_IN_PROGRESS_ERROR == code)) { @@ -86,10 +84,10 @@ index c35a587830d8..6a758f9acaad 100644 mCondition = ErrorAccordingToNSPR(code); } diff --git a/netwerk/base/nsSocketTransport2.h b/netwerk/base/nsSocketTransport2.h -index b7fbc76a79a8..b508335c7e55 100644 +index 8f3fa87161a1..34e20e586aad 100644 --- a/netwerk/base/nsSocketTransport2.h +++ b/netwerk/base/nsSocketTransport2.h -@@ -190,9 +190,7 @@ private: +@@ -201,9 +201,7 @@ private: STATE_IDLE, STATE_RESOLVING, STATE_CONNECTING, @@ -101,20 +99,19 @@ index b7fbc76a79a8..b508335c7e55 100644 // Safer way to get and automatically release PRFileDesc objects. diff --git a/netwerk/socket/nsSOCKSIOLayer.cpp b/netwerk/socket/nsSOCKSIOLayer.cpp -index 568c700e2bae..1793001df2c9 100644 +index a21dfa4a5a11..e3f4ff3b5694 100644 --- a/netwerk/socket/nsSOCKSIOLayer.cpp +++ b/netwerk/socket/nsSOCKSIOLayer.cpp -@@ -79,9 +79,7 @@ public: +@@ -83,8 +83,7 @@ public: void SetConnectTimeout(PRIntervalTime to); PRStatus DoHandshake(PRFileDesc *fd, int16_t oflags = -1); int16_t GetPollFlags() const; - bool IsConnected() const { return (mState == SOCKS_CONNECTED || - mState == SOCKS5_READ_CONNECT_RESPONSE_TOP); } -- -+ bool IsConnected() const { return mState == SOCKS_CONNECTED; } ++ bool IsConnected() const { return (mState == SOCKS_CONNECTED; } void ForgetFD() { mFD = nullptr; } + void SetNamedPipeFD(PRFileDesc *fd) { mFD = fd; } - private: -- -2.12.2 +2.11.0

1 0

[tor-messenger-build/master] Link libdmg-hfsplus from tor-browser-build
by sukhbir＠torproject.org 31 Jul '17

31 Jul '17

commit 711d3f0f39b81a796e42e1b06871593a5a8cd689 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon Jul 24 10:41:40 2017 -0400 Link libdmg-hfsplus from tor-browser-build --- projects/libdmg-hfsplus | 1 + projects/libdmg-hfsplus/build | 16 --------------- projects/libdmg-hfsplus/config | 15 -------------- projects/libdmg-hfsplus/libdmg.patch | 39 ------------------------------------ 4 files changed, 1 insertion(+), 70 deletions(-) diff --git a/projects/libdmg-hfsplus b/projects/libdmg-hfsplus new file mode 120000 index 0000000..f473842 --- /dev/null +++ b/projects/libdmg-hfsplus @@ -0,0 +1 @@ +../tor-browser-build/projects/libdmg-hfsplus \ No newline at end of file diff --git a/projects/libdmg-hfsplus/build b/projects/libdmg-hfsplus/build deleted file mode 100644 index 2903150..0000000 --- a/projects/libdmg-hfsplus/build +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -set -e -distdir=$(pwd)/dist -mkdir -p $distdir/[% project %] -tar xf [% project %]-[% c('version') %].tar.gz -cd [% project %]-[% c('version') %] -patch -p1 < ../libdmg.patch -cmake -DCMAKE_INSTALL_PREFIX:PATH=$distdir/[% project %] CMakeLists.txt -cd dmg -make -j4 -make install -cd $distdir -[% c('tar', { - tar_src => [ project ], - tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), - }) %] diff --git a/projects/libdmg-hfsplus/config b/projects/libdmg-hfsplus/config deleted file mode 100644 index 9071078..0000000 --- a/projects/libdmg-hfsplus/config +++ /dev/null @@ -1,15 +0,0 @@ -# vim: filetype=yaml sw=2 -version: '[% c("abbrev") %]' -git_url: https://github.com/vasi/libdmg-hfsplus -git_hash: dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 -filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' -remote_docker: 1 -var: - deps: - - build-essential - - cmake - - zlib1g-dev - - libbz2-dev -input_files: - - filename: libdmg.patch - - project: docker-image diff --git a/projects/libdmg-hfsplus/libdmg.patch b/projects/libdmg-hfsplus/libdmg.patch deleted file mode 100644 index a84ac3e..0000000 --- a/projects/libdmg-hfsplus/libdmg.patch +++ /dev/null @@ -1,39 +0,0 @@ -From d1a5eca891f32103ccda80ee75e158dfc7ece70d Mon Sep 17 00:00:00 2001 -From: Mike Perry <mikeperry-git(a)torproject.org> -Date: Thu, 6 Mar 2014 19:47:05 -0800 -Subject: [PATCH] Memset a UDIF header to ensure archive reproducibility. - -Some of the struct padding and fields contained unitialized memory, which -caused two successive invocations to produce archives that differed in some -bytes. ---- - dmg/dmglib.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/dmg/dmglib.c b/dmg/dmglib.c -index f481b1f..b74e50b 100644 ---- a/dmg/dmglib.c -+++ b/dmg/dmglib.c -@@ -108,7 +108,8 @@ int buildDmg(AbstractFile* abstractIn, AbstractFile* abstractOut) { - ChecksumToken dataForkToken; - - UDIFResourceFile koly; -- -+ memset(&koly, 0, sizeof(koly)); -+ - off_t plistOffset; - uint32_t plistSize; - uint32_t dataForkChecksum; -@@ -284,7 +285,8 @@ int convertToDMG(AbstractFile* abstractIn, AbstractFile* abstractOut) { - uint64_t numSectors; - - UDIFResourceFile koly; -- -+ memset(&koly, 0, sizeof(koly)); -+ - char partitionName[512]; - - off_t fileLength; --- -1.8.1.2 -

1 0

[tor-messenger-build/master] Remove redundant compiler flag
by sukhbir＠torproject.org 31 Jul '17

31 Jul '17

commit c95db52360b824313cf5d4f5f66464ca308308c9 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon Jul 24 10:36:59 2017 -0400 Remove redundant compiler flag --- projects/libgcrypt/build | 4 ---- 1 file changed, 4 deletions(-) diff --git a/projects/libgcrypt/build b/projects/libgcrypt/build index ee6aebc..3e85542 100644 --- a/projects/libgcrypt/build +++ b/projects/libgcrypt/build @@ -11,10 +11,6 @@ mkdir -p $distdir mkdir /var/tmp/build tar -C /var/tmp/build -xf $rootdir/[% project %]-[% c('version') %].tar.bz2 cd /var/tmp/build/[% project %]-[% c('version') %] -[% IF c("var/osx") -%] -# our compiler does not like -g -sed -i 's/ac_cv_prog_cc_g=yes/ac_cv_prog_cc_g=no/' configure -[% END -%] sed -i 's/^BUILD_TIMESTAMP=.*/BUILD_TIMESTAMP=2000-01-01T00:00+0000/' configure export SOURCE_DATE_EPOCH=$(stat -c %Y ChangeLog) ./configure --prefix=$distdir [% c("var/configure_opt") %][% IF c('var/windows') or c('var/osx') %] --enable-static --disable-shared[% END %]

1 0

[tor-messenger-build/master] Update build file for Instantbird (runc changes)
by sukhbir＠torproject.org 31 Jul '17

31 Jul '17

commit 802dd299259d7b3d5b18af7c57810e62ccc59b72 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Wed Jul 19 17:03:15 2017 -0400 Update build file for Instantbird (runc changes) --- projects/instantbird/build | 84 ++++++++++++++++++++++++---------------------- 1 file changed, 43 insertions(+), 41 deletions(-) diff --git a/projects/instantbird/build b/projects/instantbird/build index 9318bd0..b64c8d7 100644 --- a/projects/instantbird/build +++ b/projects/instantbird/build @@ -1,32 +1,44 @@ -#!/bin/sh -set -e -rootdir=$(pwd) - -export SHELL=/bin/sh -export HOME=$rootdir -export MOZ_BUILD_DATE=$(date -d @[% c('timestamp') %] +%Y%m%d%H%M%S) -export SOURCE_DATE_EPOCH=[% c('timestamp') %] - -[% IF c('var/osx') -%] -[% pc('gcc', 'var/setup', { compiler_tarfile => c('input_files_by_name/gcchost') }) %] -ln -s /var/tmp/dist/gcc/bin/gcc /var/tmp/dist/gcc/bin/cc +#!/bin/bash +[% c("var/setarch") -%] +[% c("var/set_default_env") -%] + +[% IF c("var/windows") -%] + mkdir -p /var/tmp/dist + tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/gcc') %] + hgccdir=/var/tmp/dist/gcc + # We need a link to our GCC, otherwise the system cc gets used which points to + # /usr/bin/gcc. + ln -s gcc $hgccdir/bin/cc + # Make sure our GCC (as host compiler) get used. We do that before + # compiler setup so that mingw is first in the PATH. + export LD_LIBRARY_PATH=$hgccdir/lib64 + export PATH=$hgccdir/bin:$PATH + + # Firefox ESR52 needs Yasm >= 1.2.0 which Ubuntu Precise does not ship. + tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/yasm') %] + export PATH="/var/tmp/dist/yasm/bin:$PATH" [% END -%] - [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] +distdir=/var/tmp/dist/[% project %] +mkdir -p /var/tmp/build -mkdir -p /var/tmp/dist -cd /var/tmp/dist - -[% IF c("var/linux") -%] -tar xf $rootdir/[% c('input_files_by_name/python') %] -export PATH="/var/tmp/dist/python/bin:$PATH" -tar xf $rootdir/[% c('input_files_by_name/binutils') %] -export PATH="/var/tmp/dist/binutils/bin:$PATH" +[% IF c("var/linux") %] + mkdir -p /var/tmp/dist + tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/binutils') %] + export PATH="/var/tmp/dist/binutils/bin:$PATH" [% END -%] -# LD_BIND_NOW needed to avoid this error: -# undefined symbol: _ZNSt14error_categoryD2Ev -export LD_BIND_NOW=1 +tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz + +[% IF c("var/osx") %] + mkdir -p $distdir/TorBrowser.app/Contents/MacOS +[% ELSE %] + mkdir -p $distdir/Browser +[% END %] + +[% IF c("var/linux") %] + mkdir -p $distdir/Debug/Browser/ +[% END %] [% IF c("var/osname") == "linux-i686" -%] export LDFLAGS=-m32 @@ -34,16 +46,6 @@ export CFLAGS=-m32 export CC='gcc -m32' [% END -%] -[% IF c("var/linux") -%] -mkdir -p /var/tmp/dist/yasm/bin -ln -s /usr/bin/yasm-1 /var/tmp/dist/yasm/bin/yasm -export PATH="/var/tmp/dist/yasm/bin:$PATH" -[% END -%] - -cd $rootdir -mkdir /var/tmp/build -tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.[% c('compress_tar') %] - mkdir moz cd moz tar xf $rootdir/[% c('input_files_by_name/mozilla') %] @@ -73,13 +75,13 @@ cp -p mozilla/tools/update-packaging/*.sh $MARTOOLS/ cp -p obj-*/dist/host/bin/mar $MARTOOLS/ cp -p obj-*/dist/host/bin/mbsdiff $MARTOOLS/ [% IF c("var/linux") -%] -cp -p obj-*/modules/libmar/tool/signmar $MARTOOLS/ -cp -p obj-*/security/nss/cmd/certutil/certutil $MARTOOLS/ -NSS_LIBS="libfreeblpriv3.so libmozsqlite3.so libnss3.so libnssdbm3.so libnssutil3.so libsmime3.so libsoftokn3.so libssl3.so" -NSPR_LIBS="libnspr4.so libplc4.so libplds4.so" -for LIB in $NSS_LIBS $NSPR_LIBS; do - cp -p obj-*/dist/bin/$LIB $MARTOOLS/ -done + cp -p obj-*/modules/libmar/tool/signmar $MARTOOLS/ + cp -p obj-*/security/nss/cmd/certutil/certutil $MARTOOLS/ + NSS_LIBS="libfreeblpriv3.so libmozsqlite3.so libnss3.so libnssdbm3.so libnssutil3.so libsmime3.so libsoftokn3.so libssl3.so" + NSPR_LIBS="libnspr4.so libplc4.so libplds4.so" + for LIB in $NSS_LIBS $NSPR_LIBS; do + cp -p obj-*/dist/bin/$LIB $MARTOOLS/ + done [% END -%] cd /var/tmp/dist

1 0

[tor-messenger-build/master] Continue the transition from docker to runc
by sukhbir＠torproject.org 31 Jul '17

31 Jul '17

commit 37b09e546b078ca7bf540de2cd4fa3223dfbd5b5 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Wed Jul 19 14:42:28 2017 -0400 Continue the transition from docker to runc --- projects/instantbird/config | 34 ++++++++++++++++------------------ projects/libgcrypt/build | 2 +- projects/libgcrypt/config | 6 ++++-- projects/libgpg-error/build | 2 +- projects/libgpg-error/config | 6 ++++-- projects/libotr/build | 2 +- projects/libotr/config | 6 ++++-- projects/python/build | 15 --------------- projects/python/config | 18 ------------------ projects/tor-messenger/config | 5 +++-- 10 files changed, 34 insertions(+), 62 deletions(-) diff --git a/projects/instantbird/config b/projects/instantbird/config index 8fd2e78..40bf243 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -3,21 +3,18 @@ version: '[% c("abbrev") %]' hg_url: https://hg.mozilla.org/releases/comm-esr52/ hg_hash: THUNDERBIRD_52_2_1_RELEASE filename: "[% project %]-[% c('version') %]-[% c('var/osname') %]-[% c('var/build_id') %]" -remote_docker: 1 + var: archive_suffix: tar.bz2 deps: - build-essential - - libmpc-dev - - autoconf2.13 - - python + - unzip - zip - - libidl-dev - - uuid-runtime - - imagemagick - - ccache + - autoconf2.13 - yasm - - git-core + - python + container: + use_container: 1 targets: windows-i686: var: @@ -38,6 +35,7 @@ targets: - libpulse-dev - libxt-dev - libx11-xcb-dev + - hardening-wrapper linux-i686: var: martools_filename: mar-tools-linux32.zip @@ -95,17 +93,17 @@ input_files: - filename: mozconfig-common - filename: 'mozconfig-[% c("var/osname") %]' name: mozconfig + - project: container-image + - name: '[% c("var/compiler") %]' + project: '[% c("var/compiler") %]' - name: mozilla project: mozilla - - name: python - project: python - enable: '[% c("var/linux") %]' - name: binutils project: binutils enable: '[% c("var/linux") %]' - - name: gcchost - project: gcc - enable: '[% c("var/osx") %]' - - name: '[% c("var/compiler") %]' - project: '[% c("var/compiler") %]' - - project: docker-image + - project: gcc + name: gcc + enable: '[% c("var/windows") %]' + - project: yasm + name: yasm + enable: '[% c("var/windows") %]' diff --git a/projects/libgcrypt/build b/projects/libgcrypt/build index 9bd0710..ee6aebc 100644 --- a/projects/libgcrypt/build +++ b/projects/libgcrypt/build @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash set -e rootdir=$(pwd) [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] diff --git a/projects/libgcrypt/config b/projects/libgcrypt/config index 2b43818..0a7208d 100644 --- a/projects/libgcrypt/config +++ b/projects/libgcrypt/config @@ -1,11 +1,13 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' version: 1.6.6 -remote_docker: 1 var: deps: - build-essential - libmpc-dev + - hardening-wrapper + container: + use_container: 1 targets: windows-i686: var: @@ -24,4 +26,4 @@ input_files: name: libgpg-error - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' - - project: docker-image + - project: container-image diff --git a/projects/libgpg-error/build b/projects/libgpg-error/build index f650c2e..6bdb462 100644 --- a/projects/libgpg-error/build +++ b/projects/libgpg-error/build @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash set -e rootdir=$(pwd) distdir="/var/tmp/dist/[% project %]" diff --git a/projects/libgpg-error/config b/projects/libgpg-error/config index 48c10be..c667ca6 100644 --- a/projects/libgpg-error/config +++ b/projects/libgpg-error/config @@ -1,11 +1,13 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' version: 1.20 -remote_docker: 1 var: deps: - build-essential - libmpc-dev + - hardening-wrapper + container: + use_container: 1 targets: windows-i686: var: @@ -24,4 +26,4 @@ input_files: enable: '[% c("var/osx") %]' - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' - - project: docker-image + - project: container-image diff --git a/projects/libotr/build b/projects/libotr/build index 4cf811c..2b02051 100755 --- a/projects/libotr/build +++ b/projects/libotr/build @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash set -e rootdir=$(pwd) [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] diff --git a/projects/libotr/config b/projects/libotr/config index 6bb1826..a915aa8 100644 --- a/projects/libotr/config +++ b/projects/libotr/config @@ -1,12 +1,14 @@ # vim: filetype=yaml sw=2 version: 4.1.1 filename: 'libotr-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' -remote_docker: 1 var: deps: - build-essential - libmpc-dev - file + - hardening-wrapper + container: + use_container: 1 targets: windows-i686: var: @@ -31,4 +33,4 @@ input_files: name: libgpg-error - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' - - project: docker-image + - project: container-image diff --git a/projects/python/build b/projects/python/build deleted file mode 100644 index e27d06a..0000000 --- a/projects/python/build +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -set -e -rootdir=$(pwd) -distdir=/var/tmp/dist/python -mkdir -p $distdir -tar xf [% c('input_files_by_name/python') %] -cd Python-[% c('version') %] -./configure --prefix=$distdir -make -j4 -make prefix=$distdir install -cd /var/tmp/dist -[% c('tar', { - tar_src => 'python', - tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), - }) %] diff --git a/projects/python/config b/projects/python/config deleted file mode 100644 index ade2cd5..0000000 --- a/projects/python/config +++ /dev/null @@ -1,18 +0,0 @@ -# vim: filetype=yaml sw=2 -version: 2.7.8 -filename: 'python-[% c("lsb_release/id") %]-[% c("lsb_release/release") %]-[% c("var/build_id") %].tar.gz' -remote_docker: 1 -var: - deps: - - xz-utils - - build-essential - - python-all - - zlib1g-dev - - libssl-dev -input_files: - - name: python - URL: 'https://www.python.org/ftp/python/[% c("version") %]/Python-[% c("version") %].tar.xz' - gpg_keyring: python.gpg - sig_ext: asc - file_gpg_id: 1 - - project: docker-image diff --git a/projects/tor-messenger/config b/projects/tor-messenger/config index 4b75b12..4395fc8 100644 --- a/projects/tor-messenger/config +++ b/projects/tor-messenger/config @@ -44,15 +44,16 @@ input_files: - project: libdmg-hfsplus name: libdmg enable: '[% c("var/osx") %]' - - project: docker-image + - project: container-image -remote_docker: 1 distribution: Debian-7.11 var: deps: - p7zip-full - bzip2 - python + container: + use_container: 1 targets: windows-i686: distribution: Ubuntu-14.10

1 0

[tor-messenger-build/master] Fix line endings for patch 16
by sukhbir＠torproject.org 31 Jul '17

31 Jul '17

commit 030f8b62a46e3109e1c02fbdfcb3bd18e2d10723 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Fri Jul 28 21:23:21 2017 -0400 Fix line endings for patch 16 --- ...ug-1321641-Use-built-in-functions-instead-of-an-svg.patch | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/projects/instantbird/0016-Bug-1321641-Use-built-in-functions-instead-of-an-svg.patch b/projects/instantbird/0016-Bug-1321641-Use-built-in-functions-instead-of-an-svg.patch index 51af131..eb8aa4e 100644 --- a/projects/instantbird/0016-Bug-1321641-Use-built-in-functions-instead-of-an-svg.patch +++ b/projects/instantbird/0016-Bug-1321641-Use-built-in-functions-instead-of-an-svg.patch @@ -29,16 +29,16 @@ index 963521eca6..0000000000 --- a/im/themes/messages/bubbles/bubbles.svg +++ /dev/null @@ -1,10 +0,0 @@ --<?xml version="1.0"?> +-<?xml version="1.0"?> - - --<svg xmlns="http://www.w3.org/2000/svg"> -- <filter id="desaturate"> -- <feColorMatrix type="saturate" values="0.4"/> -- </filter> --</svg> +-<svg xmlns="http://www.w3.org/2000/svg"> +- <filter id="desaturate"> +- <feColorMatrix type="saturate" values="0.4"/> +- </filter> +-</svg> diff --git a/im/themes/messages/bubbles/main.css b/im/themes/messages/bubbles/main.css index 80421b8ca2..6520757ddd 100644 --- a/im/themes/messages/bubbles/main.css

1 0

[tor-messenger-build/master] Link NSIS as well for Windows build
by sukhbir＠torproject.org 31 Jul '17

31 Jul '17

commit a7fe173f79c4a8f5e34a43e1fec30d30acb36eae Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Tue Jul 25 12:23:42 2017 -0400 Link NSIS as well for Windows build --- projects/instantbird/config | 1 + projects/nsis | 1 + 2 files changed, 2 insertions(+) diff --git a/projects/instantbird/config b/projects/instantbird/config index 436cd6c..3f1b3db 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -78,6 +78,7 @@ input_files: - filename: 0027-Trac-17517-Use-different-color-for-Add-Exception.patch - filename: 0028-Trac-21736-Hide-account-timestamp-from-message.patch - filename: 0029-Add-duplicated-files-to-allowed-dupes.mn.patch + enable: '[% c("var/linux") %]' - filename: mozconfig-common - filename: 'mozconfig-[% c("var/osname") %]' name: mozconfig diff --git a/projects/nsis b/projects/nsis new file mode 120000 index 0000000..f29c93d --- /dev/null +++ b/projects/nsis @@ -0,0 +1 @@ +../tor-browser-build/projects/nsis \ No newline at end of file

1 0

[tor-messenger-build/master] Update Tor Launcher version and rebase patch
by sukhbir＠torproject.org 31 Jul '17

31 Jul '17

commit f38ed0e12e3d18f01fbd114b65dee433a59c1339 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Fri Jul 28 11:58:22 2017 -0400 Update Tor Launcher version and rebase patch --- projects/tor-launcher/config | 2 +- projects/tor-launcher/controlport.patch.tmpl | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index f018c0b..2db0104 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.2.10.3 +version: 0.2.12.2 git_url: https://git.torproject.org/tor-launcher.git git_hash: '[% c("version") %]' gpg_keyring: gk.gpg diff --git a/projects/tor-launcher/controlport.patch.tmpl b/projects/tor-launcher/controlport.patch.tmpl index cc5656b..973aadb 100644 --- a/projects/tor-launcher/controlport.patch.tmpl +++ b/projects/tor-launcher/controlport.patch.tmpl @@ -1,6 +1,6 @@ -From 08800fd6f225b05817e134fa465d1b83fb42be8e Mon Sep 17 00:00:00 2001 +From 4356de52ed7414df638bd523b730fba619a59303 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> -Date: Mon, 17 Nov 2014 22:50:47 +0530 +Date: Fri, 28 Jul 2017 11:22:13 -0400 Subject: [PATCH 1/1] Set ControlPort to [% c("var/tor_control_port") %] --- @@ -8,18 +8,18 @@ Subject: [PATCH 1/1] Set ControlPort to [% c("var/tor_control_port") %] 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/defaults/preferences/prefs.js b/src/defaults/preferences/prefs.js -index 34bf1a7..b95b00f 100644 +index 752514a..7c1752a 100644 --- a/src/defaults/preferences/prefs.js +++ b/src/defaults/preferences/prefs.js -@@ -3,7 +3,7 @@ pref("extensions.torlauncher.logmethod", 1); // 0=stdout, 1=errorconsole, 2=deb - pref("extensions.torlauncher.max_tor_log_entries", 1000); - +@@ -16,7 +16,7 @@ pref("extensions.torlauncher.max_tor_log_entries", 1000); + // override the default IPC object location. If a relative path is used, + // it is handled like torrc_path (see below). pref("extensions.torlauncher.control_host", "127.0.0.1"); -pref("extensions.torlauncher.control_port", 9151); +pref("extensions.torlauncher.control_port", [% c("var/tor_control_port") %]); + pref("extensions.torlauncher.control_port_use_ipc", false); + pref("extensions.torlauncher.control_ipc_path", ""); - pref("extensions.torlauncher.start_tor", true); - pref("extensions.torlauncher.prompt_at_startup", true); -- -2.1.3 +2.13.3

1 0

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

31 Jul '17

commit 2ad07344232d6af5878cb2da992cb78251988fee Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Wed Jul 26 11:02:55 2017 -0400 Update the rebasing document --- docs/rebasing.md | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/docs/rebasing.md b/docs/rebasing.md index 98101f2..4ee9e4b 100644 --- a/docs/rebasing.md +++ b/docs/rebasing.md @@ -20,16 +20,13 @@ This isn't strictly necessary but the author of this document prefers working in git. You'll need to install [fast-export](https://github.com/frej/fast-export) ``` -hg clone https://hg.mozilla.org/releases/comm-esr45/ +hg clone https://hg.mozilla.org/releases/comm-esr52/ mkdir tor-messenger cd tor-messenger git init -hg-fast-export -r ../comm-esr45 +hg-fast-export -r ../comm-esr52 --force ``` -Note, this is going to complain about detached heads in mercurial. -Just `--force` it. - Now you have a git repo sync'd w/ hg You can rerun that as new commits come in (`hg pull && hg update`), @@ -43,7 +40,7 @@ from the time this document was originally written. Obviously, update it as necessary. ``` -export TAG=THUNDERBIRD_45_8_0_RELEASE +export TAG=THUNDERBIRD_52_2_1_RELEASE # We're still in "tor-messenger" from above git checkout -b tm-base $TAG

1 0