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

[tor-browser-build/master] Use faketime when generating dmg files
by boklm＠torproject.org 15 Feb '17

15 Feb '17

commit 80399fe56927e17df1c4130698518445b009ae5a Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Feb 15 15:25:09 2017 +0100 Use faketime when generating dmg files --- projects/tor-browser/config | 1 + projects/tor-browser/ddmg.sh | 3 +++ 2 files changed, 4 insertions(+) diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 01463d9..5ee8be7 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -22,6 +22,7 @@ targets: - unzip - python - bzip2 + - faketime windows-i686: var: mar_osname: win32 diff --git a/projects/tor-browser/ddmg.sh b/projects/tor-browser/ddmg.sh index bc88797..20bd8f9 100755 --- a/projects/tor-browser/ddmg.sh +++ b/projects/tor-browser/ddmg.sh @@ -10,6 +10,9 @@ pushd [% src %] find . -type f | sed -e 's/^\.\///' | sort | xargs -i echo "{}={}" > [% filelist %] find . -type l | sed -e 's/^\.\///' | sort | xargs -i echo "{}={}" >> [% filelist %] +export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 +export FAKETIME="[% USE date; GET date.format(c('timestamp'), format = '%Y-%m-%d %H:%M:%S') %]" + genisoimage -D -V "Tor Browser" -no-pad -R -apple -o "$dmg_tmpdir/tbb-uncompressed.dmg" -path-list [% filelist %] -graft-points -gid 20 -dir-mode 0755 -new-dir-mode 0755 dmg dmg "$dmg_tmpdir/tbb-uncompressed.dmg" [% c('dmg_out', { error_if_undef => 1 }) %]

1 0

[tor-browser-build/master] Fix tor dependency on libevent-*.dylib on OSX
by boklm＠torproject.org 15 Feb '17

15 Feb '17

commit 040e6a4309f6816e7f076e517202c2e832b603a9 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Feb 15 17:13:38 2017 +0100 Fix tor dependency on libevent-*.dylib on OSX Extract libevent in /var/tmp/dist rather than /var/tmp/build so that the x86_64-apple-darwin10-install_name_tool command can work. At the same time, we also change openssl to use this directory. This problem was reported in this comment: https://trac.torproject.org/projects/tor/ticket/17379#comment:12 --- projects/tor/build | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/projects/tor/build b/projects/tor/build index 040693e..1f42add 100644 --- a/projects/tor/build +++ b/projects/tor/build @@ -22,11 +22,11 @@ mkdir -p $TORBINDIR mkdir -p $TORCONFIGDIR [% END %] -tar -C /var/tmp/build -xf [% c('input_files_by_name/openssl') %] -tar -C /var/tmp/build -xf [% c('input_files_by_name/libevent') %] +tar -C /var/tmp/dist -xf [% c('input_files_by_name/openssl') %] +tar -C /var/tmp/dist -xf [% c('input_files_by_name/libevent') %] tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz -libeventdir=/var/tmp/build/libevent -openssldir=/var/tmp/build/openssl +libeventdir=/var/tmp/dist/libevent +openssldir=/var/tmp/dist/openssl [% IF c("var/windows") %] tar -C /var/tmp/build -xf [% c('input_files_by_name/zlib') %]

1 0

[tor-browser-build/master] projects/tor: add missing libevent on OSX
by boklm＠torproject.org 15 Feb '17

15 Feb '17

