August 2016 - tor-commits - lists.torproject.org

[tor-messenger-build/updater] Fix linux-i686
by sukhbir＠torproject.org 29 Aug '16

29 Aug '16

commit d170a50962b36b4b7d9c1fcd8fe063772d4944d1 Author: Arlo Breault <arlolra(a)gmail.com> Date: Sat Aug 27 15:05:12 2016 -0700 Fix linux-i686 --- projects/docker-image/config | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/docker-image/config b/projects/docker-image/config index 8ab70f5..9e0c42d 100644 --- a/projects/docker-image/config +++ b/projects/docker-image/config @@ -23,6 +23,7 @@ pre: | [% pc(c('origin_project'), 'var/pre_pkginst') %] [% END -%] [% IF c('lsb_release/id') == 'Ubuntu' || c('lsb_release/id') == 'Debian' %] + dpkg --add-architecture i386 apt-get update -y apt-get upgrade -y [% END %]

1 0

[tor-messenger-build/updater] Bump tags to THUNDERBIRD_45_3_0_RELEASE
by sukhbir＠torproject.org 29 Aug '16

29 Aug '16

commit 9da8647729c2b76ee35b2981fe2512ea1bd99309 Author: Arlo Breault <arlolra(a)gmail.com> Date: Sat Aug 27 10:38:43 2016 -0700 Bump tags to THUNDERBIRD_45_3_0_RELEASE --- ChangeLog | 4 ++-- projects/instantbird/config | 2 +- projects/mozilla/config | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 497bb35..511334b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,7 @@ Tor Messenger 0.1.0b7 -- * All Platforms - * Use the THUNDERBIRD_45_2_0_RELEASE tag on mozilla-esr45 - * Use the THUNDERBIRD_45_2_0_RELEASE tag on comm-esr45 + * Use the THUNDERBIRD_45_3_0_RELEASE tag on mozilla-esr45 + * Use the THUNDERBIRD_45_3_0_RELEASE tag on comm-esr45 * Bug 14388: Port Tor Browser's updater patches * Bug 19053: Display plaintext in notifications * Update libgcrypt to 1.6.6 for CVE-2016-6316 diff --git a/projects/instantbird/config b/projects/instantbird/config index c1d2b58..a1e2098 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' hg_url: https://hg.mozilla.org/releases/comm-esr45/ -hg_hash: THUNDERBIRD_45_2_0_RELEASE +hg_hash: THUNDERBIRD_45_3_0_RELEASE filename: "[% project %]-[% c('version') %]-[% c('var/osname') %]-[% c('var/build_id') %].[% c('var/archive_suffix') %]" remote_docker: 1 var: diff --git a/projects/mozilla/config b/projects/mozilla/config index c2b2e4d..2c14535 100644 --- a/projects/mozilla/config +++ b/projects/mozilla/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' hg_url: https://hg.mozilla.org/releases/mozilla-esr45/ -hg_hash: THUNDERBIRD_45_2_0_RELEASE +hg_hash: THUNDERBIRD_45_3_0_RELEASE src: | #!/bin/sh set -e

1 0

[tor-messenger-build/updater] Revert "Fix linux-i686"
by sukhbir＠torproject.org 29 Aug '16

29 Aug '16

commit 1b702d7895a5a95b23faed004b011d6b69c9032c Author: Arlo Breault <arlolra(a)gmail.com> Date: Sat Aug 27 17:13:15 2016 -0700 Revert "Fix linux-i686" This reverts commit d170a50962b36b4b7d9c1fcd8fe063772d4944d1. --- projects/docker-image/config | 1 - 1 file changed, 1 deletion(-) diff --git a/projects/docker-image/config b/projects/docker-image/config index 9e0c42d..8ab70f5 100644 --- a/projects/docker-image/config +++ b/projects/docker-image/config @@ -23,7 +23,6 @@ pre: | [% pc(c('origin_project'), 'var/pre_pkginst') %] [% END -%] [% IF c('lsb_release/id') == 'Ubuntu' || c('lsb_release/id') == 'Debian' %] - dpkg --add-architecture i386 apt-get update -y apt-get upgrade -y [% END %]

