July 2018 - tor-commits - lists.torproject.org

[tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2
by nickm＠torproject.org 30 Jul '18

30 Jul '18

commit d79557efc4a6ad77c14206d4a02fdacfdbf3d83f Merge: 8edbeb26b a8bdb851e Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 30 08:17:24 2018 -0400 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug26785 | 4 ++++ configure.ac | 3 +++ src/common/compress_zstd.c | 4 ++++ 3 files changed, 11 insertions(+)

1 0

[tor/release-0.3.3] Don't disable an unsupported compiler warning
by nickm＠torproject.org 30 Jul '18

30 Jul '18

commit a8bdb851eb23b6067e24ad955bb8f499b8348b95 Author: Taylor Yu <catalyst(a)torproject.org> Date: Thu Jul 26 12:32:34 2018 -0500 Don't disable an unsupported compiler warning Conditionalize the pragma that temporarily disables -Wunused-const-variable. Some versions of gcc don't support it. We need to do this because of an apparent bug in some libzstd headers. Fixes bug 26785; bugfix on 0.3.2.11. --- changes/bug26785 | 4 ++++ configure.ac | 3 +++ src/common/compress_zstd.c | 4 ++++ 3 files changed, 11 insertions(+) diff --git a/changes/bug26785 b/changes/bug26785 new file mode 100644 index 000000000..e6392fcbd --- /dev/null +++ b/changes/bug26785 @@ -0,0 +1,4 @@ + o Minor bugfixes (compilation, portability): + - Don't try to use a pragma to temporarily disable + -Wunused-const-variable if the compiler doesn't support it. + Fixes bug 26785; bugfix on 0.3.2.11. diff --git a/configure.ac b/configure.ac index c883279a6..37a78b779 100644 --- a/configure.ac +++ b/configure.ac @@ -2143,6 +2143,9 @@ dnl -Wthread-safety-precise if test "$tor_cv_cflags__Woverlength_strings" = "yes"; then AC_DEFINE([HAVE_CFLAG_WOVERLENGTH_STRINGS], 1, [True if we have -Woverlength-strings]) fi + if test "$tor_cv_cflags__warn_unused_const_variable_2" = "yes"; then + AC_DEFINE([HAVE_CFLAG_WUNUSED_CONST_VARIABLE], 1, [True if we have -Wunused-const-variable]) + fi if test "x$enable_fatal_warnings" = "xyes"; then # I'd like to use TOR_CHECK_CFLAGS here, but I can't, since the diff --git a/src/common/compress_zstd.c b/src/common/compress_zstd.c index baa7749f0..1a7d21d48 100644 --- a/src/common/compress_zstd.c +++ b/src/common/compress_zstd.c @@ -19,10 +19,14 @@ #include "compress_zstd.h" #ifdef HAVE_ZSTD +#ifdef HAVE_CFLAG_WUNUSED_CONST_VARIABLE DISABLE_GCC_WARNING(unused-const-variable) +#endif #include <zstd.h> +#ifdef HAVE_CFLAG_WUNUSED_CONST_VARIABLE ENABLE_GCC_WARNING(unused-const-variable) #endif +#endif /** Total number of bytes allocated for Zstandard state. */ static atomic_counter_t total_zstd_allocation;

1 0

[tor/release-0.3.2] Don't disable an unsupported compiler warning
by nickm＠torproject.org 30 Jul '18

30 Jul '18

commit a8bdb851eb23b6067e24ad955bb8f499b8348b95 Author: Taylor Yu <catalyst(a)torproject.org> Date: Thu Jul 26 12:32:34 2018 -0500 Don't disable an unsupported compiler warning Conditionalize the pragma that temporarily disables -Wunused-const-variable. Some versions of gcc don't support it. We need to do this because of an apparent bug in some libzstd headers. Fixes bug 26785; bugfix on 0.3.2.11. --- changes/bug26785 | 4 ++++ configure.ac | 3 +++ src/common/compress_zstd.c | 4 ++++ 3 files changed, 11 insertions(+) diff --git a/changes/bug26785 b/changes/bug26785 new file mode 100644 index 000000000..e6392fcbd --- /dev/null +++ b/changes/bug26785 @@ -0,0 +1,4 @@ + o Minor bugfixes (compilation, portability): + - Don't try to use a pragma to temporarily disable + -Wunused-const-variable if the compiler doesn't support it. + Fixes bug 26785; bugfix on 0.3.2.11. diff --git a/configure.ac b/configure.ac index c883279a6..37a78b779 100644 --- a/configure.ac +++ b/configure.ac @@ -2143,6 +2143,9 @@ dnl -Wthread-safety-precise if test "$tor_cv_cflags__Woverlength_strings" = "yes"; then AC_DEFINE([HAVE_CFLAG_WOVERLENGTH_STRINGS], 1, [True if we have -Woverlength-strings]) fi + if test "$tor_cv_cflags__warn_unused_const_variable_2" = "yes"; then + AC_DEFINE([HAVE_CFLAG_WUNUSED_CONST_VARIABLE], 1, [True if we have -Wunused-const-variable]) + fi if test "x$enable_fatal_warnings" = "xyes"; then # I'd like to use TOR_CHECK_CFLAGS here, but I can't, since the diff --git a/src/common/compress_zstd.c b/src/common/compress_zstd.c index baa7749f0..1a7d21d48 100644 --- a/src/common/compress_zstd.c +++ b/src/common/compress_zstd.c @@ -19,10 +19,14 @@ #include "compress_zstd.h" #ifdef HAVE_ZSTD +#ifdef HAVE_CFLAG_WUNUSED_CONST_VARIABLE DISABLE_GCC_WARNING(unused-const-variable) +#endif #include <zstd.h> +#ifdef HAVE_CFLAG_WUNUSED_CONST_VARIABLE ENABLE_GCC_WARNING(unused-const-variable) #endif +#endif /** Total number of bytes allocated for Zstandard state. */ static atomic_counter_t total_zstd_allocation;

1 0

[tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3
by nickm＠torproject.org 30 Jul '18

30 Jul '18

commit 6716cd090a7dad38edfec54b159d66941329356e Merge: 2b12e2679 15d7f24c5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 30 08:17:25 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug26785 | 4 ++++ configure.ac | 3 +++ src/common/compress_zstd.c | 4 ++++ 3 files changed, 11 insertions(+)

1 0

[tor/release-0.3.4] Merge branch 'maint-0.3.2' into maint-0.3.3
by nickm＠torproject.org 30 Jul '18

30 Jul '18

commit 15d7f24c57828b94596ccfd97081840b920c2336 Merge: dbf57ecf3 a8bdb851e Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 30 08:17:24 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug26785 | 4 ++++ configure.ac | 3 +++ src/common/compress_zstd.c | 4 ++++ 3 files changed, 11 insertions(+)

1 0

[tor/release-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3
by nickm＠torproject.org 30 Jul '18

30 Jul '18

commit 15d7f24c57828b94596ccfd97081840b920c2336 Merge: dbf57ecf3 a8bdb851e Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 30 08:17:24 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug26785 | 4 ++++ configure.ac | 3 +++ src/common/compress_zstd.c | 4 ++++ 3 files changed, 11 insertions(+)

1 0

[tor/release-0.3.4] Don't disable an unsupported compiler warning
by nickm＠torproject.org 30 Jul '18

30 Jul '18

commit a8bdb851eb23b6067e24ad955bb8f499b8348b95 Author: Taylor Yu <catalyst(a)torproject.org> Date: Thu Jul 26 12:32:34 2018 -0500 Don't disable an unsupported compiler warning Conditionalize the pragma that temporarily disables -Wunused-const-variable. Some versions of gcc don't support it. We need to do this because of an apparent bug in some libzstd headers. Fixes bug 26785; bugfix on 0.3.2.11. --- changes/bug26785 | 4 ++++ configure.ac | 3 +++ src/common/compress_zstd.c | 4 ++++ 3 files changed, 11 insertions(+) diff --git a/changes/bug26785 b/changes/bug26785 new file mode 100644 index 000000000..e6392fcbd --- /dev/null +++ b/changes/bug26785 @@ -0,0 +1,4 @@ + o Minor bugfixes (compilation, portability): + - Don't try to use a pragma to temporarily disable + -Wunused-const-variable if the compiler doesn't support it. + Fixes bug 26785; bugfix on 0.3.2.11. diff --git a/configure.ac b/configure.ac index c883279a6..37a78b779 100644 --- a/configure.ac +++ b/configure.ac @@ -2143,6 +2143,9 @@ dnl -Wthread-safety-precise if test "$tor_cv_cflags__Woverlength_strings" = "yes"; then AC_DEFINE([HAVE_CFLAG_WOVERLENGTH_STRINGS], 1, [True if we have -Woverlength-strings]) fi + if test "$tor_cv_cflags__warn_unused_const_variable_2" = "yes"; then + AC_DEFINE([HAVE_CFLAG_WUNUSED_CONST_VARIABLE], 1, [True if we have -Wunused-const-variable]) + fi if test "x$enable_fatal_warnings" = "xyes"; then # I'd like to use TOR_CHECK_CFLAGS here, but I can't, since the diff --git a/src/common/compress_zstd.c b/src/common/compress_zstd.c index baa7749f0..1a7d21d48 100644 --- a/src/common/compress_zstd.c +++ b/src/common/compress_zstd.c @@ -19,10 +19,14 @@ #include "compress_zstd.h" #ifdef HAVE_ZSTD +#ifdef HAVE_CFLAG_WUNUSED_CONST_VARIABLE DISABLE_GCC_WARNING(unused-const-variable) +#endif #include <zstd.h> +#ifdef HAVE_CFLAG_WUNUSED_CONST_VARIABLE ENABLE_GCC_WARNING(unused-const-variable) #endif +#endif /** Total number of bytes allocated for Zstandard state. */ static atomic_counter_t total_zstd_allocation;

1 0

[tor/release-0.3.4] Merge branch 'maint-0.3.3' into maint-0.3.4
by nickm＠torproject.org 30 Jul '18

30 Jul '18

commit d102e9c2e4ab5dfca0c03f7b4e27431d069338fd Merge: 977821e59 15d7f24c5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 30 08:17:25 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug26785 | 4 ++++ configure.ac | 3 +++ src/common/compress_zstd.c | 4 ++++ 3 files changed, 11 insertions(+) diff --cc src/common/compress_zstd.c index 316a3fb41,b9f9f1f07..dc8b4d621 --- a/src/common/compress_zstd.c +++ b/src/common/compress_zstd.c @@@ -18,18 -18,15 +18,22 @@@ #include "compress.h" #include "compress_zstd.h" +#ifdef ENABLE_ZSTD_ADVANCED_APIS +/* This is a lie, but we make sure it doesn't get us in trouble by wrapping + * all invocations of zstd's static-only functions in a check to make sure + * that the compile-time version matches the run-time version. */ +#define ZSTD_STATIC_LINKING_ONLY +#endif + #ifdef HAVE_ZSTD + #ifdef HAVE_CFLAG_WUNUSED_CONST_VARIABLE DISABLE_GCC_WARNING(unused-const-variable) + #endif #include <zstd.h> + #ifdef HAVE_CFLAG_WUNUSED_CONST_VARIABLE ENABLE_GCC_WARNING(unused-const-variable) #endif + #endif /** Total number of bytes allocated for Zstandard state. */ static atomic_counter_t total_zstd_allocation;

1 0

[tor/release-0.3.4] Merge branch 'maint-0.3.4' into release-0.3.4
by nickm＠torproject.org 30 Jul '18

30 Jul '18

commit 33d80123ce644cfedcd283ab7f764a84e9f8d930 Merge: a1402bac3 d102e9c2e Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 30 08:17:25 2018 -0400 Merge branch 'maint-0.3.4' into release-0.3.4 changes/bug26785 | 4 ++++ configure.ac | 3 +++ src/common/compress_zstd.c | 4 ++++ 3 files changed, 11 insertions(+)

1 0

[tor-browser/tor-browser-60.1.0esr-8.0-1] Bug 1474306 - Fix typo in the extension optionsType handler. r=Mossop
by gk＠torproject.org 30 Jul '18

30 Jul '18

commit 63bb7813511ad99ecbbbc7f0fb610718847ff108 Author: Igor Oliveira <igt0(a)torproject.org> Date: Mon Jul 9 07:24:00 2018 +0300 Bug 1474306 - Fix typo in the extension optionsType handler. r=Mossop AddonManager.OPTIONS_INLINE_BROWSER was replaced by AddonManager.OPTIONS_TYPE_INLINE_BROWSER. --- toolkit/mozapps/extensions/internal/XPIInstall.jsm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/mozapps/extensions/internal/XPIInstall.jsm b/toolkit/mozapps/extensions/internal/XPIInstall.jsm index 2fc1d7edbe80..659d97616dc6 100644 --- a/toolkit/mozapps/extensions/internal/XPIInstall.jsm +++ b/toolkit/mozapps/extensions/internal/XPIInstall.jsm @@ -560,7 +560,7 @@ async function loadManifestFromRDF(aUri, aStream) { addon.hasEmbeddedWebExtension = getRDFProperty(ds, root, "hasEmbeddedWebExtension") == "true"; if (addon.optionsType && - addon.optionsType != AddonManager.OPTIONS_INLINE_BROWSER && + addon.optionsType != AddonManager.OPTIONS_TYPE_INLINE_BROWSER && addon.optionsType != AddonManager.OPTIONS_TYPE_TAB) { throw new Error("Install manifest specifies unknown optionsType: " + addon.optionsType); }

1 0