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

[tor-messenger-build/esr52] Revert "libgpg-error: fix OSX lock-obj-pub headers"
by sukhbir＠torproject.org 02 Sep '17

02 Sep '17

commit a4ad1dabbc02ade3290fbaeddee8b67d47803126 Author: Arlo Breault <arlolra(a)gmail.com> Date: Tue Aug 29 21:08:55 2017 -0400 Revert "libgpg-error: fix OSX lock-obj-pub headers" * Fixes crash when exiting on macOS. This reverts commit 759530f06f060934ef8917745eeddd31ef8155cc. --- projects/libgpg-error/build | 2 +- projects/libgpg-error/config | 2 +- .../lock-obj-pub.x86_64-apple-darwin10.h | 17 ------------- .../lock-obj-pub.x86_64-apple-darwin14.0.0.h | 28 ++++++++++++++++++++++ 4 files changed, 30 insertions(+), 19 deletions(-) diff --git a/projects/libgpg-error/build b/projects/libgpg-error/build index 9e2efe0..1319786 100644 --- a/projects/libgpg-error/build +++ b/projects/libgpg-error/build @@ -8,7 +8,7 @@ mkdir -p /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") -%] -cp $rootdir/lock-obj-pub.x86_64-apple-darwin10.h src/syscfg/lock-obj-pub.darwin10.h +cp $rootdir/lock-obj-pub.x86_64-apple-darwin14.0.0.h src/syscfg/lock-obj-pub.darwin10.h echo 'int main() {}' > src/gen-posix-lock-obj.c [% END -%] export SOURCE_DATE_EPOCH=$(stat -c %Y ChangeLog) diff --git a/projects/libgpg-error/config b/projects/libgpg-error/config index bd00a4f..07d5d22 100644 --- a/projects/libgpg-error/config +++ b/projects/libgpg-error/config @@ -18,7 +18,7 @@ input_files: sig_ext: sig file_gpg_id: 1 gpg_keyring: libgcrypt.gpg - - filename: lock-obj-pub.x86_64-apple-darwin10.h + - filename: lock-obj-pub.x86_64-apple-darwin14.0.0.h enable: '[% c("var/osx") %]' - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' diff --git a/projects/libgpg-error/lock-obj-pub.x86_64-apple-darwin10.h b/projects/libgpg-error/lock-obj-pub.x86_64-apple-darwin10.h deleted file mode 100644 index 4d3c5fe..0000000 --- a/projects/libgpg-error/lock-obj-pub.x86_64-apple-darwin10.h +++ /dev/null @@ -1,17 +0,0 @@ -## lock-obj-pub.x86_64-apple-darwin10.h - NO LOCK SUPPORT -## File created by gen-posix-lock-obj - DO NOT EDIT -## To be included by mkheader into gpg-error.h - -/* Dummy object - no locking available. */ -typedef struct -{ - long _vers; -} gpgrt_lock_t; - -#define GPGRT_LOCK_INITIALIZER {-1} -## -## Local Variables: -## mode: c -## buffer-read-only: t -## End: -## diff --git a/projects/libgpg-error/lock-obj-pub.x86_64-apple-darwin14.0.0.h b/projects/libgpg-error/lock-obj-pub.x86_64-apple-darwin14.0.0.h new file mode 100644 index 0000000..3e3ccb2 --- /dev/null +++ b/projects/libgpg-error/lock-obj-pub.x86_64-apple-darwin14.0.0.h @@ -0,0 +1,28 @@ +## lock-obj-pub.x86_64-apple-darwin14.0.0.h +## File created by gen-posix-lock-obj - DO NOT EDIT +## To be included by mkheader into gpg-error.h + +typedef struct +{ + long _vers; + union { + volatile char _priv[64]; + long _x_align; + long *_xp_align; + } u; +} gpgrt_lock_t; + +#define GPGRT_LOCK_INITIALIZER {1,{{167,171,170,50,0,0,0,0, \ + 0,0,0,0,0,0,0,0, \ + 0,0,0,0,0,0,0,0, \ + 0,0,0,0,0,0,0,0, \ + 0,0,0,0,0,0,0,0, \ + 0,0,0,0,0,0,0,0, \ + 0,0,0,0,0,0,0,0, \ + 0,0,0,0,0,0,0,0}}} +## +## Local Variables: +## mode: c +## buffer-read-only: t +## End: +##

1 0

[tor-messenger-build/esr52] Update build dependencies in README.md
by sukhbir＠torproject.org 02 Sep '17

02 Sep '17