1 0

[tor-messenger-build/updater] Update changelog
by sukhbir＠torproject.org 29 Aug '16

29 Aug '16

commit 9e23301abf65cc62f652990fa3509e19e38ba725 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Sun Aug 28 23:27:35 2016 -0400 Update changelog --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 511334b..8260ab2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,7 @@ Tor Messenger 0.1.0b7 -- * GH 73: Show progress during verification in notification box (patch by Vu Quoc Huy) * Mac * Bug 13861: Profile directory stored in ~/Library/Application\ Support + * Bug 17460: Add graphics for OS X drag and drop to Applications Tor Messenger 0.1.0b6 -- April 06, 2016 * All Platforms

1 0

[tor-messenger-build/updater] More linux-i686 fixin'
by sukhbir＠torproject.org 29 Aug '16

29 Aug '16

commit a26af78053453ab2165066f9c1b3966cf09d4fcb Author: Arlo Breault <arlolra(a)gmail.com> Date: Sat Aug 27 15:48:43 2016 -0700 More linux-i686 fixin' --- projects/instantbird/config | 31 ++++++++++++++++++++----------- projects/tor-messenger/config | 2 +- rbm.conf | 1 + 3 files changed, 22 insertions(+), 12 deletions(-) diff --git a/projects/instantbird/config b/projects/instantbird/config index 1223804..bef6465 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -9,23 +9,12 @@ var: deps: - build-essential - libmpc-dev - - libgconf2-dev - - autotools-dev - autoconf2.13 - python - zip - - libgtk2.0-dev - libidl-dev - - libxt-dev - - libxml2-dev - uuid-runtime - imagemagick - - mesa-common-dev - - libdbus-1-dev - - libdbus-glib-1-dev - - libasound2-dev - - libgstreamer-plugins-base0.10-dev - - libpulse-dev - ccache targets: windows-i686: @@ -37,6 +26,16 @@ targets: var: arch_deps: - yasm + - libgconf2-dev + - libgtk2.0-dev + - libxml2-dev + - mesa-common-dev + - libdbus-1-dev + - libdbus-glib-1-dev + - libasound2-dev + - libgstreamer-plugins-base0.10-dev + - libpulse-dev + - libxt-dev linux-i686: var: arch_deps: @@ -45,6 +44,16 @@ targets: - lib32z1-dev - lib32asound2-dev - yasm + - 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: arch_deps: diff --git a/projects/tor-messenger/config b/projects/tor-messenger/config index 19e98b6..dc0a28b 100644 --- a/projects/tor-messenger/config +++ b/projects/tor-messenger/config @@ -29,7 +29,7 @@ input_files: - project: docker-image remote_docker: 1 -distribution: Ubuntu-12.04 +distribution: Debian-7.11 var: filename_ext: 'tar.xz' deps: diff --git a/rbm.conf b/rbm.conf index 61a5f35..f2084c5 100644 --- a/rbm.conf +++ b/rbm.conf @@ -41,6 +41,7 @@ targets: osname: linux-i686 configure_opt: '--host=i686-linux-gnu CFLAGS=-m32 CXXFLAGS=-m32 LDFLAGS=-m32' compiler: gcc + pre_pkginst: dpkg --add-architecture i386 windows-i686: distribution: Ubuntu-14.10 arch: i686

1 0

[tor-messenger-build/updater] Add a patch for bugzilla 1298574
by sukhbir＠torproject.org 29 Aug '16

29 Aug '16

