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

Forward port patch 06_add_compile_time_defaults.

Browse Source 
svn:r13972
This commit is contained in:
Peter Palfrader 2008-03-11 14:38:24 +00:00
parent 09a9edad41
commit 2cb7f63c9c
2 changed files with 10 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
debian/changelog vendored
View File

@ -5,8 +5,9 @@ tor (0.2.0.21-rc-+svn) XXperimental; urgency=low
* Build with --enable-openbsd-malloc, unless no-enable-openbsd-malloc is
found in DEB_BUILD_OPTIONS. Hopefully this deals with some of the
horrible memory fragmentation that glibc's malloc causes.
* Forward port patch 06_add_compile_time_defaults.
-- Peter Palfrader <weasel@debian.org> Tue, 11 Mar 2008 14:51:47 +0100
-- Peter Palfrader <weasel@debian.org> Tue, 11 Mar 2008 15:33:07 +0100
tor (0.2.0.21-rc-1) experimental; urgency=low

35
debian/patches/06_add_compile_time_defaults.dpatch vendored
View File

@ -23,9 +23,9 @@ esac
exit 0
@DPATCH@
diff -urNad trunk~/src/or/config.c trunk/src/or/config.c
--- trunk~/src/or/config.c 2008-02-23 11:08:40.000000000 +0100
+++ trunk/src/or/config.c 2008-02-23 13:43:05.000000000 +0100
diff -urNad git-trunk-conf~/src/or/config.c git-trunk-conf/src/or/config.c
--- git-trunk-conf~/src/or/config.c 2008-03-11 15:23:01.000000000 +0100
+++ git-trunk-conf/src/or/config.c 2008-03-11 15:30:34.139280421 +0100
@@ -15,6 +15,7 @@
#define CONFIG_PRIVATE
@ -34,7 +34,7 @@ diff -urNad trunk~/src/or/config.c trunk/src/or/config.c
#ifdef MS_WINDOWS
#include <shlobj.h>
#endif
@@ -660,6 +661,8 @@
@@ -658,6 +659,8 @@
#if defined(HAVE_EVENT_GET_VERSION) && defined(HAVE_EVENT_GET_METHOD)
static void check_libevent_version(const char *m, int server);
#endif
@ -43,18 +43,9 @@ diff -urNad trunk~/src/or/config.c trunk/src/or/config.c
/** Magic value for or_options_t. */
#define OR_OPTIONS_MAGIC 9090909
@@ -3522,7 +3525,7 @@
int
options_init_from_torrc(int argc, char **argv)
{
- or_options_t *oldoptions, *newoptions;
+ or_options_t *oldoptions, *newoptions = NULL;
config_line_t *cl;
char *cf=NULL, *fname=NULL, *errmsg=NULL;
int i, retval;
@@ -3531,6 +3534,9 @@
static char **backup_argv;
static int backup_argc;
@@ -3634,6 +3637,9 @@
char *command_arg = NULL;
char *errmsg=NULL;
+ if (debian_config_fix_defaults() < 0)
+ goto err;
@ -62,17 +53,7 @@ diff -urNad trunk~/src/or/config.c trunk/src/or/config.c
if (argv) { /* first time we're called. save commandline args */
backup_argv = argv;
backup_argc = argc;
@@ -3666,7 +3672,8 @@
err:
tor_free(fname);
torrc_fname = NULL;
- config_free(&options_format, newoptions);
+ if (newoptions)
+ config_free(&options_format, newoptions);
if (errmsg) {
log(LOG_WARN,LD_CONFIG,"Failed to parse/validate config: %s", errmsg);
tor_free(errmsg);
@@ -5011,3 +5018,64 @@
@@ -5051,3 +5057,64 @@
puts(routerparse_c_id);
}