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

[chutney/master] Make sure the chutney executable is a regular file
by teor＠torproject.org 12 Aug '16

12 Aug '16

commit 54178b5a9c5a58947fb17ae0e8b5ba29d5d37f08 Author: teor <teor2345(a)gmail.com> Date: Fri Aug 12 09:51:59 2016 +1000 Make sure the chutney executable is a regular file Otherwise, test-network.sh can confuse the chutney directory and the chutney launch script. --- tools/test-network.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/tools/test-network.sh b/tools/test-network.sh index 57bdce2..26a825d 100755 --- a/tools/test-network.sh +++ b/tools/test-network.sh @@ -125,16 +125,19 @@ fi # - if $PWD looks like a chutney directory, set it to $PWD, or # - set it based on $TOR_DIR, expecting chutney to be next to tor, or # - fail and tell the user how to clone the chutney repository -if [ ! -d "$CHUTNEY_PATH" -o ! -x "$CHUTNEY_PATH/chutney" ]; then - if [ -x "$PWD/chutney" ]; then +if [ ! -d "$CHUTNEY_PATH" -o ! -x "$CHUTNEY_PATH/chutney" -o \ + ! -f "$CHUTNEY_PATH/chutney" ]; then + if [ -x "$PWD/chutney" -a -f "$PWD/chutney" ]; then echo "$myname: \$CHUTNEY_PATH not valid, trying \$PWD" export CHUTNEY_PATH="$PWD" elif [ -d "`dirname \"$0\"`/.." -a \ - -x "`dirname \"$0\"`/../chutney" ]; then + -x "`dirname \"$0\"`/../chutney" -a \ + -f "`dirname \"$0\"`/../chutney" ]; then echo "$myname: \$CHUTNEY_PATH not valid, using this script's location" export CHUTNEY_PATH="`dirname \"$0\"`/.." elif [ -d "$TOR_DIR" -a -d "$TOR_DIR/../chutney" -a \ - -x "$TOR_DIR/../chutney/chutney" ]; then + -x "$TOR_DIR/../chutney/chutney" -a \ + -f "$TOR_DIR/../chutney/chutney" ]; then echo "$myname: \$CHUTNEY_PATH not valid, trying \$TOR_DIR/../chutney" export CHUTNEY_PATH="$TOR_DIR/../chutney" else

1 0

[tor/master] Only use evutil_secure_rng_add_bytes() when present.
by nickm＠torproject.org 12 Aug '16

12 Aug '16

commit e788c577f11ef4c0309e9d5298bf57639c0ebb06 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 11 20:37:18 2016 -0400 Only use evutil_secure_rng_add_bytes() when present. OpenBSD removes this function, and now that Tor requires Libevent 2, we should also support the OpenBSD Libevent 2. Fixes bug 19904; bugfix on 0.2.5.4-alpha. --- changes/bug19904 | 4 ++++ configure.ac | 4 +++- src/common/compat_libevent.c | 2 ++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/changes/bug19904 b/changes/bug19904 new file mode 100644 index 0000000..217d82d --- /dev/null +++ b/changes/bug19904 @@ -0,0 +1,4 @@ + o Minor bugfixes (compilation): + - Build correctly on versions of libevent2 without support + for evutil_secure_rng_add_bytes(). Fixes bug 19904; + bugfix on 0.2.5.4-alpha. diff --git a/configure.ac b/configure.ac index be7c4e8..a1a55e1 100644 --- a/configure.ac +++ b/configure.ac @@ -500,7 +500,9 @@ save_CPPFLAGS="$CPPFLAGS" LIBS="-levent $STATIC_LIBEVENT_FLAGS $TOR_LIB_WS32 $LIBS" LDFLAGS="$TOR_LDFLAGS_libevent $LDFLAGS" CPPFLAGS="$TOR_CPPFLAGS_libevent $CPPFLAGS" -AC_CHECK_FUNCS([evutil_secure_rng_set_urandom_device_file]) +AC_CHECK_FUNCS([evutil_secure_rng_set_urandom_device_file \ + evutil_secure_rng_add_bytes \ +]) LIBS="$STATIC_LIBEVENT_FLAGS $TOR_LIB_WS32 $save_LIBS" diff --git a/src/common/compat_libevent.c b/src/common/compat_libevent.c index 4dab544..055d6a8 100644 --- a/src/common/compat_libevent.c +++ b/src/common/compat_libevent.c @@ -337,7 +337,9 @@ tor_init_libevent_rng(void) rv = -1; } crypto_rand(buf, 32); +#ifdef HAVE_EVUTIL_SECURE_RNG_ADD_BYTES evutil_secure_rng_add_bytes(buf, 32); +#endif evutil_secure_rng_get_bytes(buf, sizeof(buf)); return rv; }