commit 22893766980774cd2f22a405a978b4f70abb3075 Author: Arlo Breault <arlolra(a)gmail.com> Date: Sun Aug 28 09:06:07 2016 -0700 Add a patch for bugzilla 1298574 --- projects/instantbird/bug-1298574.patch | 47 ++++++++++++++++++++++++++++++++++ projects/instantbird/config | 1 + 2 files changed, 48 insertions(+) diff --git a/projects/instantbird/bug-1298574.patch b/projects/instantbird/bug-1298574.patch new file mode 100644 index 0000000..b0a4ae2 --- /dev/null +++ b/projects/instantbird/bug-1298574.patch @@ -0,0 +1,47 @@ +# HG changeset patch +# User Arlo Breault <arlolra(a)gmail.com> +# Date 1472399861 25200 +# Sun Aug 28 08:57:41 2016 -0700 +# Branch THUNDERBIRD4530_2016082513_RELBRANCH +# Node ID 69baf6e1ea1e4c8f4ddf719bff6b542869a99a23 +# Parent f4a50139b69d93674a2fa55b51ab843a66d3fae2 +Bug 1298574 - Set _userVCard own property when downloading vCard fails. r=aleth + * This prevents an infinite req / res cycle. + +--HG-- +extra : amend_source : fb94df25b6157ec06dcf8f57b66a484aee243a28 + +diff --git a/chat/protocols/xmpp/xmpp.jsm b/chat/protocols/xmpp/xmpp.jsm +--- a/chat/protocols/xmpp/xmpp.jsm ++++ b/chat/protocols/xmpp/xmpp.jsm +@@ -2231,16 +2231,30 @@ var XMPPAccountPrototype = { + if (this._userVCard) { + let binval = this._userVCard.getElement(["PHOTO", "BINVAL"]); + if (binval && binval.children.length) { + binval = binval.children[0]; + binval.text = binval.text.replace(/[^A-Za-z0-9\+\/\=]/g, "") + .replace(/.{74}/g, "$&\n"); + } + } ++ else { ++ // Downloading the vCard failed. ++ if (this.handleErrors({ ++ itemNotFound: () => false, // OK, no vCard exists yet. ++ default: () => true ++ })(aStanza)) { ++ this.WARN("Unexpected error retrieving the user's vcard, " + ++ "so we won't attempt to set it either."); ++ return; ++ } ++ // Set this so that we don't get into an infinite loop trying to download ++ // the vcard again. The check in sendVCard is for hasOwnProperty. ++ this._userVCard = null; ++ } + this._sendVCard(); + }, + + _cachingUserIcon: false, + _cacheUserIcon: function() { + if (this._cachingUserIcon) + return; + diff --git a/projects/instantbird/config b/projects/instantbird/config index a1e2098..1223804 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -69,6 +69,7 @@ input_files: - filename: xmppRegister.js - filename: xmppRegister.xul - filename: xmpp-gtalk-resource.patch + - filename: bug-1298574.patch - filename: trac-16489.patch - filename: trac-17896.patch - filename: trac-17494.patch

1 0

