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

[collector/master] Fix .jar signing.
by karsten＠torproject.org 24 Nov '16

24 Nov '16

commit 44087017f295a0093b225acb09a9a6eb33752e14 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Nov 24 09:12:17 2016 +0100 Fix .jar signing. Adapted from Onionoo's #20712. --- CHANGELOG.md | 2 ++ build.xml | 38 ++++++++++++++++++++++++++------------ 2 files changed, 28 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1c1def5..ed368be 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ * Medium changes - Retain hidserv-* lines in sanitized extra-info descriptors. + - Sign .jar files again, and ensure they get signed in the build + process. # Changes in version 1.1.0 - 2016-10-28 diff --git a/build.xml b/build.xml index 7efdeeb..916b8f5 100644 --- a/build.xml +++ b/build.xml @@ -8,6 +8,7 @@ <property name="webappsources" value="src/main/webapp"/> <property name="generated" value="generated"/> <property name="dist" value="${generated}/dist"/> + <property name="signed" value="${dist}/signed"/> <property name="testresult" value="${generated}/test-results"/> <property name="testsources" value="src/test/java"/> <property name="testresources" value="src/test/resources/"/> @@ -18,9 +19,9 @@ <property name="docs" value="${generated}/javadoc/"/> <property name="libs" value="lib"/> <property name="cobertura.ser.file" value="${basedir}/cobertura.ser" /> - <property name="jarfile" value="${dist}/collector-${release.version}.jar" /> - <property name="jarsourcesfile" value="${dist}/collector-${release.version}-sources.jar" /> - <property name="jarjavadocfile" value="${dist}/collector-${release.version}-javadoc.jar" /> + <property name="jarfile" value="collector-${release.version}.jar" /> + <property name="jarsourcesfile" value="collector-${release.version}-sources.jar" /> + <property name="jarjavadocfile" value="collector-${release.version}-javadoc.jar" /> <property name="release.tarball" value="${dist}/collector-${release.version}.tar.gz" /> <property file="build.properties" /> @@ -85,6 +86,8 @@ <mkdir dir="${docs}"/> <mkdir dir="${testresult}"/> <mkdir dir="${instrument}"/> + <mkdir dir="${dist}"/> + <mkdir dir="${signed}"/> </target> <target name="clean"> <delete includeEmptyDirs="true" quiet="true"> @@ -136,7 +139,7 @@ <arg value="--short" /> <arg value="HEAD" /> </exec> - <jar destfile="${jarfile}" + <jar destfile="${dist}/${jarfile}" basedir="${classes}"> <fileset dir="${resources}" > <include name="collector.properties"/> @@ -163,7 +166,7 @@ value="org.torproject.collector.Main" /> </manifest> </jar> - <jar destfile="${jarsourcesfile}"> + <jar destfile="${dist}/${jarsourcesfile}"> <fileset dir="${sources}" /> <fileset dir="${testsources}" /> <manifest> @@ -173,7 +176,7 @@ value="${release.version}-${git.revision}"/> </manifest> </jar> - <jar destfile="${jarjavadocfile}"> + <jar destfile="${dist}/${jarjavadocfile}"> <fileset dir="${docs}" /> <manifest> <attribute name="Created-By" value="The Tor Project" /> @@ -187,21 +190,32 @@ <signjar alias="${jarsigner.alias}" storepass="${jarsigner.storepass}" sigalg="SHA256withRSA" + destdir="${signed}" digestalg="SHA-256" tsaurl="http://timestamp.digicert.com"> <path> - <pathelement path="${jarfile}"/> - <pathelement path="${jarsourcesfile}"/> - <pathelement path="${jarjavadocfile}"/> + <fileset dir="${dist}" + includes="${jarfile} ${jarsourcesfile} ${jarjavadocfile}"/> </path> </signjar> + <fail message="Signing failed." > + <condition> + <not> + <and> + <issigned file="${signed}/${jarfile}"/> + <issigned file="${signed}/${jarsourcesfile}"/> + <issigned file="${signed}/${jarjavadocfile}"/> + </and> + </not> + </condition> + </fail> </target> <target name="tar" depends="signjar"> <tar destfile="${release.tarball}" compression="gzip"> <tarfileset dir="." prefix="collector-${release.version}"> - <include name="${jarfile}" /> - <include name="${jarsourcesfile}" /> - <include name="${jarjavadocfile}" /> + <include name="${signed}/${jarfile}" /> + <include name="${signed}/${jarsourcesfile}" /> + <include name="${signed}/${jarjavadocfile}" /> <include name="build.xml" /> <include name="LICENSE" /> <include name="CERT" />

1 0

[collector/master] Bump version to 1.1.2-dev.
by karsten＠torproject.org 24 Nov '16

24 Nov '16

