aboutsummaryrefslogtreecommitdiff
path: root/debian/patches
diff options
context:
space:
mode:
authorPeter Palfrader <peter@palfrader.org>2004-11-10 03:27:52 +0000
committerPeter Palfrader <peter@palfrader.org>2004-11-10 03:27:52 +0000
commit967235684e0302b984785d328e6f4b5a7bddd201 (patch)
tree2879a0dd7099822ebc2440da32ef25eb8065b24a /debian/patches
parentb91e167dcdd0d3ef4523cecb86adf083dd816565 (diff)
downloadtor-967235684e0302b984785d328e6f4b5a7bddd201.tar
tor-967235684e0302b984785d328e6f4b5a7bddd201.tar.gz
04_fix_test can be backed out again, it was a backport from cvs to the package
svn:r2775
Diffstat (limited to 'debian/patches')
-rw-r--r--debian/patches/00list1
-rwxr-xr-xdebian/patches/04_fix_test38
2 files changed, 0 insertions, 39 deletions
diff --git a/debian/patches/00list b/debian/patches/00list
index e9bc68803..13c7d1b39 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,4 +1,3 @@
01_uncomment_datadirectory.dpatch
02_add_debian_files_in_manpage.dpatch
03_tor_manpage_in_section_8.dpatch
-04_fix_test
diff --git a/debian/patches/04_fix_test b/debian/patches/04_fix_test
deleted file mode 100755
index f87cc9c97..000000000
--- a/debian/patches/04_fix_test
+++ /dev/null
@@ -1,38 +0,0 @@
-#! /bin/sh -e
-## 04_fix_test.dpatch by <weasel@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-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 -p1 ${patch_opts} < $0;;
- -unpatch) patch -R -p1 ${patch_opts} < $0;;
- *)
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1;;
-esac
-
-exit 0
-
-@DPATCH@
-diff -urNad tor-0.0.9pre4/src/or/test.c /tmp/dpep.hUQG4a/tor-0.0.9pre4/src/or/test.c
---- tor-0.0.9pre4/src/or/test.c 2004-10-17 00:14:52.000000000 +0200
-+++ /tmp/dpep.hUQG4a/tor-0.0.9pre4/src/or/test.c 2004-10-17 19:03:33.772660687 +0200
-@@ -919,7 +919,8 @@
- test_assert(!is_legal_nickname_or_hexdigest("abcdefghijklmnopqrst"));
-
- get_platform_str(platform, sizeof(platform));
--
-+ memset(&r1,0,sizeof(r1));
-+ memset(&r2,0,sizeof(r2));
- r1.address = "testaddr1.foo.bar";
- r1.addr = 0xc0a80001u; /* 192.168.0.1 */
- r1.published_on = 0;