[tor-messenger-build/updater] Add OS X drag and drop to applications (closes #17460)
by sukhbir＠torproject.org 29 Aug '16

29 Aug '16

commit cefe5d8dbc02ded03928118a61823ec49ba7085b Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Sun Aug 28 22:58:43 2016 -0400 Add OS X drag and drop to applications (closes #17460) --- projects/tor-messenger/DS_Store | Bin 0 -> 15364 bytes projects/tor-messenger/VolumeIcon.icns | Bin 0 -> 124971 bytes projects/tor-messenger/background.png | Bin 0 -> 8012 bytes projects/tor-messenger/build.osx | 7 +++++++ projects/tor-messenger/config | 6 ++++++ 5 files changed, 13 insertions(+) diff --git a/projects/tor-messenger/DS_Store b/projects/tor-messenger/DS_Store new file mode 100644 index 0000000..2a2073a Binary files /dev/null and b/projects/tor-messenger/DS_Store differ diff --git a/projects/tor-messenger/VolumeIcon.icns b/projects/tor-messenger/VolumeIcon.icns new file mode 100644 index 0000000..db5a495 Binary files /dev/null and b/projects/tor-messenger/VolumeIcon.icns differ diff --git a/projects/tor-messenger/background.png b/projects/tor-messenger/background.png new file mode 100644 index 0000000..8a938c2 Binary files /dev/null and b/projects/tor-messenger/background.png differ diff --git a/projects/tor-messenger/build.osx b/projects/tor-messenger/build.osx index c7f46c7..a7b261f 100755 --- a/projects/tor-messenger/build.osx +++ b/projects/tor-messenger/build.osx @@ -44,6 +44,13 @@ mv torbrowser/TorBrowser.app/Contents/MacOS/Tor/ $rootdir/TorMessenger.app/Conte mkdir dmg mv TorMessenger.app dmg cd dmg + +cp $rootdir/VolumeIcon.icns .VolumeIcon.icns +mkdir .background +cp $rootdir/background.png .background/ +cp $rootdir/DS_Store .DS_Store +ln -s /Applications/ . + find . -executable -exec chmod 750 {} \; find . ! -executable -exec chmod 640 {} \; find . -type f | sed -e 's/^\.\///' | sort | xargs -i echo "{}={}" > ../filelist.txt diff --git a/projects/tor-messenger/config b/projects/tor-messenger/config index dc0a28b..225977f 100644 --- a/projects/tor-messenger/config +++ b/projects/tor-messenger/config @@ -18,6 +18,12 @@ input_files: - filename: start-tor-messenger - filename: start-tor-messenger.desktop - filename: execdesktop + - filename: background.png + enable: '[% c("var/osx") %]' + - filename: DS_Store + enable: '[% c("var/osx") %]' + - filename: VolumeIcon.icns + enable: '[% c("var/osx") %]' - filename: tor-messenger.nsi enable: '[% c("var/windows") %]' - filename: cert_override.txt

1 0

[tor-messenger-build/updater] Add patch for setting Tor Launcher minVersion for Instantbird
by sukhbir＠torproject.org 29 Aug '16

29 Aug '16

commit 95a69bb47a9349d9877c8382889c658808327fba Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Sat Aug 27 15:38:34 2016 -0400 Add patch for setting Tor Launcher minVersion for Instantbird --- projects/tor-launcher/build | 1 + projects/tor-launcher/config | 1 + projects/tor-launcher/min-version.patch | 13 +++++++++++++ 3 files changed, 15 insertions(+) diff --git a/projects/tor-launcher/build b/projects/tor-launcher/build index 5b11d89..ea1e533 100644 --- a/projects/tor-launcher/build +++ b/projects/tor-launcher/build @@ -14,5 +14,6 @@ cp ../default48.png src/chrome/skin/default48.png [% END -%] patch -p1 < ../logo.patch patch -p1 < ../locale-disable.patch +patch -p1 < ../min-version.patch make package mv pkg/*.xpi [% dest_dir _ '/' _ c('filename') %] diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index f4dc4ee..3a4a129 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -11,6 +11,7 @@ input_files: - filename: default48.png - filename: logo.patch - filename: locale-disable.patch + - filename: min-version.patch - filename: controlport.patch content: '[% INCLUDE controlport.patch.tmpl -%]' refresh_input: 1 diff --git a/projects/tor-launcher/min-version.patch b/projects/tor-launcher/min-version.patch new file mode 100644 index 0000000..ac58d39 --- /dev/null +++ b/projects/tor-launcher/min-version.patch @@ -0,0 +1,13 @@ +diff --git a/src/install.rdf b/src/install.rdf +index 2eea493..4ce8ac8 100644 +--- a/src/install.rdf ++++ b/src/install.rdf +@@ -34,7 +34,7 @@ + <em:targetApplication> + <Description> + <em:id>{33cb9019-c295-46dd-be21-8c4936574bee}</em:id> +- <em:minVersion>1.4</em:minVersion> ++ <em:minVersion>0</em:minVersion> + <em:maxVersion>*.*.*</em:maxVersion> + </Description> + </em:targetApplication>

1 0

[tor-messenger-build/master] Add OS X drag and drop to applications (closes #17460)
by sukhbir＠torproject.org 29 Aug '16

29 Aug '16

commit cefe5d8dbc02ded03928118a61823ec49ba7085b Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Sun Aug 28 22:58:43 2016 -0400 Add OS X drag and drop to applications (closes #17460) --- projects/tor-messenger/DS_Store | Bin 0 -> 15364 bytes projects/tor-messenger/VolumeIcon.icns | Bin 0 -> 124971 bytes projects/tor-messenger/background.png | Bin 0 -> 8012 bytes projects/tor-messenger/build.osx | 7 +++++++ projects/tor-messenger/config | 6 ++++++ 5 files changed, 13 insertions(+) diff --git a/projects/tor-messenger/DS_Store b/projects/tor-messenger/DS_Store new file mode 100644 index 0000000..2a2073a Binary files /dev/null and b/projects/tor-messenger/DS_Store differ diff --git a/projects/tor-messenger/VolumeIcon.icns b/projects/tor-messenger/VolumeIcon.icns new file mode 100644 index 0000000..db5a495 Binary files /dev/null and b/projects/tor-messenger/VolumeIcon.icns differ diff --git a/projects/tor-messenger/background.png b/projects/tor-messenger/background.png new file mode 100644 index 0000000..8a938c2 Binary files /dev/null and b/projects/tor-messenger/background.png differ diff --git a/projects/tor-messenger/build.osx b/projects/tor-messenger/build.osx index c7f46c7..a7b261f 100755 --- a/projects/tor-messenger/build.osx +++ b/projects/tor-messenger/build.osx @@ -44,6 +44,13 @@ mv torbrowser/TorBrowser.app/Contents/MacOS/Tor/ $rootdir/TorMessenger.app/Conte mkdir dmg mv TorMessenger.app dmg cd dmg + +cp $rootdir/VolumeIcon.icns .VolumeIcon.icns +mkdir .background +cp $rootdir/background.png .background/ +cp $rootdir/DS_Store .DS_Store +ln -s /Applications/ . + find . -executable -exec chmod 750 {} \; find . ! -executable -exec chmod 640 {} \; find . -type f | sed -e 's/^\.\///' | sort | xargs -i echo "{}={}" > ../filelist.txt diff --git a/projects/tor-messenger/config b/projects/tor-messenger/config index dc0a28b..225977f 100644 --- a/projects/tor-messenger/config +++ b/projects/tor-messenger/config @@ -18,6 +18,12 @@ input_files: - filename: start-tor-messenger - filename: start-tor-messenger.desktop - filename: execdesktop + - filename: background.png + enable: '[% c("var/osx") %]' + - filename: DS_Store + enable: '[% c("var/osx") %]' + - filename: VolumeIcon.icns + enable: '[% c("var/osx") %]' - filename: tor-messenger.nsi enable: '[% c("var/windows") %]' - filename: cert_override.txt

1 0

[tor-messenger-build/master] Update changelog
by sukhbir＠torproject.org 29 Aug '16

29 Aug '16

commit 9e23301abf65cc62f652990fa3509e19e38ba725 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Sun Aug 28 23:27:35 2016 -0400 Update changelog --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 511334b..8260ab2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,7 @@ Tor Messenger 0.1.0b7 -- * GH 73: Show progress during verification in notification box (patch by Vu Quoc Huy) * Mac * Bug 13861: Profile directory stored in ~/Library/Application\ Support + * Bug 17460: Add graphics for OS X drag and drop to Applications Tor Messenger 0.1.0b6 -- April 06, 2016 * All Platforms

1 0