April 2021 - tor-commits - lists.torproject.org

[tor/maint-0.4.6] Merge remote-tracking branch 'tor-gitlab/mr/355' into maint-0.4.5
by asn＠torproject.org 19 Apr '21

19 Apr '21

commit 925ec0e0ea03357537f22f5e5c774d2c5aa02ecf Merge: 30fa80c0fc 02816d6059 Author: George Kadianakis <desnacked(a)riseup.net> Date: Mon Apr 19 17:32:56 2021 +0300 Merge remote-tracking branch 'tor-gitlab/mr/355' into maint-0.4.5 changes/autoconf-2.70 | 3 +++ configure.ac | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --cc configure.ac index dfd7a495bb,179e8915b1..a85d530bed --- a/configure.ac +++ b/configure.ac @@@ -437,27 -290,23 +437,31 @@@ AC_PATH_PROG([ASCIIDOC], [asciidoc], no AC_PATH_PROGS([A2X], [a2x a2x.py], none) AM_CONDITIONAL(USE_ASCIIDOC, test "x$asciidoc" = "xtrue") +AM_CONDITIONAL(BUILD_MANPAGE, [test "x$enable_manpage" != "xno"]) +AM_CONDITIONAL(BUILD_HTML_DOCS, [test "x$enable_html_manual" != "xno"]) AM_PROG_CC_C_O - AC_PROG_CC_C99 + + dnl Before autoconf 2.70, AC_PROG_CC_C99 is supposedly necessary for some + dnl compilers if you wan't C99 support. Starting with 2.70, it is obsolete and + dnl forbidden. + m4_version_prereq([2.70], [:], [AC_PROG_CC_C99]) -AC_ARG_VAR([PYTHON], [path to Python binary]) -AC_CHECK_PROGS(PYTHON, [ \ +AC_CACHE_CHECK([for Python 3], [tor_cv_PYTHON], + [AC_PATH_PROGS_FEATURE_CHECK([PYTHON], [ \ python3 \ python3.8 python3.7 python3.6 python3.5 python3.4 \ - python \ - python2 python2.7]) + python ], + [["$ac_path_PYTHON" -c 'import sys; sys.exit(sys.version_info[0]<3)' && tor_cv_PYTHON="$ac_path_PYTHON" ac_path_PYTHON_found=:]] )]) +AC_SUBST([PYTHON], [$tor_cv_PYTHON]) + +PYTHON="$tor_cv_PYTHON" + if test "x$PYTHON" = "x"; then - AC_MSG_WARN([Python unavailable; some tests will not be run.]) + tor_incr_n_warnings + AC_MSG_WARN([Python 3 unavailable; some tests will not be run.]) fi + AM_CONDITIONAL(USEPYTHON, [test "x$PYTHON" != "x"]) dnl List all external rust crates we depend on here. Include the version

1 0

[tor/maint-0.4.6] Try making our configure.ac script build with AC 2.70.
by asn＠torproject.org 19 Apr '21

19 Apr '21

commit 02816d60591a6b3887f47df81fb99cb72d5ad2db Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 7 10:18:44 2021 -0400 Try making our configure.ac script build with AC 2.70. In versions <=2.69, according to the autoconf docs, AC_PROG_CC_C99 is needed with some compilers, if they require extra arguments to build C99 programs. In versions >=2.70, AC_PROG_CC checks for these compilers automatically, and so the AC_PROG_CC_C99 macro is obsolete. So, what can you do if you want your script to work right with both autoconf versions? IIUC, neither including AC_PROG_CC_C99 macro nor leaving it out will give you the right behavior with both versions. It looks like you need to look at the autoconf version explicitly. (Now, the autoconf manual implies that it's "against autoconf philosophy" to look at the autoconf version rather than trying the behavior to see if it works, but they don't actually tell you how to detect recoverably at autoconf-time whether a macro is obsolete or not, and I can't find a way to do that.) So, is it safe to use m4_version_prereq, like I do here? It isn't listed in the autoconf 2.63 manual (which is the oldest version we support). But a mailing list message [1] (which added the documentation back in 2008) implies that m4_version_prereq has been there since "at least back to autoconf 2.59". https://lists.gnu.org/archive/html/autoconf-patches/2008-12/msg00025.html So I think this will work. I am basing this patch against Tor 0.3.5 since, if autoconf 2.70 becomes widespread before 0.3.5 is unsupported, we might need this patch to continue 0.3.5 development. But I don't think we should backport farther than 0.4.5 until/unless that actually happens. This is part of a fix for #40355. --- changes/autoconf-2.70 | 3 +++ configure.ac | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/changes/autoconf-2.70 b/changes/autoconf-2.70 new file mode 100644 index 0000000000..27a9f243b1 --- /dev/null +++ b/changes/autoconf-2.70 @@ -0,0 +1,3 @@ + o Minor features (compilation): + - Make the autoconf script build correctly with autoconf versions 2.70 + and later. Closes part of ticket 40335. diff --git a/configure.ac b/configure.ac index 619e91528c..179e8915b1 100644 --- a/configure.ac +++ b/configure.ac @@ -292,7 +292,11 @@ AC_PATH_PROGS([A2X], [a2x a2x.py], none) AM_CONDITIONAL(USE_ASCIIDOC, test "x$asciidoc" = "xtrue") AM_PROG_CC_C_O -AC_PROG_CC_C99 + +dnl Before autoconf 2.70, AC_PROG_CC_C99 is supposedly necessary for some +dnl compilers if you wan't C99 support. Starting with 2.70, it is obsolete and +dnl forbidden. +m4_version_prereq([2.70], [:], [AC_PROG_CC_C99]) AC_ARG_VAR([PYTHON], [path to Python binary]) AC_CHECK_PROGS(PYTHON, [ \

1 0

[tor/master] Try making our configure.ac script build with AC 2.70.
by asn＠torproject.org 19 Apr '21

19 Apr '21

commit 02816d60591a6b3887f47df81fb99cb72d5ad2db Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 7 10:18:44 2021 -0400 Try making our configure.ac script build with AC 2.70. In versions <=2.69, according to the autoconf docs, AC_PROG_CC_C99 is needed with some compilers, if they require extra arguments to build C99 programs. In versions >=2.70, AC_PROG_CC checks for these compilers automatically, and so the AC_PROG_CC_C99 macro is obsolete. So, what can you do if you want your script to work right with both autoconf versions? IIUC, neither including AC_PROG_CC_C99 macro nor leaving it out will give you the right behavior with both versions. It looks like you need to look at the autoconf version explicitly. (Now, the autoconf manual implies that it's "against autoconf philosophy" to look at the autoconf version rather than trying the behavior to see if it works, but they don't actually tell you how to detect recoverably at autoconf-time whether a macro is obsolete or not, and I can't find a way to do that.) So, is it safe to use m4_version_prereq, like I do here? It isn't listed in the autoconf 2.63 manual (which is the oldest version we support). But a mailing list message [1] (which added the documentation back in 2008) implies that m4_version_prereq has been there since "at least back to autoconf 2.59". https://lists.gnu.org/archive/html/autoconf-patches/2008-12/msg00025.html So I think this will work. I am basing this patch against Tor 0.3.5 since, if autoconf 2.70 becomes widespread before 0.3.5 is unsupported, we might need this patch to continue 0.3.5 development. But I don't think we should backport farther than 0.4.5 until/unless that actually happens. This is part of a fix for #40355. --- changes/autoconf-2.70 | 3 +++ configure.ac | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/changes/autoconf-2.70 b/changes/autoconf-2.70 new file mode 100644 index 0000000000..27a9f243b1 --- /dev/null +++ b/changes/autoconf-2.70 @@ -0,0 +1,3 @@ + o Minor features (compilation): + - Make the autoconf script build correctly with autoconf versions 2.70 + and later. Closes part of ticket 40335. diff --git a/configure.ac b/configure.ac index 619e91528c..179e8915b1 100644 --- a/configure.ac +++ b/configure.ac @@ -292,7 +292,11 @@ AC_PATH_PROGS([A2X], [a2x a2x.py], none) AM_CONDITIONAL(USE_ASCIIDOC, test "x$asciidoc" = "xtrue") AM_PROG_CC_C_O -AC_PROG_CC_C99 + +dnl Before autoconf 2.70, AC_PROG_CC_C99 is supposedly necessary for some +dnl compilers if you wan't C99 support. Starting with 2.70, it is obsolete and +dnl forbidden. +m4_version_prereq([2.70], [:], [AC_PROG_CC_C99]) AC_ARG_VAR([PYTHON], [path to Python binary]) AC_CHECK_PROGS(PYTHON, [ \

1 0

[tor/master] Merge remote-tracking branch 'tor-gitlab/mr/355' into maint-0.4.5
by asn＠torproject.org 19 Apr '21

19 Apr '21

commit 925ec0e0ea03357537f22f5e5c774d2c5aa02ecf Merge: 30fa80c0fc 02816d6059 Author: George Kadianakis <desnacked(a)riseup.net> Date: Mon Apr 19 17:32:56 2021 +0300 Merge remote-tracking branch 'tor-gitlab/mr/355' into maint-0.4.5 changes/autoconf-2.70 | 3 +++ configure.ac | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --cc configure.ac index dfd7a495bb,179e8915b1..a85d530bed --- a/configure.ac +++ b/configure.ac @@@ -437,27 -290,23 +437,31 @@@ AC_PATH_PROG([ASCIIDOC], [asciidoc], no AC_PATH_PROGS([A2X], [a2x a2x.py], none) AM_CONDITIONAL(USE_ASCIIDOC, test "x$asciidoc" = "xtrue") +AM_CONDITIONAL(BUILD_MANPAGE, [test "x$enable_manpage" != "xno"]) +AM_CONDITIONAL(BUILD_HTML_DOCS, [test "x$enable_html_manual" != "xno"]) AM_PROG_CC_C_O - AC_PROG_CC_C99 + + dnl Before autoconf 2.70, AC_PROG_CC_C99 is supposedly necessary for some + dnl compilers if you wan't C99 support. Starting with 2.70, it is obsolete and + dnl forbidden. + m4_version_prereq([2.70], [:], [AC_PROG_CC_C99]) -AC_ARG_VAR([PYTHON], [path to Python binary]) -AC_CHECK_PROGS(PYTHON, [ \ +AC_CACHE_CHECK([for Python 3], [tor_cv_PYTHON], + [AC_PATH_PROGS_FEATURE_CHECK([PYTHON], [ \ python3 \ python3.8 python3.7 python3.6 python3.5 python3.4 \ - python \ - python2 python2.7]) + python ], + [["$ac_path_PYTHON" -c 'import sys; sys.exit(sys.version_info[0]<3)' && tor_cv_PYTHON="$ac_path_PYTHON" ac_path_PYTHON_found=:]] )]) +AC_SUBST([PYTHON], [$tor_cv_PYTHON]) + +PYTHON="$tor_cv_PYTHON" + if test "x$PYTHON" = "x"; then - AC_MSG_WARN([Python unavailable; some tests will not be run.]) + tor_incr_n_warnings + AC_MSG_WARN([Python 3 unavailable; some tests will not be run.]) fi + AM_CONDITIONAL(USEPYTHON, [test "x$PYTHON" != "x"]) dnl List all external rust crates we depend on here. Include the version

1 0

[tor/master] Merge branch 'maint-0.4.5' into maint-0.4.6
by asn＠torproject.org 19 Apr '21

19 Apr '21

commit 461a3c732b70fb8525dfa660dcab1605f11d7517 Merge: e6d9dd9157 925ec0e0ea Author: George Kadianakis <desnacked(a)riseup.net> Date: Mon Apr 19 17:33:46 2021 +0300 Merge branch 'maint-0.4.5' into maint-0.4.6 changes/autoconf-2.70 | 3 +++ configure.ac | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'maint-0.4.6'
by asn＠torproject.org 19 Apr '21

19 Apr '21

commit 874d2c8601146a0982bb16a8e6307da9a874b640 Merge: e7c407d927 461a3c732b Author: George Kadianakis <desnacked(a)riseup.net> Date: Mon Apr 19 17:33:46 2021 +0300 Merge branch 'maint-0.4.6' changes/autoconf-2.70 | 3 +++ configure.ac | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-)

1 0

[tor/release-0.4.5] Try making our configure.ac script build with AC 2.70.
by asn＠torproject.org 19 Apr '21

19 Apr '21

commit 02816d60591a6b3887f47df81fb99cb72d5ad2db Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 7 10:18:44 2021 -0400 Try making our configure.ac script build with AC 2.70. In versions <=2.69, according to the autoconf docs, AC_PROG_CC_C99 is needed with some compilers, if they require extra arguments to build C99 programs. In versions >=2.70, AC_PROG_CC checks for these compilers automatically, and so the AC_PROG_CC_C99 macro is obsolete. So, what can you do if you want your script to work right with both autoconf versions? IIUC, neither including AC_PROG_CC_C99 macro nor leaving it out will give you the right behavior with both versions. It looks like you need to look at the autoconf version explicitly. (Now, the autoconf manual implies that it's "against autoconf philosophy" to look at the autoconf version rather than trying the behavior to see if it works, but they don't actually tell you how to detect recoverably at autoconf-time whether a macro is obsolete or not, and I can't find a way to do that.) So, is it safe to use m4_version_prereq, like I do here? It isn't listed in the autoconf 2.63 manual (which is the oldest version we support). But a mailing list message [1] (which added the documentation back in 2008) implies that m4_version_prereq has been there since "at least back to autoconf 2.59". https://lists.gnu.org/archive/html/autoconf-patches/2008-12/msg00025.html So I think this will work. I am basing this patch against Tor 0.3.5 since, if autoconf 2.70 becomes widespread before 0.3.5 is unsupported, we might need this patch to continue 0.3.5 development. But I don't think we should backport farther than 0.4.5 until/unless that actually happens. This is part of a fix for #40355. --- changes/autoconf-2.70 | 3 +++ configure.ac | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/changes/autoconf-2.70 b/changes/autoconf-2.70 new file mode 100644 index 0000000000..27a9f243b1 --- /dev/null +++ b/changes/autoconf-2.70 @@ -0,0 +1,3 @@ + o Minor features (compilation): + - Make the autoconf script build correctly with autoconf versions 2.70 + and later. Closes part of ticket 40335. diff --git a/configure.ac b/configure.ac index 619e91528c..179e8915b1 100644 --- a/configure.ac +++ b/configure.ac @@ -292,7 +292,11 @@ AC_PATH_PROGS([A2X], [a2x a2x.py], none) AM_CONDITIONAL(USE_ASCIIDOC, test "x$asciidoc" = "xtrue") AM_PROG_CC_C_O -AC_PROG_CC_C99 + +dnl Before autoconf 2.70, AC_PROG_CC_C99 is supposedly necessary for some +dnl compilers if you wan't C99 support. Starting with 2.70, it is obsolete and +dnl forbidden. +m4_version_prereq([2.70], [:], [AC_PROG_CC_C99]) AC_ARG_VAR([PYTHON], [path to Python binary]) AC_CHECK_PROGS(PYTHON, [ \

1 0

[tor/release-0.4.6] Try making our configure.ac script build with AC 2.70.
by asn＠torproject.org 19 Apr '21

19 Apr '21

commit 02816d60591a6b3887f47df81fb99cb72d5ad2db Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 7 10:18:44 2021 -0400 Try making our configure.ac script build with AC 2.70. In versions <=2.69, according to the autoconf docs, AC_PROG_CC_C99 is needed with some compilers, if they require extra arguments to build C99 programs. In versions >=2.70, AC_PROG_CC checks for these compilers automatically, and so the AC_PROG_CC_C99 macro is obsolete. So, what can you do if you want your script to work right with both autoconf versions? IIUC, neither including AC_PROG_CC_C99 macro nor leaving it out will give you the right behavior with both versions. It looks like you need to look at the autoconf version explicitly. (Now, the autoconf manual implies that it's "against autoconf philosophy" to look at the autoconf version rather than trying the behavior to see if it works, but they don't actually tell you how to detect recoverably at autoconf-time whether a macro is obsolete or not, and I can't find a way to do that.) So, is it safe to use m4_version_prereq, like I do here? It isn't listed in the autoconf 2.63 manual (which is the oldest version we support). But a mailing list message [1] (which added the documentation back in 2008) implies that m4_version_prereq has been there since "at least back to autoconf 2.59". https://lists.gnu.org/archive/html/autoconf-patches/2008-12/msg00025.html So I think this will work. I am basing this patch against Tor 0.3.5 since, if autoconf 2.70 becomes widespread before 0.3.5 is unsupported, we might need this patch to continue 0.3.5 development. But I don't think we should backport farther than 0.4.5 until/unless that actually happens. This is part of a fix for #40355. --- changes/autoconf-2.70 | 3 +++ configure.ac | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/changes/autoconf-2.70 b/changes/autoconf-2.70 new file mode 100644 index 0000000000..27a9f243b1 --- /dev/null +++ b/changes/autoconf-2.70 @@ -0,0 +1,3 @@ + o Minor features (compilation): + - Make the autoconf script build correctly with autoconf versions 2.70 + and later. Closes part of ticket 40335. diff --git a/configure.ac b/configure.ac index 619e91528c..179e8915b1 100644 --- a/configure.ac +++ b/configure.ac @@ -292,7 +292,11 @@ AC_PATH_PROGS([A2X], [a2x a2x.py], none) AM_CONDITIONAL(USE_ASCIIDOC, test "x$asciidoc" = "xtrue") AM_PROG_CC_C_O -AC_PROG_CC_C99 + +dnl Before autoconf 2.70, AC_PROG_CC_C99 is supposedly necessary for some +dnl compilers if you wan't C99 support. Starting with 2.70, it is obsolete and +dnl forbidden. +m4_version_prereq([2.70], [:], [AC_PROG_CC_C99]) AC_ARG_VAR([PYTHON], [path to Python binary]) AC_CHECK_PROGS(PYTHON, [ \

1 0

[tor/release-0.4.5] Merge remote-tracking branch 'tor-gitlab/mr/355' into maint-0.4.5
by asn＠torproject.org 19 Apr '21

19 Apr '21

commit 925ec0e0ea03357537f22f5e5c774d2c5aa02ecf Merge: 30fa80c0fc 02816d6059 Author: George Kadianakis <desnacked(a)riseup.net> Date: Mon Apr 19 17:32:56 2021 +0300 Merge remote-tracking branch 'tor-gitlab/mr/355' into maint-0.4.5 changes/autoconf-2.70 | 3 +++ configure.ac | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --cc configure.ac index dfd7a495bb,179e8915b1..a85d530bed --- a/configure.ac +++ b/configure.ac @@@ -437,27 -290,23 +437,31 @@@ AC_PATH_PROG([ASCIIDOC], [asciidoc], no AC_PATH_PROGS([A2X], [a2x a2x.py], none) AM_CONDITIONAL(USE_ASCIIDOC, test "x$asciidoc" = "xtrue") +AM_CONDITIONAL(BUILD_MANPAGE, [test "x$enable_manpage" != "xno"]) +AM_CONDITIONAL(BUILD_HTML_DOCS, [test "x$enable_html_manual" != "xno"]) AM_PROG_CC_C_O - AC_PROG_CC_C99 + + dnl Before autoconf 2.70, AC_PROG_CC_C99 is supposedly necessary for some + dnl compilers if you wan't C99 support. Starting with 2.70, it is obsolete and + dnl forbidden. + m4_version_prereq([2.70], [:], [AC_PROG_CC_C99]) -AC_ARG_VAR([PYTHON], [path to Python binary]) -AC_CHECK_PROGS(PYTHON, [ \ +AC_CACHE_CHECK([for Python 3], [tor_cv_PYTHON], + [AC_PATH_PROGS_FEATURE_CHECK([PYTHON], [ \ python3 \ python3.8 python3.7 python3.6 python3.5 python3.4 \ - python \ - python2 python2.7]) + python ], + [["$ac_path_PYTHON" -c 'import sys; sys.exit(sys.version_info[0]<3)' && tor_cv_PYTHON="$ac_path_PYTHON" ac_path_PYTHON_found=:]] )]) +AC_SUBST([PYTHON], [$tor_cv_PYTHON]) + +PYTHON="$tor_cv_PYTHON" + if test "x$PYTHON" = "x"; then - AC_MSG_WARN([Python unavailable; some tests will not be run.]) + tor_incr_n_warnings + AC_MSG_WARN([Python 3 unavailable; some tests will not be run.]) fi + AM_CONDITIONAL(USEPYTHON, [test "x$PYTHON" != "x"]) dnl List all external rust crates we depend on here. Include the version

1 0

[tor/release-0.4.6] Merge remote-tracking branch 'tor-gitlab/mr/355' into maint-0.4.5
by asn＠torproject.org 19 Apr '21

19 Apr '21

commit 925ec0e0ea03357537f22f5e5c774d2c5aa02ecf Merge: 30fa80c0fc 02816d6059 Author: George Kadianakis <desnacked(a)riseup.net> Date: Mon Apr 19 17:32:56 2021 +0300 Merge remote-tracking branch 'tor-gitlab/mr/355' into maint-0.4.5 changes/autoconf-2.70 | 3 +++ configure.ac | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --cc configure.ac index dfd7a495bb,179e8915b1..a85d530bed --- a/configure.ac +++ b/configure.ac @@@ -437,27 -290,23 +437,31 @@@ AC_PATH_PROG([ASCIIDOC], [asciidoc], no AC_PATH_PROGS([A2X], [a2x a2x.py], none) AM_CONDITIONAL(USE_ASCIIDOC, test "x$asciidoc" = "xtrue") +AM_CONDITIONAL(BUILD_MANPAGE, [test "x$enable_manpage" != "xno"]) +AM_CONDITIONAL(BUILD_HTML_DOCS, [test "x$enable_html_manual" != "xno"]) AM_PROG_CC_C_O - AC_PROG_CC_C99 + + dnl Before autoconf 2.70, AC_PROG_CC_C99 is supposedly necessary for some + dnl compilers if you wan't C99 support. Starting with 2.70, it is obsolete and + dnl forbidden. + m4_version_prereq([2.70], [:], [AC_PROG_CC_C99]) -AC_ARG_VAR([PYTHON], [path to Python binary]) -AC_CHECK_PROGS(PYTHON, [ \ +AC_CACHE_CHECK([for Python 3], [tor_cv_PYTHON], + [AC_PATH_PROGS_FEATURE_CHECK([PYTHON], [ \ python3 \ python3.8 python3.7 python3.6 python3.5 python3.4 \ - python \ - python2 python2.7]) + python ], + [["$ac_path_PYTHON" -c 'import sys; sys.exit(sys.version_info[0]<3)' && tor_cv_PYTHON="$ac_path_PYTHON" ac_path_PYTHON_found=:]] )]) +AC_SUBST([PYTHON], [$tor_cv_PYTHON]) + +PYTHON="$tor_cv_PYTHON" + if test "x$PYTHON" = "x"; then - AC_MSG_WARN([Python unavailable; some tests will not be run.]) + tor_incr_n_warnings + AC_MSG_WARN([Python 3 unavailable; some tests will not be run.]) fi + AM_CONDITIONAL(USEPYTHON, [test "x$PYTHON" != "x"]) dnl List all external rust crates we depend on here. Include the version

1 0