diff options
| author | Peter Palfrader <peter@palfrader.org> | 2009-06-20 13:00:41 +0200 |
|---|---|---|
| committer | Peter Palfrader <peter@palfrader.org> | 2009-06-20 13:00:41 +0200 |
| commit | 6be66447e76fb6a52c0cc47346611c02fbe29a83 (patch) | |
| tree | b03ceb11ca659ba3370542a33bd11a0512507b16 /debian | |
| parent | ee2cdd1ddf326b2d3c35305832504ee65f79f17a (diff) | |
| download | tor-6be66447e76fb6a52c0cc47346611c02fbe29a83.tar tor-6be66447e76fb6a52c0cc47346611c02fbe29a83.tar.gz | |
Forward port 06_add_compile_time_defaults
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rwxr-xr-x | debian/patches/06_add_compile_time_defaults.dpatch | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index c83d1f8ea..620917081 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 <weasel@debian.org> Sat, 20 Jun 2009 12:59:29 +0200 + -- Peter Palfrader <weasel@debian.org> 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 7dfce2ef2..a2472d1db 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 @@ |