May 2013 - tor-commits - lists.torproject.org

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'
by nickm＠torproject.org 17 May '13

17 May '13

commit 382dbe9819367cb838f1099f5f29897f8f5f8f51 Merge: df731ba bc56918 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 17 14:54:19 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' changes/bug8846 | 4 ++++ src/or/connection_edge.c | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.2.4] Fix bug 8846: better log message on IP version confusion
by nickm＠torproject.org 17 May '13

17 May '13

commit bc56918e5abb48f67f31012838c689e9572eec69 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 17 14:50:45 2013 -0400 Fix bug 8846: better log message on IP version confusion --- changes/bug8846 | 4 ++++ src/or/connection_edge.c | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/changes/bug8846 b/changes/bug8846 new file mode 100644 index 0000000..377cc37 --- /dev/null +++ b/changes/bug8846 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Give a less useless error message when the user asks for an IPv4 + address on an IPv6-only port, or vice versa. Fixes bug 8846; bugfix + on 0.2.4.7-alpha. diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 926fcab..4d317d0 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -1769,9 +1769,10 @@ connection_ap_get_begincell_flags(entry_connection_t *ap_conn) } if (flags == BEGIN_FLAG_IPV4_NOT_OK) { - log_warn(LD_BUG, "Hey; I'm about to ask a node for a connection that I " + log_warn(LD_EDGE, "I'm about to ask a node for a connection that I " "am telling it to fulfil with neither IPv4 nor IPv6. That's " - "probably not going to work."); + "not going to work. Did you perhaps ask for an IPv6 address " + "on an IPv4Only port, or vice versa?"); } return flags;

1 0

[ooni-probe/master] Stop reactor when we can't start the sniffer.
by art＠torproject.org 17 May '13

17 May '13

commit 59d6fad8a19dd6f3a971c84474e977a886221129 Author: Arturo Filastò <art(a)fuffa.org> Date: Fri May 17 20:04:21 2013 +0200 Stop reactor when we can't start the sniffer. --- ooni/director.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/ooni/director.py b/ooni/director.py index 1a3bfc1..809eae4 100644 --- a/ooni/director.py +++ b/ooni/director.py @@ -221,6 +221,7 @@ class Director(object): except errors.InsufficientPrivileges: print "[!] Includepcap options requires root priviledges to run" print " you should run ooniprobe as root or disable the options in ooniprobe.conf" + reactor.stop() sys.exit(1) print "Starting sniffer"

1 0

[ooni-probe/master] Strip superflous data from ASN number
by art＠torproject.org 17 May '13

17 May '13

