February 2019 - tor-commits - lists.torproject.org

[tor/maint-0.4.0] Make test-slow compile with libevent
by nickm＠torproject.org 19 Feb '19

19 Feb '19

commit 384c5c618835a82d1d5455faff52e3f819683f43 Author: Neel Chauhan <neel(a)neelc.org> Date: Sat Feb 16 16:03:17 2019 -0500 Make test-slow compile with libevent --- src/test/include.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/include.am b/src/test/include.am index 8622fcbaa..9bfc626b2 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -259,7 +259,7 @@ src_test_test_LDADD = \ src_test_test_slow_CPPFLAGS = $(src_test_test_CPPFLAGS) src_test_test_slow_CFLAGS = $(src_test_test_CFLAGS) src_test_test_slow_LDADD = $(src_test_test_LDADD) -src_test_test_slow_LDFLAGS =@TOR_LDFLAGS_openssl@ +src_test_test_slow_LDFLAGS = @TOR_LDFLAGS_openssl@ @TOR_LDFLAGS_libevent@ src_test_test_rng_CPPFLAGS = $(src_test_test_CPPFLAGS) src_test_test_rng_CFLAGS = $(src_test_test_CFLAGS)

1 0

[tor/maint-0.4.0] Merge remote-tracking branch 'tor-github/pr/707' into maint-0.4.0
by nickm＠torproject.org 19 Feb '19

19 Feb '19

commit b5f3a3d6a76ffd7727833c2b1901629c9f23a99d Merge: 26873bc4e 384c5c618 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 19 11:34:21 2019 -0500 Merge remote-tracking branch 'tor-github/pr/707' into maint-0.4.0 src/test/include.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/707' into maint-0.4.0
by nickm＠torproject.org 19 Feb '19

19 Feb '19

commit b5f3a3d6a76ffd7727833c2b1901629c9f23a99d Merge: 26873bc4e 384c5c618 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 19 11:34:21 2019 -0500 Merge remote-tracking branch 'tor-github/pr/707' into maint-0.4.0 src/test/include.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/release-0.4.0] Merge remote-tracking branch 'tor-github/pr/707' into maint-0.4.0
by nickm＠torproject.org 19 Feb '19

19 Feb '19

commit b5f3a3d6a76ffd7727833c2b1901629c9f23a99d Merge: 26873bc4e 384c5c618 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 19 11:34:21 2019 -0500 Merge remote-tracking branch 'tor-github/pr/707' into maint-0.4.0 src/test/include.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/release-0.4.0] Make test-slow compile with libevent
by nickm＠torproject.org 19 Feb '19

19 Feb '19

commit 384c5c618835a82d1d5455faff52e3f819683f43 Author: Neel Chauhan <neel(a)neelc.org> Date: Sat Feb 16 16:03:17 2019 -0500 Make test-slow compile with libevent --- src/test/include.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/include.am b/src/test/include.am index 8622fcbaa..9bfc626b2 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -259,7 +259,7 @@ src_test_test_LDADD = \ src_test_test_slow_CPPFLAGS = $(src_test_test_CPPFLAGS) src_test_test_slow_CFLAGS = $(src_test_test_CFLAGS) src_test_test_slow_LDADD = $(src_test_test_LDADD) -src_test_test_slow_LDFLAGS =@TOR_LDFLAGS_openssl@ +src_test_test_slow_LDFLAGS = @TOR_LDFLAGS_openssl@ @TOR_LDFLAGS_libevent@ src_test_test_rng_CPPFLAGS = $(src_test_test_CPPFLAGS) src_test_test_rng_CFLAGS = $(src_test_test_CFLAGS)

1 0

[tor/master] Fix two instances of SC2004 in nagios-check-tor-authority
by nickm＠torproject.org 19 Feb '19

19 Feb '19