1 0

[tor/master] Fix a bug in the old-gcc version of ENABLE_GCC_WARNING
by nickm＠torproject.org 11 Aug '16

11 Aug '16

commit 60997a00e8e7585e076c750ab37095c0bfc3c773 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 11 19:58:13 2016 -0400 Fix a bug in the old-gcc version of ENABLE_GCC_WARNING Fixes bug 19901; bugfix on 0.2.9.1-alpha. --- changes/bug19901 | 5 +++++ src/common/compat.h | 14 +++++++------- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/changes/bug19901 b/changes/bug19901 new file mode 100644 index 0000000..97bca06 --- /dev/null +++ b/changes/bug19901 @@ -0,0 +1,5 @@ + o Minor bugfixes (compilation): +v - Fix a compilation warning on GCC versions before 4.6. Our + ENABLE_GCC_WARNING macro used the word "warning" as an + argument, when it is also required as an argument to the + compiler pragma. Fixes bug 19901; bugfix on 0.2.9.1-alpha. diff --git a/src/common/compat.h b/src/common/compat.h index 54ab8b0..40bcb26 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -104,17 +104,17 @@ # endif # if defined(__clang__) || GCC_VERSION >= 406 /* we have push/pop support */ -# define DISABLE_GCC_WARNING(warning) \ +# define DISABLE_GCC_WARNING(warningopt) \ PRAGMA_DIAGNOSTIC_(push) \ - PRAGMA_DIAGNOSTIC_(ignored PRAGMA_JOIN_STRINGIFY_(-W,warning)) -# define ENABLE_GCC_WARNING(warning) \ + PRAGMA_DIAGNOSTIC_(ignored PRAGMA_JOIN_STRINGIFY_(-W,warningopt)) +# define ENABLE_GCC_WARNING(warningopt) \ PRAGMA_DIAGNOSTIC_(pop) # else /* older version of gcc: no push/pop support. */ -# define DISABLE_GCC_WARNING(warning) \ - PRAGMA_DIAGNOSTIC_(ignored PRAGMA_JOIN_STRINGIFY_(-W,warning)) -# define ENABLE_GCC_WARNING(warning) \ - PRAGMA_DIAGNOSTIC_(warning PRAGMA_JOIN_STRINGIFY_(-W,warning)) +# define DISABLE_GCC_WARNING(warningopt) \ + PRAGMA_DIAGNOSTIC_(ignored PRAGMA_JOIN_STRINGIFY_(-W,warningopt)) +# define ENABLE_GCC_WARNING(warningopt) \ + PRAGMA_DIAGNOSTIC_(warning PRAGMA_JOIN_STRINGIFY_(-W,warningopt)) # endif #else /* ifdef __GNUC__ */ /* not gcc at all */

1 0

[tor-messenger-build/updater] Add MAR signing keys
by sukhbir＠torproject.org 11 Aug '16

11 Aug '16

