- tor-commits - lists.torproject.org

[ooni-probe/master] Increase the timeout of director tests or travis will be sad
by art＠torproject.org 29 Apr '16

29 Apr '16

commit 3e047141058c2f9d172e7f6ff79055b73b629526 Author: Arturo Filastò <art(a)fuffa.org> Date: Mon Jul 27 16:52:50 2015 +0200 Increase the timeout of director tests or travis will be sad --- ooni/tests/test_oonicli.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ooni/tests/test_oonicli.py b/ooni/tests/test_oonicli.py index 2ca94e3..9e73061 100644 --- a/ooni/tests/test_oonicli.py +++ b/ooni/tests/test_oonicli.py @@ -59,6 +59,8 @@ tor: class TestRunDirector(ConfigTestCase): + timeout = 220 + def setUp(self): super(TestRunDirector, self).setUp() if not is_internet_connected():

1 0

[ooni-probe/master] Cosmetic fix
by art＠torproject.org 29 Apr '16

29 Apr '16

commit 4a3dbc875fd95ecbecc86e8a2c7ed313cac65fd8 Author: Arturo Filastò <art(a)fuffa.org> Date: Mon Jul 27 16:53:04 2015 +0200 Cosmetic fix --- ooni/utils/trueheaders.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ooni/utils/trueheaders.py b/ooni/utils/trueheaders.py index 3905949..ac73970 100644 --- a/ooni/utils/trueheaders.py +++ b/ooni/utils/trueheaders.py @@ -68,7 +68,7 @@ class TrueHeaders(http_headers.Headers): except KeyError: pass - for k, v in itertools.chain(headers_a.getAllRawHeaders(), \ + for k, v in itertools.chain(headers_a.getAllRawHeaders(), headers_b.getAllRawHeaders()): field_names.append(k)

1 0

[tor-browser-bundle/master] Remove references to unused packages in versions.beta
by gk＠torproject.org 29 Apr '16

29 Apr '16

commit 2949186d010368417599854304030951ad9d870c Author: Georg Koppen <gk(a)torproject.org> Date: Fri Apr 29 08:42:10 2016 +0000 Remove references to unused packages in versions.beta --- gitian/versions.beta | 5 ----- 1 file changed, 5 deletions(-) diff --git a/gitian/versions.beta b/gitian/versions.beta index 9df153b..87680b7 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -22,7 +22,6 @@ LIBEVENT_TAG=release-2.0.21-stable MINGW_REV=6184 PYPTLIB_TAG=pyptlib-0.0.6 OBFSPROXY_TAG=obfsproxy-0.2.12 -FLASHPROXY_TAG=1.6 LIBFTE_TAG=58734a5aec563600fa8d82fb48ea9d6b8e26556c # tag 0.1.0 FTEPROXY_TAG=597f8378f6f4f3de570b8e1064c2e4cb8d67fbd0 # tag 0.2.19 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 @@ -45,7 +44,6 @@ ARGPARSE_VER=1.2.1 PYYAML_VER=3.11 ZOPEINTERFACE_VER=4.0.5 TWISTED_VER=13.2.0 -M2CRYPTO_VER=0.21.1 PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 PARSLEY_VER=1.2 @@ -67,7 +65,6 @@ ARGPARSE_PACKAGE=argparse-${ARGPARSE_VER}.tar.gz PYYAML_PACKAGE=PyYAML-${PYYAML_VER}.tar.gz ZOPEINTERFACE_PACKAGE=zope.interface-${ZOPEINTERFACE_VER}.zip TWISTED_PACKAGE=Twisted-${TWISTED_VER}.tar.bz2 -M2CRYPTO_PACKAGE=M2Crypto-${M2CRYPTO_VER}.tar.gz PY2EXE_PACKAGE=py2exe-${PY2EXE_VER}.win32-py2.7.exe SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz @@ -92,7 +89,6 @@ ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 PYYAML_HASH=c36c938a872e5ff494938b33b14aaa156cb439ec67548fcab3535bb78b0846e8 ZOPEINTERFACE_HASH=1a7c84716bbd9981915b64a81d8a3f076a5934a8c8df4224655469b3564940cc TWISTED_HASH=095175638c019ac7c0604f4c291724a16ff1acd062e181b01293bf4dcbc62cf3 -M2CRYPTO_HASH=25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 @@ -119,7 +115,6 @@ PYYAML_URL=https://pypi.python.org/packages/source/P/PyYAML/${PYYAML_PACKAG… ZOPEINTERFACE_URL=https://pypi.python.org/packages/source/z/zope.interface/… TWISTED_URL=https://pypi.python.org/packages/source/T/Twisted/${TWISTED_PAC… # TWISTED_URL=https://twistedmatrix.com/Releases/Twisted/$(echo ${TWISTED_VER} | awk -F. '{print $1"."$2}')/${TWISTED_PACKAGE} -M2CRYPTO_URL=https://pypi.python.org/packages/source/M/M2Crypto/${M2CRYPTO_PACKAGE} PY2EXE_URL=http://softlayer-dal.dl.sourceforge.net/project/py2exe/py2exe/${… SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC…

1 0

[tor-browser-bundle/master] Bug 18919: Remove swig dependencies and wine-wrapper.
by gk＠torproject.org 29 Apr '16

29 Apr '16

commit 4f80e41c593e5680bfe31fcb421d04fc7d875c89 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Apr 23 09:30:15 2016 -0700 Bug 18919: Remove swig dependencies and wine-wrapper. swig was only needed as a dependency of M2crypto, which was removed in 969136e13861c1cc6d983a66a82736a1fae971c3. --- gitian/build-helpers/wine-wrappers/setup.py | 2 +- gitian/build-helpers/wine-wrappers/swig.py | 33 ---------------------- .../linux/gitian-pluggable-transports.yml | 2 -- .../mac/gitian-pluggable-transports.yml | 2 -- .../windows/gitian-pluggable-transports.yml | 2 +- 5 files changed, 2 insertions(+), 39 deletions(-) diff --git a/gitian/build-helpers/wine-wrappers/setup.py b/gitian/build-helpers/wine-wrappers/setup.py index 77a9526..f80f2c0 100644 --- a/gitian/build-helpers/wine-wrappers/setup.py +++ b/gitian/build-helpers/wine-wrappers/setup.py @@ -1,7 +1,7 @@ from distutils.core import setup import py2exe setup( - console=["gcc.py", "g++.py", "dllwrap.py", "swig.py"], + console=["gcc.py", "g++.py", "dllwrap.py"], zipfile=None, options={"py2exe": {"bundle_files": 1, "compressed": True}} ) diff --git a/gitian/build-helpers/wine-wrappers/swig.py b/gitian/build-helpers/wine-wrappers/swig.py deleted file mode 100755 index 45941f4..0000000 --- a/gitian/build-helpers/wine-wrappers/swig.py +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env python - -# A wrapper for swig that converts Windows paths to Unix paths, so that swig can -# be called by Python distutils. - -import os -import subprocess -import sys - -import common - -args = ["/usr/bin/swig"] -sys.argv.pop(0) -while sys.argv: - a = sys.argv.pop(0) - if not a.startswith("-"): - args.append(common.winepath(a)) - continue - if a in ("-I",): - args.append(a) - args.append(common.winepath(sys.argv.pop(0))) - continue - o = common.search_startswith(a, ("-I",)) - if o is not None: - path = a[len(o):] - args.append("%s%s" % (o, common.winepath(path))) - continue - args.append(a) -p = common.popen_faketime(args, stderr=subprocess.PIPE) -stderr = p.stderr.read() -sys.stderr.write(stderr) -if " Error: " in stderr: - sys.exit(1) diff --git a/gitian/descriptors/linux/gitian-pluggable-transports.yml b/gitian/descriptors/linux/gitian-pluggable-transports.yml index cecc390..38ae561 100644 --- a/gitian/descriptors/linux/gitian-pluggable-transports.yml +++ b/gitian/descriptors/linux/gitian-pluggable-transports.yml @@ -11,8 +11,6 @@ packages: - "unzip" - "python-setuptools" - "python-dev" -# Needed by M2Crypto -- "swig" - "zip" - "hardening-wrapper" reference_datetime: "2000-01-01 00:00:00" diff --git a/gitian/descriptors/mac/gitian-pluggable-transports.yml b/gitian/descriptors/mac/gitian-pluggable-transports.yml index 6b1a99e..fbf38c2 100644 --- a/gitian/descriptors/mac/gitian-pluggable-transports.yml +++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml @@ -10,8 +10,6 @@ packages: - "unzip" - "python-setuptools" - "python-dev" -# Needed by M2Crypto -- "swig" - "zip" reference_datetime: "2000-01-01 00:00:00" remotes: diff --git a/gitian/descriptors/windows/gitian-pluggable-transports.yml b/gitian/descriptors/windows/gitian-pluggable-transports.yml index 9c1642d..f073fd1 100644 --- a/gitian/descriptors/windows/gitian-pluggable-transports.yml +++ b/gitian/descriptors/windows/gitian-pluggable-transports.yml @@ -136,7 +136,7 @@ script: | mkdir -p build/bdist.win32/winexe/bundle-2.7/ cp -a $INSTDIR/python/python27.dll build/bdist.win32/winexe/bundle-2.7/ LD_PRELOAD= $INSTPYTHON setup.py py2exe - cp -a dist/gcc.exe dist/g++.exe dist/dllwrap.exe dist/swig.exe $WINEROOT/windows/ + cp -a dist/gcc.exe dist/g++.exe dist/dllwrap.exe $WINEROOT/windows/ cd .. # Building go

1 0

[tor-browser-bundle/master] Bug 18919: Remove unused gpg keys.
by gk＠torproject.org 29 Apr '16

29 Apr '16

commit 124cfb4ed86f38ddbcab81722f76a4bb4eed3424 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Apr 23 09:06:59 2016 -0700 Bug 18919: Remove unused gpg keys. Unused since ac9da1d5965169f91973d57737fcd20e06351b08: LXML PYTHON Unused since 969136e13861c1cc6d983a66a82736a1fae971c3: M2CRYPTO flashproxy --- gitian/gpg/LXML.gpg | Bin 1450 -> 0 bytes gitian/gpg/M2CRYPTO.gpg | Bin 2441 -> 0 bytes gitian/gpg/PYTHON.gpg | Bin 4446 -> 0 bytes gitian/gpg/flashproxy.gpg | Bin 5876 -> 0 bytes 4 files changed, 0 insertions(+), 0 deletions(-) diff --git a/gitian/gpg/LXML.gpg b/gitian/gpg/LXML.gpg deleted file mode 100644 index fd5f415..0000000 Binary files a/gitian/gpg/LXML.gpg and /dev/null differ diff --git a/gitian/gpg/M2CRYPTO.gpg b/gitian/gpg/M2CRYPTO.gpg deleted file mode 100644 index d6d889a..0000000 Binary files a/gitian/gpg/M2CRYPTO.gpg and /dev/null differ diff --git a/gitian/gpg/PYTHON.gpg b/gitian/gpg/PYTHON.gpg deleted file mode 100644 index 0b32223..0000000 Binary files a/gitian/gpg/PYTHON.gpg and /dev/null differ diff --git a/gitian/gpg/flashproxy.gpg b/gitian/gpg/flashproxy.gpg deleted file mode 100644 index f3b543f..0000000 Binary files a/gitian/gpg/flashproxy.gpg and /dev/null differ

1 0

[tor-browser/tor-browser-45.1.0esr-6.0-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 29 Apr '16

29 Apr '16

commit d592a0e41881c06e6d93c4f272ea7e4f3ea6e9bb Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Tue Apr 26 16:46:38 2016 -0700 fixup! TB4: Tor Browser's Firefox preference overrides. Disable Pocket feature (bug 18886) --- browser/app/profile/000-tor-browser.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index b2beff5..bd24118 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -97,6 +97,10 @@ pref("browser.search.geoip.url", ""); pref("browser.fixup.alternate.enabled", false); // Bug #16783: Prevent .onion fixups // Make sure there is no Tracking Protection active in Tor Browser, see: #17898. pref("privacy.trackingprotection.pbmode.enabled", false); +// Disable the Pocket extension (Bug #18886) +pref("browser.pocket.enabled", false); +pref("browser.pocket.api", ""); +pref("browser.pocket.site", ""); // Fingerprinting pref("webgl.min_capability_mode", true);

1 0

[collector/master] Extended .gitignore, replaced ERNIE by CollecTor, and changed copyright year for the touched files.
by karsten＠torproject.org 28 Apr '16

28 Apr '16

commit 9b6c3054d9a2f4b184ea96fad2dcfa58a90bdb81 Author: iwakeh <iwakeh(a)torproject.org> Date: Thu Apr 28 20:17:27 2016 +0000 Extended .gitignore, replaced ERNIE by CollecTor, and changed copyright year for the touched files. --- .gitignore | 2 ++ .../torproject/collector/bridgedescs/SanitizedBridgesWriter.java | 8 ++++---- .../collector/bridgepools/BridgePoolAssignmentsProcessor.java | 8 ++++---- src/org/torproject/collector/exitlists/ExitListDownloader.java | 8 ++++---- src/org/torproject/collector/main/LoggingConfiguration.java | 4 ++-- src/org/torproject/collector/relaydescs/ArchiveWriter.java | 8 ++++---- src/org/torproject/collector/torperf/TorperfDownloader.java | 8 ++++---- 7 files changed, 24 insertions(+), 22 deletions(-) diff --git a/.gitignore b/.gitignore index f7d045e..ec941d0 100644 --- a/.gitignore +++ b/.gitignore @@ -9,4 +9,6 @@ log/ rsync/ stats/ tarballs/ +generated +lib diff --git a/src/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java b/src/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java index cf2a1d0..4aa13ea 100644 --- a/src/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java +++ b/src/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java @@ -1,4 +1,4 @@ -/* Copyright 2010--2012 The Tor Project +/* Copyright 2010--2016 The Tor Project * See LICENSE for licensing information */ package org.torproject.collector.bridgedescs; @@ -54,7 +54,7 @@ public class SanitizedBridgesWriter extends Thread { new LoggingConfiguration("bridge-descriptors"); Logger logger = Logger.getLogger( SanitizedBridgesWriter.class.getName()); - logger.info("Starting bridge-descriptors module of ERNIE."); + logger.info("Starting bridge-descriptors module of CollecTor."); // Initialize configuration Configuration config = new Configuration(); @@ -62,7 +62,7 @@ public class SanitizedBridgesWriter extends Thread { // Use lock file to avoid overlapping runs LockFile lf = new LockFile("bridge-descriptors"); if (!lf.acquireLock()) { - logger.severe("Warning: ERNIE is already running or has not exited " + logger.severe("Warning: CollecTor is already running or has not exited " + "cleanly! Exiting!"); System.exit(1); } @@ -73,7 +73,7 @@ public class SanitizedBridgesWriter extends Thread { // Remove lock file lf.releaseLock(); - logger.info("Terminating bridge-descriptors module of ERNIE."); + logger.info("Terminating bridge-descriptors module of CollecTor."); } private Configuration config; diff --git a/src/org/torproject/collector/bridgepools/BridgePoolAssignmentsProcessor.java b/src/org/torproject/collector/bridgepools/BridgePoolAssignmentsProcessor.java index 33f28e2..b682316 100644 --- a/src/org/torproject/collector/bridgepools/BridgePoolAssignmentsProcessor.java +++ b/src/org/torproject/collector/bridgepools/BridgePoolAssignmentsProcessor.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2012 The Tor Project +/* Copyright 2011--2016 The Tor Project * See LICENSE for licensing information */ package org.torproject.collector.bridgepools; @@ -40,7 +40,7 @@ public class BridgePoolAssignmentsProcessor extends Thread { new LoggingConfiguration("bridge-pool-assignments"); Logger logger = Logger.getLogger( BridgePoolAssignmentsProcessor.class.getName()); - logger.info("Starting bridge-pool-assignments module of ERNIE."); + logger.info("Starting bridge-pool-assignments module of CollecTor."); // Initialize configuration Configuration config = new Configuration(); @@ -48,7 +48,7 @@ public class BridgePoolAssignmentsProcessor extends Thread { // Use lock file to avoid overlapping runs LockFile lf = new LockFile("bridge-pool-assignments"); if (!lf.acquireLock()) { - logger.severe("Warning: ERNIE is already running or has not exited " + logger.severe("Warning: CollecTor is already running or has not exited " + "cleanly! Exiting!"); System.exit(1); } @@ -59,7 +59,7 @@ public class BridgePoolAssignmentsProcessor extends Thread { // Remove lock file lf.releaseLock(); - logger.info("Terminating bridge-pool-assignments module of ERNIE."); + logger.info("Terminating bridge-pool-assignments module of CollecTor."); } private Configuration config; diff --git a/src/org/torproject/collector/exitlists/ExitListDownloader.java b/src/org/torproject/collector/exitlists/ExitListDownloader.java index 4f202d8..7e019b0 100644 --- a/src/org/torproject/collector/exitlists/ExitListDownloader.java +++ b/src/org/torproject/collector/exitlists/ExitListDownloader.java @@ -1,4 +1,4 @@ -/* Copyright 2010--2012 The Tor Project +/* Copyright 2010--2016 The Tor Project * See LICENSE for licensing information */ package org.torproject.collector.exitlists; @@ -36,7 +36,7 @@ public class ExitListDownloader extends Thread { /* Initialize logging configuration. */ new LoggingConfiguration("exit-lists"); Logger logger = Logger.getLogger(ExitListDownloader.class.getName()); - logger.info("Starting exit-lists module of ERNIE."); + logger.info("Starting exit-lists module of CollecTor."); // Initialize configuration Configuration config = new Configuration(); @@ -44,7 +44,7 @@ public class ExitListDownloader extends Thread { // Use lock file to avoid overlapping runs LockFile lf = new LockFile("exit-lists"); if (!lf.acquireLock()) { - logger.severe("Warning: ERNIE is already running or has not exited " + logger.severe("Warning: CollecTor is already running or has not exited " + "cleanly! Exiting!"); System.exit(1); } @@ -55,7 +55,7 @@ public class ExitListDownloader extends Thread { // Remove lock file lf.releaseLock(); - logger.info("Terminating exit-lists module of ERNIE."); + logger.info("Terminating exit-lists module of CollecTor."); } public ExitListDownloader(Configuration config) { diff --git a/src/org/torproject/collector/main/LoggingConfiguration.java b/src/org/torproject/collector/main/LoggingConfiguration.java index 4da527b..f3a620c 100644 --- a/src/org/torproject/collector/main/LoggingConfiguration.java +++ b/src/org/torproject/collector/main/LoggingConfiguration.java @@ -1,4 +1,4 @@ -/* Copyright 2010--2012 The Tor Project +/* Copyright 2010--2016 The Tor Project * See LICENSE for licensing information */ package org.torproject.collector.main; @@ -18,7 +18,7 @@ import java.util.logging.Logger; /** * Initialize logging configuration. * - * Log levels used by ERNIE: + * Log levels used by CollecTor: * * - SEVERE: An event made it impossible to continue program execution. * - WARNING: A potential problem occurred that requires the operator to diff --git a/src/org/torproject/collector/relaydescs/ArchiveWriter.java b/src/org/torproject/collector/relaydescs/ArchiveWriter.java index da83bd1..a4bddff 100644 --- a/src/org/torproject/collector/relaydescs/ArchiveWriter.java +++ b/src/org/torproject/collector/relaydescs/ArchiveWriter.java @@ -1,4 +1,4 @@ -/* Copyright 2010--2014 The Tor Project +/* Copyright 2010--2016 The Tor Project * See LICENSE for licensing information */ package org.torproject.collector.relaydescs; @@ -41,7 +41,7 @@ public class ArchiveWriter extends Thread { /* Initialize logging configuration. */ new LoggingConfiguration("relay-descriptors"); Logger logger = Logger.getLogger(ArchiveWriter.class.getName()); - logger.info("Starting relay-descriptors module of ERNIE."); + logger.info("Starting relay-descriptors module of CollecTor."); // Initialize configuration Configuration config = new Configuration(); @@ -49,7 +49,7 @@ public class ArchiveWriter extends Thread { // Use lock file to avoid overlapping runs LockFile lf = new LockFile("relay-descriptors"); if (!lf.acquireLock()) { - logger.severe("Warning: ERNIE is already running or has not exited " + logger.severe("Warning: CollecTor is already running or has not exited " + "cleanly! Exiting!"); System.exit(1); } @@ -64,7 +64,7 @@ public class ArchiveWriter extends Thread { // Remove lock file lf.releaseLock(); - logger.info("Terminating relay-descriptors module of ERNIE."); + logger.info("Terminating relay-descriptors module of CollecTor."); } private Configuration config; diff --git a/src/org/torproject/collector/torperf/TorperfDownloader.java b/src/org/torproject/collector/torperf/TorperfDownloader.java index 2b65552..a1483c2 100644 --- a/src/org/torproject/collector/torperf/TorperfDownloader.java +++ b/src/org/torproject/collector/torperf/TorperfDownloader.java @@ -1,4 +1,4 @@ -/* Copyright 2012 The Tor Project +/* Copyright 2012-2016 The Tor Project * See LICENSE for licensing information */ package org.torproject.collector.torperf; @@ -36,7 +36,7 @@ public class TorperfDownloader extends Thread { /* Initialize logging configuration. */ new LoggingConfiguration("torperf"); Logger logger = Logger.getLogger(TorperfDownloader.class.getName()); - logger.info("Starting torperf module of ERNIE."); + logger.info("Starting torperf module of CollecTor."); // Initialize configuration Configuration config = new Configuration(); @@ -44,7 +44,7 @@ public class TorperfDownloader extends Thread { // Use lock file to avoid overlapping runs LockFile lf = new LockFile("torperf"); if (!lf.acquireLock()) { - logger.severe("Warning: ERNIE is already running or has not exited " + logger.severe("Warning: CollecTor is already running or has not exited " + "cleanly! Exiting!"); System.exit(1); } @@ -55,7 +55,7 @@ public class TorperfDownloader extends Thread { // Remove lock file lf.releaseLock(); - logger.info("Terminating torperf module of ERNIE."); + logger.info("Terminating torperf module of CollecTor."); } private Configuration config;

1 0

[collector/master] Added checkstyle task.
by karsten＠torproject.org 28 Apr '16

28 Apr '16

commit 1609d64dbfa856943947fed5fe7c5b42ecc9446f Author: iwakeh <iwakeh(a)torproject.org> Date: Thu Apr 28 20:17:27 2016 +0000 Added checkstyle task. --- build.xml | 21 +++++ resources/metrics_checks.xml | 210 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 231 insertions(+) diff --git a/build.xml b/build.xml index cec0bb2..8e99076 100644 --- a/build.xml +++ b/build.xml @@ -4,6 +4,7 @@ <property name="descriptorversion" value="1.1.0-dev" /> <property name="source-and-target-java-version" value="1.7" /> <property name="sources" value="src/"/> + <property name="resources" value="resources/"/> <property name="generated" value="generated/"/> <property name="testresult" value="${generated}/test-results"/> <property name="testsources" value="test"/> @@ -27,6 +28,11 @@ <include name="descriptor-${descriptorversion}.jar"/> </fileset> </path> + <path id="checkstyle.classpath" > + <fileset dir="${libs}"> + <include name="checkstyle-6.17-all.jar" /> + </fileset> + </path> <path id="cobertura.classpath"> <fileset dir="${libs}"> <include name="descriptor-${descriptorversion}.jar"/> @@ -135,6 +141,21 @@ </manifest> </jar> </target> + <taskdef resource="com/puppycrawl/tools/checkstyle/ant/checkstyle-ant-task.properties"> + <classpath refid="checkstyle.classpath" /> + </taskdef> + <target name="checks" depends="compile"> + <checkstyle config="${resources}/metrics_checks.xml"> + <fileset dir="${sources}" + includes="**/*.java" /> + <classpath> + <path refid="classpath" /> + <path refid="checkstyle.classpath" /> + </classpath> + <formatter type="plain" + toFile="${generated}/checkstyle_report.txt"/> + </checkstyle> + </target> <taskdef classpathref="cobertura.classpath" resource="tasks.properties" /> <target name="coverage" depends="compile,compile-tests"> <copy todir="${instrument}" > diff --git a/resources/metrics_checks.xml b/resources/metrics_checks.xml new file mode 100644 index 0000000..4fa2737 --- /dev/null +++ b/resources/metrics_checks.xml @@ -0,0 +1,210 @@ +<?xml version="1.0"?> +<!DOCTYPE module PUBLIC + "-//Puppy Crawl//DTD Check Configuration 1.3//EN" + "http://www.puppycrawl.com/dtds/configuration_1_3.dtd"> + + + +<module name = "Checker"> + <property name="charset" value="UTF-8"/> + + <property name="severity" value="warning"/> + + <property name="fileExtensions" value="java, properties, xml"/> +  +  + <module name="FileTabCharacter"> + <property name="eachLine" value="true"/> + </module> + + <module name="TreeWalker"> + <module name="OuterTypeFilename"/> + <module name="IllegalTokenText"> + <property name="tokens" value="STRING_LITERAL, CHAR_LITERAL"/> + <property name="format" value="\\u00(08|09|0(a|A)|0(c|C)|0(d|D)|22|27|5(C|c))|\\(0(10|11|12|14|15|42|47)|134)"/> + <property name="message" value="Avoid using corresponding octal or Unicode escape."/> + </module> + <module name="AvoidEscapedUnicodeCharacters"> + <property name="allowEscapesForControlCharacters" value="true"/> + <property name="allowByTailComment" value="true"/> + <property name="allowNonPrintableEscapes" value="true"/> + </module> + <module name="LineLength"> + <property name="max" value="100"/> + <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/> + </module> + <module name="AvoidStarImport"/> + <module name="OneTopLevelClass"/> + <module name="NoLineWrap"/> + <module name="EmptyBlock"> + <property name="option" value="TEXT"/> + <property name="tokens" value="LITERAL_TRY, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_SWITCH"/> + </module> + <module name="NeedBraces"/> + <module name="LeftCurly"> + <property name="maxLineLength" value="100"/> + </module> + <module name="RightCurly"/> + <module name="RightCurly"> + <property name="option" value="alone"/> + <property name="tokens" value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, LITERAL_DO, STATIC_INIT, INSTANCE_INIT"/> + </module> + <module name="WhitespaceAround"> + <property name="allowEmptyConstructors" value="true"/> + <property name="allowEmptyMethods" value="true"/> + <property name="allowEmptyTypes" value="true"/> + <property name="allowEmptyLoops" value="true"/> + <message key="ws.notFollowed" + value="WhitespaceAround: ''{0}'' is not followed by whitespace. Empty blocks may only be represented as '{}' when not part of a multi-block statement (4.1.3)"/> + <message key="ws.notPreceded" + value="WhitespaceAround: ''{0}'' is not preceded with whitespace."/> + </module> + <module name="OneStatementPerLine"/> + <module name="MultipleVariableDeclarations"/> + <module name="ArrayTypeStyle"/> + <module name="MissingSwitchDefault"/> + <module name="FallThrough"/> + <module name="UpperEll"/> + <module name="ModifierOrder"/> + <module name="EmptyLineSeparator"> + <property name="allowNoEmptyLineBetweenFields" value="true"/> + </module> + <module name="SeparatorWrap"> + <property name="tokens" value="DOT"/> + <property name="option" value="nl"/> + </module> + <module name="SeparatorWrap"> + <property name="tokens" value="COMMA"/> + <property name="option" value="EOL"/> + </module> + <module name="PackageName"> + <property name="format" value="^[a-z]+(\.[a-z][a-z0-9]*)*$"/> + <message key="name.invalidPattern" + value="Package name ''{0}'' must match pattern ''{1}''."/> + </module> + <module name="TypeName"> + <message key="name.invalidPattern" + value="Type name ''{0}'' must match pattern ''{1}''."/> + </module> + <module name="MemberName"> + <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9]*$"/> + <message key="name.invalidPattern" + value="Member name ''{0}'' must match pattern ''{1}''."/> + </module> + <module name="ParameterName"> + <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9]*$"/> + <message key="name.invalidPattern" + value="Parameter name ''{0}'' must match pattern ''{1}''."/> + </module> + <module name="CatchParameterName"> + <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9]*$"/> + <message key="name.invalidPattern" + value="Catch parameter name ''{0}'' must match pattern ''{1}''."/> + </module> + <module name="LocalVariableName"> + <property name="tokens" value="VARIABLE_DEF"/> + <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9]*$"/> + <property name="allowOneCharVarInForLoop" value="true"/> + <message key="name.invalidPattern" + value="Local variable name ''{0}'' must match pattern ''{1}''."/> + </module> + <module name="ClassTypeParameterName"> + <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/> + <message key="name.invalidPattern" + value="Class type name ''{0}'' must match pattern ''{1}''."/> + </module> + <module name="MethodTypeParameterName"> + <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/> + <message key="name.invalidPattern" + value="Method type name ''{0}'' must match pattern ''{1}''."/> + </module> + <module name="InterfaceTypeParameterName"> + <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/> + <message key="name.invalidPattern" + value="Interface type name ''{0}'' must match pattern ''{1}''."/> + </module> + <module name="NoFinalizer"/> + <module name="GenericWhitespace"> + <message key="ws.followed" + value="GenericWhitespace ''{0}'' is followed by whitespace."/> + <message key="ws.preceded" + value="GenericWhitespace ''{0}'' is preceded with whitespace."/> + <message key="ws.illegalFollow" + value="GenericWhitespace ''{0}'' should followed by whitespace."/> + <message key="ws.notPreceded" + value="GenericWhitespace ''{0}'' is not preceded with whitespace."/> + </module> + <module name="Indentation"> + <property name="basicOffset" value="2"/> + <property name="braceAdjustment" value="0"/> + <property name="caseIndent" value="2"/> + <property name="throwsIndent" value="4"/> + <property name="lineWrappingIndentation" value="4"/> + <property name="arrayInitIndent" value="2"/> + </module> + <module name="AbbreviationAsWordInName"> + <property name="ignoreFinal" value="false"/> + <property name="allowedAbbreviationLength" value="1"/> + </module> + <module name="OverloadMethodsDeclarationOrder"/> + <module name="VariableDeclarationUsageDistance"/> + <module name="CustomImportOrder"> + <property name="specialImportsRegExp" value="com.google"/> + <property name="sortImportsInGroupAlphabetically" value="true"/> + <property name="customImportOrderRules" value="STATIC###SPECIAL_IMPORTS###THIRD_PARTY_PACKAGE###STANDARD_JAVA_PACKAGE"/> + </module> + <module name="MethodParamPad"/> + <module name="OperatorWrap"> + <property name="option" value="NL"/> + <property name="tokens" value="BAND, BOR, BSR, BXOR, DIV, EQUAL, GE, GT, LAND, LE, LITERAL_INSTANCEOF, LOR, LT, MINUS, MOD, NOT_EQUAL, PLUS, QUESTION, SL, SR, STAR "/> + </module> + <module name="AnnotationLocation"> + <property name="tokens" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF"/> + </module> + <module name="AnnotationLocation"> + <property name="tokens" value="VARIABLE_DEF"/> + <property name="allowSamelineMultipleAnnotations" value="true"/> + </module> + <module name="NonEmptyAtclauseDescription"/> + <module name="JavadocTagContinuationIndentation"/> + <module name="SummaryJavadoc"> + <property name="forbiddenSummaryFragments" value="^@return the *|^This method returns |^A [{]@code [a-zA-Z0-9]+[}]( is a )"/> + </module> + <module name="JavadocParagraph"/> + <module name="AtclauseOrder"> + <property name="tagOrder" value="@param, @return, @throws, @deprecated"/> + <property name="target" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/> + </module> + <module name="JavadocMethod"> + <property name="scope" value="public"/> + <property name="allowMissingParamTags" value="true"/> + <property name="allowMissingThrowsTags" value="true"/> + <property name="allowMissingReturnTag" value="true"/> + <property name="minLineCount" value="2"/> + <property name="allowedAnnotations" value="Override, Test"/> + <property name="allowThrowsTagsForSubclasses" value="true"/> + </module> + <module name="MethodName"> + <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9_]*$"/> + <message key="name.invalidPattern" + value="Method name ''{0}'' must match pattern ''{1}''."/> + </module> + <module name="SingleLineJavadoc"> + <property name="ignoreInlineTags" value="false"/> + </module> + <module name="EmptyCatchBlock"> + <property name="exceptionVariableName" value="expected"/> + </module> + <module name="CommentsIndentation"/> + </module> +</module>

1 0

[translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
by translation＠torproject.org 28 Apr '16

28 Apr '16

commit 4a67ea3a1f8881c2c957a85e996bd555259ef639 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 28 18:16:05 2016 +0000 Update translations for torbutton-torbuttonproperties --- ca/torbutton.properties | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ca/torbutton.properties b/ca/torbutton.properties index 604efc0..956b96c 100644 --- a/ca/torbutton.properties +++ b/ca/torbutton.properties @@ -39,12 +39,12 @@ torbutton.popup.dontask = A partir d'ara, descarrega els fitxers automàticament torbutton.popup.test.no_http_proxy = Prova de proxy Tor: no es pot assolir el Proxy HTTP local. Comproveu si Polipo funciona correctament. torbutton.popup.captcha.title = Voleu evitar els Captchas de Google? torbutton.popup.captcha.ask = El Torbutton ha detectat un Captcha de Google. Voleu utilitzar un motor de cerca diferent, aquest cop? -torbutton.popup.captcha.always = Realitzar sempre aquesta acció -torbutton.popup.redirect = Redireccionar -torbutton.popup.no_redirect = No redireccionar -torbutton.popup.prompted_language = Per donar-li més privacitat, Torbutton pot demanar la versió en anglès de les pàgines web. Això pot provocar que pàgines web que prefereixi veure a la teva llengua nativa siguin mostrades en anglès.\n\nDesitja demanar les pàgines web en anglès per una major privacitat? -torbutton.popup.no_newnym = Torbutton no pot adjudicar-li de forma segura una nova identitat. No disposa d'accés al Tor Control Port.\n\nEsteu usant Tor Browser Bundle? -torbutton.popup.use_tbb = Sembla que està usant Torbutton amb Firefox, el qual ja no és una configuració segura recomanada.\n\nAl seu lloc, recomanem que obtinga l'últim Tor Browser Bundle enviant un email a gettor(a)torproject.org o bé descarregant-lo de l'adreça següent: +torbutton.popup.captcha.always = A partir d'ara, realitza sempre aquesta acció. +torbutton.popup.redirect = Redirecciona +torbutton.popup.no_redirect = No redireccionis +torbutton.popup.prompted_language = Per donar-vos més privacitat, el Torbutton pot demanar la versió en anglès de les pàgines web. Això pot provocar que les pàgines web que vulgueu veure en una altra llengua siguin mostrades en anglès.\n\nVoleu demanar les pàgines web en anglès per una major privadesa? +torbutton.popup.no_newnym = El Torbutton no pot adjudicar-vos de forma segura una nova identitat. No disposeu d'accés al Tor Control Port.\n\nEsteu usant el Tor Browser Bundle? +torbutton.popup.use_tbb = Sembla que esteu fent servir el Torbutton amb el Firefox, i això ja no és una configuració segura recomanada. \n\nAl seu lloc, recomanem que obtingueu l'última versió del Tor Browser Bundle enviant un correu electrònic a gettor(a)torproject.org o baixant-la de l'adreça següent: torbutton.popup.pref_error = Torbutton no pot actualitzar les preferències al directori de perfil del Tor Browser. torbutton.popup.permission_denied = Siusplau, o bé re-inicieu els permisos del directori Tor Browser o copieu-lo a una nova ubicació. torbutton.popup.device_full = Sembla que el disc és ple. Siusplau allibereu espai o moveu Tor Browser a un nou dispositiu.

1 0

[translation/tor-launcher-properties_completed] Update translations for tor-launcher-properties_completed
by translation＠torproject.org 28 Apr '16

28 Apr '16

commit 204a40c9aa533a8cce0c4cdb230d98405f7d14fe Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 28 18:15:42 2016 +0000 Update translations for tor-launcher-properties_completed --- ca/torlauncher.properties | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/ca/torlauncher.properties b/ca/torlauncher.properties index 520ffda..e5e22f0 100644 --- a/ca/torlauncher.properties +++ b/ca/torlauncher.properties @@ -1,25 +1,25 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Inicialitzador Tor torlauncher.tor_exited=Tor ha sortit inesperadament. Pot ser degut a un error de Tor, d'un altre programa del vostre sistema, o d'una fallada del maquinari. Fins que no reinicieu Tor, el Navegador Tor no podrà accedir a cap web. Si el problema persisteix, envieu una còpia del vostre registre de Tor a l'equip d'assistència. torlauncher.tor_exited2=Reiniciar Tor no tancarà les pestanyes del navegador. -torlauncher.tor_controlconn_failed=Nos'ha pogut conectar al port de control Tor -torlauncher.tor_failed_to_start=Tor ha fallat al iniciar. +torlauncher.tor_controlconn_failed=No s'ha pogut conectar al port de control Tor +torlauncher.tor_failed_to_start=Tor ha fallat mentre iniciava. torlauncher.tor_control_failed=No s'ha pogut prendre el control de Tor. torlauncher.tor_bootstrap_failed=Tor no ha pogut establir una connexió de xarxa Tor. torlauncher.tor_bootstrap_failed_details=%1$S ha fallat (%2$S). -torlauncher.unable_to_start_tor=Impossible iniciar Tor.\n%S +torlauncher.unable_to_start_tor=No s'ha pogut iniciar Tor.\n%S torlauncher.tor_missing=Falta l'executable de Tor. -torlauncher.torrc_missing=Falta l'arxiu torrc. -torlauncher.datadir_missing=La carpeta de dades de Tor no existeix. -torlauncher.password_hash_missing=Ha fallat l'obtencio de la contrasenya hash. +torlauncher.torrc_missing=El fitxer torrc no hi és i no s'ha pogut crear. +torlauncher.datadir_missing=La carpeta de dades de Tor no existeix i no s'ha pogut crear. +torlauncher.password_hash_missing=Ha fallat l'obtenció de la contrasenya hash. -torlauncher.failed_to_get_settings=Impossible obtenir la configuració de Tor\n%S -torlauncher.failed_to_save_settings=Impossible guardar la configuració de Tor.\n%S -torlauncher.ensure_tor_is_running=Si us plau assegurat de que Tor esta funcionant. +torlauncher.failed_to_get_settings=No s'ha pogut obtenir la configuració de Tor\n%S +torlauncher.failed_to_save_settings=No s'ha pogut desar la configuració de Tor.\n%S +torlauncher.ensure_tor_is_running=Assegureu-vos que el Tor esta funcionant. torlauncher.error_proxy_addr_missing=Heu d'especificar tant una adreça IP o domini com un número de port per a configurar el Tor per tal que pugui utilitzar un servidor intermediari per a accedir a Internet. torlauncher.error_proxy_type_missing=Heu de seleccionar el tipus de proxy. @@ -36,6 +36,7 @@ torlauncher.quit_win=Surt torlauncher.done=Fet torlauncher.forAssistance=Per assistència, contacta %S +torlauncher.forAssistance2=Per a més ajuda, visiteu %S torlauncher.copiedNLogMessages=Còpia completada. Els missatges del registre de %S Tor ja es poden enganxar en un editor de text o un missatge de correu.

1 0