From a1073ee956021ead19d30c2151510dbaced416a8 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Tue, 25 Jan 2011 14:08:13 -0500 Subject: [PATCH 1/3] Simplest fix to bug2402: do not include SVN versions When we stopped using svn, 0.2.1.x lost the ability to notice its svn revision and report it in the version number. However, it kept looking at the micro-revision.i file... so if you switched to master, built tor, then switched to 0.2.1.x, you'd get a micro-revision.i file from master reported as an SVN tag. This patch takes out the "include the svn tag" logic entirely. Bugfix on 0.2.1.15-rc; fixes bug 2402. --- changes/bug2402 | 4 ++++ src/or/config.c | 11 +---------- 2 files changed, 5 insertions(+), 10 deletions(-) create mode 100644 changes/bug2402 diff --git a/changes/bug2402 b/changes/bug2402 new file mode 100644 index 0000000000..f16f6773e7 --- /dev/null +++ b/changes/bug2402 @@ -0,0 +1,4 @@ + o Minor bugfixes (build) + - Do not include Git version tags as though they were SVN tags when + generating a tarball from inside a repository that has switched between + branches. Bugfix on 0.2.1.15-rc; fixes bug 2402. diff --git a/src/or/config.c b/src/or/config.c index f8cfd29f84..c5d654078e 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -827,16 +827,7 @@ static char *_version = NULL; const char * get_version(void) { - if (_version == NULL) { - if (strlen(tor_svn_revision)) { - size_t len = strlen(VERSION)+strlen(tor_svn_revision)+8; - _version = tor_malloc(len); - tor_snprintf(_version, len, "%s (r%s)", VERSION, tor_svn_revision); - } else { - _version = tor_strdup(VERSION); - } - } - return _version; + return VERSION; } /** Release additional memory allocated in options From 372773d681ed0f67e824cf2eef41a7186ab6c458 Mon Sep 17 00:00:00 2001 From: Roger Dingledine Date: Tue, 22 Feb 2011 14:50:00 -0500 Subject: [PATCH 2/3] changes file for removing torspec from the tarball --- changes/torspec.git | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 changes/torspec.git diff --git a/changes/torspec.git b/changes/torspec.git new file mode 100644 index 0000000000..ba33ca20fd --- /dev/null +++ b/changes/torspec.git @@ -0,0 +1,5 @@ + o Packaging changes: + - Stop shipping the Tor specs files and development proposal documents + in the tarball. They are now in a separate git repository at + git://git.torproject.org/torspec.git + From e606f19fa369c7ad5934793cb4f72f97972b52bc Mon Sep 17 00:00:00 2001 From: Roger Dingledine Date: Tue, 22 Feb 2011 14:50:00 -0500 Subject: [PATCH 3/3] changes file for removing torspec from the tarball --- changes/torspec.git | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 changes/torspec.git diff --git a/changes/torspec.git b/changes/torspec.git new file mode 100644 index 0000000000..ba33ca20fd --- /dev/null +++ b/changes/torspec.git @@ -0,0 +1,5 @@ + o Packaging changes: + - Stop shipping the Tor specs files and development proposal documents + in the tarball. They are now in a separate git repository at + git://git.torproject.org/torspec.git +