From 2c221e923b1ff7d8693d8a8b9e6bb5474956349e Mon Sep 17 00:00:00 2001 From: Andrew Lewman Date: Thu, 2 Jul 2009 17:57:47 -0400 Subject: [PATCH 1/4] updated rpm instructions for realtime libevent. --- doc/tor-rpm-creation.txt | 69 ++++++++++------------------------------ 1 file changed, 17 insertions(+), 52 deletions(-) diff --git a/doc/tor-rpm-creation.txt b/doc/tor-rpm-creation.txt index a8280fe367..3fc6bde79c 100644 --- a/doc/tor-rpm-creation.txt +++ b/doc/tor-rpm-creation.txt @@ -2,60 +2,25 @@ ## The process used to create the official rpms is as follows: -Download and Extract the latest tor source code from https://www.torproject.org/. +Download latest stable libevent from +http://www.monkey.org/~provos/libevent/ + +The first step of compiling libevent is to configure it as follows: +./configure --enable-static --disable-shared + +Complete the "make" and "make install". You will need to be root, +or sudo -s, to complete the "make install". + +Check for a successful universal binary of libevent.a in, by default, +/usr/local/lib by using the following command: + "file /usr/local/lib/libevent.a" + +Download and Extract the latest tor source code from +https://www.torproject.org/download + In the resulting directory: -./configure +LIBS=-lrt ./configure make dist-rpm You should have at least two, maybe three, rpms. There should be the binary i386.rpm, a src.rpm, and on redhat/centos machines, a debuginfo.rpm. - -## Optional customization -## -If you wish to further tune Tor binaries in rpm format beyond this list, -see the GCC doc page for further options: -http://gcc.gnu.org/onlinedocs/gcc-4.0.2/gcc/ - -The tor.spec.in file contains the basic info needed to tune the binaries -produced in rpm format. The key parameters to tune are located in the -third section of the tor.spec.in file. Locate the section similar to -this: - -## Target a specific arch and OS -# -# default is i386 linux -%define target gnu -%define target_cpu i386 -%define target_os linux - -The three parameters: target, target_cpu, and target_os are used -throughout the "make dist-rpm" process. They control the parameters -passed to "configure" and the final tuning of the binaries produced. -The default settings, as shown above, create binaries for the widest -range of Intel x86 or x86-compatible architectures. - -The parameters can be set as follows: - -The "target" parameter: -This should be "gnu", "redhat", or the short name of your linux distribution. -Other possibilities are "mandrake" or "suse". This is passed to -"configure" through the --host, --build, and --target parameters. -Therefore, this "target" parameter must be a valid OS for "configure" as -well. - -The "target_cpu" parameter: -This parameter controls the optimization and tuning of your binaries via -gcc and "configure". This parameter is passed to gcc via the -mtune= or --mcpu= options. The "configure" script will also receive this parameter -through the --host, --build, and --target parameters. Therefore, this -"target_cpu" parameter must be valid for both gcc and "configure". A -few common options for this parameter may be "athlon64, i686, pentium4" or -others. - -The "target_os" parameter: -This parameter controls the target operating system. Normally, this is -only "linux". If you wish to build rpms for a non-linux operating -system, you can replace "linux" with your operating system. - - - From 258b980331f4a6c208144b80df4d4ce7de5caa58 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Tue, 7 Jul 2009 12:19:04 -0400 Subject: [PATCH 2/4] Make "Invalid onion hostname" msg respect SafeLogging. Patch by Roger; fixes bug 1027. --- ChangeLog | 4 +++- src/or/connection_edge.c | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index a3199c787e..d368871079 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -Changes in version 0.2.1.17-rc - 2009-07-02 +Changes in version 0.2.1.17-rc - 2009-07-07 o Major features: - Clients now use the bandwidth values in the consensus, rather than the bandwidth values in each relay descriptor. This approach opens @@ -36,6 +36,8 @@ Changes in version 0.2.1.17-rc - 2009-07-02 - When we can't find an intro key for a v2 hidden service descriptor, fall back to the v0 hidden service descriptor and log a bug message. Workaround for bug 1024. + - Fix a log message that did not respect the SafeLogging option. + Resolves bug 1027. o Minor features: - If we're a relay and we change our IP address, be more verbose diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 1ef87dbffa..d699591cdc 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -1484,7 +1484,8 @@ connection_ap_handshake_rewrite_and_attach(edge_connection_t *conn, addresstype = parse_extended_hostname(socks->address); if (addresstype == BAD_HOSTNAME) { - log_warn(LD_APP, "Invalid hostname %s; rejecting", socks->address); + log_warn(LD_APP, "Invalid onion hostname %s; rejecting", + safe_str(socks->address)); control_event_client_status(LOG_WARN, "SOCKS_BAD_HOSTNAME HOSTNAME=%s", escaped(socks->address)); connection_mark_unattached_ap(conn, END_STREAM_REASON_TORPROTOCOL); From 32d40607246e357d905bdf17acc20f6c863afd2b Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Tue, 7 Jul 2009 12:22:46 -0400 Subject: [PATCH 3/4] Bump version to 0.2.1.17-rc --- configure.in | 2 +- contrib/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.in b/configure.in index 8d97c8e80a..e704249457 100644 --- a/configure.in +++ b/configure.in @@ -5,7 +5,7 @@ dnl Copyright (c) 2007-2008, The Tor Project, Inc. dnl See LICENSE for licensing information AC_INIT -AM_INIT_AUTOMAKE(tor, 0.2.1.16-rc-dev) +AM_INIT_AUTOMAKE(tor, 0.2.1.17-rc) AM_CONFIG_HEADER(orconfig.h) AC_CANONICAL_HOST diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in index 4e1df5e63a..743e915a57 100644 --- a/contrib/tor-mingw.nsi.in +++ b/contrib/tor-mingw.nsi.in @@ -9,7 +9,7 @@ !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.1.16-rc-dev" +!define VERSION "0.2.1.17-rc" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index eede82385f..a13b4139c3 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -226,6 +226,6 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.1.16-rc-dev" +#define VERSION "0.2.1.17-rc" From d996b7463e8228dd6b08a28bc42cee61eeff910c Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Tue, 7 Jul 2009 12:39:35 -0400 Subject: [PATCH 4/4] Bump version to 0.2.1.17-rc-dev --- configure.in | 2 +- contrib/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.in b/configure.in index e704249457..605282bb8d 100644 --- a/configure.in +++ b/configure.in @@ -5,7 +5,7 @@ dnl Copyright (c) 2007-2008, The Tor Project, Inc. dnl See LICENSE for licensing information AC_INIT -AM_INIT_AUTOMAKE(tor, 0.2.1.17-rc) +AM_INIT_AUTOMAKE(tor, 0.2.1.17-rc-dev) AM_CONFIG_HEADER(orconfig.h) AC_CANONICAL_HOST diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in index 743e915a57..70e9140299 100644 --- a/contrib/tor-mingw.nsi.in +++ b/contrib/tor-mingw.nsi.in @@ -9,7 +9,7 @@ !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.1.17-rc" +!define VERSION "0.2.1.17-rc-dev" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index a13b4139c3..6e599b38b2 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -226,6 +226,6 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.1.17-rc" +#define VERSION "0.2.1.17-rc-dev"