November 2015 - tor-commits - lists.torproject.org

[tor/master] Changes to 3199 branch based on feedback from special
by nickm＠torproject.org 17 Nov '15

17 Nov '15

commit 661e5bdbfae8f66a5b12caeb8636e665186bcc55 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 17 08:26:04 2015 -0500 Changes to 3199 branch based on feedback from special --- src/or/main.c | 24 ++++++++++++------------ src/or/periodic.c | 10 ++++++---- src/or/periodic.h | 13 +++++++------ 3 files changed, 25 insertions(+), 22 deletions(-) diff --git a/src/or/main.c b/src/or/main.c index 1dd791f..9fc6035 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1455,7 +1455,7 @@ run_scheduled_events(time_t now) dirvote_act(options, now); } - /* 3a. Every second, we examine pending circuits and prune the + /* 3a. Every second, we examine pending circuits and prune the * ones which have been pending for more than a few seconds. * We do this before step 4, so it can try building more if * it's not comfortable with the number of available circuits. @@ -1545,7 +1545,7 @@ rotate_onion_key_callback(time_t now, const or_options_t *options) router_upload_dir_desc_to_dirservers(0); return MIN_ONION_KEY_LIFETIME; } - return -1; + return PERIODIC_EVENT_NO_UPDATE; } static int @@ -1562,21 +1562,21 @@ check_ed_keys_callback(time_t now, const or_options_t *options) } return 30; } - return -1; + return PERIODIC_EVENT_NO_UPDATE; } static int launch_descriptor_fetches_callback(time_t now, const or_options_t *options) { if (should_delay_dir_fetches(options, NULL)) - return -1; + return PERIODIC_EVENT_NO_UPDATE; update_all_descriptor_downloads(now); update_extrainfo_downloads(now); if (router_have_minimum_dir_info()) return LAZY_DESCRIPTOR_RETRY_INTERVAL; else - return GREEDY_DESCRIPTOR_RETRY_INTERVAL; + return GREEDY_DESCRIPTOR_RETRY_INTERVAL; } static int @@ -1609,7 +1609,7 @@ rotate_x509_certificate_callback(time_t now, const or_options_t *options) /* We also make sure to rotate the TLS connections themselves if they've * been up for too long -- but that's done via is_bad_for_new_circs in - * connection_run_housekeeping() above. */ + * run_connection_housekeeping() above. */ return MAX_SSL_KEY_LIFETIME_INTERNAL; } @@ -1763,7 +1763,7 @@ record_bridge_stats_callback(time_t now, const or_options_t *options) * next time bridge mode is turned on. */ should_init_bridge_stats = 1; } - return -1; + return PERIODIC_EVENT_NO_UPDATE; } static int @@ -1877,7 +1877,7 @@ fetch_networkstatus_callback(time_t now, const or_options_t *options) #define networkstatus_dl_check_interval(o) ((o)->TestingTorNetwork ? 1 : 60) if (should_delay_dir_fetches(options, NULL)) - return -1; + return PERIODIC_EVENT_NO_UPDATE; update_networkstatus_downloads(now); return networkstatus_dl_check_interval(options); @@ -1893,7 +1893,7 @@ retry_listeners_callback(time_t now, const or_options_t *options) retry_all_listeners(NULL, NULL, 0); return 60; } - return -1; + return PERIODIC_EVENT_NO_UPDATE; } static int @@ -1914,7 +1914,7 @@ check_dns_honesty_callback(time_t now, const or_options_t *options) if (net_is_disabled() || ! public_server_mode(options) || router_my_exit_policy_is_reject_star()) - return -1; + return PERIODIC_EVENT_NO_UPDATE; static int first_time = 1; if (first_time) { @@ -1936,7 +1936,7 @@ write_bridge_ns_callback(time_t now, const or_options_t *options) #define BRIDGE_STATUSFILE_INTERVAL (30*60) return BRIDGE_STATUSFILE_INTERVAL; } - return -1; + return PERIODIC_EVENT_NO_UPDATE; } static int @@ -1945,7 +1945,7 @@ check_fw_helper_app_callback(time_t now, const or_options_t *options) if (net_is_disabled() || ! server_mode(options) || ! options->PortForwarding) { - return -1; + return PERIODIC_EVENT_NO_UPDATE; } /* 11. check the port forwarding app */ diff --git a/src/or/periodic.c b/src/or/periodic.c index 708c009..e21b1af 100644 --- a/src/or/periodic.c +++ b/src/or/periodic.c @@ -12,8 +12,9 @@ #include <event.h> #endif -/** We disable any interval greate than this number of seconds, on the ground - * that it is probably an absolute time mistakenly passed in as a relative time. +/** We disable any interval greater than this number of seconds, on the + * grounds that it is probably an absolute time mistakenly passed in as a + * relative time. */ static const int MAX_INTERVAL = 10 * 365 * 86400; @@ -41,6 +42,7 @@ periodic_event_dispatch(evutil_socket_t fd, short what, void *data) time_t now = time(NULL); const or_options_t *options = get_options(); + log_debug(LD_GENERAL, "Dispatching %s", event->name); int r = event->fn(now, options); int next_interval = 0; @@ -63,10 +65,10 @@ periodic_event_dispatch(evutil_socket_t fd, short what, void *data) next_interval = 1; } + log_debug(LD_GENERAL, "Scheduling %s for %d seconds", event->name, + next_interval); struct timeval tv = { next_interval , 0 }; event_add(event->ev, &tv); - - log_info(LD_GENERAL, "Dispatching %s", event->name); } /** Schedules event to run as soon as possible from now. */ diff --git a/src/or/periodic.h b/src/or/periodic.h index e57666c..a77f411 100644 --- a/src/or/periodic.h +++ b/src/or/periodic.h @@ -4,12 +4,13 @@ #ifndef TOR_PERIODIC_H #define TOR_PERIODIC_H -/** Callback function for a periodic event to take action. -* The return value influences the next time the function will get called. -* Return -1 to not update last_action_time and be polled again in -* the next second. If a positive value is returned it will update the -* interval time. If the returned value is larger than now then it -* is assumed to be a future time to poll again. */ +#define PERIODIC_EVENT_NO_UPDATE (-1) + +/** Callback function for a periodic event to take action. The return value +* influences the next time the function will get called. Return +* PERIODIC_EVENT_NO_UPDATE to not update last_action_time and be polled +* again in the next second. If a positive value is returned it will update the +* interval time. */ typedef int (*periodic_event_helper_t)(time_t now, const or_options_t *options);

1 0

[tor/master] Add documentation for periodic event api
by nickm＠torproject.org 17 Nov '15

17 Nov '15

commit eb721ed2d9f3abc049b92b904f5d47d08bae9311 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 16 10:40:23 2015 -0500 Add documentation for periodic event api --- src/or/main.c | 23 +++++++++++++++++++---- src/or/periodic.c | 10 +++++++--- 2 files changed, 26 insertions(+), 7 deletions(-) diff --git a/src/or/main.c b/src/or/main.c index d5d4112..1dd791f 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1228,9 +1228,11 @@ get_signewnym_epoch(void) return newnym_epoch; } -/** DOCDOC */ +/** True iff we have initialized all the members of periodic_events. + * Used to prevent double-initialization. */ static int periodic_events_initialized = 0; +/* Declare all the timer callback functions... */ #define CALLBACK(name) \ static int name ## _callback(time_t, const or_options_t *) CALLBACK(rotate_onion_key); @@ -1260,6 +1262,8 @@ CALLBACK(check_fw_helper_app); CALLBACK(heartbeat); #undef CALLBACK + +/* Now we declare an array of periodic_event_item_t for each periodic event */ #define CALLBACK(name) PERIODIC_EVENT(name) static periodic_event_item_t periodic_events[] = { @@ -1292,6 +1296,10 @@ static periodic_event_item_t periodic_events[] = { }; #undef CALLBACK +/* These are pointers to members of periodic_events[] that are used to + * implement particular callbacks. We keep them separate here so that we + * can access them by name. We also keep them inside periodic_events[] + * so that we can implement "reset all timers" in a reasaonable way. */ static periodic_event_item_t *check_descriptor_event=NULL; static periodic_event_item_t *fetch_networkstatus_event=NULL; static periodic_event_item_t *launch_descriptor_fetches_event=NULL; @@ -1311,7 +1319,9 @@ reset_all_main_loop_timers(void) } } -/**DOCDOC*/ +/** Return the member of periodic_events[] whose name is name. + * Return NULL if no such event is found. + */ static periodic_event_item_t * find_periodic_event(const char *name) { @@ -1323,7 +1333,11 @@ find_periodic_event(const char *name) return NULL; } -/** DOCDOC */ +/** Helper, run one second after setup: + * Initializes all members of periodic_events and starts them running. + * + * (We do this one second after setup for backward-compatibility reasons; + * it might not actually be necessary.) */ static void initialize_periodic_events_cb(evutil_socket_t fd, short events, void *data) { @@ -1336,7 +1350,8 @@ initialize_periodic_events_cb(evutil_socket_t fd, short events, void *data) } } -/** DOCDOC */ +/** Set up all the members of periodic_events[], and configure them all to be + * launched from a callback. */ static void initialize_periodic_events(void) { diff --git a/src/or/periodic.c b/src/or/periodic.c index 44e1714..708c009 100644 --- a/src/or/periodic.c +++ b/src/or/periodic.c @@ -12,9 +12,13 @@ #include <event.h> #endif +/** We disable any interval greate than this number of seconds, on the ground + * that it is probably an absolute time mistakenly passed in as a relative time. + */ static const int MAX_INTERVAL = 10 * 365 * 86400; -/** DOCDOC */ +/** Set the event event to run in next_interval seconds from + * now. */ static void periodic_event_set_interval(periodic_event_item_t *event, time_t next_interval) @@ -65,7 +69,7 @@ periodic_event_dispatch(evutil_socket_t fd, short what, void *data) log_info(LD_GENERAL, "Dispatching %s", event->name); } -/** DOCDOC */ +/** Schedules event to run as soon as possible from now. */ void periodic_event_reschedule(periodic_event_item_t *event) { @@ -92,7 +96,7 @@ periodic_event_launch(periodic_event_item_t *event) periodic_event_dispatch(-1, EV_TIMEOUT, event); } -/** DOCDOC */ +/** Release all storage associated with event */ void periodic_event_destroy(periodic_event_item_t *event) {

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 17 Nov '15

17 Nov '15

