diff options
| author | Peter Palfrader <peter@palfrader.org> | 2009-09-03 15:10:47 +0200 |
|---|---|---|
| committer | Peter Palfrader <peter@palfrader.org> | 2009-09-03 15:10:47 +0200 |
| commit | 2bf59689a223fa026a2d2919f455ce100fe43480 (patch) | |
| tree | 180932fa558b2fab3d984b0d64210bf8d1207179 /debian | |
| parent | 7dba7dcf718b8e4776c0003c90a8eb2e36428e96 (diff) | |
| download | tor-2bf59689a223fa026a2d2919f455ce100fe43480.tar.gz tor-2bf59689a223fa026a2d2919f455ce100fe43480.zip | |
Forward port patches/06_add_compile_time_defaults.dpatch
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rwxr-xr-x | debian/patches/06_add_compile_time_defaults.dpatch | 21 |
2 files changed, 13 insertions, 11 deletions
diff --git a/debian/changelog b/debian/changelog index f6af5a4e01..6673fe01b0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,9 @@ tor (0.2.2.1-alpha-1) experimental; urgency=low * New upstream version. * Forward port patches/03_tor_manpage_in_section_8.dpatch. + * Forward port patches/06_add_compile_time_defaults.dpatch. - -- Peter Palfrader <weasel@debian.org> Thu, 03 Sep 2009 15:06:58 +0200 + -- Peter Palfrader <weasel@debian.org> Thu, 03 Sep 2009 15:10:26 +0200 tor (0.2.1.19-1) unstable; urgency=low diff --git a/debian/patches/06_add_compile_time_defaults.dpatch b/debian/patches/06_add_compile_time_defaults.dpatch index a2472d1db8..e64d4618af 100755 --- a/debian/patches/06_add_compile_time_defaults.dpatch +++ b/debian/patches/06_add_compile_time_defaults.dpatch @@ -23,9 +23,9 @@ esac exit 0 @DPATCH@ -diff -urNad tor-trunk~/src/or/config.c tor-trunk/src/or/config.c ---- tor-trunk~/src/or/config.c 2009-01-18 01:47:33.000000000 +0100 -+++ tor-trunk/src/or/config.c 2009-02-05 00:25:17.614844812 +0100 +diff -urNad tor~/src/or/config.c tor/src/or/config.c +--- tor~/src/or/config.c 2009-09-03 15:05:41.000000000 +0200 ++++ tor/src/or/config.c 2009-09-03 15:09:37.662104166 +0200 @@ -12,6 +12,7 @@ #define CONFIG_PRIVATE @@ -34,16 +34,17 @@ diff -urNad tor-trunk~/src/or/config.c tor-trunk/src/or/config.c #ifdef MS_WINDOWS #include <shlobj.h> #endif -@@ -711,6 +712,8 @@ - #if defined(HAVE_EVENT_GET_VERSION) && defined(HAVE_EVENT_GET_METHOD) - static void check_libevent_version(const char *m, int server); - #endif +@@ -717,6 +718,9 @@ + static void init_libevent(void); + static int opt_streq(const char *s1, const char *s2); + +static int debian_running_as_debiantor(); +static int debian_config_fix_defaults(); - ++ /** Magic value for or_options_t. */ #define OR_OPTIONS_MAGIC 9090909 -@@ -3917,6 +3920,9 @@ + +@@ -4086,6 +4090,9 @@ char *command_arg = NULL; char *errmsg=NULL; @@ -53,7 +54,7 @@ diff -urNad tor-trunk~/src/or/config.c tor-trunk/src/or/config.c if (argv) { /* first time we're called. save command line args */ backup_argv = argv; backup_argc = argc; -@@ -5307,3 +5313,62 @@ +@@ -5304,3 +5311,62 @@ return 0; } |