Remove tor-fw-helper more thoroughly

diff --git a/Makefile.am b/Makefile.am
index 8f6b38aa0f43c568292ac10f38e36e9be649b5ce..3e0ae3a227b711fdc267b45531bce1e2d8c33a10 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -140,8 +140,7 @@ check-spaces:
                $(top_srcdir)/src/common/*.[ch] \
                $(top_srcdir)/src/or/*.[ch] \
                $(top_srcdir)/src/test/*.[ch] \
-               $(top_srcdir)/src/tools/*.[ch] \
-               $(top_srcdir)/src/tools/tor-fw-helper/*.[ch]
+               $(top_srcdir)/src/tools/*.[ch]
 
 check-docs: all
        $(PERL) $(top_builddir)/scripts/maint/checkOptionDocs.pl

diff --git a/doc/include.am b/doc/include.am
index af995015026ceb9805927437850e4f97773ce001..47f1ab3433cf666c6877dcc197a0d16160f0f2e0 100644 (file)
--- a/doc/include.am
+++ b/doc/include.am
@@ -13,7 +13,7 @@
 # just use the .1 and .html files.
 
 base_mans = doc/tor doc/tor-gencert doc/tor-resolve doc/torify
-all_mans = $(base_mans) doc/tor-fw-helper
+all_mans = $(base_mans)
 if USE_FW_HELPER
 install_mans = $(all_mans)
 else
@@ -57,13 +57,11 @@ doc/tor.1.in: doc/tor.1.txt
 doc/torify.1.in: doc/torify.1.txt
 doc/tor-gencert.1.in: doc/tor-gencert.1.txt
 doc/tor-resolve.1.in: doc/tor-resolve.1.txt
-doc/tor-fw-helper.1.in: doc/tor-fw-helper.1.txt
 
 doc/tor.html.in: doc/tor.1.txt
 doc/torify.html.in: doc/torify.1.txt
 doc/tor-gencert.html.in: doc/tor-gencert.1.txt
 doc/tor-resolve.html.in: doc/tor-resolve.1.txt
-doc/tor-fw-helper.html.in: doc/tor-fw-helper.1.txt
 
 # use config.status to swap all machine-specific magic strings
 # in the asciidoc with their replacements.
@@ -78,13 +76,11 @@ doc/tor.html: doc/tor.html.in
 doc/tor-gencert.html: doc/tor-gencert.html.in
 doc/tor-resolve.html: doc/tor-resolve.html.in
 doc/torify.html: doc/torify.html.in
-doc/tor-fw-helper.html: doc/tor-fw-helper.html.in
 
 doc/tor.1: doc/tor.1.in
 doc/tor-gencert.1: doc/tor-gencert.1.in
 doc/tor-resolve.1: doc/tor-resolve.1.in
 doc/torify.1: doc/torify.1.in
-doc/tor-fw-helper.1: doc/tor-fw-helper.1.in
 
 CLEANFILES+= $(asciidoc_product) config.log
 DISTCLEANFILES+= $(html_in) $(man_in)

diff --git a/doc/tor-fw-helper.1.txt b/doc/tor-fw-helper.1.txt
deleted file mode 100644 (file)
index 1c103d9..0000000
--- a/doc/tor-fw-helper.1.txt
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright (c) The Tor Project, Inc.
-// See LICENSE for licensing information
-// This is an asciidoc file used to generate the manpage/html reference.
-// Learn asciidoc on http://www.methods.co.nz/asciidoc/userguide.html
-:man source:   Tor
-:man manual:   Tor Manual
-tor-fw-helper(1)
-================
-Jacob Appelbaum
-
-NAME
-----
-tor-fw-helper - Manage upstream firewall/NAT devices
-
-SYNOPSIS
---------
-**tor-fw-helper** [-h|--help] [-T|--test-commandline] [-v|--verbose] [-g|--fetch-public-ip]
- [-p __external port__:__internal_port__]
-
-DESCRIPTION
------------
-**tor-fw-helper** currently supports Apple's NAT-PMP protocol and the UPnP
-standard for TCP port mapping. It is written as the reference implementation of
-tor-fw-helper-spec.txt and conforms to that loose plugin API.  If your network
-supports either NAT-PMP or UPnP, tor-fw-helper will attempt to automatically
-map the required TCP ports for Tor's Or and Dir ports. +
-
-OPTIONS
--------
-**-h** or **--help**::
-    Display help text and exit.
-
-**-v** or **--verbose**::
-    Display verbose output.
-
-**-T** or **--test-commandline**::
-    Display test information and print the test information in
-    tor-fw-helper.log
-
-**-g** or **--fetch-public-ip**::
-    Fetch the the public ip address for each supported NAT helper method.
-
-**-p** or **--port** __external_port__:__internal_port__::
-    Forward external_port to internal_port.  This option can appear
-    more than once.
-
-BUGS
-----
-This probably doesn't run on Windows. That's not a big issue, since we don't
-really want to deal with Windows before October 2010 anyway.
-
-SEE ALSO
---------
-**tor**(1) +
-
-See also the "tor-fw-helper-spec.txt" file, distributed with Tor.
-
-AUTHORS
--------
-    Jacob Appelbaum <jacob@torproject.org>, Steven J. Murdoch <Steven.Murdoch@cl.cam.ac.uk>

diff --git a/scripts/maint/format_changelog.py b/scripts/maint/format_changelog.py
index a557fcaf407cea7b4a62e5feef94988554c7a45f..5e4c8cac9aaefe04c955b029537c5dc661d67346 100755 (executable)
--- a/scripts/maint/format_changelog.py
+++ b/scripts/maint/format_changelog.py
@@ -36,7 +36,6 @@ NO_HYPHENATE=set("""
 pf-divert
 tor-resolve
 tor-gencert
-tor-fw-helper
 """.split())
 
 LASTLINE_UNDERFLOW_EXPONENT = 1