diff options
| author | Peter Palfrader <peter@palfrader.org> | 2007-11-15 10:06:59 +0000 |
|---|---|---|
| committer | Peter Palfrader <peter@palfrader.org> | 2007-11-15 10:06:59 +0000 |
| commit | 5973a2a5642c598c32f29450862a51ed91926ce4 (patch) | |
| tree | 2c45e10b8156afcf9f599e99fbc6ab601d5697c0 /debian | |
| parent | e843e0556355d1487a61640457d073238e214417 (diff) | |
| download | tor-5973a2a5642c598c32f29450862a51ed91926ce4.tar.gz tor-5973a2a5642c598c32f29450862a51ed91926ce4.zip | |
Remove 12_r12235_do_not_crash_when_myfamily_is_set.dpatch
svn:r12502
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/patches/00list | 1 | ||||
| -rwxr-xr-x | debian/patches/12_r12235_do_not_crash_when_myfamily_is_set.dpatch | 68 |
2 files changed, 0 insertions, 69 deletions
diff --git a/debian/patches/00list b/debian/patches/00list index f7ae50aab3..a6d4270cc8 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -3,4 +3,3 @@ 06_add_compile_time_defaults.dpatch 07_log_to_file_by_default.dpatch 11_tor_as_root_more_helpful.dpatch -12_r12235_do_not_crash_when_myfamily_is_set.dpatch diff --git a/debian/patches/12_r12235_do_not_crash_when_myfamily_is_set.dpatch b/debian/patches/12_r12235_do_not_crash_when_myfamily_is_set.dpatch deleted file mode 100755 index 559f7bb5be..0000000000 --- a/debian/patches/12_r12235_do_not_crash_when_myfamily_is_set.dpatch +++ /dev/null @@ -1,68 +0,0 @@ -#! /bin/sh -e - -if [ $# -lt 1 ]; then - echo "`basename $0`: script expects -patch|-unpatch as argument" >&2 - exit 1 -fi - -[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts -patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}" - -case "$1" in - -patch) patch -p2 ${patch_opts} < $0;; - -unpatch) patch -R -p2 ${patch_opts} < $0;; - *) - echo "`basename $0`: script expects -patch|-unpatch as argument" >&2 - exit 1;; -esac - -exit 0 - -@DPATCH@ -Author: arma -Date: 2007-10-27 17:40:32 -0400 (Sat, 27 Oct 2007) -New Revision: 12235 - -Modified: - tor/trunk/ChangeLog - tor/trunk/src/or/networkstatus.c -Log: -we need to send nick to the chalkboard to type 'un' 1000 times: - -Stop servers from crashing if they set a Family option (or -maybe in other situations too). Bugfix on 0.2.0.9-alpha; reported -by Fabian Keil. - - -# disabled by weasel -# Modified: tor/trunk/ChangeLog -# =================================================================== -# --- tor/trunk/ChangeLog 2007-10-27 21:36:56 UTC (rev 12234) -# +++ tor/trunk/ChangeLog 2007-10-27 21:40:32 UTC (rev 12235) -# @@ -1,4 +1,9 @@ -# Changes in version 0.2.0.10-alpha - 2007-1?-?? -# + o Major bugfixes: -# + - Stop servers from crashing if they set a Family option (or -# + maybe in other situations too). Bugfix on 0.2.0.9-alpha; reported -# + by Fabian Keil. -# + -# o New requirements: -# - Drop support for OpenSSL version 0.9.6. Just about nobody was using -# it, it had no AES, and it hasn't seen any security patches since 2004. -# -Modified: tor/trunk/src/or/networkstatus.c -=================================================================== ---- tor/trunk/src/or/networkstatus.c 2007-10-27 21:36:56 UTC (rev 12234) -+++ tor/trunk/src/or/networkstatus.c 2007-10-27 21:40:32 UTC (rev 12235) -@@ -885,7 +885,9 @@ - int - networkstatus_nickname_is_unnamed(const char *nickname) - { -- return strmap_get_lc(named_server_map, nickname) != NULL; -+ if (!unnamed_server_map) -+ return 0; -+ return strmap_get_lc(unnamed_server_map, nickname) != NULL; - } - - /** How frequently do directory authorities re-download fresh networkstatus - |