commit e7150d2abc89fe0b331985577c8a59ba882878f6 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Thu Aug 24 15:33:59 2017 -0400 Update build dependencies in README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e2e6cd3..10744cd 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ with the following command: libstring-shellquote-perl libsort-versions-perl \ libdigest-sha-perl libdata-uuid-perl libdata-dump-perl \ libfile-copy-recursive-perl git libgtk2.0-dev curl runc \ - mercurial + mercurial zip ``` Starting a build

1 0

[tor-messenger-build/esr52] Update the changelog for various pushed commits
by sukhbir＠torproject.org 02 Sep '17

02 Sep '17

commit d24a4c67709d952bc42abc62b21ab3be42ec7718 Author: Arlo Breault <arlolra(a)gmail.com> Date: Fri Sep 1 09:43:31 2017 -0400 Update the changelog for various pushed commits * Should have been part of, 67cf5ed57e2186a5baace53191450d0be2628ae6 a0c459f20779f10a13d9045ae7ef63efeb8423e5 bbded9cef95914552735e0fa4c8779bc07b15911 --- ChangeLog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ChangeLog b/ChangeLog index 5b97025..5c74e59 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,13 @@ Tor Messenger 0.5.0b1 -- * Use the THUNDERBIRD_52_3_0_RELEASE tag on comm-esr52 * Update tor-browser to 7.0.4 * Update tor-launcher to 0.2.12.3 + * Trac 22005: Move to ESR 52 + * Trac 16606: Temporary XMPP accounts + * Trac 13855: Use known onions for XMPP servers + * Mac + * Trac 20316: Update OS X toolchain + * Windows + * Trac 17469: Tor Messenger is not working on Windows XP Tor Messenger 0.4.0b3 -- June 13, 2017 * All Platforms

1 0

[tor-messenger-build/esr52] Disable SRV lookups that use the system DNS library
by sukhbir＠torproject.org 02 Sep '17

02 Sep '17

commit d47648c8a55ad5d2419827aff7461688cc026c41 Author: Arlo Breault <arlolra(a)gmail.com> Date: Tue Aug 29 22:23:26 2017 -0400 Disable SRV lookups that use the system DNS library * From bugzilla 787369 --- .../0001-Set-Tor-Messenger-preferences.patch | 33 ++++++++++++---------- ...c-21634-Autologin-default-should-be-false.patch | 2 +- .../0003-XMPP-in-band-registration.patch | 2 +- .../instantbird/0004-Remove-search-from-UI.patch | 2 +- .../0005-Add-Tor-Messenger-branding.patch | 2 +- ...ve-option-for-configuring-account-picture.patch | 2 +- .../0007-Modify-top-protocol-defaults.patch | 2 +- .../instantbird/0008-Modify-IRC-defaults.patch | 2 +- .../0009-Do-not-set-default-XMPP-server.patch | 2 +- projects/instantbird/0010-Modify-themes.patch | 2 +- projects/instantbird/0011-Remove-logging-UI.patch | 2 +- projects/instantbird/0012-Cert-override.patch | 2 +- .../0013-Display-all-traffic-over-Tor.patch | 2 +- .../instantbird/0014-Trac-17480-Content-sink.patch | 2 +- .../0015-SASL-ECDSA-NIST256P-CHALLENGE.patch | 2 +- ...-Use-built-in-functions-instead-of-an-svg.patch | 2 +- ...-Add-a-pref-to-disable-JavaScript-in-brow.patch | 2 +- ...517-Use-different-color-for-Add-Exception.patch | 2 +- ...21736-Hide-account-timestamp-from-message.patch | 6 ++-- ...wed-duplicated-files-for-Windows-and-Linu.patch | 2 +- ...g-13855-Use-known-onions-for-XMPP-servers.patch | 2 +- .../0022-Bug-16606-Automatic-XMPP-accounts.patch | 2 +- 22 files changed, 41 insertions(+), 38 deletions(-) diff --git a/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch b/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch index f1ec406..d215552 100644 --- a/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch +++ b/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch @@ -1,17 +1,17 @@ -From 44eadb31b5f73252cf991328b014b9cb64bde155 Mon Sep 17 00:00:00 2001 +From 3aef7c8034e706afa8f0b3e31ecd03c8f9017ab4 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Wed, 26 Jul 2017 14:30:41 -0400 Subject: [PATCH 01/22] Set Tor Messenger preferences --- - im/app/profile/all-instantbird.js | 455 ++++++++++++++++++++++++++++++++++++-- - 1 file changed, 431 insertions(+), 24 deletions(-) + im/app/profile/all-instantbird.js | 458 ++++++++++++++++++++++++++++++++++++-- + 1 file changed, 434 insertions(+), 24 deletions(-) diff --git a/im/app/profile/all-instantbird.js b/im/app/profile/all-instantbird.js -index 127c86a662..fd95a1e6b1 100644 +index 127c86a662..31b3744c63 100644 --- a/im/app/profile/all-instantbird.js +++ b/im/app/profile/all-instantbird.js -@@ -1,3 +1,53 @@ +@@ -1,3 +1,56 @@ +/** + * This file is divided into three section, + * @@ -53,6 +53,9 @@ index 127c86a662..fd95a1e6b1 100644 +// Disable JavaScript in browser requests +pref("chat.browserRequest.disableJavascript", true); + ++// Whether to disable SRV lookups that use the system DNS library. ++pref("chat.dns.srv.disable", true); ++ +// No AUS check for system add-on updates for Tor Browser users. +// This pref is taken from the TB diff of browser/app/profile/firefox.js +pref("extensions.systemAddon.update.url", ""); @@ -65,7 +68,7 @@ index 127c86a662..fd95a1e6b1 100644 /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -@@ -28,7 +78,7 @@ pref("general.autoScroll", true); +@@ -28,7 +81,7 @@ pref("general.autoScroll", true); // 0 = spellcheck nothing // 1 = check multi-line controls [default] // 2 = check multi/single line controls @@ -74,7 +77,7 @@ index 127c86a662..fd95a1e6b1 100644 pref("messenger.accounts.convertOldPasswords", true); pref("messenger.accounts.promptOnDelete", true); -@@ -66,7 +116,7 @@ pref("extensions.mintrayr.singleClickRestore", false); +@@ -66,7 +119,7 @@ pref("extensions.mintrayr.singleClickRestore", false); // Whether message related sounds should be played at all. If this is enabled // then the more specific prefs are checked as well. @@ -83,7 +86,7 @@ index 127c86a662..fd95a1e6b1 100644 // Specifies whether each message event should trigger a sound for incoming // and outgoing messages, or when your nickname is mentioned in a chat. pref("messenger.options.playSounds.outgoing", true); -@@ -142,26 +192,23 @@ pref("app.update.staging.enabled", true); +@@ -142,26 +195,23 @@ pref("app.update.staging.enabled", true); // Update service URL: // You do not need to use all the %VAR% parameters. Use what you need, %PRODUCT%,%VERSION%,%BUILD_ID%,%CHANNEL% for example @@ -115,7 +118,7 @@ index 127c86a662..fd95a1e6b1 100644 // Interval: Time before prompting the user to restart to install the latest // download (in seconds) default=30 minutes -@@ -195,7 +242,7 @@ pref("browser.search.order.1", "chrome://instantbird/locale/regio +@@ -195,7 +245,7 @@ pref("browser.search.order.1", "chrome://instantbird/locale/regio pref("browser.search.order.2", "chrome://instantbird/locale/region.properties"); // send ping to the server to update @@ -124,7 +127,7 @@ index 127c86a662..fd95a1e6b1 100644 // disable logging for the search service update system by default pref("browser.search.update.log", false); -@@ -220,8 +267,8 @@ pref("services.kinto.update_enabled", false); +@@ -220,8 +270,8 @@ pref("services.kinto.update_enabled", false); // Block insecure active content on https pages pref("security.mixed_content.block_active_content", true); @@ -135,7 +138,7 @@ index 127c86a662..fd95a1e6b1 100644 /* Extension manager */ pref("xpinstall.dialog.confirm", "chrome://mozapps/content/xpinstall/xpinstallConfirm.xul"); -@@ -235,10 +282,10 @@ pref("extensions.ignoreMTimeChanges", false); +@@ -235,10 +285,10 @@ pref("extensions.ignoreMTimeChanges", false); pref("extensions.logging.enabled", false); pref("general.skins.selectedSkin", "classic/1.0"); @@ -148,7 +151,7 @@ index 127c86a662..fd95a1e6b1 100644 // Preferences for the Get Add-ons pane pref("extensions.getAddons.cache.enabled", false); -@@ -265,16 +312,16 @@ pref("plugins.click_to_play", false); +@@ -265,16 +315,16 @@ pref("plugins.click_to_play", false); pref("plugin.default.state", 0); // Plugins bundled in XPIs are enabled by default. @@ -169,7 +172,7 @@ index 127c86a662..fd95a1e6b1 100644 // don't load links inside Instantbird pref("network.protocol-handler.expose-all", false); -@@ -286,13 +333,13 @@ pref("network.protocol-handler.expose.https", true); +@@ -286,13 +336,13 @@ pref("network.protocol-handler.expose.https", true); // expose javascript: so that message themes can use it. // javascript: links inside messages are filtered out. @@ -186,7 +189,7 @@ index 127c86a662..fd95a1e6b1 100644 // We have an Error Console menu item by default so let's display chrome errors pref("javascript.options.showInConsole", true); -@@ -327,7 +374,7 @@ pref("browser.tabs.tabClipWidth", 140); +@@ -327,7 +377,7 @@ pref("browser.tabs.tabClipWidth", 140); // 3 at the end of the tabstrip pref("browser.tabs.closeButtons", 1); @@ -195,7 +198,7 @@ index 127c86a662..fd95a1e6b1 100644 pref("chat.twitter.consumerKey", "TSuyS1ieRAkB3qWv8yyEw"); pref("chat.twitter.consumerSecret", "DKtKaSf5a7pBNhdBsSZHTnI5Y03hRlPFYWmb4xXBlkU"); -@@ -337,4 +384,364 @@ pref("chat.twitter.consumerSecret", "DKtKaSf5a7pBNhdBsSZHTnI5Y03hRlPFYWmb4xXBlkU +@@ -337,4 +387,364 @@ pref("chat.twitter.consumerSecret", "DKtKaSf5a7pBNhdBsSZHTnI5Y03hRlPFYWmb4xXBlkU pref("chat.prpls.forcePurple", ""); // Whether to parse log files for conversation statistics. diff --git a/projects/instantbird/0002-Trac-21634-Autologin-default-should-be-false.patch b/projects/instantbird/0002-Trac-21634-Autologin-default-should-be-false.patch index 8594e83..8d06c52 100644 --- a/projects/instantbird/0002-Trac-21634-Autologin-default-should-be-false.patch +++ b/projects/instantbird/0002-Trac-21634-Autologin-default-should-be-false.patch @@ -1,4 +1,4 @@ -From eeef298b165b6c91bcb7da7c288d332e1805e823 Mon Sep 17 00:00:00 2001 +From ab5dabcf6221b83733482587c6ccdb3975b30b46 Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Mon, 16 Nov 2015 20:37:53 -0800 Subject: [PATCH 02/22] Trac 21634: Autologin default should be false diff --git a/projects/instantbird/0003-XMPP-in-band-registration.patch b/projects/instantbird/0003-XMPP-in-band-registration.patch index 2819f5e..5b1fd6d 100644 --- a/projects/instantbird/0003-XMPP-in-band-registration.patch +++ b/projects/instantbird/0003-XMPP-in-band-registration.patch @@ -1,4 +1,4 @@ -From c67cae1deee24e2b440c967d720d033e176e5b8d Mon Sep 17 00:00:00 2001 +From 313ff42077e8a6aa6ca8acf9a659d991af64bdc3 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Wed, 26 Jul 2017 15:09:40 -0400 Subject: [PATCH 03/22] XMPP in-band registration diff --git a/projects/instantbird/0004-Remove-search-from-UI.patch b/projects/instantbird/0004-Remove-search-from-UI.patch index ac73869..3459d6c 100644 --- a/projects/instantbird/0004-Remove-search-from-UI.patch +++ b/projects/instantbird/0004-Remove-search-from-UI.patch @@ -1,4 +1,4 @@ -From 8f329c1df365a64ecce561b0c4a46d7c683e7a1d Mon Sep 17 00:00:00 2001 +From 5b47b35c62fe57b4e37b75efd9e116d6995c0b88 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 18:47:48 -0700 Subject: [PATCH 04/22] Remove search from UI diff --git a/projects/instantbird/0005-Add-Tor-Messenger-branding.patch b/projects/instantbird/0005-Add-Tor-Messenger-branding.patch index df7bb63..85aca2d 100644 --- a/projects/instantbird/0005-Add-Tor-Messenger-branding.patch +++ b/projects/instantbird/0005-Add-Tor-Messenger-branding.patch @@ -1,4 +1,4 @@ -From ec0c0fdf2242795ec29678476a14498e9e7251c3 Mon Sep 17 00:00:00 2001 +From 38fa4bd0401bc9dbcba80a7fb1d51456dae0e3b1 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Wed, 26 Jul 2017 15:46:51 -0400 Subject: [PATCH 05/22] Add Tor Messenger branding diff --git a/projects/instantbird/0006-Remove-option-for-configuring-account-picture.patch b/projects/instantbird/0006-Remove-option-for-configuring-account-picture.patch index 737f6ed..b69798e 100644 --- a/projects/instantbird/0006-Remove-option-for-configuring-account-picture.patch +++ b/projects/instantbird/0006-Remove-option-for-configuring-account-picture.patch @@ -1,4 +1,4 @@ -From ef2d5cf0c6c44393e80d968491d6f62840ca803e Mon Sep 17 00:00:00 2001 +From ca63ac2fee5d1cd4c07385c27951336ca044e0f1 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:24:09 -0700 Subject: [PATCH 06/22] Remove option for configuring account picture diff --git a/projects/instantbird/0007-Modify-top-protocol-defaults.patch b/projects/instantbird/0007-Modify-top-protocol-defaults.patch index 584a267..465f994 100644 --- a/projects/instantbird/0007-Modify-top-protocol-defaults.patch +++ b/projects/instantbird/0007-Modify-top-protocol-defaults.patch @@ -1,4 +1,4 @@ -From a3ebacee503fb025e13110a5838645f3f9b250c9 Mon Sep 17 00:00:00 2001 +From 4273f5eaed18c4454e2e44abcf65934e2c36b403 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Wed, 26 Jul 2017 16:16:09 -0400 Subject: [PATCH 07/22] Modify top protocol defaults diff --git a/projects/instantbird/0008-Modify-IRC-defaults.patch b/projects/instantbird/0008-Modify-IRC-defaults.patch index b0e28aa..d484fce 100644 --- a/projects/instantbird/0008-Modify-IRC-defaults.patch +++ b/projects/instantbird/0008-Modify-IRC-defaults.patch @@ -1,4 +1,4 @@ -From 47fb77f57e3ab7dea49d6a8061873e2125117dde Mon Sep 17 00:00:00 2001 +From 8c5a1d78d4fa63299a11683de8c722dd684925dd Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:31:58 -0700 Subject: [PATCH 08/22] Modify IRC defaults diff --git a/projects/instantbird/0009-Do-not-set-default-XMPP-server.patch b/projects/instantbird/0009-Do-not-set-default-XMPP-server.patch index 3b9e94e..53519ec 100644 --- a/projects/instantbird/0009-Do-not-set-default-XMPP-server.patch +++ b/projects/instantbird/0009-Do-not-set-default-XMPP-server.patch @@ -1,4 +1,4 @@ -From d6131e4b0851b15a5adfd89177eb772de73ee958 Mon Sep 17 00:00:00 2001 +From f9e325df59a312e311fa8427db4c8970e1ea827d Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Fri, 28 Jul 2017 12:11:57 -0400 Subject: [PATCH 09/22] Do not set default XMPP server diff --git a/projects/instantbird/0010-Modify-themes.patch b/projects/instantbird/0010-Modify-themes.patch index b840e86..0611c04 100644 --- a/projects/instantbird/0010-Modify-themes.patch +++ b/projects/instantbird/0010-Modify-themes.patch @@ -1,4 +1,4 @@ -From 3206bed9480c826f7c70ba4804076248959772ad Mon Sep 17 00:00:00 2001 +From 794e18ff85d131302db91c92f99e36e11af89f51 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:36:38 -0700 Subject: [PATCH 10/22] Modify themes diff --git a/projects/instantbird/0011-Remove-logging-UI.patch b/projects/instantbird/0011-Remove-logging-UI.patch index 78c03c8..10356d8 100644 --- a/projects/instantbird/0011-Remove-logging-UI.patch +++ b/projects/instantbird/0011-Remove-logging-UI.patch @@ -1,4 +1,4 @@ -From af3bcdcb928902e44f28e872ed7ed1eeea4f4a7d Mon Sep 17 00:00:00 2001 +From 1e98d5b631fef9d8d1c37589293938c2b10c7a4f Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:50:48 -0700 Subject: [PATCH 11/22] Remove logging UI diff --git a/projects/instantbird/0012-Cert-override.patch b/projects/instantbird/0012-Cert-override.patch index f4879f1..8544009 100644 --- a/projects/instantbird/0012-Cert-override.patch +++ b/projects/instantbird/0012-Cert-override.patch @@ -1,4 +1,4 @@ -From 4acec30f0d25ad8c3661ab279748336ef230a7a2 Mon Sep 17 00:00:00 2001 +From 333dd2f6557312497902f5b2796c212503be7c8f Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:56:46 -0700 Subject: [PATCH 12/22] Cert override diff --git a/projects/instantbird/0013-Display-all-traffic-over-Tor.patch b/projects/instantbird/0013-Display-all-traffic-over-Tor.patch index b11ecf4..8692956 100644 --- a/projects/instantbird/0013-Display-all-traffic-over-Tor.patch +++ b/projects/instantbird/0013-Display-all-traffic-over-Tor.patch @@ -1,4 +1,4 @@ -From 73321adb92aa81f60de281208634d5a62566428b Mon Sep 17 00:00:00 2001 +From 33bcbd47beeeb7b0d96d5ed7148c528c98b7e2cb Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:58:31 -0700 Subject: [PATCH 13/22] Display all traffic over Tor diff --git a/projects/instantbird/0014-Trac-17480-Content-sink.patch b/projects/instantbird/0014-Trac-17480-Content-sink.patch index 41c2309..97a78e7 100644 --- a/projects/instantbird/0014-Trac-17480-Content-sink.patch +++ b/projects/instantbird/0014-Trac-17480-Content-sink.patch @@ -1,4 +1,4 @@ -From a5c9e85e965f28e05997dbddac9c84903ada9cb4 Mon Sep 17 00:00:00 2001 +From d0ffa62609bb4c275e3a3a68ed40d79f936c4a7d Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Wed, 5 Oct 2016 11:09:25 -0700 Subject: [PATCH 14/22] Trac 17480: Content sink diff --git a/projects/instantbird/0015-SASL-ECDSA-NIST256P-CHALLENGE.patch b/projects/instantbird/0015-SASL-ECDSA-NIST256P-CHALLENGE.patch index cf9f76e..818b868 100644 --- a/projects/instantbird/0015-SASL-ECDSA-NIST256P-CHALLENGE.patch +++ b/projects/instantbird/0015-SASL-ECDSA-NIST256P-CHALLENGE.patch @@ -1,4 +1,4 @@ -From a83c92268dbd0959427525d85245de8364c3b120 Mon Sep 17 00:00:00 2001 +From e19c3cf5b7f56e19a1c6ed144192b3cb12f198d6 Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Sun, 2 Oct 2016 08:46:55 -0700 Subject: [PATCH 15/22] SASL ECDSA-NIST256P-CHALLENGE 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 8bf5458..5356662 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 @@ -1,4 +1,4 @@ -From 563a445eccd41b832f43cfe3465785870591528e Mon Sep 17 00:00:00 2001 +From a9bb56bdb91d98709d66036b09bb39ad05436651 Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Tue, 29 Aug 2017 14:45:29 -0400 Subject: [PATCH 16/22] Bug 1321641 - Use built-in functions instead of an svg diff --git a/projects/instantbird/0017-Bug-1321420-Add-a-pref-to-disable-JavaScript-in-brow.patch b/projects/instantbird/0017-Bug-1321420-Add-a-pref-to-disable-JavaScript-in-brow.patch index f107bb8..25d50ab 100644 --- a/projects/instantbird/0017-Bug-1321420-Add-a-pref-to-disable-JavaScript-in-brow.patch +++ b/projects/instantbird/0017-Bug-1321420-Add-a-pref-to-disable-JavaScript-in-brow.patch @@ -1,4 +1,4 @@ -From bcc668d8a25bce408c9e908975891f21447cd8ea Mon Sep 17 00:00:00 2001 +From 9dc6ee85b96d16d159a5132e1e6ed1b94b068824 Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Wed, 26 Jul 2017 16:35:33 -0400 Subject: [PATCH 17/22] Bug 1321420 - Add a pref to disable JavaScript in diff --git a/projects/instantbird/0018-Trac-17517-Use-different-color-for-Add-Exception.patch b/projects/instantbird/0018-Trac-17517-Use-different-color-for-Add-Exception.patch index 5ce547d..b58c717 100644 --- a/projects/instantbird/0018-Trac-17517-Use-different-color-for-Add-Exception.patch +++ b/projects/instantbird/0018-Trac-17517-Use-different-color-for-Add-Exception.patch @@ -1,4 +1,4 @@ -From e27529ddb8f28889416f6ec829d4f13c05ec1b53 Mon Sep 17 00:00:00 2001 +From 08785730b9ccc353900cc8807b4b2cd5ae348337 Mon Sep 17 00:00:00 2001 From: Vu Quoc Huy <huyvq.c633(a)gmail.com> Date: Wed, 26 Jul 2017 16:38:19 -0400 Subject: [PATCH 18/22] Trac 17517 - Use different color for Add Exception diff --git a/projects/instantbird/0019-Trac-21736-Hide-account-timestamp-from-message.patch b/projects/instantbird/0019-Trac-21736-Hide-account-timestamp-from-message.patch index 0d636c8..a2facae 100644 --- a/projects/instantbird/0019-Trac-21736-Hide-account-timestamp-from-message.patch +++ b/projects/instantbird/0019-Trac-21736-Hide-account-timestamp-from-message.patch @@ -1,4 +1,4 @@ -From 7f60ba9eca14bd39eefa3fb732fd0f2db83b2ff6 Mon Sep 17 00:00:00 2001 +From a2a8f798d2a6464d89da8f566cfeb6343ff1eee8 Mon Sep 17 00:00:00 2001 From: Vu Quoc Huy <huyvq.c633(a)gmail.com> Date: Sun, 2 Apr 2017 13:07:09 -0400 Subject: [PATCH 19/22] Trac 21736 - Hide account/timestamp from message @@ -44,10 +44,10 @@ index a723d742bf..95d917f0d7 100644 } diff --git a/im/app/profile/all-instantbird.js b/im/app/profile/all-instantbird.js -index fd95a1e6b1..fbc540bc5e 100644 +index 31b3744c63..98e1a7b929 100644 --- a/im/app/profile/all-instantbird.js +++ b/im/app/profile/all-instantbird.js -@@ -47,6 +47,11 @@ pref("extensions.systemAddon.update.url", ""); +@@ -50,6 +50,11 @@ pref("extensions.systemAddon.update.url", ""); // background (in seconds) pref("app.update.download.backgroundInterval", 60); diff --git a/projects/instantbird/0020-Update-allowed-duplicated-files-for-Windows-and-Linu.patch b/projects/instantbird/0020-Update-allowed-duplicated-files-for-Windows-and-Linu.patch index ca1d7a9..121d034 100644 --- a/projects/instantbird/0020-Update-allowed-duplicated-files-for-Windows-and-Linu.patch +++ b/projects/instantbird/0020-Update-allowed-duplicated-files-for-Windows-and-Linu.patch @@ -1,4 +1,4 @@ -From eaf813e223ec20118a82ed81f08598cfaf7a81ef Mon Sep 17 00:00:00 2001 +From 89f693b09d1c8238e38351b430e31942919732cc Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Thu, 27 Jul 2017 15:16:54 -0400 Subject: [PATCH 20/22] Update allowed duplicated files for Windows and Linux diff --git a/projects/instantbird/0021-Bug-13855-Use-known-onions-for-XMPP-servers.patch b/projects/instantbird/0021-Bug-13855-Use-known-onions-for-XMPP-servers.patch index 3425782..516b29b 100644 --- a/projects/instantbird/0021-Bug-13855-Use-known-onions-for-XMPP-servers.patch +++ b/projects/instantbird/0021-Bug-13855-Use-known-onions-for-XMPP-servers.patch @@ -1,4 +1,4 @@ -From ce9b1c114e07ca2e2633d01cb68e96f9e9423263 Mon Sep 17 00:00:00 2001 +From 0fe0d83b49d2f05f2e4d7952c2c7ee9b8fadd058 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Tue, 15 Aug 2017 16:40:33 -0400 Subject: [PATCH 21/22] Bug 13855: Use known onions for XMPP servers diff --git a/projects/instantbird/0022-Bug-16606-Automatic-XMPP-accounts.patch b/projects/instantbird/0022-Bug-16606-Automatic-XMPP-accounts.patch index 4d81dbe..7e2dc00 100644 --- a/projects/instantbird/0022-Bug-16606-Automatic-XMPP-accounts.patch +++ b/projects/instantbird/0022-Bug-16606-Automatic-XMPP-accounts.patch @@ -1,4 +1,4 @@ -From e64cd7dfd68993fe6734be0a6cd4eb965c3942b4 Mon Sep 17 00:00:00 2001 +From 44fc8b702b71754b1f86e38b0085f784777298d8 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 21 Aug 2017 23:00:07 -0400 Subject: [PATCH 22/22] Bug 16606: Automatic XMPP accounts

1 0

[tor-messenger-build/esr52] Fix rebase of mozilla/ patches
by sukhbir＠torproject.org 02 Sep '17

02 Sep '17

commit ce272c028576c2c89263c49ffd4c0aab9e9e3f85 Author: Arlo Breault <arlolra(a)gmail.com> Date: Fri Sep 1 18:07:44 2017 -0400 Fix rebase of mozilla/ patches --- .../mozilla/0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch | 12 +++++++----- projects/mozilla/0002-Trac-16475-Block-flash-too.patch | 4 ++-- projects/mozilla/0003-OSX-package-as-tar.bz2.patch | 4 ++-- projects/mozilla/0004-Updater-fixups-for-TM.patch | 4 ++-- ...ermit-storing-exceptions-even-w-inPrivateBrowsingMo.patch | 4 ++-- 5 files changed, 15 insertions(+), 13 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 421eb25..754f617 100644 --- a/projects/mozilla/0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch +++ b/projects/mozilla/0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch @@ -1,9 +1,11 @@ -From 517e61f71f911bc2b2fbed5ccdd5acce1f39f1f6 Mon Sep 17 00:00:00 2001 +From c0d3a7d4edcba39a098e5025271f7b7d59344304 Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> -Date: Tue, 25 Jul 2017 15:51:22 -0400 +Date: Fri, 1 Sep 2017 17:39:04 -0400 Subject: [PATCH 1/5] Trac 19910: Prevents STARTTLS in XMPP - * Revert "Bug #3875: Use Optimistic Data SOCKS variant." + * Revert "Bug 3875: Use Optimistic Data SOCKS variant." + +This reverts commit 9b0df5bf5da258439fb0a697f81e903882c315a9. --- netwerk/base/nsSocketTransport2.cpp | 44 ++++++++----------------------------- netwerk/base/nsSocketTransport2.h | 4 +--- @@ -11,7 +13,7 @@ Subject: [PATCH 1/5] Trac 19910: Prevents STARTTLS in XMPP 3 files changed, 11 insertions(+), 40 deletions(-) diff --git a/netwerk/base/nsSocketTransport2.cpp b/netwerk/base/nsSocketTransport2.cpp -index 4399465fe534..a5df391fb7d5 100644 +index 4399465fe534..1bfd1fc91525 100644 --- a/netwerk/base/nsSocketTransport2.cpp +++ b/netwerk/base/nsSocketTransport2.cpp @@ -1983,26 +1983,7 @@ nsSocketTransport::OnSocketReady(PRFileDesc *fd, int16_t outFlags) @@ -38,7 +40,7 @@ index 4399465fe534..a5df391fb7d5 100644 - } - else if (((mState == STATE_CONNECTING) || (mState = STATE_SENTGET)) && - !gIOService->IsNetTearingDown()) { -+ else if (mState == STATE_CONNECTING) { ++ else if ((mState == STATE_CONNECTING) && !gIOService->IsNetTearingDown()) { // We do not need to do PR_ConnectContinue when we are already // shutting down. diff --git a/projects/mozilla/0002-Trac-16475-Block-flash-too.patch b/projects/mozilla/0002-Trac-16475-Block-flash-too.patch index 31d6238..23a9447 100644 --- a/projects/mozilla/0002-Trac-16475-Block-flash-too.patch +++ b/projects/mozilla/0002-Trac-16475-Block-flash-too.patch @@ -1,6 +1,6 @@ -From 387fbb26920e7c9230647136ff21fef0a4574aa7 Mon Sep 17 00:00:00 2001 +From 9772edfd02bf499342c3089473a807dcf47b2525 Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> -Date: Tue, 25 Jul 2017 15:52:29 -0400 +Date: Thu, 6 Oct 2016 20:13:35 -0700 Subject: [PATCH 2/5] Trac 16475: Block flash too * Builds on "Bug #3547: Block all plugins except flash." diff --git a/projects/mozilla/0003-OSX-package-as-tar.bz2.patch b/projects/mozilla/0003-OSX-package-as-tar.bz2.patch index 1366752..8a9d260 100644 --- a/projects/mozilla/0003-OSX-package-as-tar.bz2.patch +++ b/projects/mozilla/0003-OSX-package-as-tar.bz2.patch @@ -1,6 +1,6 @@ -From bc3be7cdeaee5a30282c4ef42e99a2c38b3709f1 Mon Sep 17 00:00:00 2001 +From 6a753441870fcaf9b1c59f373b59e2242c9f3739 Mon Sep 17 00:00:00 2001 From: Nicolas Vigier <boklm(a)torproject.org> -Date: Tue, 25 Jul 2017 16:17:08 -0400 +Date: Thu, 25 Jun 2015 12:18:43 +0200 Subject: [PATCH 3/5] OSX: package as tar.bz2 --- diff --git a/projects/mozilla/0004-Updater-fixups-for-TM.patch b/projects/mozilla/0004-Updater-fixups-for-TM.patch index 3044404..ab99be9 100644 --- a/projects/mozilla/0004-Updater-fixups-for-TM.patch +++ b/projects/mozilla/0004-Updater-fixups-for-TM.patch @@ -1,6 +1,6 @@ -From 5f2d3904f8d068bb9b48e521d609bc971f34fee3 Mon Sep 17 00:00:00 2001 +From cfc8d680995fed12cc63633699dc28b40bb124a3 Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> -Date: Tue, 25 Jul 2017 16:20:49 -0400 +Date: Fri, 1 Sep 2017 17:45:40 -0400 Subject: [PATCH 4/5] Updater fixups for TM * Remove updater links diff --git a/projects/mozilla/0005-Permit-storing-exceptions-even-w-inPrivateBrowsingMo.patch b/projects/mozilla/0005-Permit-storing-exceptions-even-w-inPrivateBrowsingMo.patch index 2a3b041..5e83e5a 100644 --- a/projects/mozilla/0005-Permit-storing-exceptions-even-w-inPrivateBrowsingMo.patch +++ b/projects/mozilla/0005-Permit-storing-exceptions-even-w-inPrivateBrowsingMo.patch @@ -1,6 +1,6 @@ -From 0de194c75c3667d40ba6c48496c7b710efde2b19 Mon Sep 17 00:00:00 2001 +From 013421c4b0d74bc94fb3b460e7d3bcc0293f9c0f Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> -Date: Tue, 25 Jul 2017 16:24:25 -0400 +Date: Sat, 3 Dec 2016 10:01:52 -0800 Subject: [PATCH 5/5] Permit storing exceptions even w/ inPrivateBrowsingMode ---

1 0

[tor-messenger-build/esr52] Stop building linux with debug symbols
by sukhbir＠torproject.org 02 Sep '17

02 Sep '17

commit cdde464b75dae553cf8ac4e6dfc17256e58caf46 Author: Arlo Breault <arlolra(a)gmail.com> Date: Fri Sep 1 10:01:06 2017 -0400 Stop building linux with debug symbols --- projects/instantbird/mozconfig-linux-i686 | 9 ++------- projects/instantbird/mozconfig-linux-x86_64 | 8 -------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/projects/instantbird/mozconfig-linux-i686 b/projects/instantbird/mozconfig-linux-i686 index ef6a5f2..ae90209 100644 --- a/projects/instantbird/mozconfig-linux-i686 +++ b/projects/instantbird/mozconfig-linux-i686 @@ -1,13 +1,8 @@ -export CFLAGS="-m32 -gdwarf-2 -Wno-sign-compare" -export CXXFLAGS="-m32 -gdwarf-2" +export CFLAGS=-m32 +export CXXFLAGS=-m32 export LDFLAGS=-m32 export XLDOPTS=-m32 export ASFLAGS=-m32 -# For NSS symbols -export MOZ_DEBUG_SYMBOLS=1 -ac_add_options --enable-debug-symbols="-gdwarf-2" - ac_add_options --host=i686-linux-gnu ac_add_options --enable-default-toolkit=cairo-gtk2 -ac_add_options --disable-strip diff --git a/projects/instantbird/mozconfig-linux-x86_64 b/projects/instantbird/mozconfig-linux-x86_64 index 39a36eb..63b610b 100644 --- a/projects/instantbird/mozconfig-linux-x86_64 +++ b/projects/instantbird/mozconfig-linux-x86_64 @@ -1,9 +1 @@ -export CFLAGS="-gdwarf-2 -Wno-sign-compare" -export CXXFLAGS="-gdwarf-2" - -# For NSS symbols -export MOZ_DEBUG_SYMBOLS=1 -ac_add_options --enable-debug-symbols="-gdwarf-2" - ac_add_options --enable-default-toolkit=cairo-gtk2 -ac_add_options --disable-strip

1 0

[tor-messenger-build/esr52] Make Windows build reproducible
by sukhbir＠torproject.org 02 Sep '17

02 Sep '17

commit 9accac5b740962c85e044ae620789a156e3c17be Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Fri Sep 1 18:48:13 2017 -0400 Make Windows build reproducible Borrowed from tor-browser-build.git commit 2a15e10d49e4 --- projects/tor-messenger/build | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/tor-messenger/build b/projects/tor-messenger/build index 1c11ce7..2ae3953 100755 --- a/projects/tor-messenger/build +++ b/projects/tor-messenger/build @@ -119,6 +119,7 @@ MAR=$MARTOOLS/mar MBSDIFF=$MARTOOLS/mbsdiff[% IF c("var/windows") %].exe[% END % [% END %] [% IF c('var/windows') -%] +find tor-messenger -exec [% c("var/touch") %] {} \; makensis tor-messenger.nsi mv tor-messenger-install.exe tor-messenger-install-tmp.exe

1 0

[tor-messenger-build/esr52] Ensure deterministic builds for libotr on macOS
by sukhbir＠torproject.org 02 Sep '17

02 Sep '17

commit 4129992654a3b456e8792602608ab50142e45953 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Fri Sep 1 16:06:30 2017 -0400 Ensure deterministic builds for libotr on macOS --- projects/libgcrypt/build | 7 +++++++ projects/libgcrypt/config | 4 ++++ projects/libgpg-error/build | 7 +++++++ projects/libgpg-error/config | 4 ++++ projects/libotr/build | 7 +++++++ projects/libotr/config | 4 ++++ 6 files changed, 33 insertions(+) diff --git a/projects/libgcrypt/build b/projects/libgcrypt/build index ac27285..d5e1848 100644 --- a/projects/libgcrypt/build +++ b/projects/libgcrypt/build @@ -14,8 +14,15 @@ cd /var/tmp/build/[% project %]-[% c('version') %] 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 %] +[% IF c("var/osx") -%] + export LD_PRELOAD=[% c("var/faketime_path") %] + export FAKETIME="[% USE date; GET date.format(c('timestamp'), format = '%Y-%m-%d %H:%M:%S') %]" +[% END -%] make -j4 make prefix=$distdir install +[% IF c("var/osx") -%] + unset LD_PRELOAD +[% END -%] cd /var/tmp/dist [% c('tar', { tar_src => [ project ], diff --git a/projects/libgcrypt/config b/projects/libgcrypt/config index d9f08fe..33a49a2 100644 --- a/projects/libgcrypt/config +++ b/projects/libgcrypt/config @@ -13,6 +13,10 @@ targets: var: arch_deps: - gettext + osx-x86_64: + var: + arch_deps: + - faketime input_files: - URL: 'ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-[% c("version") %].tar.bz2' sig_ext: sig diff --git a/projects/libgpg-error/build b/projects/libgpg-error/build index 1319786..e2680eb 100644 --- a/projects/libgpg-error/build +++ b/projects/libgpg-error/build @@ -13,8 +13,15 @@ echo 'int main() {}' > src/gen-posix-lock-obj.c [% END -%] 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 %] +[% IF c("var/osx") -%] + export LD_PRELOAD=[% c("var/faketime_path") %] + export FAKETIME="[% USE date; GET date.format(c('timestamp'), format = '%Y-%m-%d %H:%M:%S') %]" +[% END -%] make -j4 make prefix="$distdir" install +[% IF c("var/osx") -%] + unset LD_PRELOAD +[% END -%] cd /var/tmp/dist [% c('tar', { tar_src => [ project ], diff --git a/projects/libgpg-error/config b/projects/libgpg-error/config index 07d5d22..a815397 100644 --- a/projects/libgpg-error/config +++ b/projects/libgpg-error/config @@ -13,6 +13,10 @@ targets: var: arch_deps: - gettext + osx-x86_64: + var: + arch_deps: + - faketime input_files: - URL: 'ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-[% c("version") %].tar.bz2' sig_ext: sig diff --git a/projects/libotr/build b/projects/libotr/build index 2f49602..6edb5d1 100755 --- a/projects/libotr/build +++ b/projects/libotr/build @@ -15,8 +15,15 @@ tar -C /var/tmp/build -xf libotr-[% c('version') %].tar.gz cd /var/tmp/build/libotr-[% c('version') %] export SOURCE_DATE_EPOCH=$(stat -c %Y ChangeLog) ./configure --prefix=$distdir [% c("var/configure_opt") %] +[% IF c("var/osx") -%] + export LD_PRELOAD=[% c("var/faketime_path") %] + export FAKETIME="[% USE date; GET date.format(c('timestamp'), format = '%Y-%m-%d %H:%M:%S') %]" +[% END -%] make -j4 [% IF c("var/windows") %]LDFLAGS='-no-undefined -lssp'[% END %] make prefix=$distdir install +[% IF c("var/osx") -%] + unset LD_PRELOAD +[% END -%] cd /var/tmp/dist [% c('tar', { tar_src => [ project ], diff --git a/projects/libotr/config b/projects/libotr/config index 14a8ea4..12cf34b 100644 --- a/projects/libotr/config +++ b/projects/libotr/config @@ -17,6 +17,10 @@ targets: configure_opt: '--host=i686-w64-mingw32 CFLAGS="[% c("var/CFLAGS_otr") %]" LDFLAGS="[% c("var/LDFLAGS_otr") %]" CC="i686-w64-mingw32-gcc -static-libgcc"' CFLAGS_otr: '[% c("var/CFLAGS") %] -Wl,-Bstatic,-L/var/tmp/dist/libgcrypt/lib,-lgcrypt,-L/var/tmp/dist/libgpg-error/lib,-lgpg-error,-Bdynamic' LDFLAGS_otr: '[% c("var/LDFLAGS") %] -Wl,-Bstatic,-L/var/tmp/dist/libgcrypt/lib,-lgcrypt,-L/var/tmp/dist/libgpg-error/lib,-lgpg-error,-Bdynamic' + osx-x86_64: + var: + arch_deps: + - faketime input_files: - filename: 'libotr-[% c("version") %].tar.gz' URL: 'https://otr.cypherpunks.ca/libotr-[% c("version") %].tar.gz'

1 0

[tor-messenger-build/esr52] Make OS X builds reproducible
by sukhbir＠torproject.org 02 Sep '17

02 Sep '17

commit 40a17907e3422785c495e01bfb5c7c0f6b9e7e11 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Fri Sep 1 17:57:11 2017 -0400 Make OS X builds reproducible This commit makes the OS X builds reproducible. Changes borrowed from tor-browser-build.git (ddmg.sh). --- projects/tor-messenger/build.osx | 3 +++ projects/tor-messenger/config | 1 + 2 files changed, 4 insertions(+) diff --git a/projects/tor-messenger/build.osx b/projects/tor-messenger/build.osx index 5764809..f344153 100755 --- a/projects/tor-messenger/build.osx +++ b/projects/tor-messenger/build.osx @@ -72,6 +72,9 @@ find . ! -executable -exec chmod 644 {} \; find . -type f | sed -e 's/^\.\///' | sort | xargs -i echo "{}={}" > ../filelist.txt find . -type l | sed -e 's/^\.\///' | sort | xargs -i echo "{}={}" >> ../filelist.txt +export LD_PRELOAD=[% c("var/faketime_path") %] +export FAKETIME="[% USE date; GET date.format(c('timestamp'), format = '%Y-%m-%d %H:%M:%S') %]" + genisoimage -D -V "Tor Messenger" -no-pad -R -apple -o ../TorMessenger-uncompressed.dmg -path-list ../filelist.txt -graft-points -gid 20 -dir-mode 0755 -new-dir-mode 0755 cd .. OUTDIR='[% dest_dir _ "/" _ c("filename") %]' diff --git a/projects/tor-messenger/config b/projects/tor-messenger/config index 56f1854..ee2f401 100644 --- a/projects/tor-messenger/config +++ b/projects/tor-messenger/config @@ -68,6 +68,7 @@ targets: mar_osname: osx64 arch_deps: - genisoimage + - faketime - bsdtar linux-i686: var:

1 0

[tor-messenger-build/esr52] Update changelog for 4129992 and 40a1790
by sukhbir＠torproject.org 02 Sep '17

02 Sep '17

commit e392f3abf5ca1cd956ab6ce1e01d59d79a7cf748 Author: Arlo Breault <arlolra(a)gmail.com> Date: Fri Sep 1 18:13:10 2017 -0400 Update changelog for 4129992 and 40a1790 --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 5c74e59..26e3181 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,7 @@ Tor Messenger 0.5.0b1 -- * Trac 13855: Use known onions for XMPP servers * Mac * Trac 20316: Update OS X toolchain + * Trac 10942: Deterministic builds for Instantbird * Windows * Trac 17469: Tor Messenger is not working on Windows XP

1 0