From: Peter Palfrader Date: Sat, 20 Jun 2009 11:00:41 +0000 (+0200) Subject: Forward port 06_add_compile_time_defaults X-Git-Tag: tor-0.2.1.17-rc~20^2~1^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6be66447e76fb6a52c0cc47346611c02fbe29a83;p=thirdparty%2Ftor.git Forward port 06_add_compile_time_defaults --- diff --git a/debian/changelog b/debian/changelog index c83d1f8eab..620917081b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,8 +15,9 @@ tor (0.2.1.16-rc-1) unreleased; urgency=low - Change dh_strip call from --dbg-package=tor to --dbg-package=tor-dbg. - Update versioned build time dependency on debhelper. + * Forward port 06_add_compile_time_defaults. - -- Peter Palfrader Sat, 20 Jun 2009 12:59:29 +0200 + -- Peter Palfrader Sat, 20 Jun 2009 13:00:14 +0200 tor (0.2.1.15-rc-1) experimental; urgency=low diff --git a/debian/patches/06_add_compile_time_defaults.dpatch b/debian/patches/06_add_compile_time_defaults.dpatch index 7dfce2ef23..a2472d1db8 100755 --- a/debian/patches/06_add_compile_time_defaults.dpatch +++ b/debian/patches/06_add_compile_time_defaults.dpatch @@ -50,7 +50,7 @@ diff -urNad tor-trunk~/src/or/config.c tor-trunk/src/or/config.c + if (debian_config_fix_defaults() < 0) + goto err; + - if (argv) { /* first time we're called. save commandline args */ + if (argv) { /* first time we're called. save command line args */ backup_argv = argv; backup_argc = argc; @@ -5307,3 +5313,62 @@