commit 48ef37ab7175dfe53b4ce09ddfb3e12bf1c751df Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Nov 24 21:15:43 2016 +0100 Bump version to 1.1.2-dev. --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index 1b3a9c2..14e3e2c 100644 --- a/build.xml +++ b/build.xml @@ -1,5 +1,5 @@ <project default="compile" name="CollecTor" basedir="."> - <property name="release.version" value="1.1.1" /> + <property name="release.version" value="1.1.2-dev" /> <property name="name" value="CollecTor"/> <property name="descriptorversion" value="1.5.0" /> <property name="source-and-target-java-version" value="1.7" />

1 0

[collector/master] Prepare for 1.1.1 release.
by karsten＠torproject.org 24 Nov '16

24 Nov '16

commit 1510b0d060ea5b1c578b13767864ee7329332619 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Nov 24 09:25:49 2016 +0100 Prepare for 1.1.1 release. --- CHANGELOG.md | 8 +++++++- build.xml | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ed368be..4ffc821 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,16 @@ -# Changes in version ?.?.? - 201?-??-?? +# Changes in version 1.1.1 - 2016-11-24 * Medium changes + - Handle corrupt internal file used for checking references between + descriptors by deleting and regenerating instead of escalating. - Retain hidserv-* lines in sanitized extra-info descriptors. - Sign .jar files again, and ensure they get signed in the build process. + * Minor changes + - Add instructions and sample configuration for using nginx as HTTP + server rather than Apache. + # Changes in version 1.1.0 - 2016-10-28 diff --git a/build.xml b/build.xml index 916b8f5..1b3a9c2 100644 --- a/build.xml +++ b/build.xml @@ -1,5 +1,5 @@ <project default="compile" name="CollecTor" basedir="."> - <property name="release.version" value="1.2.0-dev" /> + <property name="release.version" value="1.1.1" /> <property name="name" value="CollecTor"/> <property name="descriptorversion" value="1.5.0" /> <property name="source-and-target-java-version" value="1.7" />

1 0

[stem/master] Update download links
by atagar＠torproject.org 24 Nov '16

24 Nov '16

commit c857786668aeb1f0862f87da6b5cdc4742abc1fc Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Nov 24 09:31:53 2016 -0800 Update download links Oops! Juan pointed out out download links still pointed to version 1.4.1. Seems PyPI no longer uploads to the shorter, nicer urls so we're stuck with these longer ones. --- docs/download.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/download.rst b/docs/download.rst index 43602d0..3250934 100644 --- a/docs/download.rst +++ b/docs/download.rst @@ -71,9 +71,9 @@ Download Signed releases and instructions for both Python 2.x and 3.x. You can easily install from its `tarball - <https://pypi.python.org/packages/source/s/stem/stem-1.4.1b.tar.bz2>`_ + <https://pypi.python.org/packages/5f/45/4ea1e1eb4a0562955736e6e2393a7e207ba9…>`_ (`sig - <https://pypi.python.org/packages/source/s/stem/stem-1.4.1b.tar.bz2.asc>`_), + <https://pypi.python.org/packages/5f/45/4ea1e1eb4a0562955736e6e2393a7e207ba9…>`_), or with **pip**... ::

1 0

[torbirdy/master] Bump version to 0.2.1
by sukhbir＠torproject.org 24 Nov '16

24 Nov '16

commit 5da0998476219764e3d8b06d4c12350ee042e143 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Thu Nov 24 11:20:05 2016 -0500 Bump version to 0.2.1 --- install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install.rdf b/install.rdf index 801c7ad..93736d4 100644 --- a/install.rdf +++ b/install.rdf @@ -4,7 +4,7 @@ xmlns:em="http://www.mozilla.org/2004/em-rdf#"> <Description about="urn:mozilla:install-manifest"> <em:id>castironthunderbirdclub(a)torproject.org</em:id> - <em:version>0.2.0</em:version> + <em:version>0.2.1</em:version> <em:type>2</em:type> <em:iconURL>chrome://castironthunderbirdclub/skin/images/tor.png</em:iconURL>

1 0

[torbirdy/master] Update changelog for Bug 20750, 20644
by sukhbir＠torproject.org 24 Nov '16

24 Nov '16

commit c2d524c9ca2e5ff541dc904764654bfada054569 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Thu Nov 24 11:13:52 2016 -0500 Update changelog for Bug 20750, 20644 --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index a2bbd8c..07774ae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,6 @@ 0.2.1, * Bug 20157: Do not set calendar timezone to UTC + * Bug 20750, 20644: Ensure RSS feeds are displayed in plain text * Revert setting no_proxies_on to an empty string * Added support for automatic configuration of systemli.org email accounts

1 0

[torbirdy/master] Bug 20750, 20644: Ensure RSS feeds are displayed as plain text
by sukhbir＠torproject.org 24 Nov '16

24 Nov '16

commit 1ee985b6d113780c0cfc0501ece56ca99e98a350 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Thu Nov 24 01:30:13 2016 -0500 Bug 20750, 20644: Ensure RSS feeds are displayed as plain text --- components/torbirdy.js | 1 + 1 file changed, 1 insertion(+) diff --git a/components/torbirdy.js b/components/torbirdy.js index 6d6bd23..41baf5f 100644 --- a/components/torbirdy.js +++ b/components/torbirdy.js @@ -320,6 +320,7 @@ var TorBirdyPrefs = { // These are similar to the mailnews.* settings. "rss.display.disallow_mime_handlers": 3, "rss.display.html_as": 1, + "rss.show.content-base": 1, // Override the user agent by setting it to an empty string. "general.useragent.override": "",

1 0

[tor-browser/tor-browser-45.5.0esr-6.5-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 24 Nov '16

24 Nov '16

commit 76d74d18040e22fdb6b100b4638078c2e83fa195 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Nov 14 10:46:45 2016 -0800 fixup! TB4: Tor Browser's Firefox preference overrides. --- browser/app/profile/000-tor-browser.js | 1 + 1 file changed, 1 insertion(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 1f1db9e..a5b6aa9 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -147,6 +147,7 @@ pref("ui.use_standins_for_native_colors", true); // https://bugzilla.mozilla.org // bug 18950 for more details. pref("browser.reader.detectedFirstArticle", true); pref("reader.parse-on-load.enabled", false); +pref("privacy.use_utc_timezone", true); // Third party stuff pref("network.cookie.cookieBehavior", 1);

1 0

[tor-browser/tor-browser-45.5.0esr-6.5-1] Bug 16622: Pref to spoof time zone as UTC
by gk＠torproject.org 24 Nov '16

24 Nov '16

commit d973b7ebaa5e93ee8e4b6b9f07ec51333687087b Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Nov 14 10:22:09 2016 -0800 Bug 16622: Pref to spoof time zone as UTC --- toolkit/xre/nsAppRunner.cpp | 9 +++++++++ toolkit/xre/nsAppRunner.h | 3 +++ 2 files changed, 12 insertions(+) diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp index f0cdd41..81f949a 100644 --- a/toolkit/xre/nsAppRunner.cpp +++ b/toolkit/xre/nsAppRunner.cpp @@ -4680,6 +4680,8 @@ XREMain::XRE_mainRun() OverrideDefaultLocaleIfNeeded(); + UseUTCTimeZoneIfNeeded(); + #ifdef MOZ_CRASHREPORTER nsCString userAgentLocale; // Try a localized string first. This pref is always a localized string in @@ -5385,3 +5387,10 @@ OverrideDefaultLocaleIfNeeded() { setlocale(LC_ALL, "C.UTF-8") || setlocale(LC_ALL, "C"); } } + +void +UseUTCTimeZoneIfNeeded() { + if (mozilla::Preferences::GetBool("privacy.use_utc_timezone", false)) { + SaveToEnv("TZ=UTC"); + } +} diff --git a/toolkit/xre/nsAppRunner.h b/toolkit/xre/nsAppRunner.h index c7048e0..cab42a4 100644 --- a/toolkit/xre/nsAppRunner.h +++ b/toolkit/xre/nsAppRunner.h @@ -96,6 +96,9 @@ WriteConsoleLog(); void OverrideDefaultLocaleIfNeeded(); +void +UseUTCTimeZoneIfNeeded(); + #ifdef XP_WIN void UseParentConsole();

1 0

[torbutton/master] Bug 16622: Timezone spoofing moved to tor-browser.git
by gk＠torproject.org 24 Nov '16

24 Nov '16

commit 86dd5f30f7b6b29d6eb7e1947c225cd3cc43021b Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Nov 14 10:49:20 2016 -0800 Bug 16622: Timezone spoofing moved to tor-browser.git --- src/chrome/content/torbutton.js | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 139cb41..c0fe710 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -891,17 +891,6 @@ function torbutton_update_toolbutton() torbutton_get_property_string(tooltipKey)); } -// Bug 1506 P4: Timezone spoofing is pretty important -function torbutton_set_timezone() { - /* Windows doesn't call tzset() automatically.. Linux and MacOS - * both do though.. FF3.5 now calls _tzset() for us on windows. - */ - torbutton_log(3, "Setting timezone to UTC"); - var environ = Components.classes["@mozilla.org/process/environment;1"] - .getService(Components.interfaces.nsIEnvironment); - environ.set("TZ", "UTC"); -} - // Bug 1506 P3: Support code for language+uagent spoofing function torbutton_get_general_useragent_locale() { try { @@ -1747,8 +1736,6 @@ function torbutton_update_fingerprinting_prefs() { m_tb_prefs.setBoolPref("extensions.torbutton.resize_new_windows", mode); - // XXX: How do we undo timezone? - // Force prefs to be synced to disk m_tb_prefs.savePrefFile(null); } @@ -2026,9 +2013,6 @@ function torbutton_do_startup() // Bug 1506: Should probably be moved to an XPCOM component torbutton_do_main_window_startup(); - // Bug 1506: Still want to do this - torbutton_set_timezone(); - // For charsets torbutton_update_fingerprinting_prefs();

1 0