nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 21:23:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'remove_digests'

Browse Source
This commit is contained in:
Nick Mathewson 2015-04-01 13:53:03 -04:00
commit d366c3354f
10 changed files with 7 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -121,7 +121,6 @@ cscope.*
# /src/common/
/src/common/Makefile
/src/common/Makefile.in
/src/common/common_sha1.i
/src/common/libor.a
/src/common/libor-testing.a
/src/common/libor.lib
@ -149,7 +148,6 @@ cscope.*
# /src/or/
/src/or/Makefile
/src/or/Makefile.in
/src/or/or_sha1.i
/src/or/tor
/src/or/tor.exe
/src/or/tor-cov

5
changes/no_digests Normal file
View File

@ -0,0 +1,5 @@
o Removed features:
- Remove the undocumented "--digests" command-line option. It
complicated our build process, caused subtle build issues
on multiple platforms, and is now redundant since we started
including git version identifiers. Closes ticket 14742.

3
configure.ac
View File

@ -283,9 +283,6 @@ if test "$tor_cv_c_c99_designated_init" != "yes"; then
AC_MSG_ERROR([Your compiler doesn't support c99 designated initializers. This is required as of Tor 0.2.6.x])
fi
AC_PATH_PROG([SHA1SUM], [sha1sum], none)
AC_PATH_PROG([OPENSSL], [openssl], none)
TORUSER=_tor
AC_ARG_WITH(tor-user,
AS_HELP_STRING(--with-tor-user=NAME, [specify username for tor daemon]),

15
src/common/include.am
View File

@ -61,7 +61,6 @@ LIBOR_A_SOURCES = \
src/common/log.c \
src/common/memarea.c \
src/common/util.c \
src/common/util_codedigest.c \
src/common/util_process.c \
src/common/sandbox.c \
src/common/workqueue.c \
@ -133,17 +132,3 @@ COMMONHEADERS = \
noinst_HEADERS+= $(COMMONHEADERS)
CLEANFILES+= src/common/common_sha1.i
src/common/common_sha1.i: $(libor_SOURCES) $(libor_crypto_a_SOURCES) $(COMMONHEADERS)
$(AM_V_GEN)if test "@SHA1SUM@" != none; then \
(cd "$(srcdir)" && "@SHA1SUM@" $(src_common_libor_SOURCES) $(src_common_libor_crypto_a_SOURCES) $(COMMONHEADERS)) | "@SED@" -n 's/^\(.*\)$$/"\1\\n"/p' > $@; \
elif test "@OPENSSL@" != none; then \
(cd "$(srcdir)" && "@OPENSSL@" sha1 $(src_common_libor_SOURCES) $(src_Common_libor_crypto_a_SOURCES) $(COMMONHEADERS)) | "@SED@" -n 's/SHA1(\(.*\))= \(.*\)/"\2 \1\\n"/p' > $@; \
else \
rm $@; \
touch $@; \
fi
src/common/util_codedigest.o: src/common/common_sha1.i

2
src/common/util.h
View File

@ -573,8 +573,6 @@ STATIC int format_helper_exit_status(unsigned char child_state,
#endif
const char *libor_get_digests(void);
#define ARRAY_LENGTH(x) ((sizeof(x)) / sizeof(x[0]))
#endif

13
src/common/util_codedigest.c
View File

@ -1,13 +0,0 @@
#include "util.h"
/** Return a string describing the digest of the source files in src/common/
*/
const char *
libor_get_digests(void)
{
return ""
#include "common_sha1.i"
;
}

8
src/or/config.c
View File

@ -1887,7 +1887,6 @@ static const struct {
{ "-h", 0 },
{ "--help", 0 },
{ "--list-torrc-options", 0 },
{ "--digests", 0 },
{ "--nt-service", 0 },
{ "-nt-service", 0 },
{ NULL, 0 },
@ -4364,13 +4363,6 @@ options_init_from_torrc(int argc, char **argv)
exit(0);
}
if (config_line_find(cmdline_only_options, "--digests")) {
printf("Tor version %s.\n",get_version());
printf("%s", libor_get_digests());
printf("%s", tor_get_digests());
exit(0);
}
if (config_line_find(cmdline_only_options, "--library-versions")) {
printf("Tor version %s. \n", get_version());
printf("Library versions\tCompiled\t\tRuntime\n");

1
src/or/config.h
View File

@ -91,7 +91,6 @@ int getinfo_helper_config(control_connection_t *conn,
const char *question, char **answer,
const char **errmsg);
const char *tor_get_digests(void);
uint32_t get_effective_bwrate(const or_options_t *options);
uint32_t get_effective_bwburst(const or_options_t *options);

13
src/or/config_codedigest.c
View File

@ -1,13 +0,0 @@
const char *tor_get_digests(void);
/** Return a string describing the digest of the source files in src/or/
*/
const char *
tor_get_digests(void)
{
return ""
#include "or_sha1.i"
;
}

19
src/or/include.am
View File

@ -79,8 +79,7 @@ LIBTOR_A_SOURCES = \
src/or/status.c \
src/or/onion_ntor.c \
$(evdns_source) \
$(tor_platform_source) \
src/or/config_codedigest.c
$(tor_platform_source)
src_or_libtor_a_SOURCES = $(LIBTOR_A_SOURCES)
src_or_libtor_testing_a_SOURCES = $(LIBTOR_A_SOURCES)
@ -190,8 +189,6 @@ ORHEADERS = \
noinst_HEADERS+= $(ORHEADERS) micro-revision.i
src/or/config_codedigest.o: src/or/or_sha1.i
micro-revision.i: FORCE
$(AM_V_GEN)rm -f micro-revision.tmp; \
if test -d "$(top_srcdir)/.git" && \
@ -210,18 +207,6 @@ micro-revision.i: FORCE
rm -f micro-revision.tmp; \
true
src/or/or_sha1.i: $(src_or_tor_SOURCES) $(src_or_libtor_a_SOURCES) $(ORHEADERS)
$(AM_V_GEN)if test "@SHA1SUM@" != none; then \
(cd "$(srcdir)" && "@SHA1SUM@" $(src_or_tor_SOURCES) $(src_or_libtor_a_SOURCES) $(ORHEADERS) ) | \
"@SED@" -n 's/^\(.*\)$$/"\1\\n"/p' > src/or/or_sha1.i; \
elif test "@OPENSSL@" != none; then \
(cd "$(srcdir)" && "@OPENSSL@" sha1 $(src_or_tor_SOURCES) $(src_or_libtor_a_SOURCES) $(ORHEADERS)) | \
"@SED@" -n 's/SHA1(\(.*\))= \(.*\)/"\2 \1\\n"/p' > src/or/or_sha1.i; \
else \
rm src/or/or_sha1.i; \
touch src/or/or_sha1.i; \
fi
CLEANFILES+= src/or/or_sha1.i micro-revision.i src/or/micro-revision.i micro-revision.tmp
CLEANFILES+= micro-revision.i src/or/micro-revision.i micro-revision.tmp
FORCE: