This commit was manufactured by cvs2svn to create tag

'debian_version_0_0_8-1'. svn:r2323
2024-12-06 19:41:15 +01:00 · 2004-08-27 12:34:43 +00:00
parent 84161504d7
commit 2df4148520
19 changed files with 903 additions and 0 deletions
@@ -0,0 +1,18 @@
+Tor only provides TCP layer anonymity.  It does not do any protocol
+cleaning, so if you are going to browse the web you still give away a
+lot of information to servers.
+
+The privoxy package provides a privacy enhancing HTTP proxy, which
+is good at filtering headers, cookies, and much more.  To view the
+description of the Debian privoxy package just run "apt-cache show
+privoxy".  Please refer to the privoxy documentation for more details.
+
+In order to use privoxy over tor, add the following line to your
+privoxy configuration file:
+	forward-socks4a / localhost:9050 .
+(the dot is important)
+
+Then configure your browser to use privoxy as its HTTP proxy.
+
+-- 
+Peter Palfrader <weasel@debian.org>, Tue, 17 Feb 2004 02:15:36 +0100
@@ -0,0 +1,10 @@
+Legend:
+        - Not done
+        * Top priority
+        . Partially done
+        o Done
+        D Deferred
+        X Abandoned
+
+- strip debugging symbols when tor is more mature
+- don't enable coredumps by default
@@ -0,0 +1,232 @@
+tor (0.0.8-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Peter Palfrader <weasel@debian.org>  Fri, 27 Aug 2004 14:08:10 +0200
+
+tor (0.0.7.2+0.0.8rc1-1) unstable; urgency=low
+
+  * New upstream release candidate.
+  * Install design paper in usr/share/doc/tor, not usr/share/doc.  Ooops.
+
+ -- Peter Palfrader <weasel@debian.org>  Wed, 18 Aug 2004 09:59:13 +0200
+
+tor (0.0.7.2+0.0.8pre3-1) unstable; urgency=low
+
+  * New upstream (pre)release.
+  * Ship AUTHORS, doc/CLIENTS, doc/FAQ, doc/HACKING, doc/TODO,
+    doc/tor-doc.{css,html}, doc/{rend,tor}-spec.txt with the binary package.
+  * Build tor-design.{pdf,ps}, wich adds new build-dependencies:
+    tetex-{bin,extra}, transfig, and gs.
+  * Support DEB_BUILD_OPTIONS option 'nodoc' to skip building tor-design.
+    With nodoc the build will not need tetex-{bin,extra}, transfig, and gs.
+  * Support DEB_BUILD_OPTIONS option 'nocheck' to skip unittests
+    ('notest' is an alias')
+  * Enable coredumps by default, this is still development code.
+  * Modify 02_add_debian_files_in_manpage to still apply.
+
+ -- Peter Palfrader <weasel@debian.org>  Sun,  8 Aug 2004 15:03:32 +0200
+
+tor (0.0.7.2+0.0.8pre2-1) unstable; urgency=low
+
+  * New upstream (pre)release.
+  * Depend on python as we now have a python script: tor_resolve
+
+ -- Peter Palfrader <weasel@debian.org>  Wed,  4 Aug 2004 20:09:26 +0200
+
+tor (0.0.7.2-1) unstable; urgency=medium
+
+  * New upstream release.
+    Fixes another instance of that remote crash bug.
+  * Mention another reason why stop/reload may fail in the init script.
+
+ -- Peter Palfrader <weasel@debian.org>  Thu,  8 Jul 2004 03:21:32 +0200
+
+tor (0.0.7.1-1) unstable; urgency=medium
+
+  * New upstream release.
+    Fixes a bug that allows a remote crash on exit nodes.
+  * Logrotate var/log/tor/*log instead of just var/log/tor/log, in
+    case the admin wants several logs.
+
+ -- Peter Palfrader <weasel@debian.org>  Mon,  5 Jul 2004 19:18:12 +0200
+
+tor (0.0.7-1) unstable; urgency=low
+
+  * New upstream version
+    closes: #249893: FTBFS on ia64
+
+ -- Peter Palfrader <weasel@debian.org>  Mon,  7 Jun 2004 21:46:08 +0200
+
+tor (0.0.6.2-1) unstable; urgency=medium
+
+  * New upstream release (breaks backwards compatibility yet again).
+  * Recommend socat.
+  * Since tor is in /usr/sbin, the manpage should be in section 8, not
+    in section 1.  Move it there, including updating the section in
+    the manpage itself and the reference in torify(1).
+  * Update debian/copyright file.
+
+ -- Peter Palfrader <weasel@debian.org>  Sun, 16 May 2004 10:47:20 +0200
+
+tor (0.0.6.1-1) unstable; urgency=medium
+
+  * New upstream release (breaks backwards compatibility).
+
+ -- Peter Palfrader <weasel@debian.org>  Fri,  7 May 2004 00:24:49 +0200
+
+tor (0.0.6-1) unstable; urgency=low
+
+  * New upstream release (breaks backwards compatibility).
+
+ -- Peter Palfrader <weasel@debian.org>  Sun,  2 May 2004 23:58:36 +0200
+
+tor (0.0.5+0.0.6rc4-1) unstable; urgency=low
+
+  * New upstream release candidate.
+
+ -- Peter Palfrader <weasel@debian.org>  Sun,  2 May 2004 14:36:59 +0200
+
+tor (0.0.5+0.0.6rc3-1) unstable; urgency=low
+
+  * New upstream release candidate.
+
+ -- Peter Palfrader <weasel@debian.org>  Thu, 29 Apr 2004 11:52:07 +0200
+
+tor (0.0.5+0.0.6rc2-1) unstable; urgency=low
+
+  * New upstream release candidate.
+  * Mention upstream website and mailinglist archives in long
+    description.
+
+ -- Peter Palfrader <weasel@debian.org>  Mon, 26 Apr 2004 12:23:20 +0200
+
+tor (0.0.5-1) unstable; urgency=low
+
+  * New upstream release.
+  * Upstream installs a torrc.sample file now, rather than torrc.
+    Keep using torrc as dpkg handles conffile upgrades.
+
+ -- Peter Palfrader <weasel@debian.org>  Tue, 30 Mar 2004 20:54:00 +0200
+
+tor (0.0.4-1) unstable; urgency=low
+
+  * New upstream release (how the version numbers fly by :).
+
+ -- Peter Palfrader <weasel@debian.org>  Fri, 26 Mar 2004 23:46:09 +0100
+
+tor (0.0.3-1) unstable; urgency=low
+
+  * New upstream release.
+  * Also mention that tree.h is by Niels Provos in debian/copyright.
+
+ -- Peter Palfrader <weasel@debian.org>  Fri, 26 Mar 2004 20:36:08 +0100
+
+tor (0.0.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * Uses strlcpy and strlcat by Todd C. Miller, mention him in
+    debian/copyright.
+
+ -- Peter Palfrader <weasel@debian.org>  Fri, 19 Mar 2004 12:37:17 +0100
+
+tor (0.0.1+0.0.2pre27-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Peter Palfrader <weasel@debian.org>  Mon, 15 Mar 2004 05:19:16 +0100
+
+tor (0.0.1+0.0.2pre26-1) unstable; urgency=low
+
+  * New upstream release.
+  * Mention log and pidfile location in tor.1.
+
+ -- Peter Palfrader <weasel@debian.org>  Mon, 15 Mar 2004 02:21:29 +0100
+
+tor (0.0.1+0.0.2pre25-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Peter Palfrader <weasel@debian.org>  Thu,  4 Mar 2004 23:05:38 +0100
+
+tor (0.0.1+0.0.2pre24-1) unstable; urgency=low
+
+  * New upstream release.
+  * Do not strip binaries for now.
+  * Add "# ulimit -c unlimited" to tor.default
+  * Always enable DataDirectory.
+  * Actually use dpatch now (to modify upstream torrc.in)
+  * Wait for tor to die in init stop.  Let the user know if it doesn't.
+
+ -- Peter Palfrader <weasel@debian.org>  Wed,  3 Mar 2004 14:10:25 +0100
+
+tor (0.0.1+0.0.2pre23-1) unstable; urgency=low
+
+  * New upstream release.
+  * The one test that always failed has been fixed:  removed comment from
+    rules file.
+
+ -- Peter Palfrader <weasel@debian.org>  Sun, 29 Feb 2004 12:36:33 +0100
+
+tor (0.0.1+0.0.2pre22-1) unstable; urgency=low
+
+  * New upstream release.
+  * Upstream has moved tor back to usr/bin, but we will keep it in
+    usr/sbin.  That's the right place and it doesn't break my tab
+    completion there.
+
+ -- Peter Palfrader <weasel@debian.org>  Fri, 27 Feb 2004 01:59:09 +0100
+
+tor (0.0.1+0.0.2pre21-1) unstable; urgency=low
+
+  * New upstream release.
+  * 0.0.2pre20-2 removed the Recommends: on privoxy rather
+    than tsocks (which is now required) by mistake.  Fix that.
+  * package description: Mention that the package starts the OP by default and
+    that OR can be enabled in the config.
+  * tor moved to sbin, updating init script.
+
+ -- Peter Palfrader <weasel@debian.org>  Wed, 18 Feb 2004 10:08:12 +0100
+
+tor (0.0.1+0.0.2pre20-2) unstable; urgency=low
+
+  * Add torify script, documentation, and config file.  Means we also
+    depend on tsocks now rather than just recommending it.  Right now
+    we install it in debian/rules, but upcoming versions might install
+    it in upstream's make install target.
+  * There's an upstream ChangeLog file now.  Enjoy!
+  * Add a README.privoxy file that explains how to setup privoxy to
+    go over tor.
+  * As is the case too often, the INSTALL file not only covers
+    installation, but also basic usage and configuration.  Therefore
+    include it in the docs dir.
+  * Add a lintian override for the INSTALL file.
+
+ -- Peter Palfrader <weasel@debian.org>  Tue, 17 Feb 2004 02:32:00 +0100
+
+tor (0.0.1+0.0.2pre20-1) unstable; urgency=low
+
+  * New upstream version.
+    - various design paper updates
+    - resolve cygwin warnings
+    - split the token bucket into "rate" and "burst" params
+    - try to resolve discrepency between bytes transmitted over TLS and actual
+      bandwidth use
+    - setuid to user _before_ complaining about running as root
+    - fix several memleaks and double frees
+    - minor logging fixes
+    - add more debugging for logs.
+    - various documentation fixes and improvements
+    - for perforcmance testing, paths are always 3 hops, not "3 or more"
+      (this will go away at a later date again)
+  * Add dependency on adduser which was previously missing.
+  * Change short description to a nicer one.
+
+ -- Peter Palfrader <weasel@debian.org>  Sat, 31 Jan 2004 10:10:45 +0100
+
+tor (0.0.1+0.0.2pre19-1) unstable; urgency=low
+
+  * Initial Release  (closes: #216611).
+
+ -- Peter Palfrader <weasel@debian.org>  Sat, 10 Jan 2004 11:20:06 +0100
+
@@ -0,0 +1 @@
+4
@@ -0,0 +1,48 @@
+Source: tor
+Section: comm
+Priority: optional
+Maintainer: Peter Palfrader <weasel@debian.org>
+Build-Depends: debhelper (>= 4.1.65), libssl-dev, dpatch, tetex-bin, tetex-extra, transfig, gs
+Standards-Version: 3.6.1
+
+Package: tor
+Architecture: any
+Depends: ${shlibs:Depends}, adduser, tsocks, python
+Recommends: privoxy, socat
+Suggests: mixmaster, mixminion, anon-proxy
+Description: anonymizing overlay network for TCP
+ Tor is a connection-based low-latency anonymous communication system which
+ addresses many flaws in the original onion routing design.
+ .
+ In brief, Onion Routing is a connection-oriented anonymizing communication
+ service. Users choose a source-routed path through a set of nodes, and
+ negotiate a "virtual circuit" through the network, in which each node
+ knows its predecessor and successor, but no others. Traffic flowing down
+ the circuit is unwrapped by a symmetric key at each node, which reveals
+ the downstream node.
+ .
+ Basically Tor provides a distributed network of servers ("onion
+ routers"). Users bounce their tcp streams (web traffic, ftp, ssh, etc)
+ around the routers, and recipients, observers, and even the routers
+ themselves have difficulty tracking the source of the stream.
+ .
+ Note that Tor does no protocol cleaning.  That means there is a danger that
+ application protocols and associated programs can be induced to reveal
+ information about the initiator.  Tor depends on Privoxy and similar protocol
+ cleaners to solve this problem.
+ .
+ Client applications can use the Tor network by connecting to the local
+ onion proxy.  If the application itself does not come with socks support
+ you can use a socks client such as tsocks.  Some web browsers like mozilla
+ and web proxies like privoxy come with socks support, so you don't need an
+ extra socks client if you want to use Tor with them.
+ .
+ This package enables only the onion proxy by default, but it can be configured
+ as a relay (server) node.
+ .
+ Remember that this is alpha code, and the network is very small -- Tor will
+ not provide anonymity currently.
+ .
+ The latest information can be found at http://freehaven.net/tor/, or on the
+ mailing lists, archived at http://archives.seul.org/or/dev/ or
+ http://archives.seul.org/or/announce/.
@@ -0,0 +1,102 @@
+This package was debianized by Peter Palfrader <weasel@debian.org> on
+Sat, 10 Jan 2004 11:20:06 +0100.
+
+It was downloaded from http://freehaven.net/tor/
+
+Upstream Authors: Roger Dingledine <arma@freehaven.net>
+                  Nick Mathewson <nickm@freehaven.net>
+                  Matej Pfajfar <badbytes@freehaven.net>
+
+
+Copyright (c) 2001-2004 Roger Dingledine
+Copyright (c) 2002,2003 Nick Mathewson
+Copyright (c) 2001-2003 Matej Pfajfar
+strlcat, strlcpy: Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
+tree.h: Copyright (c) 2002 Niels Provos <provos@citi.umich.edu>
+Modifications for Debian: Copyright (c) 2004 Peter Palfrader <weasel@debian.org>
+
+The tor code is under this license:
+===============================================================================
+Copyright (c) 2001-2004, Roger Dingledine
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+    * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+
+    * Neither the names of the copyright owners nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+===============================================================================
+tree.h by Niels Provos is licensed as follows:
+
+ * Copyright 2002 Niels Provos <provos@citi.umich.edu>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+===============================================================================
+strlcat and strlcpy by Todd C. Miller are licensed under the following license:
+
+ * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
+ * THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
@@ -0,0 +1,3 @@
+01_uncomment_datadirectory.dpatch
+02_add_debian_files_in_manpage.dpatch
+03_tor_manpage_in_section_8.dpatch
@@ -0,0 +1,37 @@
+#! /bin/sh -e
+## 01_uncomment_datadirectory.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 /home/weasel/projects/tor/cvs/src/config/torrc.sample.in cvs/src/config/torrc.sample.in
+--- /home/weasel/projects/tor/cvs/src/config/torrc.sample.in	2004-03-01 23:41:26.000000000 +0100
+++ cvs/src/config/torrc.sample.in	2004-03-03 13:47:25.000000000 +0100
+@@ -11,7 +11,7 @@
+ ##################### Below is just for servers #####################
+ 
+ ## The directory for keeping all the keys/etc for this server
+-#DataDirectory @LOCALSTATEDIR@/lib/tor
+DataDirectory @LOCALSTATEDIR@/lib/tor
+ 
+ #Nickname moria # A unique handle for this server
+ #Address moria.seul.org # The fqdn for this server
@@ -0,0 +1,41 @@
+#! /bin/sh -e
+## 02_add_debian_files_in_manpage.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 /home/weasel/tmp/tor/tor-0.0.7.2+0.0.8pre3cvs/doc/tor.1.in tor-0.0.7.2+0.0.8pre3cvs/doc/tor.1.in
+--- /home/weasel/tmp/tor/tor-0.0.7.2+0.0.8pre3cvs/doc/tor.1.in	2004-08-08 07:32:55.000000000 +0200
+++ tor-0.0.7.2+0.0.8pre3cvs/doc/tor.1.in	2004-08-08 15:16:27.185115824 +0200
+@@ -201,6 +201,12 @@
+ .TP
+ .I @LOCALSTATEDIR@/lib/tor/
+ The tor process stores keys and other data here.
+.TP
+.I /var/log/tor/log
+The tor server logs to this file.
+.TP
+.I /var/run/tor/tor.pid
+The PID of the tor (master) process is stored in this file.
+ 
+ .SH SEE ALSO
+ .BR privoxy (1),
@@ -0,0 +1,45 @@
+#! /bin/sh -e
+## 02_tor_manpage_in_section_8.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 /home/weasel/projects/tor/cvs/contrib/torify.1 cvs/contrib/torify.1
+--- /home/weasel/projects/tor/cvs/contrib/torify.1	2004-02-17 01:45:25.000000000 +0100
+++ cvs/contrib/torify.1	2004-05-07 01:12:57.000000000 +0200
+@@ -18,6 +18,6 @@
+ binaries.
+ 
+ .SH SEE ALSO
+-.BR tor (1),
+.BR tor (8),
+ .BR tsocks (1),
+ .BR tsocks.conf (5).
+diff -urNad /home/weasel/projects/tor/cvs/doc/tor.1.in cvs/doc/tor.1.in
+--- /home/weasel/projects/tor/cvs/doc/tor.1.in	2004-04-18 20:40:42.000000000 +0200
+++ cvs/doc/tor.1.in	2004-05-07 01:12:12.000000000 +0200
+@@ -1,4 +1,4 @@
+-.TH TOR 1 "November 2003" "TOR"
+.TH TOR 8 "November 2003" "TOR"
+ .SH NAME
+ tor \- The second-generation onion router
+ .SH SYNOPSIS
@@ -0,0 +1,153 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+CFLAGS = -Wall -g
+
+export PACKAGE=tor
+include /usr/share/dpatch/dpatch.make
+
+# Do not optimize the build with "noopt"
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -O0
+else
+	CFLAGS += -O2
+endif
+
+# Do not strip the binary with "nostrip"
+#ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+#	INSTALL_PROGRAM += -s
+#endif
+
+# Prevent the design paper from being built with "nodoc"
+ifneq (,$(findstring nodoc,$(DEB_BUILD_OPTIONS)))
+	BUILD_DOC = no
+endif
+
+# Prevent the unit tests from being run with "nocheck"
+ifneq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
+	RUN_TEST = no
+endif
+ifneq (,$(findstring notest,$(DEB_BUILD_OPTIONS)))
+	RUN_TEST = no
+endif
+
+configure: patch-stamp
+config.status: configure
+	dh_testdir
+	CFLAGS="$(CFLAGS)" ./configure \
+		--host=$(DEB_HOST_GNU_TYPE) \
+		--build=$(DEB_BUILD_GNU_TYPE) \
+		--prefix=/usr \
+		--mandir=\$${prefix}/share/man \
+		--infodir=\$${prefix}/share/info \
+		--localstatedir=/var \
+		--sysconfdir=/etc
+
+
+build: build-stamp
+
+build-stamp:  config.status
+	dh_testdir
+
+	$(MAKE)
+	@echo
+	@echo
+	# Running unit tests
+	if [ "$(RUN_TEST)" != "no" ]; then \
+		src/or/test; \
+	else \
+		echo -e "\n\nSkipping unittests\n\n"; \
+	fi
+	@echo
+
+	# make design paper
+	if [ "$(BUILD_DOC)" != "no" ]; then \
+		make -C doc/design-paper tor-design.ps tor-design.pdf || \
+		( echo -e "*\n*\n*\n*"; \
+		  echo "* Building some docs failed, perhaps because you did not install the"; \
+		  echo "* declared build dependencies and then used -o with dpkg-buildpackage."; \
+		  echo "*"; \
+		  echo "* If you want to skip this part, you can set nodoc in DEB_BUILD_OPTIONS" ; \
+		  echo "* and start the build again.  DEB_BUILD_OPTIONS=nodoc dpkg-buildpackage.."; \
+		  echo -e "*\n*\n*\n*"; \
+		  false ); \
+	else \
+		echo -e "\n\nSkipping tor-design.{ps,pdf}\n\n"; \
+	fi
+
+	touch build-stamp
+
+clean: unpatch
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp
+
+	-$(MAKE) distclean
+
+	dh_clean
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/tor
+	# move tor to where it belongs
+	mv $(CURDIR)/debian/tor/etc/tor/torrc.sample $(CURDIR)/debian/tor/etc/tor/torrc
+	mv $(CURDIR)/debian/tor/usr/bin/tor $(CURDIR)/debian/tor/usr/sbin/tor
+	install -d $(CURDIR)/debian/tor/usr/share/man/man8
+	mv $(CURDIR)/debian/tor/usr/share/man/man1/tor.1 $(CURDIR)/debian/tor/usr/share/man/man8/tor.8
+
+	install -m 755 contrib/torify $(CURDIR)/debian/tor/usr/bin
+	install -m 644 contrib/torify.1 $(CURDIR)/debian/tor/usr/share/man/man1
+	install -m 644 contrib/tor-tsocks.conf $(CURDIR)/debian/tor/etc/tor
+
+	install -m 644 debian/tor.lintian-override $(CURDIR)/debian/tor/usr/share/lintian/overrides/tor
+
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs ChangeLog
+	dh_installdocs
+	if [ "$(BUILD_DOC)" != "no" ]; then \
+		install -m 644 doc/design-paper/tor-design.ps  $(CURDIR)/debian/tor/usr/share/doc/tor/; \
+		install -m 644 doc/design-paper/tor-design.pdf $(CURDIR)/debian/tor/usr/share/doc/tor/; \
+	fi
+	dh_installexamples
+#	dh_install
+#	dh_installdebconf
+	dh_installlogrotate
+#	dh_installemacsen
+#	dh_installmime
+	dh_installinit
+#	dh_installcron
+	dh_installman
+	dh_link
+	#dh_strip
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install 
@@ -0,0 +1,13 @@
+# Defaults for tor initscript
+# sourced by /etc/init.d/tor
+# installed at /etc/default/tor by the maintainer scripts
+
+#
+# This is a POSIX shell fragment
+#
+RUN_DAEMON="yes"
+
+#
+# Uncomment this if you want to get coredumps
+#
+ulimit -c unlimited
@@ -0,0 +1,7 @@
+etc/tor
+var/lib/tor
+var/log/tor
+var/run/tor
+usr/share/lintian/overrides
+usr/bin
+usr/sbin
@@ -0,0 +1,12 @@
+AUTHORS
+README
+INSTALL
+debian/README.privoxy
+doc/CLIENTS
+doc/FAQ
+doc/HACKING
+doc/TODO
+doc/tor-doc.css
+doc/tor-doc.html
+doc/rend-spec.txt
+doc/tor-spec.txt
@@ -0,0 +1,104 @@
+#! /bin/sh
+
+set -e
+
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+DAEMON=/usr/sbin/tor
+NAME=tor
+DESC="tor daemon"
+TORLOG=/var/log/tor/log
+TORPID=/var/run/tor/tor.pid
+DEFAULTSFILE=/etc/default/$NAME
+WAITFORDAEMON=10
+ARGS="--pidfile $TORPID --logfile $TORLOG --runasdaemon 1"
+
+test -x $DAEMON || exit 0
+
+# Include tor defaults if available
+if [ -f $DEFAULTSFILE ] ; then
+	. $DEFAULTSFILE
+fi
+
+wait_for_deaddaemon () {
+	pid=$1
+	sleep 1
+	if test -n "$pid"
+	then
+		if kill -0 $pid 2>/dev/null
+		then
+			echo -n "."
+			cnt=0
+			while kill -0 $pid 2>/dev/null
+			do
+				cnt=`expr $cnt + 1`
+				if [ $cnt -gt $WAITFORDAEMON ]
+				then
+					echo " FAILED."
+					return 1
+				fi
+				sleep 1
+				echo -n "."
+			done
+		fi
+	fi
+	return 0
+}
+
+case "$1" in
+  start)
+	if [ "$RUN_DAEMON" != "yes" ]; then
+		echo "Not starting $DESC (Disabled in $DEFAULTSFILE)."
+	else
+		echo -n "Starting $DESC: "
+		start-stop-daemon --start --quiet --oknodo \
+			--chuid debian-tor:debian-tor \
+			--pidfile $TORPID \
+			--exec $DAEMON -- $ARGS
+		echo "$NAME."
+	fi
+	;;
+  stop)
+	echo -n "Stopping $DESC: "
+	pid=`cat $TORPID 2>/dev/null` || true
+	if test ! -f $TORPID -o -z "$pid"
+	then
+		echo "not running (there is no $TORPID)."
+	elif start-stop-daemon --stop --quiet --pidfile $TORPID --exec $DAEMON
+	then
+		wait_for_deaddaemon $pid
+		echo "$NAME."
+	elif kill -0 $pid 2>/dev/null
+	then
+		echo "FAILED (Is $pid not $NAME?  Is $DAEMON a different binary now?)."
+	else
+		echo "FAILED ($DAEMON died: process $pid not running; or permission denied)."
+	fi
+	;;
+  reload|force-reload)
+	echo -n "Reloading $DESC configuration: "
+	pid=`cat $TORPID 2>/dev/null` || true
+	if test ! -f $TORPID -o -z "$pid"
+	then
+		echo "not running (there is no $TORPID)."
+	elif start-stop-daemon --stop --signal 1 --quiet --pidfile $TORPID --exec $DAEMON
+	then
+		echo "$NAME."
+	elif kill -0 $pid 2>/dev/null
+	then
+		echo "FAILED (Is $pid not $NAME?  Is $DAEMON a different binary now?)."
+	else
+		echo "FAILED ($DAEMON died: process $pid not running; or permission denied)."
+	fi
+	;;
+  restart)
+	$0 stop
+	sleep 1
+	$0 start
+	;;
+  *)
+	echo "Usage: $0 {start|stop|restart|reload|force-reload}" >&2
+	exit 1
+	;;
+esac
+
+exit 0
@@ -0,0 +1 @@
+tor: package-contains-upstream-install-documentation
@@ -0,0 +1,11 @@
+/var/log/tor/*log {
+	daily
+	rotate 5
+	compress
+	delaycompress
+	missingok
+	notifempty
+	postrotate
+		/etc/init.d/tor reload > /dev/null
+	endscript
+}
@@ -0,0 +1,54 @@
+#!/bin/sh -e
+
+# checking debian-tor account
+
+uid=`getent passwd debian-tor | cut -d ":" -f 3`
+home=`getent passwd debian-tor | cut -d ":" -f 6`
+
+# if there is the uid the account is there and we can do
+# the sanit(ar)y checks otherwise we can safely create it.
+
+if [ "$uid" ]; then
+    # guess??? the checks!!!
+    if [ $uid -ge 100 ] && [ $uid -le 999 ]; then
+    	echo "debian-tor uid check: ok"
+    else
+    	echo "ERROR: debian-tor account has a non-system uid!"
+	echo "Please check /usr/share/doc/tor/README.Debian on how to"
+	echo "correct this problem"
+	exit 1
+    fi
+    if [ "$home" = "/var/lib/tor" ]; then
+        echo "debian-tor homedir check: ok"
+    else
+	echo "ERROR: debian-tor account has an invalid home directory!"
+	echo "Please check /usr/share/doc/tor/README.Debian on how to"
+	echo "correct this problem"
+	exit 1
+    fi
+else
+    # what this might mean?? oh creating a system l^Huser!
+    adduser --quiet \
+            --system \
+            --disabled-password \
+            --home /var/lib/tor \
+	    --no-create-home \
+	    --shell /bin/bash \
+	    --group \
+    debian-tor
+fi
+
+# ch{owning,moding} things around
+# We will do nothing across upgrades.
+
+if [ "$2" = "" ]; then
+    for i in lib log run; do
+	chown -R debian-tor:debian-tor /var/$i/tor
+	chmod -R 700 /var/$i/tor
+	find /var/$i/tor -type f -exec chmod 600 '{}' ';'
+    done
+fi
+
+#DEBHELPER#
+
+exit 0
@@ -0,0 +1,11 @@
+#!/bin/sh -e
+
+if [ "$1" = "purge" ]; then
+    # logs have to be removed according to policy.
+    rm -rf /var/log/tor/
+    rm -rf /var/lib/tor/
+fi
+
+#DEBHELPER#
+
+exit 0
				`@@ -0,0 +1 @@`
				`tor: package-contains-upstream-install-documentation`