commit 1fc8bbff9cefd243725c04890426a28204d7b0d2 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Wed Feb 6 10:20:11 2019 +0200 Fix two instances of SC2004 in nagios-check-tor-authority --- contrib/dirauth-tools/nagios-check-tor-authority-cert | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/dirauth-tools/nagios-check-tor-authority-cert b/contrib/dirauth-tools/nagios-check-tor-authority-cert index 46dc7284b..7a60da16f 100755 --- a/contrib/dirauth-tools/nagios-check-tor-authority-cert +++ b/contrib/dirauth-tools/nagios-check-tor-authority-cert @@ -74,10 +74,10 @@ now=$(date +%s) if [ "$now" -ge "$expiryunix" ]; then echo "CRITICAL: Certificate expired $expirydate (authority $identity)." exit 2 -elif [ "$(( $now + 7*24*60*60 ))" -ge "$expiryunix" ]; then +elif [ "$(( now + 7*24*60*60 ))" -ge "$expiryunix" ]; then echo "CRITICAL: Certificate expires $expirydate (authority $identity)." exit 2 -elif [ "$(( $now + 30*24*60*60 ))" -ge "$expiryunix" ]; then +elif [ "$(( now + 30*24*60*60 ))" -ge "$expiryunix" ]; then echo "WARNING: Certificate expires $expirydate (authority $identity)." exit 1 else

1 0

[tor/master] Fix SC2181
by nickm＠torproject.org 19 Feb '19

19 Feb '19

commit 7e415ec05a1bb1cf5cda7088f2c27e9202b3b3f1 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Wed Feb 6 10:51:54 2019 +0200 Fix SC2181 --- contrib/dirauth-tools/nagios-check-tor-authority-cert | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/dirauth-tools/nagios-check-tor-authority-cert b/contrib/dirauth-tools/nagios-check-tor-authority-cert index 932a78061..75ff479a5 100755 --- a/contrib/dirauth-tools/nagios-check-tor-authority-cert +++ b/contrib/dirauth-tools/nagios-check-tor-authority-cert @@ -53,8 +53,8 @@ TMPFILE=$(mktemp) trap 'rm -f "$TMPFILE"' 0 for dirserver in $DIRSERVERS; do - wget -q -O "$TMPFILE" "http://$dirserver/tor/keys/fp/$identity" - if [ "$?" = 0 ]; then + if wget -q -O "$TMPFILE" "http://$dirserver/tor/keys/fp/$identity" + then break else cat /dev/null > "$TMPFILE"

1 0

[tor/master] Use mktemp to fix SC2186; also, fix SC2006.
by nickm＠torproject.org 19 Feb '19

19 Feb '19

commit 2649239c620b57cc11c2499ed35fa571af996d18 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Wed Feb 6 10:27:16 2019 +0200 Use mktemp to fix SC2186; also, fix SC2006. --- contrib/dirauth-tools/nagios-check-tor-authority-cert | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/dirauth-tools/nagios-check-tor-authority-cert b/contrib/dirauth-tools/nagios-check-tor-authority-cert index 7a60da16f..932a78061 100755 --- a/contrib/dirauth-tools/nagios-check-tor-authority-cert +++ b/contrib/dirauth-tools/nagios-check-tor-authority-cert @@ -49,7 +49,7 @@ DIRSERVERS="$DIRSERVERS 80.190.246.100:80" # gabelmoo DIRSERVERS="$DIRSERVERS 194.109.206.212:80" # dizum DIRSERVERS="$DIRSERVERS 213.73.91.31:80" # dannenberg -TMPFILE="`tempfile`" +TMPFILE=$(mktemp) trap 'rm -f "$TMPFILE"' 0 for dirserver in $DIRSERVERS; do

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/683'
by nickm＠torproject.org 19 Feb '19

19 Feb '19

commit af36af1a9b857772fb6dac2b413850ce8e02bdee Merge: 1239e411a 4e3880607 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 19 11:32:33 2019 -0500 Merge remote-tracking branch 'tor-github/pr/683' changes/ticket29071 | 3 +++ contrib/dirauth-tools/nagios-check-tor-authority-cert | 10 +++++----- 2 files changed, 8 insertions(+), 5 deletions(-)

1 0

[tor/master] Add changes file
by nickm＠torproject.org 19 Feb '19

19 Feb '19

commit 4e3880607ad2f09711e18429afda1514a2cb7e28 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Wed Feb 6 10:53:12 2019 +0200 Add changes file --- changes/ticket29071 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/ticket29071 b/changes/ticket29071 new file mode 100644 index 000000000..0997a8d22 --- /dev/null +++ b/changes/ticket29071 @@ -0,0 +1,3 @@ + o Code simplification and refactoring (shell scripts): + - Fix shellcheck warnings in nagios-check-tor-authority-cert script. + Resolves issue 29071.

1 0