commit 3f1f586b54c723eb09327498145f31c0bb5193bf Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Wed Aug 10 12:43:15 2016 -0400 Add MAR signing keys Similar to Tor Browser (#18008), we embed two MAR signing keys and will sign the builds with either of them. --- projects/instantbird/build | 3 +++ projects/instantbird/config | 2 ++ projects/instantbird/marsigner.der | Bin 0 -> 1233 bytes projects/instantbird/marsigner1.der | Bin 0 -> 1235 bytes 4 files changed, 5 insertions(+) diff --git a/projects/instantbird/build b/projects/instantbird/build index 2701591..293fc07 100644 --- a/projects/instantbird/build +++ b/projects/instantbird/build @@ -90,6 +90,9 @@ then done fi +cp $rootdir/marsigner.der toolkit/mozapps/update/updater/release_primary.der +cp $rootdir/marsigner1.der toolkit/mozapps/update/updater/release_secondary.der + cp $rootdir/aboutTBUpdateLogo.png browser/base/content/abouttbupdate/ if ls -1 $rootdir/*.nsspatch > /dev/null 2>&1 diff --git a/projects/instantbird/config b/projects/instantbird/config index 3acde39..65d3316 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -106,6 +106,8 @@ input_files: - filename: about-wordmark.png - filename: branding-aboutDialog.css - filename: updater-text.patch + - filename: marsigner.der + - filename: marsigner1.der - filename: branding/osx.patch enable: '[% c("var/osx") %]' - filename: bug-1218193.patch diff --git a/projects/instantbird/marsigner.der b/projects/instantbird/marsigner.der new file mode 100644 index 0000000..5f98d36 Binary files /dev/null and b/projects/instantbird/marsigner.der differ diff --git a/projects/instantbird/marsigner1.der b/projects/instantbird/marsigner1.der new file mode 100644 index 0000000..a7370bd Binary files /dev/null and b/projects/instantbird/marsigner1.der differ

1 0

[tor-messenger-build/master] Add patch to set updater window brand name
by sukhbir＠torproject.org 11 Aug '16

11 Aug '16

commit 6d7b1c1ce2387e028169a704b7da6baef2451944 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Sat Jul 30 20:50:13 2016 -0400 Add patch to set updater window brand name --- projects/instantbird/config | 1 + projects/instantbird/updater-text.patch | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/projects/instantbird/config b/projects/instantbird/config index 2e53a6a..676bf14 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -105,6 +105,7 @@ input_files: - filename: about-logo(a)2x.png - filename: about-wordmark.png - filename: branding-aboutDialog.css + - filename: updater-text.patch - filename: branding/osx.patch enable: '[% c("var/osx") %]' - filename: bug-1218193.patch diff --git a/projects/instantbird/updater-text.patch b/projects/instantbird/updater-text.patch new file mode 100644 index 0000000..d571511 --- /dev/null +++ b/projects/instantbird/updater-text.patch @@ -0,0 +1,9 @@ +diff --git a/im/locales/en-US/updater/updater.ini b/im/locales/en-US/updater/updater.ini +--- a/im/locales/en-US/updater/updater.ini ++++ b/im/locales/en-US/updater/updater.ini +@@ -5,4 +5,4 @@ + ; This file is in the UTF-8 encoding + [Strings] + Title=Software Update +-Info=Instantbird is installing your updates and will start in a few moments… ++Info=Tor Messenger is installing your updates and will start in a few moments…

1 0

[tor-messenger-build/master] Add patch for #18900 (Linux updater library search path)
by sukhbir＠torproject.org 11 Aug '16

11 Aug '16

commit ef3f49487c566d9a18d18191a2e9cb999ff78295 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Fri Aug 5 15:39:36 2016 -0400 Add patch for #18900 (Linux updater library search path) --- .../Updater-Linux-search-path-bug-18900.mozpatch | 42 ++++++++++++++++++++++ projects/instantbird/config | 1 + 2 files changed, 43 insertions(+) diff --git a/projects/instantbird/Updater-Linux-search-path-bug-18900.mozpatch b/projects/instantbird/Updater-Linux-search-path-bug-18900.mozpatch new file mode 100644 index 0000000..3c46bd7 --- /dev/null +++ b/projects/instantbird/Updater-Linux-search-path-bug-18900.mozpatch @@ -0,0 +1,42 @@ +From 82cfa7c8786c1ad1421666365bd71f3594861328 Mon Sep 17 00:00:00 2001 +From: Kathy Brade <brade(a)pearlcrescent.com> +Date: Tue, 26 Apr 2016 14:25:35 -0400 +Subject: Bug 18900: updater doesn't work on Linux (cannot find libraries) + +Revert "Bug 1159090 - Only append library path for updater if it is a unique value. r=rstrong" + +This reverts commit 5c4fcaf37f8e479b5d3c46a21b8a48ad1fe567d8. + +diff --git a/toolkit/xre/nsUpdateDriver.cpp b/toolkit/xre/nsUpdateDriver.cpp +index 0c7b6b0..d256f2a 100644 +--- a/toolkit/xre/nsUpdateDriver.cpp ++++ b/toolkit/xre/nsUpdateDriver.cpp +@@ -488,20 +488,20 @@ CopyUpdaterIntoUpdateDir(nsIFile *greDir, nsIFile *appDir, nsIFile *updateDir, + static void + AppendToLibPath(const char *pathToAppend) + { ++ char *s = nullptr; + char *pathValue = getenv(LD_LIBRARY_PATH_ENVVAR_NAME); + if (nullptr == pathValue || '\0' == *pathValue) { +- char *s = PR_smprintf("%s=%s", LD_LIBRARY_PATH_ENVVAR_NAME, pathToAppend); +- PR_SetEnv(s); +- } else if (!strstr(pathValue, pathToAppend)) { +- char *s = PR_smprintf("%s=%s" PATH_SEPARATOR "%s", ++ s = PR_smprintf("%s=%s", LD_LIBRARY_PATH_ENVVAR_NAME, pathToAppend); ++ } else { ++ s = PR_smprintf("%s=%s" PATH_SEPARATOR "%s", + LD_LIBRARY_PATH_ENVVAR_NAME, pathToAppend, pathValue); +- PR_SetEnv(s); + } + + // The memory used by PR_SetEnv is not copied to the environment on all + // platform, it can be used by reference directly. So we purposely do not + // call PR_smprintf_free on s. Subsequent calls to PR_SetEnv will free + // the old memory first. ++ PR_SetEnv(s); + } + #endif + +-- +cgit v0.10.2 + diff --git a/projects/instantbird/config b/projects/instantbird/config index 676bf14..3acde39 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -131,6 +131,7 @@ input_files: - filename: Sign-MAR-files-bug-13379.mozpatch - filename: Update-load-local-changes-bug-14392-first.mozpatch - filename: Update-load-local-changes-bug-16940-second.mozpatch + - filename: Updater-Linux-search-path-bug-18900.mozpatch - filename: aboutTBUpdateLogo.png - filename: trac-16475.mozpatch - filename: OSX-package-as-tar.bz2.mozpatch

1 0

[tor-messenger-build/master] Add MAR signing keys
by sukhbir＠torproject.org 11 Aug '16

11 Aug '16

commit 3f1f586b54c723eb09327498145f31c0bb5193bf Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Wed Aug 10 12:43:15 2016 -0400 Add MAR signing keys Similar to Tor Browser (#18008), we embed two MAR signing keys and will sign the builds with either of them. --- projects/instantbird/build | 3 +++ projects/instantbird/config | 2 ++ projects/instantbird/marsigner.der | Bin 0 -> 1233 bytes projects/instantbird/marsigner1.der | Bin 0 -> 1235 bytes 4 files changed, 5 insertions(+) diff --git a/projects/instantbird/build b/projects/instantbird/build index 2701591..293fc07 100644 --- a/projects/instantbird/build +++ b/projects/instantbird/build @@ -90,6 +90,9 @@ then done fi +cp $rootdir/marsigner.der toolkit/mozapps/update/updater/release_primary.der +cp $rootdir/marsigner1.der toolkit/mozapps/update/updater/release_secondary.der + cp $rootdir/aboutTBUpdateLogo.png browser/base/content/abouttbupdate/ if ls -1 $rootdir/*.nsspatch > /dev/null 2>&1 diff --git a/projects/instantbird/config b/projects/instantbird/config index 3acde39..65d3316 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -106,6 +106,8 @@ input_files: - filename: about-wordmark.png - filename: branding-aboutDialog.css - filename: updater-text.patch + - filename: marsigner.der + - filename: marsigner1.der - filename: branding/osx.patch enable: '[% c("var/osx") %]' - filename: bug-1218193.patch diff --git a/projects/instantbird/marsigner.der b/projects/instantbird/marsigner.der new file mode 100644 index 0000000..5f98d36 Binary files /dev/null and b/projects/instantbird/marsigner.der differ diff --git a/projects/instantbird/marsigner1.der b/projects/instantbird/marsigner1.der new file mode 100644 index 0000000..a7370bd Binary files /dev/null and b/projects/instantbird/marsigner1.der differ

1 0

[collector/master] Bump version to 1.1.0-dev.
by karsten＠torproject.org 11 Aug '16

11 Aug '16

commit 8393774ebe05ac1d1056cbc48ce616f78f2073c4 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Aug 11 20:13:37 2016 +0200 Bump version to 1.1.0-dev. --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index 4e3e1fb..1e292b7 100644 --- a/build.xml +++ b/build.xml @@ -1,5 +1,5 @@ <project default="compile" name="CollecTor" basedir="."> - <property name="release.version" value="1.0.0" /> + <property name="release.version" value="1.1.0-dev" /> <property name="name" value="CollecTor"/> <property name="descriptorversion" value="1.3.1" /> <property name="source-and-target-java-version" value="1.7" />

1 0

[collector/master] Prepare for 1.0.0 release.
by karsten＠torproject.org 11 Aug '16

11 Aug '16

commit 06bcf327bb7741f3b972e932c80c7cfcb090e1fa Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Aug 11 11:05:21 2016 +0200 Prepare for 1.0.0 release. --- .gitignore | 1 + CERT | 18 ++++++++++++++++++ CHANGELOG.md | 6 ++++++ build.xml | 48 +++++++++++++++++++++++++++++++++++++++++++++--- 4 files changed, 70 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 0ca0b1c..e4e7512 100644 --- a/.gitignore +++ b/.gitignore @@ -13,4 +13,5 @@ /lib cobertura.ser *~ +build.properties diff --git a/CERT b/CERT new file mode 100644 index 0000000..eaeef50 --- /dev/null +++ b/CERT @@ -0,0 +1,18 @@ +-----BEGIN CERTIFICATE----- +MIIDbTCCAlWgAwIBAgIEca8MxDANBgkqhkiG9w0BAQsFADBnMQswCQYDVQQGEwJVUzELMAkGA1UE +CBMCTUExEjAQBgNVBAcTCUNhbWJyaWRnZTEdMBsGA1UEChMUVGhlIFRvciBQcm9qZWN0LCBJbmMx +GDAWBgNVBAMTD0thcnN0ZW4gTG9lc2luZzAeFw0xNjA1MzExODIwMjlaFw0xNjA4MjkxODIwMjla +MGcxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJNQTESMBAGA1UEBxMJQ2FtYnJpZGdlMR0wGwYDVQQK +ExRUaGUgVG9yIFByb2plY3QsIEluYzEYMBYGA1UEAxMPS2Fyc3RlbiBMb2VzaW5nMIIBIjANBgkq +hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAgJCqHFgEhyj8AI4w93YcyZEkKwn2Jw5t7bYcaLieP0wa +Ai2xrRFROo0eofjIllPlYTFtj9jLAZf+MQ1/Sdv7SLdlpasBCS0deTGlxuMzyMP9ztkkkAeibc+F +IXYPJArwGJiycnd+obW8b8KNrJQsnb0Se5Fdgo/PSu1rqMh/Mylv9vLqUzB4hbN4bg5+7THlTAOK +egYyR0NEPDzi327MAvzzle27kXV9yOCQr01zXW9NeWYed6JMXCZwaMN6nTVEFiwTfAyATfPncarf +gZ1kyAkQ6/Sw2bGMv8jHqB63Ka0/6GXHRbFgCeWU+c/1sfEMBD3ZurEjwSjWGl73E4GBswIDAQAB +oyEwHzAdBgNVHQ4EFgQUJbu6UT97IU4utjyc4zYUrLIgzvQwDQYJKoZIhvcNAQELBQADggEBAHOF +jMP0rNa+cKy8beEpU0VRZ1RNLb70BoFjXZvzgv92MGnojg509fYO3PgzXUZv5v50VenexZjeZ9to +iiqw5zDelg1maVSZwKrQVgFIwXnP4+okIcPMtFjSNiF9VyhRd8OE3U/kpIBdecMVIEhCIKOaF/nq +uBwilXAK7VwYN7hQgKbIODoX9Y3dr9QDvrILkFDEmOudmDRo+RePAKJum+/E0RuUYjOeXpFmzXOf +5LJ/Y4hMKuLfuxoWasHOV0IRx///CNgF1L287TCyjrYUbEjWwMtFQc0NRjedhcWUzwXLpbk2unxM +j6ElkADaczDG20ZGSgrFfU4MYb1RFeQu6yk= +-----END CERTIFICATE----- diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..9f9b2b2 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,6 @@ +# Changes in version 1.0.0 - 2016-08-11 + + * Major changes + - This is the initial release after over six and a half years of + development. + diff --git a/build.xml b/build.xml index 75e00f8..4e3e1fb 100644 --- a/build.xml +++ b/build.xml @@ -1,10 +1,11 @@ <project default="compile" name="CollecTor" basedir="."> - <property name="release.version" value="0.9.0-dev" /> + <property name="release.version" value="1.0.0" /> <property name="name" value="CollecTor"/> - <property name="descriptorversion" value="1.3.0" /> + <property name="descriptorversion" value="1.3.1" /> <property name="source-and-target-java-version" value="1.7" /> <property name="sources" value="src/main/java"/> <property name="resources" value="src/main/resources/"/> + <property name="webappsources" value="src/main/webapp"/> <property name="generated" value="generated/"/> <property name="testresult" value="${generated}/test-results"/> <property name="testsources" value="src/test/java"/> @@ -19,6 +20,9 @@ <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="collector-${release.version}.tar.gz" /> + <property file="build.properties" /> <patternset id="runtime" > <include name="commons-codec-1.9.jar"/> <include name="commons-compress-1.9.jar"/> @@ -89,6 +93,7 @@ <delete file="${jarfile}" quiet="true"/> <delete file="${jarsourcesfile}" quiet="true"/> <delete file="${jarjavadocfile}" quiet="true"/> + <delete file="${release.tarball}"/> </target> <target name="compile" depends="init"> <javac srcdir="${sources}" @@ -136,7 +141,6 @@ </exec> <jar destfile="${jarfile}" basedir="${classes}"> - <fileset dir="${classes}"/> <fileset dir="${resources}" > <include name="collector.properties"/> <include name="logback.xml"/> @@ -182,6 +186,44 @@ </manifest> </jar> </target> + <target name="signjar" depends="jar"> + <signjar alias="${jarsigner.alias}" + storepass="${jarsigner.storepass}" + sigalg="SHA256withRSA" + digestalg="SHA-256" + tsaurl="http://timestamp.digicert.com"> + <path> + <pathelement path="${jarfile}"/> + <pathelement path="${jarsourcesfile}"/> + <pathelement path="${jarjavadocfile}"/> + </path> + </signjar> + </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="build.xml" /> + <include name="LICENSE" /> + <include name="CERT" /> + <include name="*.md" /> + </tarfileset> + <tarfileset dir="${sources}" + prefix="collector-${release.version}/${sources}" /> + <tarfileset dir="${resources}" + prefix="collector-${release.version}/${resources}" /> + <tarfileset dir="${webappsources}" + prefix="collector-${release.version}/${webappsources}" /> + <tarfileset dir="${testsources}" + prefix="collector-${release.version}/${testsources}" /> + <tarfileset dir="${testresources}" + prefix="collector-${release.version}/${testresources}" /> + <tarfileset dir="${libs}" + prefix="collector-${release.version}/${libs}" /> + </tar> + </target> <taskdef resource="com/puppycrawl/tools/checkstyle/ant/checkstyle-ant-task.properties"> <classpath refid="checkstyle.classpath" /> </taskdef>

1 0

[collector/master] Removed the obsolete 'Ignore' annotations from ConfigurationTest.
by karsten＠torproject.org 11 Aug '16

11 Aug '16

commit 9bf140110be14aa302cfbebfe82787c355ed6dcc Author: iwakeh <iwakeh(a)torproject.org> Date: Thu Aug 11 14:07:48 2016 +0200 Removed the obsolete 'Ignore' annotations from ConfigurationTest. --- src/test/java/org/torproject/collector/conf/ConfigurationTest.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/test/java/org/torproject/collector/conf/ConfigurationTest.java b/src/test/java/org/torproject/collector/conf/ConfigurationTest.java index 2f727aa..45ab5ed 100644 --- a/src/test/java/org/torproject/collector/conf/ConfigurationTest.java +++ b/src/test/java/org/torproject/collector/conf/ConfigurationTest.java @@ -11,7 +11,6 @@ import org.torproject.collector.MainTest; import org.torproject.collector.cron.CollecTorMain; import org.torproject.collector.cron.Dummy; -import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; @@ -173,7 +172,6 @@ public class ConfigurationTest { conf.setWatchableSourceAndLoad(Paths.get("/tmp/phantom.path")); } - @Ignore("Test fails: Update was not called.") @Test() public void testConfigChange() throws Exception { Configuration conf = new Configuration(); @@ -194,7 +192,6 @@ public class ConfigurationTest { assertFalse("Update was called.", called.get()); } - @Ignore("Test fails: expected:<0> but was:<2>") @Test() public void testConfigUnreadable() throws Exception { Configuration conf = new Configuration();

1 0