commit a9b07efe8c554ecf323d6afd2aa9af73009105b6 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Feb 15 17:12:29 2017 +0100 projects/tor: add missing libevent on OSX --- projects/tor/build | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/projects/tor/build b/projects/tor/build index 088c486..040693e 100644 --- a/projects/tor/build +++ b/projects/tor/build @@ -53,6 +53,10 @@ chmod 700 "$distdir"/Tor/*.so* export LD_LIBRARY_PATH="$distdir/Tor/" [% END %] +[% IF c("var/osx") %] +cp $libeventdir/lib/libevent-*.dylib $TORBINDIR/ +[% END %] + cd /var/tmp/build/[% project %]-[% c('version') %] ./autogen.sh find -type f -print0 | xargs -0 [% c("var/touch") %]

1 0

[tor-browser-build/master] projects/tor: touch files to avoid "clock skew" errors with libfaketime
by boklm＠torproject.org 15 Feb '17

15 Feb '17

commit ab1c37c393853f113fed8cef026fa95071d5c537 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Feb 15 16:50:21 2017 +0100 projects/tor: touch files to avoid "clock skew" errors with libfaketime --- projects/tor/build | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/tor/build b/projects/tor/build index 95328a7..088c486 100644 --- a/projects/tor/build +++ b/projects/tor/build @@ -55,6 +55,7 @@ export LD_LIBRARY_PATH="$distdir/Tor/" cd /var/tmp/build/[% project %]-[% c('version') %] ./autogen.sh +find -type f -print0 | xargs -0 [% c("var/touch") %] ./configure --disable-asciidoc --with-libevent-dir="$libeventdir" --with-openssl-dir="$openssldir" \ [% IF c("var/windows") %]--with-zlib-dir="$zlibdir"[% END %] \ [% IF c("var/osx") %]--enable-static-openssl[% END %] \

1 0

[tor/maint-0.2.9] whoops; make 21450 compile
by nickm＠torproject.org 15 Feb '17

15 Feb '17

commit fea93abecd14b1e95a0bdd894183a81e2c284434 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 15 08:19:37 2017 -0500 whoops; make 21450 compile --- src/or/routerparse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/routerparse.c b/src/or/routerparse.c index c325412..7d9769b 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -5621,7 +5621,7 @@ tor_version_parse(const char *s, tor_version_t *out) #define NUMBER(m) \ do { \ - out->m = (int)tor_parse_uint64(val, 10, 0, INT32_MAX, &ok, &eos); \ + out->m = (int)tor_parse_uint64(cp, 10, 0, INT32_MAX, &ok, &eos); \ if (!ok) \ return -1; \ if (!eos || eos == cp) \

1 0

[tor/master] Merge branch 'maint-0.2.9'
by nickm＠torproject.org 15 Feb '17

15 Feb '17

commit d633c4757c1392fbbdeb3bdcc39e9b8e834f8fc9 Merge: 39af9fc fea93ab Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 15 08:19:51 2017 -0500 Merge branch 'maint-0.2.9' src/or/routerparse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/release-0.2.9] Limit version numbers to 0...INT32_MAX.
by nickm＠torproject.org 15 Feb '17

15 Feb '17

commit cb6b3b7cadb641b648577e5d5536735222cc68da Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 15 07:57:34 2017 -0500 Limit version numbers to 0...INT32_MAX. Closes 21450; patch from teor. --- changes/bug21450 | 4 ++++ src/or/routerparse.c | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/changes/bug21450 b/changes/bug21450 new file mode 100644 index 0000000..a1cf89a --- /dev/null +++ b/changes/bug21450 @@ -0,0 +1,4 @@ + o Minor bugfixes (voting consistency): + - Reject version numbers with components that exceed INT32_MAX. + Otherwise 32-bit and 64-bit platforms would behave inconsistently. + Fixes bug 21450; bugfix on 0.0.8pre1. diff --git a/src/or/routerparse.c b/src/or/routerparse.c index a896dde..c325412 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -5605,6 +5605,7 @@ tor_version_parse(const char *s, tor_version_t *out) { char *eos=NULL; const char *cp=NULL; + int ok = 1; /* Format is: * "Tor " ? NUM dot NUM [ dot NUM [ ( pre | rc | dot ) NUM ] ] [ - tag ] */ @@ -5620,7 +5621,9 @@ tor_version_parse(const char *s, tor_version_t *out) #define NUMBER(m) \ do { \ - out->m = (int)strtol(cp, &eos, 10); \ + out->m = (int)tor_parse_uint64(val, 10, 0, INT32_MAX, &ok, &eos); \ + if (!ok) \ + return -1; \ if (!eos || eos == cp) \ return -1; \ cp = eos; \

1 0

[tor/master] whoops; make 21450 compile
by nickm＠torproject.org 15 Feb '17

15 Feb '17

commit fea93abecd14b1e95a0bdd894183a81e2c284434 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 15 08:19:37 2017 -0500 whoops; make 21450 compile --- src/or/routerparse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/routerparse.c b/src/or/routerparse.c index c325412..7d9769b 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -5621,7 +5621,7 @@ tor_version_parse(const char *s, tor_version_t *out) #define NUMBER(m) \ do { \ - out->m = (int)tor_parse_uint64(val, 10, 0, INT32_MAX, &ok, &eos); \ + out->m = (int)tor_parse_uint64(cp, 10, 0, INT32_MAX, &ok, &eos); \ if (!ok) \ return -1; \ if (!eos || eos == cp) \

1 0

[tor/release-0.2.9] whoops; make 21450 compile
by nickm＠torproject.org 15 Feb '17

15 Feb '17

commit fea93abecd14b1e95a0bdd894183a81e2c284434 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 15 08:19:37 2017 -0500 whoops; make 21450 compile --- src/or/routerparse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/routerparse.c b/src/or/routerparse.c index c325412..7d9769b 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -5621,7 +5621,7 @@ tor_version_parse(const char *s, tor_version_t *out) #define NUMBER(m) \ do { \ - out->m = (int)tor_parse_uint64(val, 10, 0, INT32_MAX, &ok, &eos); \ + out->m = (int)tor_parse_uint64(cp, 10, 0, INT32_MAX, &ok, &eos); \ if (!ok) \ return -1; \ if (!eos || eos == cp) \

1 0

[tor/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9
by nickm＠torproject.org 15 Feb '17

15 Feb '17

commit ff649ec2d91e9471c9cd9d13132922fe270ab7d9 Merge: 35f449c cb6b3b7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 15 07:58:10 2017 -0500 Merge branch 'maint-0.2.9' into release-0.2.9 changes/bug21450 | 4 ++++ src/or/routerparse.c | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-)

1 0