commit 3ae947b87863a228ac162934471a4a81923f07dd Author: Arturo Filastò <art(a)fuffa.org> Date: Fri May 17 20:03:41 2013 +0200 Strip superflous data from ASN number Fixes bug in validating ASN in backend (thank kheops for reporting it). --- ooni/geoip.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ooni/geoip.py b/ooni/geoip.py index 1e6f6e9..875ed07 100644 --- a/ooni/geoip.py +++ b/ooni/geoip.py @@ -36,7 +36,7 @@ def IPToLocation(ipaddr): location['countrycode'] = country_dat.country_code_by_addr(ipaddr) asn_dat = GeoIP(asn_file) - location['asn'] = asn_dat.org_by_addr(ipaddr) + location['asn'] = asn_dat.org_by_addr(ipaddr).split(' ')[0] except IOError: log.err("Could not find GeoIP data files. Go into data/ "

1 0

[stem/master] Asserting ownership over the integ tests
by atagar＠torproject.org 17 May '13

17 May '13

commit 29086a71cd508614d247f70888df884028d51185 Author: Jeremy <saturn5971(a)gmail.com> Date: Thu May 16 23:23:35 2013 -0400 Asserting ownership over the integ tests Ticket #8634. Integ tests now assert ownership over the tor process, but avoid accidentally terminating tor mid-test. --- run_tests.py | 7 ++++--- test/integ/control/controller.py | 4 ++++ test/runner.py | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/run_tests.py b/run_tests.py index 1e76738..b59b405 100755 --- a/run_tests.py +++ b/run_tests.py @@ -185,9 +185,10 @@ def main(): println("Running tests...\n", STATUS) - for test_class in test.util.get_integ_tests(args.test_prefix): - run_result = _run_test(test_class, output_filters, logging_buffer) - skipped_tests += len(getattr(run_result, 'skipped', [])) + with integ_runner.get_tor_controller(True): # Controller to own our main tor process + for test_class in test.util.get_integ_tests(args.test_prefix): + run_result = _run_test(test_class, output_filters, logging_buffer) + skipped_tests += len(getattr(run_result, 'skipped', [])) # We should have joined on all threads. If not then that indicates a # leak that could both likely be a bug and disrupt further targets. diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index 2f4c413..50c0cc7 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -102,6 +102,8 @@ class TestController(unittest.TestCase): self.assertEqual(State.RESET, state_type) self.assertTrue(state_timestamp > before and state_timestamp < after) + controller.reset_conf("__OwningControllerProcess") + def test_event_handling(self): """ Add a couple listeners for various events and make sure that they receive @@ -559,6 +561,7 @@ class TestController(unittest.TestCase): finally: # reload original valid config controller.load_conf(oldconf) + controller.reset_conf("__OwningControllerProcess") def test_saveconf(self): if test.runner.require_control(self): @@ -580,6 +583,7 @@ class TestController(unittest.TestCase): finally: controller.load_conf(oldconf) controller.save_conf() + controller.reset_conf("__OwningControllerProcess") def test_get_socks_ports(self): """ diff --git a/test/runner.py b/test/runner.py index 3614816..e2d6def 100644 --- a/test/runner.py +++ b/test/runner.py @@ -710,7 +710,7 @@ class Runner(object): print_init_line = lambda line: println(" %s" % line, SUBSTATUS) torrc_dst = os.path.join(self._test_dir, "torrc") - self._tor_process = stem.process.launch_tor(tor_cmd, None, torrc_dst, complete_percent, print_init_line) + self._tor_process = stem.process.launch_tor(tor_cmd, None, torrc_dst, complete_percent, print_init_line, take_ownership = True) runtime = time.time() - start_time println(" done (%i seconds)\n" % runtime, STATUS)

1 0

[tor/master] Changes file for 8792
by nickm＠torproject.org 17 May '13

17 May '13

commit df731bac54a8ab70084d9fc855db7c7854608f4c Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 17 10:14:06 2013 -0400 Changes file for 8792 --- changes/bug8792 | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/changes/bug8792 b/changes/bug8792 new file mode 100644 index 0000000..6f4e3bf --- /dev/null +++ b/changes/bug8792 @@ -0,0 +1,4 @@ + o Removed code + - Remove constants and tests for PKCS1 padding; it's insecure and + shouldn't be used for anything new. Fixes bug #8792; patch + from Arlo Breault.

1 0

[tor/master] Remove PK_PKCS1_PADDING
by nickm＠torproject.org 17 May '13

17 May '13

commit 0ab38b93660b4c9cb53771a454805e978ad9f406 Author: Arlo Breault <arlolra(a)gmail.com> Date: Thu May 16 12:05:50 2013 -0700 Remove PK_PKCS1_PADDING See #8792 --- src/common/crypto.c | 2 -- src/common/crypto.h | 4 ---- src/test/test_crypto.c | 25 +++++++++++-------------- 3 files changed, 11 insertions(+), 20 deletions(-) diff --git a/src/common/crypto.c b/src/common/crypto.c index 31a0df1..bda1ed0 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -114,7 +114,6 @@ crypto_get_rsa_padding_overhead(int padding) switch (padding) { case RSA_PKCS1_OAEP_PADDING: return PKCS1_OAEP_PADDING_OVERHEAD; - case RSA_PKCS1_PADDING: return PKCS1_PADDING_OVERHEAD; default: tor_assert(0); return -1; } } @@ -126,7 +125,6 @@ crypto_get_rsa_padding(int padding) { switch (padding) { - case PK_PKCS1_PADDING: return RSA_PKCS1_PADDING; case PK_PKCS1_OAEP_PADDING: return RSA_PKCS1_OAEP_PADDING; default: tor_assert(0); return -1; } diff --git a/src/common/crypto.h b/src/common/crypto.h index 38eb455..2886306 100644 --- a/src/common/crypto.h +++ b/src/common/crypto.h @@ -69,13 +69,9 @@ * signs removed. */ #define BASE64_DIGEST256_LEN 43 -/** Constant used to indicate PKCS1 padding for public-key encryption */ -#define PK_PKCS1_PADDING 60001 /** Constant used to indicate OAEP padding for public-key encryption */ #define PK_PKCS1_OAEP_PADDING 60002 -/** Number of bytes added for PKCS1 padding. */ -#define PKCS1_PADDING_OVERHEAD 11 /** Number of bytes added for PKCS1-OAEP padding. */ #define PKCS1_OAEP_PADDING_OVERHEAD 42 diff --git a/src/test/test_crypto.c b/src/test/test_crypto.c index 4b7e7f2..839de7d 100644 --- a/src/test/test_crypto.c +++ b/src/test/test_crypto.c @@ -394,7 +394,7 @@ test_crypto_pk(void) char *encoded = NULL; char data1[1024], data2[1024], data3[1024]; size_t size; - int i, j, p, len; + int i, len; /* Public-key ciphers */ pk1 = pk_generate(0); @@ -478,19 +478,16 @@ test_crypto_pk(void) /* Try with hybrid encryption wrappers. */ crypto_rand(data1, 1024); - for (i = 0; i < 2; ++i) { - for (j = 85; j < 140; ++j) { - memset(data2,0,1024); - memset(data3,0,1024); - p = (i==0)?PK_PKCS1_PADDING:PK_PKCS1_OAEP_PADDING; - len = crypto_pk_public_hybrid_encrypt(pk1,data2,sizeof(data2), - data1,j,p,0); - test_assert(len>=0); - len = crypto_pk_private_hybrid_decrypt(pk1,data3,sizeof(data3), - data2,len,p,1); - test_eq(len,j); - test_memeq(data1,data3,j); - } + for (i = 85; i < 140; ++i) { + memset(data2,0,1024); + memset(data3,0,1024); + len = crypto_pk_public_hybrid_encrypt(pk1,data2,sizeof(data2), + data1,i,PK_PKCS1_OAEP_PADDING,0); + test_assert(len>=0); + len = crypto_pk_private_hybrid_decrypt(pk1,data3,sizeof(data3), + data2,len,PK_PKCS1_OAEP_PADDING,1); + test_eq(len,i); + test_memeq(data1,data3,i); } /* Try copy_full */

1 0

[tor-browser/tor-browser-17.0.6esr-2] Tor Browser's Firefox preference overrides.
by mikeperry＠torproject.org 16 May '13

16 May '13

commit ffbc378bc53fcc091a9e22c2e3142992218556fa Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon May 6 15:52:50 2013 -0700 Tor Browser's Firefox preference overrides. This hack directly includes our preference changes in omni.ja. --- browser/app/Makefile.in | 1 + browser/app/profile/000-tor-browser.js | 124 ++++++++++++++++++++++++++++++++ browser/installer/package-manifest.in | 1 + toolkit/mozapps/installer/packager.mk | 2 +- 4 files changed, 127 insertions(+), 1 deletions(-) diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in index 5f891ca..d8bc784 100644 --- a/browser/app/Makefile.in +++ b/browser/app/Makefile.in @@ -18,6 +18,7 @@ endif PREF_JS_EXPORTS = $(srcdir)/profile/firefox.js \ $(NULL) +PREF_JS_EXPORTS += $(srcdir)/profile/000-tor-browser.js # hardcode en-US for the moment diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js new file mode 100644 index 0000000..e49c950 --- /dev/null +++ b/browser/app/profile/000-tor-browser.js @@ -0,0 +1,124 @@ +# Default Preferences +# Tor Browser Bundle +# Do not edit this file. + +// Disable browser auto updaters and associated homepage notifications +pref("app.update.auto", false); +pref("app.update.enabled", false); +pref("browser.search.update", false); +pref("browser.rights.3.shown", true); +pref("browser.startup.homepage_override.mstone", "ignore"); +pref("startup.homepage_welcome_url", ""); +pref("startup.homepage_override_url", ""); + +// Disk activity: Disable Browsing History Storage +pref("browser.privatebrowsing.autostart", true); +pref("browser.cache.disk.enable", false); +pref("browser.cache.offline.enable", false); +pref("dom.indexedDB.enabled", false); +pref("permissions.memory_only", true); +pref("network.cookie.lifetimePolicy", 2); +pref("browser.download.manager.retention", 1); + +// Disk activity: TBB Directory Isolation +pref("browser.download.useDownloadDir", false); +pref("browser.shell.checkDefaultBrowser", false); +pref("browser.download.manager.addToRecentDocs", false); + +// Misc privacy: Disk +pref("signon.rememberSignons", false); +pref("browser.formfill.enable", false); +pref("signon.autofillForms", false); +pref("browser.sessionstore.privacy_level", 2); + +// Misc privacy: Remote +pref("browser.send_pings", false); +pref("geo.enabled", false); +pref("geo.wifi.uri", ""); +pref("browser.search.suggest.enabled", false); +pref("browser.safebrowsing.enabled", false); +pref("browser.safebrowsing.malware.enabled", false); + +// Fingerprinting +pref("webgl.min_capability_mode", true); +pref("webgl.disable-extensions", true); +pref("dom.battery.enabled", false); // fingerprinting due to differing OS implementations +pref("dom.network.enabled",false); // fingerprinting due to differing OS implementations +pref("browser.display.max_font_attempts",10); +pref("browser.display.max_font_count",10); +pref("gfx.downloadable_fonts.fallback_delay", -1); +pref("general.appname.override", "Netscape"); +pref("general.appversion.override", "5.0 (Windows)"); +pref("general.buildID.override", "0"); +pref("general.oscpu.override", "Windows NT 6.1"); +pref("general.platform.override", "Win32"); +pref("general.productSub.override", "20100101"); +pref("general.useragent.override", "Mozilla/5.0 (Windows NT 6.1; rv:17.0) Gecko/20100101 Firefox/17.0"); +pref("general.useragent.vendor", ""); +pref("general.useragent.vendorSub", ""); +pref("dom.enable_performance", false); +pref("plugin.expose_full_path", false); +pref("browser.startup.homepage_override.buildID", "20110325121920"); +pref("browser.startup.homepage_override.mstone", "rv:2.0"); +pref("browser.zoom.siteSpecific", false); +// pref("intl.accept_languages", "en-us, en"); // Set by Torbutton +// pref("intl.accept_charsets", "iso-8859-1,*,utf-8"); // Set by Torbutton +// pref("intl.charsetmenu.browser.cache", "UTF-8"); // Set by Torbutton + +// Third party stuff +pref("network.cookie.cookieBehavior", 1); +pref("security.enable_tls_session_tickets", false); +pref("network.http.spdy.enabled", false); // Stores state and may have keepalive issues (both fixable) +pref("network.http.spdy.enabled.v2", false); // Seems redundant, but just in case +pref("network.http.spdy.enabled.v3", false); // Seems redundant, but just in case + +// Proxy and proxy security +pref("network.proxy.socks", "127.0.0.1"); +pref("network.proxy.socks_port", 9150); +pref("network.proxy.socks_remote_dns", true); +pref("network.proxy.type", 1); +pref("network.security.ports.banned", "8118,8123,9050,9051,9150,9151"); +pref("network.dns.disablePrefetch", true); +pref("network.protocol-handler.external-default", false); +pref("network.protocol-handler.external.mailto", false); +pref("network.protocol-handler.external.news", false); +pref("network.protocol-handler.external.nntp", false); +pref("network.protocol-handler.external.snews", false); +pref("network.protocol-handler.warn-external.mailto", true); +pref("network.protocol-handler.warn-external.news", true); +pref("network.protocol-handler.warn-external.nntp", true); +pref("network.protocol-handler.warn-external.snews", true); +pref("plugins.click_to_play", true); + +// Network and performance +pref("network.http.pipelining", true); +pref("network.http.pipelining.aggressive", true); +pref("network.http.pipelining.maxrequests", 12); +pref("network.http.pipelining.ssl", true); +pref("network.http.proxy.pipelining", true); +pref("security.ssl.enable_false_start", true); +pref("network.http.keep-alive.timeout", 20); +pref("network.http.connection-retry-timeout", 0); +pref("network.http.max-persistent-connections-per-proxy", 256); +pref("network.http.pipelining.reschedule-timeout", 15000); +pref("network.http.pipelining.read-timeout", 60000); +// Hacked pref: Now means "Attempt to pipeline at least this many requests together" +pref("network.http.pipelining.max-optimistic-requests", 3); + +// Extension support +pref("extensions.autoDisableScopes", 0); +pref("extensions.bootstrappedAddons", "{}"); +pref("extensions.checkCompatibility.4.*", false); +pref("extensions.databaseSchema", 3); +pref("extensions.enabledAddons", "https-everywhere%40eff.org:3.1.4,%7B73a6fe31-595d-460b-a920-fcc0f8843232%7D:2.6.6.1,torbutton%40torproject.org:1.5.2,ubufox%40ubuntu.com:2.6,tor-launcher%40torproject.org:0.1.1pre-alpha,%7B972ce4c6-7e08-4474-a285-3208198ce6fd%7D:17.0.5"); +pref("extensions.enabledItems", "langpack-en-US@firefox.mozilla.org:,{73a6fe31-595d-460b-a920-fcc0f8843232}:1.9.9.57,{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}:1.2.4,{972ce4c6-7e08-4474-a285-3208198ce6fd}:3.5.8"); +pref("extensions.enabledScopes", 1); +pref("extensions.pendingOperations", false); +pref("xpinstall.whitelist.add", ""); +pref("xpinstall.whitelist.add.36", ""); + +// Omnibox settings +pref("keyword.URL", "https://startpage.com/do/search?q="); + +// Version placeholder +pref("torbrowser.version", "UNKNOWN"); diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in index 7b24967..753597c 100644 --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in @@ -570,6 +570,7 @@ @BINPATH@/@PREF_DIR@/channel-prefs.js #endif @BINPATH@/defaults/profile/prefs.js +@BINPATH@/@PREF_DIR@/000-tor-browser.js ; [Layout Engine Resources] ; Style Sheets, Graphics and other Resources used by the layout engine. diff --git a/toolkit/mozapps/installer/packager.mk b/toolkit/mozapps/installer/packager.mk index 8460c91..6963e8b 100644 --- a/toolkit/mozapps/installer/packager.mk +++ b/toolkit/mozapps/installer/packager.mk @@ -496,7 +496,7 @@ OMNIJAR_FILES = \ $(NULL) # defaults/pref/channel-prefs.js is handled separate from other prefs due to -# bug 756325 +# bug 756325. NON_OMNIJAR_FILES += \ chrome/icons/\* \ $(PREF_DIR)/channel-prefs.js \

1 0

[tor-browser/tor-browser-17.0.6esr-2] Tor Browser's official .mozconfigs.
by mikeperry＠torproject.org 16 May '13

16 May '13

commit 7ff1fbccb9f6142a503127737da6f7fbd2b1a8c1 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon May 6 15:51:06 2013 -0700 Tor Browser's official .mozconfigs. --- .mozconfig | 17 +++++++++++++++++ .mozconfig-mingw | 27 +++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 0 deletions(-) diff --git a/.mozconfig b/.mozconfig new file mode 100755 index 0000000..ff722dc --- /dev/null +++ b/.mozconfig @@ -0,0 +1,17 @@ +. $topsrcdir/browser/config/mozconfig + +mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-@CONFIG_GUESS@ +mk_add_options MOZ_APP_DISPLAYNAME=TorBrowser +mk_add_options MOZ_MAKE_FLAGS="-s --no-print-directory -j4" +mk_add_options MOZILLA_OFFICIAL=1 +mk_add_options BUILD_OFFICIAL=1 + +ac_add_options --enable-optimize +#ac_add_options --disable-optimize +ac_add_options --enable-official-branding +ac_add_options --enable-strip +ac_add_options --disable-tests +ac_add_options --disable-debug +ac_add_options --disable-maintenance-service +ac_add_options --disable-crashreporter +ac_add_options --disable-webrtc diff --git a/.mozconfig-mingw b/.mozconfig-mingw new file mode 100644 index 0000000..221cdc5 --- /dev/null +++ b/.mozconfig-mingw @@ -0,0 +1,27 @@ +#Specify the cross compile +export CROSS_COMPILE=1 +export MIDL=/usr/bin/i686-w64-mingw32-widl + +ac_add_options --enable-application=browser +ac_add_options --target=i686-w64-mingw32 +ac_add_options --enable-default-toolkit=cairo-windows +mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-mingw +mk_add_options MOZ_APP_DISPLAYNAME=TorBrowser +mk_add_options MOZ_MAKE_FLAGS="-s --no-print-directory -j4" +mk_add_options MOZILLA_OFFICIAL=1 +mk_add_options BUILD_OFFICIAL=1 + +ac_add_options --disable-debug +ac_add_options --enable-optimize +ac_add_options --enable-strip +ac_add_options --enable-official-branding + +ac_add_options --disable-updater +ac_add_options --disable-crashreporter +ac_add_options --disable-maintenance-service +ac_add_options --disable-webrtc +ac_add_options --disable-tests + +# XXX: So close.. Undefined ref to _IID_IAccessible during linking +ac_add_options --disable-accessibility +ac_add_options --disable-webgl

1 0

[tor-browser/tor-browser-17.0.6esr-2] Fix build issues with MinGW.
by mikeperry＠torproject.org 16 May '13

16 May '13

commit 76a007d7babf0db5180c880088de1e53f3b7dfb4 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Apr 29 23:52:48 2013 -0700 Fix build issues with MinGW. The following patches were applied: https://hg.mozilla.org/mozilla-central/rev/c581bb3ceac5 https://hg.mozilla.org/mozilla-central/rev/b0c6a324e72f https://hg.mozilla.org/mozilla-central/rev/305ce1b73071 Still need (but conflicts prevent us from using them): https://hg.mozilla.org/mozilla-central/rev/ddabcd6f9491 https://hg.mozilla.org/mozilla-central/rev/476e02f9a619 --- accessible/public/ia2/Makefile.in | 10 +++++----- accessible/public/msaa/Makefile.in | 8 ++++---- accessible/public/msaa/nsIWinAccessNode.idl | 2 +- accessible/src/msaa/AccessibleWrap.cpp | 2 +- accessible/src/msaa/HyperTextAccessibleWrap.h | 2 +- accessible/src/msaa/nsAccessNodeWrap.h | 4 ++-- browser/installer/package-manifest.in | 6 +++--- configure.in | 15 ++++++++++++++- gfx/angle/Makefile.in | 4 ++++ gfx/angle/src/libEGL/Makefile.in | 12 +++++++++++- gfx/angle/src/libGLESv2/Makefile.in | 16 ++++++++++++++++ gfx/angle/src/libGLESv2/libGLESv2.def | 5 +++++ gfx/layers/d3d9/LayerManagerD3D9.cpp | 1 + js/src/configure.in | 1 + .../src/common/windows/guid_string.h | 2 +- widget/windows/nsWindow.h | 2 +- 16 files changed, 71 insertions(+), 21 deletions(-) diff --git a/accessible/public/ia2/Makefile.in b/accessible/public/ia2/Makefile.in index 504c2c0..32e272a 100644 --- a/accessible/public/ia2/Makefile.in +++ b/accessible/public/ia2/Makefile.in @@ -73,11 +73,11 @@ EMBED_MANIFEST_AT = 2 include $(topsrcdir)/config/rules.mk OS_LIBS = \ - kernel32.lib \ - rpcns4.lib \ - rpcrt4.lib \ - ole32.lib \ - oleaut32.lib \ + -lkernel32 \ + -lrpcns4 \ + -lrpcrt4 \ + -lole32 \ + -loleaut32 \ $(NULL) # generate list of to-be-generated files that are missing diff --git a/accessible/public/msaa/Makefile.in b/accessible/public/msaa/Makefile.in index 2055ad2..df60e49 100644 --- a/accessible/public/msaa/Makefile.in +++ b/accessible/public/msaa/Makefile.in @@ -52,10 +52,10 @@ MIDL_GENERATED_FILES = \ SRCDIR_CSRCS = $(addprefix $(srcdir)/,$(CSRCS)) OS_LIBS = \ - kernel32.lib \ - rpcns4.lib \ - rpcrt4.lib \ - oleaut32.lib \ + -lkernel32 \ + -lrpcns4 \ + -lrpcrt4 \ + -loleaut32 \ $(NULL) $(MIDL_GENERATED_FILES): done_gen diff --git a/accessible/public/msaa/nsIWinAccessNode.idl b/accessible/public/msaa/nsIWinAccessNode.idl index 133d784..e129030 100644 --- a/accessible/public/msaa/nsIWinAccessNode.idl +++ b/accessible/public/msaa/nsIWinAccessNode.idl @@ -7,7 +7,7 @@ #include "nsISupports.idl" %{C++ -#include "Guiddef.h" +#include "guiddef.h" %} [ref] native MSCOMIIDRef(IID); diff --git a/accessible/src/msaa/AccessibleWrap.cpp b/accessible/src/msaa/AccessibleWrap.cpp index 08470c9..a3fad2c 100644 --- a/accessible/src/msaa/AccessibleWrap.cpp +++ b/accessible/src/msaa/AccessibleWrap.cpp @@ -40,7 +40,7 @@ #include "Accessible2_i.c" #include "AccessibleRole.h" #include "AccessibleStates.h" -#include "OLEACC.H" +#include "oleacc.h" using namespace mozilla; using namespace mozilla::a11y; diff --git a/accessible/src/msaa/HyperTextAccessibleWrap.h b/accessible/src/msaa/HyperTextAccessibleWrap.h index 9e87071..1699f6c 100644 --- a/accessible/src/msaa/HyperTextAccessibleWrap.h +++ b/accessible/src/msaa/HyperTextAccessibleWrap.h @@ -10,7 +10,7 @@ #include "HyperTextAccessible.h" #include "ia2AccessibleEditableText.h" -#include "ia2AccessibleHyperText.h" +#include "ia2AccessibleHypertext.h" class HyperTextAccessibleWrap : public HyperTextAccessible, public ia2AccessibleHypertext, diff --git a/accessible/src/msaa/nsAccessNodeWrap.h b/accessible/src/msaa/nsAccessNodeWrap.h index 33a4ca9..16749a8 100644 --- a/accessible/src/msaa/nsAccessNodeWrap.h +++ b/accessible/src/msaa/nsAccessNodeWrap.h @@ -25,8 +25,8 @@ #include "nsIDOMElement.h" #include "nsIContent.h" #include "nsAccessNode.h" -#include "OLEIDL.H" -#include "OLEACC.H" +#include "oleidl.h" +#include "oleacc.h" #include <winuser.h> #ifdef MOZ_CRASHREPORTER #include "nsICrashReporter.h" diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in index 391e093..7b24967 100644 --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in @@ -40,9 +40,9 @@ @BINPATH@/hyphenation/* @BINPATH@/@PREF_DIR@/firefox-l10n.js @BINPATH@/searchplugins/* -#ifdef XP_WIN32 -@BINPATH@/uninstall/helper.exe -#endif +;#ifdef XP_WIN32 +;@BINPATH@/uninstall/helper.exe +;#endif #ifdef MOZ_UPDATER @BINPATH@/update.locale @BINPATH@/updater.ini diff --git a/configure.in b/configure.in index 63c7bdb..988741e 100644 --- a/configure.in +++ b/configure.in @@ -701,6 +701,18 @@ EOF AC_MSG_ERROR([windres version $WINDRES_VERSION or higher is required to build.]) fi + AC_CHECK_PROGS(MIDL, $target-widl widl) + if test -n "$MIDL"; then + case "$target" in + i*86-*) + MIDL_FLAGS="$MIDL_FLAGS --win32 -m32" + ;; + x86_64-*) + MIDL_FLAGS="$MIDL_FLAGS --win64 -m64" + ;; + esac + fi + MOZ_WINSDK_MAXVER=0x06020000 fi # !GNU_CC @@ -2240,6 +2252,7 @@ ia64*-hpux*) if test -n "$GNU_CC"; then CFLAGS="$CFLAGS -mstackrealign -fno-keep-inline-dllexport" CXXFLAGS="$CXXFLAGS -mstackrealign -fno-keep-inline-dllexport" + LDFLAGS="$LDFLAGS -Wl,--enable-stdcall-fixup -Wl,--large-address-aware" else AC_DEFINE(HAVE_STDCALL) DSO_LDOPTS="$DSO_LDOPTS -MACHINE:X86" @@ -5705,7 +5718,7 @@ if test -n "$MOZ_WEBGL_DISABLED"; then MOZ_ANGLE_RENDERER= fi -if test -n "$MOZ_ANGLE_RENDERER"; then +if test -n "$MOZ_ANGLE_RENDERER" -a -z "$CROSS_COMPILE"; then # Get the SDK path from the registry. # First try to get the June 2010 SDK MOZ_DIRECTX_SDK_REG_KEY=`reg query 'HKLM\Software\Microsoft\DirectX' //s | grep 'Microsoft DirectX SDK (June 2010)' | head -n 1` diff --git a/gfx/angle/Makefile.in b/gfx/angle/Makefile.in index 981579c..78333c3 100644 --- a/gfx/angle/Makefile.in +++ b/gfx/angle/Makefile.in @@ -125,8 +125,12 @@ ifdef MOZ_ANGLE_RENDERER DIRS = src/libGLESv2 src/libEGL libs:: +ifdef MOZ_D3DX9_CAB expand "$(MOZ_D3DX9_CAB)" -F:$(MOZ_D3DX9_DLL) "$(DIST)/bin" +endif +ifdef MOZ_D3DCOMPILER_CAB expand "$(MOZ_D3DCOMPILER_CAB)" -F:$(MOZ_D3DCOMPILER_DLL) "$(DIST)/bin" +endif endif diff --git a/gfx/angle/src/libEGL/Makefile.in b/gfx/angle/src/libEGL/Makefile.in index b643f1a..3f10262 100644 --- a/gfx/angle/src/libEGL/Makefile.in +++ b/gfx/angle/src/libEGL/Makefile.in @@ -68,9 +68,19 @@ RCFILE = $(srcdir)/libEGL.rc include $(topsrcdir)/config/rules.mk +OS_LIBS += $(call EXPAND_LIBNAME,dwmapi) + +ifdef GNU_CC + +OS_CXXFLAGS := $(filter-out -fno-exceptions,$(OS_CXXFLAGS)) -fexceptions +OS_LIBS += -ld3d9 -ldxguid -llibGLESv2 + +else + EXTRA_DSO_LDOPTS = "$(MOZ_DIRECTX_SDK_PATH)/lib/$(MOZ_DIRECTX_SDK_CPU_SUFFIX)/d3d9.lib" \ "$(MOZ_DIRECTX_SDK_PATH)/lib/$(MOZ_DIRECTX_SDK_CPU_SUFFIX)/dxguid.lib" \ "$(DIST)/lib/libGLESv2.lib" \ - dwmapi.lib \ delayimp.lib \ /delayload:dwmapi.dll + +endif diff --git a/gfx/angle/src/libGLESv2/Makefile.in b/gfx/angle/src/libGLESv2/Makefile.in index 67bbd78..9a626b2 100644 --- a/gfx/angle/src/libGLESv2/Makefile.in +++ b/gfx/angle/src/libGLESv2/Makefile.in @@ -165,6 +165,22 @@ RCFILE = $(srcdir)/libGLESv2.rc include $(topsrcdir)/config/rules.mk +ifdef GNU_CC + +TextureSSE2.$(OBJ_SUFFIX): CXXFLAGS+=-msse2 + +OS_CXXFLAGS := $(filter-out -fno-exceptions,$(OS_CXXFLAGS)) -fexceptions +OS_LIBS += -ld3d9 +ifdef MOZ_D3DX9_VERSION +OS_LIBS += -ld3dx9_$(MOZ_D3DX9_VERSION) -ld3dcompiler_$(MOZ_D3DX9_VERSION) +else +OS_LIBS += -ld3dx9 -ld3dcompiler +endif + +else + EXTRA_DSO_LDOPTS = "$(MOZ_DIRECTX_SDK_PATH)/lib/$(MOZ_DIRECTX_SDK_CPU_SUFFIX)/d3d9.lib" \ "$(MOZ_DIRECTX_SDK_PATH)/lib/$(MOZ_DIRECTX_SDK_CPU_SUFFIX)/d3dx9.lib" \ "$(MOZ_DIRECTX_SDK_PATH)/lib/$(MOZ_DIRECTX_SDK_CPU_SUFFIX)/D3DCompiler.lib" + +endif diff --git a/gfx/angle/src/libGLESv2/libGLESv2.def b/gfx/angle/src/libGLESv2/libGLESv2.def index 5f935c3..2324dcb 100644 --- a/gfx/angle/src/libGLESv2/libGLESv2.def +++ b/gfx/angle/src/libGLESv2/libGLESv2.def @@ -180,3 +180,8 @@ EXPORTS glGetCurrentContext @147 NONAME glGetProcAddress @148 NONAME glBindTexImage @158 NONAME + + ; GCC has problems with linking to undecored stdcall functions, + ; so we explicitly add aliases for APIs used by EGL + glGetProcAddress@4=glGetProcAddress + glBindTexImage@4=glBindTexImage diff --git a/gfx/layers/d3d9/LayerManagerD3D9.cpp b/gfx/layers/d3d9/LayerManagerD3D9.cpp index fcda692..c3f85e5 100644 --- a/gfx/layers/d3d9/LayerManagerD3D9.cpp +++ b/gfx/layers/d3d9/LayerManagerD3D9.cpp @@ -16,6 +16,7 @@ #include "nsServiceManagerUtils.h" #include "gfxFailure.h" #include "mozilla/Preferences.h" +#include "nsServiceManagerUtils.h" #include "gfxCrashReporterUtils.h" diff --git a/js/src/configure.in b/js/src/configure.in index e5962d6..bca3ff3 100644 --- a/js/src/configure.in +++ b/js/src/configure.in @@ -1871,6 +1871,7 @@ ia64*-hpux*) if test -n "$GNU_CC"; then CFLAGS="$CFLAGS -mstackrealign -fno-keep-inline-dllexport" CXXFLAGS="$CXXFLAGS -mstackrealign -fno-keep-inline-dllexport" + LDFLAGS="$LDFLAGS -Wl,--large-address-aware" else DSO_LDOPTS="$DSO_LDOPTS -MACHINE:X86" fi diff --git a/toolkit/crashreporter/google-breakpad/src/common/windows/guid_string.h b/toolkit/crashreporter/google-breakpad/src/common/windows/guid_string.h index f8aa8a2..57716e5 100644 --- a/toolkit/crashreporter/google-breakpad/src/common/windows/guid_string.h +++ b/toolkit/crashreporter/google-breakpad/src/common/windows/guid_string.h @@ -32,7 +32,7 @@ #ifndef COMMON_WINDOWS_GUID_STRING_H__ #define COMMON_WINDOWS_GUID_STRING_H__ -#include <Guiddef.h> +#include <guiddef.h> #include <string> diff --git a/widget/windows/nsWindow.h b/widget/windows/nsWindow.h index dde77bf..32af401 100644 --- a/widget/windows/nsWindow.h +++ b/widget/windows/nsWindow.h @@ -33,7 +33,7 @@ #include "TaskbarWindowPreview.h" #ifdef ACCESSIBILITY -#include "OLEACC.H" +#include "oleacc.h" #include "mozilla/a11y/Accessible.h" #endif

1 0