commit 44d3b253bc0134eaa27fb32132c60056452dbaf6 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Nov 17 12:15:18 2015 +0000 Update translations for liveusb-creator --- hu/hu.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hu/hu.po b/hu/hu.po index 0b0d8e1..ed7ecb9 100644 --- a/hu/hu.po +++ b/hu/hu.po @@ -17,7 +17,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-02 21:23+0100\n" -"PO-Revision-Date: 2015-11-15 07:58+0000\n" +"PO-Revision-Date: 2015-11-17 12:03+0000\n" "Last-Translator: benewfy <benewfy(a)gmail.com>\n" "Language-Team: Hungarian (http://www.transifex.com/otf/torproject/language/hu/)\n" "MIME-Version: 1.0\n" @@ -66,7 +66,7 @@ msgid "" "p, li { white-space: pre-wrap; }\n" "</style></head><body style=\" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;\">\n" "Need help? Read the <a href=\"file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\">documentation</a>.</body></html>" -msgstr "" +msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;\">\nSegítségre van szükséged? Olvasd el a <a href=\"file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\">dokumentációt</a>.</body></html>" #: ../liveusb/launcher_ui.py:155 msgid ""

1 0

[tor-browser/tor-browser-38.4.0esr-5.5-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 17 Nov '15

17 Nov '15

commit 910844e490662894031a8b73a24093ddeda9e4f0 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Nov 13 14:46:37 2015 +0000 fixup! TB4: Tor Browser's Firefox preference overrides. Bug 17369: Disable RC4 fallback. --- browser/app/profile/000-tor-browser.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index c0fce16..1de3ed1 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -242,6 +242,9 @@ pref("network.jar.block-remote-files", false); // Enable TLS 1.1 and 1.2: // https://trac.torproject.org/projects/tor/ticket/11253 pref("security.tls.version.max", 3); +// Disable RC4 fallback. This will go live in Firefox 44, Chrome and IE/Edge: +// https://blog.mozilla.org/security/2015/09/11/deprecating-the-rc4-cipher/ +pref("security.tls.unrestricted_rc4_fallback", false); // Enforce certificate pinning, see: https://bugs.torproject.org/16206 pref("security.cert_pinning.enforcement_level", 2);

1 0

[tor-messenger-build/master] Prevent auto login at startup
by arlo＠torproject.org 17 Nov '15

17 Nov '15

commit 4f9934fae3244b99262d45ec8039e12ab0517926 Author: Arlo Breault <arlolra(a)gmail.com> Date: Mon Nov 16 20:45:14 2015 -0800 Prevent auto login at startup * Trac 16489 --- ChangeLog | 1 + projects/instantbird/config | 1 + projects/instantbird/trac-16489.patch | 158 +++++++++++++++++++++++++++++++++ 3 files changed, 160 insertions(+) diff --git a/ChangeLog b/ChangeLog index d8c16df..5615014 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,7 @@ Tor Messenger 0.1.0b4 -- * Bug 17539: Pass username when interpolating resent string * Bug 15179: Add an OTR Preferences item to the Tools menu * Use the FIREFOX_42_0_RELEASE tag on mozilla-release + * Bug 16489: Prevent automatic logins at startup * Mac * Bug 16476: Themes preference is positioned incorrectly * Bug 17456: Hang in preferences menu diff --git a/projects/instantbird/config b/projects/instantbird/config index 638339d..22c1bb3 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -72,6 +72,7 @@ input_files: - filename: xmppRegister.xul - filename: xmpp-gtalk-resource.patch - filename: trac-17552.patch + - filename: trac-16489.patch - filename: version.patch - filename: search-context-menu.patch - filename: search-preferences-xul.patch diff --git a/projects/instantbird/trac-16489.patch b/projects/instantbird/trac-16489.patch new file mode 100644 index 0000000..579b286 --- /dev/null +++ b/projects/instantbird/trac-16489.patch @@ -0,0 +1,158 @@ +# HG changeset patch +# User Arlo Breault <arlolra(a)gmail.com> +# Date 1447735073 28800 +# Mon Nov 16 20:37:53 2015 -0800 +# Node ID dd2cd9b18e3a356e227d02beec052f8591509cec +# Parent 073468887b0faecb810a6e4463a2806924fead81 +trac 16489 - autologin + +diff --git a/chat/components/src/imAccounts.js b/chat/components/src/imAccounts.js +--- a/chat/components/src/imAccounts.js ++++ b/chat/components/src/imAccounts.js +@@ -583,17 +583,17 @@ imAccount.prototype = { + if (aException.result != Components.results.NS_ERROR_ABORT) + throw aException; + + gUserCanceledMasterPasswordPrompt = true; + executeSoon(function () { gUserCanceledMasterPasswordPrompt = false; }); + }, + + get autoLogin() { +- let autoLogin = true; ++ let autoLogin = false; + try { + autoLogin = this.prefBranch.getBoolPref(kPrefAccountAutoLogin); + } catch (e) { } + return autoLogin; + }, + set autoLogin(val) { + this.prefBranch.setBoolPref(kPrefAccountAutoLogin, val); + SavePrefTimer.initTimer(); +diff --git a/im/content/account.xml b/im/content/account.xml +--- a/im/content/account.xml ++++ b/im/content/account.xml +@@ -36,20 +36,16 @@ + <xul:description class="error" anonid="error"/> + <xul:description class="error" anonid="reconnect"/> + <xul:label class="addException text-link" + onclick="gAccountManager.addException()" + value="&certmgr.addException.label;" + accesskey="&certmgr.addException.accesskey;"/> + <xul:spacer flex="1"/> + </xul:vbox> +- <xul:checkbox label="&account.autoSignOn.label;" dir="reverse" +- xbl:inherits="checked=autologin" class="autoSignOn" +- accesskey="&account.autoSignOn.accesskey;" +- oncommand="gAccountManager.autologin()"/> + </xul:hbox> + <xul:hbox flex="1" class="account-buttons" anonid="buttons" + xbl:inherits="autologin"/> + </xul:vbox> + </content> + <implementation> + <method name="build"> + <parameter name="aAccount"/> +diff --git a/im/content/accountWizard.js b/im/content/accountWizard.js +--- a/im/content/accountWizard.js ++++ b/im/content/accountWizard.js +@@ -430,32 +430,23 @@ var accountWizard = { + case opt.typeString: + case opt.typeList: + acc.setString(option.name, option.value); + break; + default: + throw "unknown type"; + } + } +- let autologin = this.getValue("connectAutomatically"); +- acc.autoLogin = autologin; ++ acc.autoLogin = false; + + if (this.proto.usePurpleProxy) + acc.proxyInfo = this.proxy; + + acc.save(); + +- try { +- if (autologin) +- acc.connect(); +- } catch (e) { +- // If the connection fails (for example if we are currently in +- // offline mode), we still want to close the account wizard +- } +- + if (window.opener) { + let am = window.opener.gAccountManager; + if (am) + am.selectAccount(acc.id); + } + + return true; + }, +diff --git a/im/content/accountWizard.xul b/im/content/accountWizard.xul +--- a/im/content/accountWizard.xul ++++ b/im/content/accountWizard.xul +@@ -132,13 +132,11 @@ + <separator/> + <grid id="summarygrid" flex="1"> + <columns> + <column/> + <column flex="1"/> + </columns> + <rows id="summaryRows"/> + </grid> +- <separator/> +- <checkbox id="connectAutomatically" label= "&accountSummary.connectAutomatically.label;" checked="true"/> + </wizardpage> + + </wizard> +diff --git a/im/content/preferences/main.xul b/im/content/preferences/main.xul +--- a/im/content/preferences/main.xul ++++ b/im/content/preferences/main.xul +@@ -15,46 +15,28 @@ + <overlay id="MainPaneOverlay" + xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> + + <prefpane id="paneMain" onpaneload="gMainPane.init();"> + + <script type="application/javascript" src="chrome://instantbird/content/preferences/main.js"/> + + <preferences id="mainPreferences"> +- <preference id="messenger.startup.action" name="messenger.startup.action" type="int"/> + <preference id="messenger.options.playSounds.blist" name="messenger.options.playSounds.blist" type="bool"/> + <preference id="messenger.options.playSounds.message" name="messenger.options.playSounds.message" type="bool"/> + <preference id="messenger.options.getAttentionOnNewMessages" name="messenger.options.getAttentionOnNewMessages" type="bool"/> + #ifdef XP_MACOSX + <preference id="messenger.options.showUnreadCountInDock" name="messenger.options.showUnreadCountInDock" type="bool"/> + #else + <preference id="extensions.mintrayr.alwaysShowTrayIcon" name="extensions.mintrayr.alwaysShowTrayIcon" type="bool"/> + <preference id="extensions.mintrayr.minimizeon" name="extensions.mintrayr.minimizeon" type="int"/> + #endif + <preference id="messenger.options.notifyOfNewMessages" name="messenger.options.notifyOfNewMessages" type="bool"/> + </preferences> + +-  +- <groupbox id="startupGroup"> +- <caption label="&startup.label;"/> +- +- <hbox align="center"> +- <label value="&startupAction.label;" accesskey="&startupAction.accesskey;" +- control="messengerStartupAction"/> +- <menulist id="messengerStartupAction" preference="messenger.startup.action"> +- <menupopup> +- <menuitem label="&startupOffline.label;" value="0"/> +- <menuitem label="&startupConnectAuto.label;" value="1"/> +- </menupopup> +- </menulist> +- </hbox> +- </groupbox> +- +- + <groupbox id="accountsMgrGroup" orient="horizontal" align="center"> + <caption label="&accountsMgr.label;"/> + + <description control="manageAccounts" + #ifdef XP_WIN + flex="1">&manageAccountsDescWin.label;</description> + #else + flex="1">&manageAccountsDescUnix2.label;</description>

1 0

[gettor/develop] Simple logging string for stats (Deleted redundant info)
by ilv＠torproject.org 17 Nov '15

17 Nov '15

commit 9c10511a8f0ae3e88a7ae9fa3785108995fe66e1 Author: ilv <ilv(a)users.noreply.github.com> Date: Tue Nov 17 00:37:49 2015 -0300 Simple logging string for stats (Deleted redundant info) --- gettor/smtp.py | 13 +++++-------- gettor/twitter.py | 11 ++++------- gettor/xmpp.py | 13 +++++-------- 3 files changed, 14 insertions(+), 23 deletions(-) diff --git a/gettor/smtp.py b/gettor/smtp.py index 9203039..d6de2ed 100644 --- a/gettor/smtp.py +++ b/gettor/smtp.py @@ -462,14 +462,14 @@ class SMTP(object): norm_from_addr = self._get_normalized_address(from_addr) except AddressError as e: bogus_request = True - self.log.info('REQUEST: invalid; OS: none; LC: none') + self.log.info('invalid; none; none') if norm_from_addr: anon_addr = utils.get_sha256(norm_from_addr) if self._is_blacklisted(anon_addr): bogus_request = True - self.log.info('REQUEST: blacklist; OS: none; LC: none') + self.log.info('blacklist; none; none') if not bogus_request: # try to figure out what the user is asking @@ -482,8 +482,7 @@ class SMTP(object): # possible options: help, links, mirrors if req['type'] == 'help': self.log.debug("Trying to send help...") - self.log.info('REQUEST: help; OS: none; LC: %s' % - req['lc']) + self.log.info('help; none; %s' % req['lc']) # make sure we can send emails try: self._send_help('en', our_addr, norm_from_addr) @@ -494,8 +493,7 @@ class SMTP(object): elif req['type'] == 'mirrors': self.log.debug("Trying to send the mirrors...") - self.log.info('REQUEST: mirrors; OS: none; LC: %s' % - req['lc']) + self.log.info('mirrors; none; %s' % req['lc']) # make sure we can send emails try: self._send_mirrors('en', our_addr, norm_from_addr) @@ -506,8 +504,7 @@ class SMTP(object): elif req['type'] == 'links': self.log.debug("Trying to obtain the links...") - self.log.info('REQUEST: links; OS: %s; LC: %s' % - req['os '], req['lc']) + self.log.info('links; %s; %s' % (req['os '], req['lc'])) try: links = self.core.get_links( diff --git a/gettor/twitter.py b/gettor/twitter.py index 85cad47..f4b934f 100644 --- a/gettor/twitter.py +++ b/gettor/twitter.py @@ -218,7 +218,7 @@ class TwitterBot(object): try: if self._is_blacklisted(str(sender_id)): - self.log.info('REQUEST: blacklist; OS: none; LC: none') + self.log.info('blacklist; none; none') bogus_request = True if not bogus_request: @@ -228,8 +228,7 @@ class TwitterBot(object): # possible options: links, mirrors, help if request['type'] == 'links': - self.log.info('REQUEST: links; OS: %s; LC: %s' % - (req['os'], req['lc'])) + self.log.info('links; %s; %s' % (req['os'], req['lc'])) links = self.core.get_links( 'Twitter', request['os'], @@ -240,8 +239,7 @@ class TwitterBot(object): reply = reply % (request['os'], request['lc'], links) elif request['type'] == 'mirrors': - self.log.info('REQUEST: mirrors; OS: none; LC: %s' % - req['lc']) + self.log.info('mirrors; none; %s' % req['lc']) reply = self._get_msg('mirrors', 'en') try: with open(self.mirrors, "r") as list_mirrors: @@ -252,8 +250,7 @@ class TwitterBot(object): reply = self._get_msg('mirrors_unavailable', 'en') else: - self.log.info('REQUEST: help; OS: none; LC: %s' % - req['lc']) + self.log.info('help; none; %s' % req['lc']) reply = self._get_msg('help', 'en') self.api.send_direct_message( diff --git a/gettor/xmpp.py b/gettor/xmpp.py index 072d988..1bea716 100644 --- a/gettor/xmpp.py +++ b/gettor/xmpp.py @@ -277,7 +277,7 @@ class XMPP(object): self.log.debug("Parsing request") try: if self._is_blacklisted(str(account)): - self.log.info('REQUEST: blacklist; OS: none; LC: none') + self.log.info('blacklist; none; none') bogus_request = True # first let's find out how many words are in the message @@ -286,7 +286,7 @@ class XMPP(object): if len(words) > self.max_words: bogus_request = True self.log.info("Message way too long") - self.log.info('REQUEST: invalid; OS: none; LC: none') + self.log.info('invalid; none; none') reply = self._get_msg('message_error', 'en') if not bogus_request: @@ -295,13 +295,11 @@ class XMPP(object): req = self._parse_text(str(msg)) if req['type'] == 'help': - self.log.info('REQUEST: help; OS: none; LC: %s' % - req['lc']) + self.log.info('help; none; %s' % req['lc']) reply = self._get_msg('help', 'en') elif req['type'] == 'mirrors': - self.log.info('REQUEST: mirrors; OS: none; LC: %s' % - req['lc']) + self.log.info('mirrors; none; %s' % req['lc']) reply = self._get_msg('mirrors', 'en') try: with open(self.mirrors, "r") as list_mirrors: @@ -311,8 +309,7 @@ class XMPP(object): reply = self._get_msg('mirrors_unavailable', 'en') elif req['type'] == 'links': - self.log.info('REQUEST: links; OS: %s; LC: %s' % - (req['os'], req['lc'])) + self.log.info('links; %s; %s' % (req['os'], req['lc'])) links = self.core.get_links( "XMPP", req['os'],

1 0

[gettor/develop] Updated sample log file with blacklist and invalid requests examples
by ilv＠torproject.org 16 Nov '15

16 Nov '15

commit 4bea6bb708e6d0a9f6e17b173d9c4411c62e89e9 Author: ilv <ilv(a)users.noreply.github.com> Date: Mon Nov 16 15:23:00 2015 -0300 Updated sample log file with blacklist and invalid requests examples --- log/smtp.log | 3 +++ 1 file changed, 3 insertions(+) diff --git a/log/smtp.log b/log/smtp.log index 3950925..1e436c1 100644 --- a/log/smtp.log +++ b/log/smtp.log @@ -1,3 +1,6 @@ [INFO] DATE: 2015-11-16; REQUEST: help; OS: none; LC: fa [INFO] DATE: 2015-11-16; REQUEST: links; OS: windows; LC: zh +[INFO] DATE: 2015-11-16; REQUEST: blacklist; OS: none; LC: none [INFO] DATE: 2015-11-16; REQUEST: mirrors; OS: none; LC: tr +[INFO] DATE: 2015-11-16; REQUEST: invalid; OS: none; LC: none +

1 0

[gettor/develop] Deleted database interaction from channels and core. Added new logging strings for stats purposes (See #17588).
by ilv＠torproject.org 16 Nov '15

16 Nov '15

commit 553519a8d4fd0f1514cca164def386a96e393328 Author: ilv <ilv(a)users.noreply.github.com> Date: Mon Nov 16 15:19:44 2015 -0300 Deleted database interaction from channels and core. Added new logging strings for stats purposes (See #17588). --- gettor/core.py | 11 ----------- gettor/smtp.py | 40 +++++++++------------------------------- gettor/twitter.py | 51 ++++++++++++++++++++------------------------------- gettor/utils.py | 15 +++++++++------ gettor/xmpp.py | 28 ++++++++-------------------- log/smtp.log | 3 +++ 6 files changed, 49 insertions(+), 99 deletions(-) diff --git a/gettor/core.py b/gettor/core.py index 6336e04..3d946c9 100644 --- a/gettor/core.py +++ b/gettor/core.py @@ -469,14 +469,3 @@ class Core(object): else: self.log.debug("FAILED (links file doesn't seem legit)") raise LinkFileError("No links file for %s" % provider) - - def add_request_to_db(self): - """Add request to database.""" - self.log.debug("Trying to add request to database") - try: - self.db.connect() - self.db.add_request() - self.log.debug("Request added!") - except db.DBError as e: - self.log.debug("FAILED %s" % str(e)) - raise InternalError("Couldn't add request to database %s" % str(e)) diff --git a/gettor/smtp.py b/gettor/smtp.py index 3697786..9203039 100644 --- a/gettor/smtp.py +++ b/gettor/smtp.py @@ -461,24 +461,15 @@ class SMTP(object): self.log.debug("Normalizing address...") norm_from_addr = self._get_normalized_address(from_addr) except AddressError as e: - status = 'malformed' bogus_request = True - self.log.debug("Address is malformed!") - # it might be interesting to know what triggered this - # we are not logging this for now - # logfile = self._log_email('malformed', content) + self.log.info('REQUEST: invalid; OS: none; LC: none') if norm_from_addr: - self.log.debug("Anonymizing address...") anon_addr = utils.get_sha256(norm_from_addr) if self._is_blacklisted(anon_addr): - status = 'blacklisted' bogus_request = True - self.log.debug("Address is blacklisted!") - # it might be interesting to know extra info - # we are not logging this for now - # logfile = self._log_email(anon_addr, content) + self.log.info('REQUEST: blacklist; OS: none; LC: none') if not bogus_request: # try to figure out what the user is asking @@ -487,45 +478,43 @@ class SMTP(object): # our address should have the locale requested our_addr = "gettor+%s@%s" % (req['lc'], self.our_domain) - self.log.debug("Replying from %s" % our_addr) # possible options: help, links, mirrors if req['type'] == 'help': - self.log.debug("Type of request: help") self.log.debug("Trying to send help...") + self.log.info('REQUEST: help; OS: none; LC: %s' % + req['lc']) # make sure we can send emails try: self._send_help('en', our_addr, norm_from_addr) - status = 'success' except SendEmailError as e: - status = 'internal_error' self.log.debug("FAILED: %s" % str(e)) raise InternalError("Something's wrong with the SMTP " "server: %s" % str(e)) elif req['type'] == 'mirrors': - self.log.debug("Type of request: mirrors") self.log.debug("Trying to send the mirrors...") + self.log.info('REQUEST: mirrors; OS: none; LC: %s' % + req['lc']) # make sure we can send emails try: self._send_mirrors('en', our_addr, norm_from_addr) - status = 'success' except SendEmailError as e: - status = 'internal_error' self.log.debug("FAILED: %s" % str(e)) raise SendEmailError("Something's wrong with the SMTP " "server: %s" % str(e)) elif req['type'] == 'links': - self.log.debug("Type of request: links") self.log.debug("Trying to obtain the links...") + self.log.info('REQUEST: links; OS: %s; LC: %s' % + req['os '], req['lc']) + try: links = self.core.get_links( 'SMTP', req['os'], req['lc'] ) # if core fails, we fail too except (core.InternalError, core.ConfigError) as e: - status = 'core_error' self.log.debug("FAILED: %s" % str(e)) # something went wrong with the core raise InternalError("Error obtaining the links") @@ -535,19 +524,8 @@ class SMTP(object): try: self._send_links(links, req['lc'], req['os'], our_addr, norm_from_addr) - status = 'success' except SendEmailError as e: - status = 'internal_error' self.log.debug("FAILED: %s" % str(e)) raise SendEmailError("Something's wrong with the SMTP " "server: %s" % str(e)) self.log.debug("Mail sent!") - finally: - # keep stats - if req: - self.log.debug("Adding request to database... ") - try: - self.core.add_request_to_db() - self.log.debug("Request added") - except InternalError as e: - self.log.debug("FAILED: %s" % str(e)) diff --git a/gettor/twitter.py b/gettor/twitter.py index 13666a3..85cad47 100644 --- a/gettor/twitter.py +++ b/gettor/twitter.py @@ -24,6 +24,7 @@ import blacklist """Twitter channel for distributing links to download Tor Browser.""" + class ConfigError(Exception): pass @@ -51,7 +52,7 @@ class TwitterBot(object): :param: cfg (string) the path of the configuration file. """ - + default_cfg = 'twitter.cfg' config = ConfigParser.ConfigParser() @@ -107,10 +108,8 @@ class TwitterBot(object): logfileh.setLevel(logging.getLevelName(loglevel)) log.addHandler(logfileh) - # stop logging on stdout from now on - #log.propagate = False self.log = log - + def _is_blacklisted(self, username): """Check if a user is blacklisted. @@ -141,7 +140,6 @@ class TwitterBot(object): Return: a string containing the given message. """ - #self.log.debug("Getting message '%s' for locale %s" % (msgid, lc)) try: t = gettext.translation(lc, self.i18ndir, languages=[lc]) _ = t.ugettext @@ -161,7 +159,7 @@ class TwitterBot(object): :return: request (list) 3-tuple with locale, os and type of request. """ - + # core knows what OS are supported supported_os = self.core.get_supported_os() supported_lc = self.core.get_supported_lc() @@ -198,7 +196,7 @@ class TwitterBot(object): req['type'] = 'mirrors' if (found_lc and found_os) or (found_lc and found_mirrors): break - + return req def parse_request(self, dm): @@ -220,31 +218,30 @@ class TwitterBot(object): try: if self._is_blacklisted(str(sender_id)): - self.log.info("Request from blacklisted account!") - status = 'blacklisted' + self.log.info('REQUEST: blacklist; OS: none; LC: none') bogus_request = True if not bogus_request: self.log.debug("Request seems legit, let's parse it") # let's try to guess what the user is asking request = self.parse_text(str(msg)) - + # possible options: links, mirrors, help if request['type'] == 'links': - self.log.debug("Type of request: links") + self.log.info('REQUEST: links; OS: %s; LC: %s' % + (req['os'], req['lc'])) links = self.core.get_links( 'Twitter', request['os'], request['lc'] ) - + reply = self._get_msg('links', 'en') reply = reply % (request['os'], request['lc'], links) - elif request['type'] == 'mirrors': - self.log.debug("Type of request: mirrors") - status = 'success' + self.log.info('REQUEST: mirrors; OS: none; LC: %s' % + req['lc']) reply = self._get_msg('mirrors', 'en') try: with open(self.mirrors, "r") as list_mirrors: @@ -255,10 +252,10 @@ class TwitterBot(object): reply = self._get_msg('mirrors_unavailable', 'en') else: - self.log.debug("Type of request: help") - status = 'success' + self.log.info('REQUEST: help; OS: none; LC: %s' % + req['lc']) reply = self._get_msg('help', 'en') - + self.api.send_direct_message( user_id=sender_id, text=reply @@ -267,25 +264,18 @@ class TwitterBot(object): except (core.ConfigError, core.InternalError) as e: # if core failes, send the user an error message, but keep going self.log.error("Something went wrong internally: %s" % str(e)) - status = 'core_error' reply = self._get_msg('internal_error', 'en') - finally: - # keep stats - if request: - self.log.debug("Adding request to database... ") - self.core.add_request_to_db() - def start(self): """ Start the bot for handling requests. Start a new Twitter bot. """ self.auth = tweepy.OAuthHandler( - self.api_key, + self.api_key, self.api_secret ) - + self.auth.set_access_token( self.access_token, self.token_secret @@ -293,11 +283,10 @@ class TwitterBot(object): self.api = tweepy.API(self.auth) self.bot_info = self.api.me() - + stream = tweepy.Stream( - auth = self.api.auth, + auth=self.api.auth, listener=GetTorStreamListener(self) ) - - stream.userstream() + stream.userstream() diff --git a/gettor/utils.py b/gettor/utils.py index b4ab9c6..8224f25 100644 --- a/gettor/utils.py +++ b/gettor/utils.py @@ -16,25 +16,28 @@ import hashlib """Common utilities for GetTor modules.""" -LOGGING_FORMAT = "[%(levelname)s] %(asctime)s - %(message)s" -DATE_FORMAT = "%Y-%m-%d" # %H:%M:%S +LOGGING_FORMAT = "[%(levelname)s] DATE: %(asctime)s; %(message)s" +DATE_FORMAT = "%Y-%m-%d" # %H:%M:%S + def get_logging_format(): """Get the logging format. - + :return: (string) the logging format. - + """ return LOGGING_FORMAT + def get_date_format(): """Get the date format for logging. - + :return: (string) the date format for logging. - + """ return DATE_FORMAT + def get_sha256(string): """Get sha256 of a string. diff --git a/gettor/xmpp.py b/gettor/xmpp.py index a605f50..072d988 100644 --- a/gettor/xmpp.py +++ b/gettor/xmpp.py @@ -277,8 +277,7 @@ class XMPP(object): self.log.debug("Parsing request") try: if self._is_blacklisted(str(account)): - self.log.info("Request from blacklisted account!") - status = 'blacklisted' + self.log.info('REQUEST: blacklist; OS: none; LC: none') bogus_request = True # first let's find out how many words are in the message @@ -287,7 +286,7 @@ class XMPP(object): if len(words) > self.max_words: bogus_request = True self.log.info("Message way too long") - status = 'error' + self.log.info('REQUEST: invalid; OS: none; LC: none') reply = self._get_msg('message_error', 'en') if not bogus_request: @@ -296,13 +295,13 @@ class XMPP(object): req = self._parse_text(str(msg)) if req['type'] == 'help': - self.log.debug("Type of request: help") - status = 'success' + self.log.info('REQUEST: help; OS: none; LC: %s' % + req['lc']) reply = self._get_msg('help', 'en') elif req['type'] == 'mirrors': - self.log.debug("Type of request: mirrors") - status = 'success' + self.log.info('REQUEST: mirrors; OS: none; LC: %s' % + req['lc']) reply = self._get_msg('mirrors', 'en') try: with open(self.mirrors, "r") as list_mirrors: @@ -312,7 +311,8 @@ class XMPP(object): reply = self._get_msg('mirrors_unavailable', 'en') elif req['type'] == 'links': - self.log.debug("Type of request: help") + self.log.info('REQUEST: links; OS: %s; LC: %s' % + (req['os'], req['lc'])) links = self.core.get_links( "XMPP", req['os'], @@ -321,22 +321,10 @@ class XMPP(object): reply = self._get_msg('links', 'en') reply = reply % (req['os'], req['lc'], links) - status = 'success' - except (core.ConfigError, core.InternalError) as e: # if core failes, send the user an error message, but keep going self.log.error("Something went wrong internally: %s" % str(e)) - status = 'core_error' reply = self._get_msg('internal_error', req['lc']) finally: - # keep stats - if req: - self.log.debug("Adding request to database... ") - self.core.add_request_to_db() - - if reply: - self.log.debug("Everything seems OK. Sending back the reply") - else: - self.log.debug("Nothing to reply!") return reply diff --git a/log/smtp.log b/log/smtp.log index e69de29..3950925 100644 --- a/log/smtp.log +++ b/log/smtp.log @@ -0,0 +1,3 @@ +[INFO] DATE: 2015-11-16; REQUEST: help; OS: none; LC: fa +[INFO] DATE: 2015-11-16; REQUEST: links; OS: windows; LC: zh +[INFO] DATE: 2015-11-16; REQUEST: mirrors; OS: none; LC: tr

1 0

[tor-messenger-build/master] Use the FIREFOX_42_0_RELEASE tag on mozilla-release
by boklm＠torproject.org 16 Nov '15

16 Nov '15

commit 317efc107ad7e5d9fb110799737b767a04c8d847 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Nov 12 15:00:25 2015 +0100 Use the FIREFOX_42_0_RELEASE tag on mozilla-release * Rebase Bug-9173-Change-the-default-Firefox-profile-director.mozpatch * Update mingw-w64 to fix the Windows build * Add 0001-Bug-1197281-Use-MOZ_FIND_WINSDK_VERSION-for-MOZ_WINS.mozpatch * Remove patches already merged in firefox 42.0 --- ChangeLog | 1 + ...efinition-of-MFVideoFormat_VP80-with-m.mozpatch | 28 ------ ...e-MOZ_FIND_WINSDK_VERSION-for-MOZ_WINS.mozpatch | 101 ++++++++++++++++++++ ...move-a-dead-iOS-related-conditional-fr.mozpatch | 31 ------ ...e-the-default-Firefox-profile-director.mozpatch | 65 +++++++------ ...31-do-not-mark-static-inline-functions.mozpatch | 29 ------ projects/instantbird/config | 14 +-- projects/mingw-w64/config | 2 +- projects/mozilla/config | 2 +- 9 files changed, 146 insertions(+), 127 deletions(-) diff --git a/ChangeLog b/ChangeLog index cfa58ab..d8c16df 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,7 @@ Tor Messenger 0.1.0b4 -- * ctypes-otr * Bug 17539: Pass username when interpolating resent string * Bug 15179: Add an OTR Preferences item to the Tools menu + * Use the FIREFOX_42_0_RELEASE tag on mozilla-release * Mac * Bug 16476: Themes preference is positioned incorrectly * Bug 17456: Hang in preferences menu diff --git a/projects/instantbird/0001-Avoid-double-definition-of-MFVideoFormat_VP80-with-m.mozpatch b/projects/instantbird/0001-Avoid-double-definition-of-MFVideoFormat_VP80-with-m.mozpatch deleted file mode 100644 index 1e094ac..0000000 --- a/projects/instantbird/0001-Avoid-double-definition-of-MFVideoFormat_VP80-with-m.mozpatch +++ /dev/null @@ -1,28 +0,0 @@ -From dd5b8134fd85507d68ed79f9efbb3afc87ee9d7e Mon Sep 17 00:00:00 2001 -From: Nicolas Vigier <boklm(a)torproject.org> -Date: Wed, 30 Sep 2015 14:35:36 +0200 -Subject: [PATCH] Avoid double definition of MFVideoFormat_VP80 with mingw-w64 - ---- - dom/media/platforms/wmf/WMFVideoMFTManager.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/dom/media/platforms/wmf/WMFVideoMFTManager.cpp b/dom/media/platforms/wmf/WMFVideoMFTManager.cpp ---- a/dom/media/platforms/wmf/WMFVideoMFTManager.cpp -+++ b/dom/media/platforms/wmf/WMFVideoMFTManager.cpp -@@ -30,6 +30,7 @@ - using mozilla::layers::LayerManager; - using mozilla::layers::LayersBackend; - -+#if 0 - const GUID MFVideoFormat_VP80 = - { - 0x30385056, -@@ -45,6 +46,7 @@ - 0x0010, - {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71} - }; -+#endif - - const CLSID CLSID_WebmMfVp8Dec = - { diff --git a/projects/instantbird/0001-Bug-1197281-Use-MOZ_FIND_WINSDK_VERSION-for-MOZ_WINS.mozpatch b/projects/instantbird/0001-Bug-1197281-Use-MOZ_FIND_WINSDK_VERSION-for-MOZ_WINS.mozpatch new file mode 100644 index 0000000..fc7daf1 --- /dev/null +++ b/projects/instantbird/0001-Bug-1197281-Use-MOZ_FIND_WINSDK_VERSION-for-MOZ_WINS.mozpatch @@ -0,0 +1,101 @@ +From 12146218bf250e6b7f2e15ebe1685d3da9cdd99a Mon Sep 17 00:00:00 2001 +From: Jacek Caban <jacek(a)codeweavers.com> +Date: Wed, 7 Oct 2015 12:26:40 +0200 +Subject: [PATCH] Bug 1197281 - Use MOZ_FIND_WINSDK_VERSION for + MOZ_WINSDK_MAXVER on mingw. r=glandium + +--- + configure.in | 11 ++++------- + js/src/configure.in | 11 ++++------- + 2 files changed, 8 insertions(+), 14 deletions(-) + +diff --git a/configure.in b/configure.in +index dc0192193ce8..3c7ee5afcf57 100644 +--- a/configure.in ++++ b/configure.in +@@ -505,6 +505,9 @@ EOF + fi + fi + ++AC_PROG_CPP ++AC_PROG_CXXCPP ++ + dnl ======================================================== + dnl Special win32 checks + dnl ======================================================== +@@ -730,8 +733,6 @@ See https://developer.mozilla.org/en/Windows_Build_Prerequisites.] + fi + CFLAGS="$CFLAGS -D_HAS_EXCEPTIONS=0" + CXXFLAGS="$CXXFLAGS -D_HAS_EXCEPTIONS=0" +- +- MOZ_FIND_WINSDK_VERSION + else + # Check w32api version + _W32API_MAJOR_VERSION=`echo $W32API_VERSION | $AWK -F\. '{ print $1 }'` +@@ -783,10 +784,9 @@ See https://developer.mozilla.org/en/Windows_Build_Prerequisites.] + # strsafe.h on mingw uses macros for function deprecation that pollutes namespace + # causing problems with local implementations with the same name. + AC_DEFINE(STRSAFE_NO_DEPRECATE) +- +- MOZ_WINSDK_MAXVER=0x06030000 + fi # !GNU_CC + ++ MOZ_FIND_WINSDK_VERSION + AC_DEFINE_UNQUOTED(WINVER,0x$WINVER) + AC_DEFINE_UNQUOTED(_WIN32_WINNT,0x$WINVER) + # Require OS features provided by IE 6.0 SP2 (XP SP2) +@@ -810,9 +810,6 @@ See https://developer.mozilla.org/en/Windows_Build_Prerequisites.] + ;; + esac + +-AC_PROG_CPP +-AC_PROG_CXXCPP +- + if test -n "$_WIN32_MSVC"; then + SKIP_PATH_CHECKS=1 + SKIP_COMPILER_CHECKS=1 +diff --git a/js/src/configure.in b/js/src/configure.in +index 7cc41469aa36..e0c546876201 100644 +--- a/js/src/configure.in ++++ b/js/src/configure.in +@@ -303,6 +303,9 @@ MOZ_TOOL_VARIABLES + + MOZ_CHECK_COMPILER_WRAPPER + ++AC_PROG_CPP ++AC_PROG_CXXCPP ++ + dnl Special win32 checks + dnl ======================================================== + +@@ -432,8 +435,6 @@ case "$target" in + + CFLAGS="$CFLAGS -D_HAS_EXCEPTIONS=0" + CXXFLAGS="$CXXFLAGS -D_HAS_EXCEPTIONS=0" +- +- MOZ_FIND_WINSDK_VERSION + else + # Check w32api version + _W32API_MAJOR_VERSION=`echo $W32API_VERSION | $AWK -F\. '{ print $1 }'` +@@ -469,10 +470,9 @@ case "$target" in + then + AC_MSG_ERROR([windres version $WINDRES_VERSION or higher is required to build.]) + fi +- +- MOZ_WINSDK_MAXVER=0x06030000 + fi # !GNU_CC + ++ MOZ_FIND_WINSDK_VERSION + AC_DEFINE_UNQUOTED(WINVER,0x$WINVER) + AC_DEFINE_UNQUOTED(_WIN32_WINNT,0x$WINVER) + # Require OS features provided by IE 6.0 SP2 (XP SP2) +@@ -494,9 +494,6 @@ case "$target" in + ;; + esac + +-AC_PROG_CPP +-AC_PROG_CXXCPP +- + if test -n "$_WIN32_MSVC"; then + SKIP_PATH_CHECKS=1 + SKIP_COMPILER_CHECKS=1 diff --git a/projects/instantbird/0001-bug-1183129-Remove-a-dead-iOS-related-conditional-fr.mozpatch b/projects/instantbird/0001-bug-1183129-Remove-a-dead-iOS-related-conditional-fr.mozpatch deleted file mode 100644 index 895626e..0000000 --- a/projects/instantbird/0001-bug-1183129-Remove-a-dead-iOS-related-conditional-fr.mozpatch +++ /dev/null @@ -1,31 +0,0 @@ -From ee0ef02a1fa4e473201bfbdcee8cea9cf5bd3357 Mon Sep 17 00:00:00 2001 -From: Ted Mielczarek <ted(a)mielczarek.org> -Date: Mon, 13 Jul 2015 07:20:30 -0400 -Subject: [PATCH] bug 1183129 - Remove a dead iOS-related conditional from - configure.in. r=glandium - ---HG-- -extra : rebase_source : 59f06d0f9e6734dc005e5458a05da062367d71cb ---- - configure.in | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - -diff --git a/configure.in b/configure.in -index f76c761739d2..7f38650138c8 100644 ---- a/configure.in -+++ b/configure.in -@@ -4345,10 +4345,7 @@ cairo-cocoa) - CXXFLAGS="$CXXFLAGS $TK_CFLAGS" - MOZ_USER_DIR="Mozilla" - MOZ_FS_LAYOUT=bundle -- # skip event loop instrumentation on UIKit for now -- if test "$MOZ_WIDGET_TOOLKIT" == "cocoa"; then -- MOZ_INSTRUMENT_EVENT_LOOP=1 -- fi -+ MOZ_INSTRUMENT_EVENT_LOOP=1 - ;; - - cairo-uikit) --- -2.1.0 - diff --git a/projects/instantbird/Bug-9173-Change-the-default-Firefox-profile-director.mozpatch b/projects/instantbird/Bug-9173-Change-the-default-Firefox-profile-director.mozpatch index abdf109..a3ca392 100644 --- a/projects/instantbird/Bug-9173-Change-the-default-Firefox-profile-director.mozpatch +++ b/projects/instantbird/Bug-9173-Change-the-default-Firefox-profile-director.mozpatch @@ -25,7 +25,7 @@ index 7d09374ba773..417ebee773ba 100644 #include "mozilla/Services.h" #include "mozilla/Omnijar.h" #include "mozilla/Preferences.h" -@@ -197,9 +198,6 @@ +@@ -200,9 +201,6 @@ nsXREDirProvider::GetUserProfilesRootDir(nsIFile** aResult, aProfileName, aAppName, aVendorName); if (NS_SUCCEEDED(rv)) { @@ -35,7 +35,7 @@ index 7d09374ba773..417ebee773ba 100644 // We must create the profile directory here if it does not exist. nsresult tmp = EnsureDirectoryExists(file); if (NS_FAILED(tmp)) { -@@ -222,9 +220,6 @@ +@@ -225,9 +223,6 @@ nsXREDirProvider::GetUserProfilesLocalDir(nsIFile** aResult, aProfileName, aAppName, aVendorName); if (NS_SUCCEEDED(rv)) { @@ -45,7 +45,7 @@ index 7d09374ba773..417ebee773ba 100644 // We must create the profile directory here if it does not exist. nsresult tmp = EnsureDirectoryExists(file); if (NS_FAILED(tmp)) { -@@ -1219,82 +1214,44 @@ +@@ -1222,90 +1217,45 @@ nsresult nsXREDirProvider::GetUserDataDirectoryHome(nsIFile** aFile, bool aLocal) { // Copied from nsAppFileLocationProvider (more or less) @@ -84,44 +84,42 @@ index 7d09374ba773..417ebee773ba 100644 + rv = localDir->GetNativeLeafName(removedName); + NS_ENSURE_SUCCESS(rv, rv); + bool didRemove = !removedName.Equals("."); + +- rv = dirFileMac->InitWithFSRef(&fsRef); +- NS_ENSURE_SUCCESS(rv, rv); + // Remove a directory component. + nsCOMPtr<nsIFile> parentDir; + rv = localDir->GetParent(getter_AddRefs(parentDir)); + NS_ENSURE_SUCCESS(rv, rv); + localDir = parentDir; -+ -+ if (didRemove) -+ --levelsToRemove; -+ } - -- rv = dirFileMac->InitWithFSRef(&fsRef); -+ if (!localDir) -+ return NS_ERROR_FAILURE; -+ -+ rv = localDir->AppendRelativeNativePath(NS_LITERAL_CSTRING("TorMessenger" -+ XPCOM_FILE_PATH_SEPARATOR "Data" -+ XPCOM_FILE_PATH_SEPARATOR "Browser")); - NS_ENSURE_SUCCESS(rv, rv); - localDir = do_QueryInterface(dirFileMac, &rv); +-#elif defined(XP_IOS) +- nsAutoCString userDir; +- if (GetUIKitDirectory(aLocal, userDir)) { +- rv = NS_NewNativeLocalFile(userDir, true, getter_AddRefs(localDir)); +- } else { +- rv = NS_ERROR_FAILURE; +- } +- NS_ENSURE_SUCCESS(rv, rv); -#elif defined(XP_WIN) - nsString path; - if (aLocal) { +- if (aLocal) { - rv = GetShellFolderPath(CSIDL_LOCAL_APPDATA, path); - if (NS_FAILED(rv)) - rv = GetRegWindowsAppDataFolder(aLocal, path); -+ rv = localDir->AppendNative(NS_LITERAL_CSTRING("Caches")); -+ NS_ENSURE_SUCCESS(rv, rv); - } +- } - if (!aLocal || NS_FAILED(rv)) { - rv = GetShellFolderPath(CSIDL_APPDATA, path); - if (NS_FAILED(rv)) { - if (!aLocal) - rv = GetRegWindowsAppDataFolder(aLocal, path); - } -- } ++ if (didRemove) ++ --levelsToRemove; + } - NS_ENSURE_SUCCESS(rv, rv); -- + - rv = NS_NewLocalFile(path, true, getter_AddRefs(localDir)); -#elif defined(MOZ_WIDGET_GONK) - rv = NS_NewNativeLocalFile(NS_LITERAL_CSTRING("/data/b2g"), true, @@ -129,13 +127,18 @@ index 7d09374ba773..417ebee773ba 100644 -#elif defined(XP_UNIX) - const char* homeDir = getenv("HOME"); - if (!homeDir || !*homeDir) -- return NS_ERROR_FAILURE; -- ++ if (!localDir) + return NS_ERROR_FAILURE; + -#ifdef ANDROID /* We want (ProfD == ProfLD) on Android. */ - aLocal = false; -#endif -- -- if (aLocal) { ++ rv = localDir->AppendRelativeNativePath(NS_LITERAL_CSTRING("TorMessenger" ++ XPCOM_FILE_PATH_SEPARATOR "Data" ++ XPCOM_FILE_PATH_SEPARATOR "Browser")); ++ NS_ENSURE_SUCCESS(rv, rv); + + if (aLocal) { - // If $XDG_CACHE_HOME is defined use it, otherwise use $HOME/.cache. - const char* cacheHome = getenv("XDG_CACHE_HOME"); - if (cacheHome && *cacheHome) { @@ -150,14 +153,16 @@ index 7d09374ba773..417ebee773ba 100644 - } else { - rv = NS_NewNativeLocalFile(nsDependentCString(homeDir), true, - getter_AddRefs(localDir)); -- } ++ rv = localDir->AppendNative(NS_LITERAL_CSTRING("Caches")); ++ NS_ENSURE_SUCCESS(rv, rv); + } -#else -#error "Don't know how to get product dir on your platform" -#endif NS_IF_ADDREF(*aFile = localDir); return rv; -@@ -1507,48 +1464,25 @@ +@@ -1518,48 +1468,25 @@ nsXREDirProvider::AppendProfilePath(nsIFile* aFile, } nsAutoCString profile; @@ -209,7 +214,7 @@ index 7d09374ba773..417ebee773ba 100644 #elif defined(ANDROID) // The directory used for storing profiles -@@ -1560,12 +1494,6 @@ +@@ -1571,12 +1498,6 @@ nsXREDirProvider::AppendProfilePath(nsIFile* aFile, rv = aFile->AppendNative(nsDependentCString("mozilla")); NS_ENSURE_SUCCESS(rv, rv); #elif defined(XP_UNIX) @@ -222,7 +227,7 @@ index 7d09374ba773..417ebee773ba 100644 if (!profile.IsEmpty()) { // Skip any leading path characters const char* profileStart = profile.get(); -@@ -1574,31 +1502,17 @@ +@@ -1585,31 +1506,17 @@ nsXREDirProvider::AppendProfilePath(nsIFile* aFile, // On the off chance that someone wanted their folder to be hidden don't // let it become ".." diff --git a/projects/instantbird/bug-1176731-do-not-mark-static-inline-functions.mozpatch b/projects/instantbird/bug-1176731-do-not-mark-static-inline-functions.mozpatch deleted file mode 100644 index 7580ea0..0000000 --- a/projects/instantbird/bug-1176731-do-not-mark-static-inline-functions.mozpatch +++ /dev/null @@ -1,29 +0,0 @@ -From: Jacek Caban <jacek(a)codeweavers.com> -Don't maek static inline functions as MFBT_API in TimeStamp.h. - - -diff --git a/mozglue/misc/TimeStamp.h b/mozglue/misc/TimeStamp.h -index 8f043d4..c2c9cf9 100644 ---- a/mozglue/misc/TimeStamp.h -+++ b/mozglue/misc/TimeStamp.h -@@ -421,18 +421,18 @@ public: - * Now() is trying to ensure the best possible precision on each platform, - * at least one millisecond. - * - * NowLoRes() has been introduced to workaround performance problems of - * QueryPerformanceCounter on the Windows platform. NowLoRes() is giving - * lower precision, usually 15.6 ms, but with very good performance benefit. - * Use it for measurements of longer times, like >200ms timeouts. - */ -- static MFBT_API TimeStamp Now() { return Now(true); } -- static MFBT_API TimeStamp NowLoRes() { return Now(false); } -+ static TimeStamp Now() { return Now(true); } -+ static TimeStamp NowLoRes() { return Now(false); } - - /** - * Return a timestamp representing the time when the current process was - * created which will be comparable with other timestamps taken with this - * class. If the actual process creation time is detected to be inconsistent - * the @a aIsInconsistent parameter will be set to true, the returned - * timestamp however will still be valid though inaccurate. - * diff --git a/projects/instantbird/config b/projects/instantbird/config index d2ffb5d..638339d 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -108,24 +108,24 @@ input_files: enable: '[% c("var/osx") %]' - filename: fix-mingw-build.patch enable: '[% c("var/windows") %]' - - filename: bug-1176731-do-not-mark-static-inline-functions.mozpatch - enable: '[% c("var/windows") %]' - filename: gmploader-sandbox.mozpatch enable: '[% c("var/windows") %]' + - filename: 0001-Revert-no-bug-fix-case-of-nsIDocShell.h-in-WindowsUI.mozpatch + enable: '[% c("var/windows") %]' - filename: 0002-Revert-Bug-1170522-expose-whether-or-not-we-re-in-ta.mozpatch enable: '[% c("var/windows") %]' + - filename: 0003-Revert-Bug-1192573-Require-tablet-mode-Win10-to-show.mozpatch + enable: '[% c("var/windows") %]' - filename: bug-1197282-include-atomic-in-videodecoder.mozpatch enable: '[% c("var/windows") %]' - - filename: 0001-Avoid-double-definition-of-MFVideoFormat_VP80-with-m.mozpatch + - filename: 0001-Bug-1192248-Fixed-WinIMEHandler.cpp-cross-compilatio.mozpatch + enable: '[% c("var/windows") %]' + - filename: 0001-Bug-1197281-Use-MOZ_FIND_WINSDK_VERSION-for-MOZ_WINS.mozpatch enable: '[% c("var/windows") %]' - # When 1197281 is fixed, this should not be needed anymore: - # https://bugzilla.mozilla.org/show_bug.cgi?id=1197281 - filename: Bug-9173-Change-the-default-Firefox-profile-director.mozpatch - filename: block-plugins.mozpatch - filename: OSX-package-as-tar.bz2.mozpatch enable: '[% c("var/osx") %]' - - filename: 0001-bug-1183129-Remove-a-dead-iOS-related-conditional-fr.mozpatch - enable: '[% c("var/osx") %]' - filename: 'mozconfig-[% c("var/osname") %]' name: mozconfig - name: python diff --git a/projects/mingw-w64/config b/projects/mingw-w64/config index 85c9b7f..c080a13 100644 --- a/projects/mingw-w64/config +++ b/projects/mingw-w64/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' git_url: http://git.code.sf.net/p/mingw-w64/mingw-w64 -git_hash: 548b1984042a1dd66cae95ad8c0003b5e5494a68 +git_hash: 917249082fd711f6a3e13515d1f6ffd4474d4f9c version: '[% c("abbrev") %]' remote_docker: 1 var: diff --git a/projects/mozilla/config b/projects/mozilla/config index 4b98c6d..2e813b5 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-release/ -hg_hash: THUNDERBIRD_41_0b1_RELEASE +hg_hash: FIREFOX_42_0_RELEASE src: | #!/bin/sh set -e

1 0

[torspec/master] Add a relay_early section to prop249
by nickm＠torproject.org 16 Nov '15

16 Nov '15

commit e316823455a4b23f61d6ccf586dad5204f167235 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 16 10:46:49 2015 -0500 Add a relay_early section to prop249 --- proposals/249-large-create-cells.txt | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/proposals/249-large-create-cells.txt b/proposals/249-large-create-cells.txt index 793ea92..69020cf 100644 --- a/proposals/249-large-create-cells.txt +++ b/proposals/249-large-create-cells.txt @@ -77,7 +77,17 @@ Status: Draft If any intervening cells are received, the receiver SHOULD destroy the circuit. -4. Example +4. Interacting with RELAY_EARLY cells + + The first EXTEND2 cell in a batch must arrive in a RELAY_EARLY cell. + The others MAY arrive in RELAY_EARLY cells. + + Note that this change leaks the size of the handshake being used to + intermediate relays. We should analyze this and see whether it matters. + Clients MAY send RELAY_DROP cells during circuit construction in order to + hide the true size of their handshakes. + +5. Example So for example, if we are a client, and we need to send a 2000-byte handshake to extend a circuit from relay X to relay Y, we might send @@ -119,7 +129,7 @@ Status: Draft Upon receiving this last cell, the relay X would send a create2v cell to Y, containing the entire handshake. -5. Migration +6. Migration We can and should implement the EXTEND2 fragmentation feature before we implement anything that uses it. If we can get it widely deployed @@ -132,7 +142,7 @@ Status: Draft Relays MAY send CREATE2V and CREATED2V cells to relays that don't support them, since unrecognized cell types are ignored. -6. Resource management issues +7. Resource management issues This feature requires relays and clients to buffer EXTEND2 cell bodies for incoming cells until the entire CREATE2V/CREATED2V body

1 0