Imported Debian patch 3.3+dfsg-3 debian
authorTeemu Hukkanen <tjhukkan@iki.fi>
Sun, 24 Jun 2012 09:07:46 +0000 (10:07 +0100)
committerMati Aharoni (Kali Linux Developer) <muts@kali.org>
Tue, 14 Jan 2014 15:42:59 +0000 (10:42 -0500)
22 files changed:
debian/changelog
debian/compat [new file with mode: 0644]
debian/control
debian/copyright
debian/copyright-files [new file with mode: 0644]
debian/dirs [deleted file]
debian/docs [deleted file]
debian/httptunnel.docs [new file with mode: 0644]
debian/patches/01-document-bind-to-address.patch [new file with mode: 0644]
debian/patches/02-document-cmdline-options.patch [new file with mode: 0644]
debian/patches/03-quote-dashes-in-manpage.patch [new file with mode: 0644]
debian/patches/04-fix-stdin-stdout.patch [new file with mode: 0644]
debian/patches/05-update-email-address.patch [new file with mode: 0644]
debian/patches/06-fix-cppflags-usage.patch [new file with mode: 0644]
debian/patches/07-quote-autoconf-definitions.patch [new file with mode: 0644]
debian/patches/series [new file with mode: 0644]
debian/postinst [deleted file]
debian/prerm [deleted file]
debian/rules
debian/source/format [new file with mode: 0644]
debian/source/options [new file with mode: 0644]
debian/watch [new file with mode: 0644]

index 4260634..e608089 100644 (file)
@@ -1,3 +1,52 @@
+httptunnel (3.3+dfsg-3) unstable; urgency=low
+
+  * Bump to debhelper v9.
+  * Split patches.
+  * Add new patch 06-fix-cppflags-usage.patch, and run autoreconf upon
+    configure.
+  * Add new patch 07-quote-autoconf-definitions.
+  * Update to copyright format 1.0.
+  * Update to Standards-Version 3.9.3, no changes needed.
+
+ -- Teemu Hukkanen <tjhukkan@iki.fi>  Sun, 24 Jun 2012 10:07:46 +0100
+
+httptunnel (3.3+dfsg-2) unstable; urgency=low
+
+  * Minimal rules debhelper rules file.
+  * Broaden the package Description (Closes: #463375)
+  * Add Homepage field, and update Standards-Version to 3.8.4.0 (no
+    changes needed) (Closes: #463376)
+  * Document -s / --stdin-stdout (hts), -z / --proxy-authorization-file
+    (htc), -w / --no-daemon (hts/htc). Patch from Gonéri Le Bouder
+    <goneri@rulezlan.org> (Closes: #438493)
+  * Document the ability to bind to a specific ip address
+    (Closes: #501833)
+  * Update copyright file.
+  * Quote dashes in manpage.
+  * Add watch file.
+
+ -- Teemu Hukkanen <tjhukkan@iki.fi>  Mon, 15 Mar 2010 00:06:18 +0200
+
+httptunnel (3.3+dfsg-1) unstable; urgency=low
+
+  * Repacked upstream tarball to remove IETF RFCs. (Closes: #393374)
+  * Removed emacs variables from changelog.
+  * common.c: fixed stdin-stdout option by pulling an upstream patch for
+    common.c "Change stdout descriptor to 1 (from 0)." (Closes: #429885)
+    Thanks to Israel G. Lugo for the report.
+  * debian/postinst: removed, fixing lintian warning
+    postinst-should-not-set-usr-doc-link
+  * debian/rules:
+   - debian-rules-ignores-make-clean-error
+   - package-contains-upstream-install-documentation
+  * debian/copyright:
+    - copyright-should-refer-to-common-license-file-for-gpl
+    - copyright-lists-upstream-authors-with-dh_make-boilerplate
+  * Updated standards-version, minor changes.
+    * debian/rules: support DEB_BUILD_OPTIONS nostrip, noopt
+
+ -- Teemu Hukkanen <tjhukkan@iki.fi>  Sat, 11 Aug 2007 21:33:57 +0300
+
 httptunnel (3.2) unstable; urgency=low
 
   * New upstream version.
@@ -57,7 +106,4 @@ httptunnel (2.8-1) unstable; urgency=low
 
  -- Teemu Hukkanen <tjhukkan@iki.fi>  Thu, 12 Aug 1999 11:56:17 +0300
 
-Local variables:
-mode: debian-changelog
-add-log-mailing-address: "tjhukkan@iki.fi"
-End:
+
diff --git a/debian/compat b/debian/compat
new file mode 100644 (file)
index 0000000..ec63514
--- /dev/null
@@ -0,0 +1 @@
+9
index 2b58689..29bec8b 100644 (file)
@@ -1,14 +1,20 @@
 Source: httptunnel
 Section: net
 Priority: optional
+Build-Depends: debhelper (>= 9), autoconf, automake
 Maintainer: Teemu Hukkanen <tjhukkan@iki.fi>
-Standards-Version: 3.1.0.0
+Standards-Version: 3.9.3
+Homepage: http://www.nocrew.org/software/httptunnel.html
 
 Package: httptunnel
 Architecture: any
-Depends: ${shlibs:Depends}
-Description: Tunnels a data stream in HTTP requests.
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Tunnels a data stream in HTTP requests
  Creates a bidirectional virtual data stream tunnelled in
  HTTP requests. The requests can be sent via a HTTP proxy
  if so desired.
-
+ .
+ This can be useful for users behind restrictive firewalls. If WWW
+ access is allowed through a HTTP proxy, it's possible to use
+ httptunnel and, say, telnet or PPP to connect to a computer
+ outside the firewall.
index 80f8a60..2c2fd1e 100644 (file)
-This package was debianized by Teemu Hukkanen <tjhukkan@iki.fi> on
-Wed, 28 Jul 1999 16:00:06 +0300.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Source: http://ftp.gnu.org/gnu/httptunnel/
 
-It was downloaded from <ftp://ftp.gnu.org/pub/httptunnel/>
+Files: aclocal.m4
+Copyright: 1994-1999, Free Software Foundation
+License:
+ This file is free software; the Free Software Foundation
+ gives unlimited permission to copy and/or distribute it,
+ with or without modifications, as long as this notice is preserved.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+ even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ PARTICULAR PURPOSE.
 
-Upstream Author(s): Lars Brinkhoff <lars@nocrew.org>
+Files: Makefile.in port/Makefile.in port/sys/Makefile.in
+Copyright: 1994-1999, Free Software Foundation
+License:
+ This Makefile.in is free software; the Free Software Foundation
+ gives unlimited permission to copy and/or distribute it,
+ with or without modifications, as long as this notice is preserved.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+ even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ PARTICULAR PURPOSE.
 
-Copyright:
- httptunnel is licensed under the GNU General Public License.
+Files: configure
+Copyright: 1992-1996, Free Software Foundation
+License:
+ This configure script is free software; the Free Software Foundation
+ gives unlimited permission to copy, distribute and modify it.
 
----
-httptunnel is free software.  See COPYING for terms and conditions.
-If you like it, I would appreciate if you sent a post card to:
-        Lars Brinkhoff
+Files: missing
+Copyright: 1996-1997, Free Software Foundation
+License: GPL-2+
+
+Files: install-sh
+Copyright: 1994, X Consortium
+License: 
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to
+ deal in the Software without restriction, including without limitation the
+ rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ sell copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
+ TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ .
+ Except as contained in this notice, the name of the X Consortium shall not
+ be used in advertising or otherwise to promote the sale, use or other deal-
+ ings in this Software without prior written authorization from the X Consor-
+ tium.
+
+Files: port/getopt1.c port/getopt.c port/getopt.h
+Copyright: 1987-1997, Free Software Foundation, Inc
+License: GPL-2+
+
+Files: debian/* htc.1 hts.1
+Copyright: 1999-2012, Teemu Hukkanen <tjhukkan@iki.fi>
+License: GPL-2+
+
+Files: *
+Copyright: 1999-2001, Lars Brinkhoff <lars@nocrew.org>
+License:
+ httptunnel is free software.  See COPYING for terms and conditions.
+ If you like it, I would appreciate if you sent a post card to:
+       Lars Brinkhoff
        Kopmansgatan 2
-        411 13  Goteborg
-        Sweden
----
+       411 13  Goteborg
+       Sweden
+ .
+ I hereby disclaim all responsibility for this hack. If it backfires on
+ you in any way whatsoever, that's the breaks. Not my fault. If you
+ don't understand the risks inherent in doing this, don't do it. If you
+ use this hack and it allows vicious vandals to break into your
+ company's computers and costs you your job and your company millions
+ of dollars, well that's just tough nuggies. Don't come crying to me.
+ .
+ A copy of the GNU General Public License is available on Debian 
+ GNU/Linux systems as /usr/share/common-licenses/GPL-2
 
-A copy of the GNU General Public License is available on Debian 
-GNU/Linux systems as /usr/share/common-license/GPL.
+License: GPL-2+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ On Debian systems, the full text of the GNU General Public License
+ version 2 can be found in the file /usr/share/common-licenses/GPL-2.
diff --git a/debian/copyright-files b/debian/copyright-files
new file mode 100644 (file)
index 0000000..723a9e3
--- /dev/null
@@ -0,0 +1,119 @@
+.
+./config.h.in
+./htc.1
+./doc
+./NEWS
+./base64.h
+./tunnel.c
+./configure
+./INSTALL
+./config.h.in~
+./depcomp
+./port
+./port/getopt.h
+./port/getopt1.c
+./port/poll.c
+./port/vsyslog.c
+./port/sys
+./port/sys/Makefile.in
+./port/sys/Makefile
+./port/sys/Makefile.am
+./port/sys/poll_.h
+./port/daemon.c
+./port/Makefile.in
+./port/syslog_.h
+./port/stdio_.h
+./port/unistd_.h
+./port/Makefile
+./port/vsnprintf.c
+./port/netdb_.h
+./port/Makefile.am
+./port/getopt.c
+./port/endprotoent.c
+./install-sh
+./ChangeLog
+./aclocal.m4
+./config.status
+./Makefile.in
+./tunnel.h
+./stamp-h.in
+./hts.c
+./Makefile
+./FAQ
+./AUTHORS
+./acconfig.h
+./base64.c
+./htc.c
+./common.h
+./missing
+./Makefile.am
+./debian
+./debian/httptunnel.substvars
+./debian/httptunnel.debhelper.log
+./debian/httptunnel.docs
+./debian/watch
+./debian/changelog
+./debian/control
+./debian/httptunnel
+./debian/httptunnel/usr
+./debian/httptunnel/usr/share
+./debian/httptunnel/usr/share/doc
+./debian/httptunnel/usr/share/doc/httptunnel
+./debian/httptunnel/usr/share/doc/httptunnel/changelog.gz
+./debian/httptunnel/usr/share/doc/httptunnel/NEWS.gz
+./debian/httptunnel/usr/share/doc/httptunnel/changelog.Debian.gz
+./debian/httptunnel/usr/share/doc/httptunnel/FAQ
+./debian/httptunnel/usr/share/doc/httptunnel/AUTHORS
+./debian/httptunnel/usr/share/doc/httptunnel/TODO.gz
+./debian/httptunnel/usr/share/doc/httptunnel/HACKING
+./debian/httptunnel/usr/share/doc/httptunnel/DISCLAIMER
+./debian/httptunnel/usr/share/doc/httptunnel/copyright
+./debian/httptunnel/usr/share/doc/httptunnel/README
+./debian/httptunnel/usr/share/man
+./debian/httptunnel/usr/share/man/man1
+./debian/httptunnel/usr/share/man/man1/hts.1.gz
+./debian/httptunnel/usr/share/man/man1/htc.1.gz
+./debian/httptunnel/usr/bin
+./debian/httptunnel/usr/bin/hts
+./debian/httptunnel/usr/bin/htc
+./debian/httptunnel/DEBIAN
+./debian/httptunnel/DEBIAN/control
+./debian/httptunnel/DEBIAN/md5sums
+./debian/copyright-files
+./debian/files
+./debian/source
+./debian/source/options
+./debian/source/format
+./debian/rules
+./debian/changelog~
+./debian/patches
+./debian/patches/01-document-bind-to-address
+./debian/patches/04-fix-stdin-stdout
+./debian/patches/series
+./debian/patches/06-fix-cppflags-usage.patch
+./debian/patches/02-document-cmdline-options
+./debian/patches/03-quote-dashes-in-manpage
+./debian/patches/05-update-email-address
+./debian/compat
+./debian/copyright~
+./debian/copyright
+./config.h
+./TODO
+./HACKING
+./DISCLAIMER
+./http.c
+./acinclude.m4
+./config.log
+./http.h
+./hts.1
+./autom4te.cache
+./autom4te.cache/traces.0
+./autom4te.cache/output.0
+./autom4te.cache/requests
+./autom4te.cache/output.1
+./autom4te.cache/traces.1
+./common.c
+./COPYING
+./README
+./configure.in
+./stamp-h1
diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644 (file)
index a9e7954..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/bin
-usr/share/man
-usr/share/man/man1
diff --git a/debian/docs b/debian/docs
deleted file mode 100644 (file)
index ba150ad..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-FAQ
-INSTALL
-NEWS
-README
-TODO
-DISCLAIMER
-AUTHORS
-HACKING
diff --git a/debian/httptunnel.docs b/debian/httptunnel.docs
new file mode 100644 (file)
index 0000000..8fe92cc
--- /dev/null
@@ -0,0 +1,7 @@
+FAQ
+NEWS
+README
+TODO
+DISCLAIMER
+AUTHORS
+HACKING
diff --git a/debian/patches/01-document-bind-to-address.patch b/debian/patches/01-document-bind-to-address.patch
new file mode 100644 (file)
index 0000000..20e365d
--- /dev/null
@@ -0,0 +1,33 @@
+Description: Document that hts can bind to an ip address
+Bug-Debian: http://bugs.debian.org/501833
+--- a/hts.1
++++ b/hts.1
+@@ -3,14 +3,15 @@
+ hts \- httptunnel server
+ .SH SYNOPSIS
+ .B hts
+-.I "[options] [port]"
++.I "[options] [host:][port]"
+ .SH "DESCRIPTION"
+ This manual page briefly documents the
+ .BR hts
+ command.
+ .PP
+ .B hts
+-listens for incoming httptunnel connections at PORT (default port is 8888).
++listens for incoming httptunnel connections at PORT (default port is
++8888), and optionally binds to ip address HOST.
+ When a connection is made, I/O is redirected to the destination specified
+ by the --device or --forward-port switch.
+ .SH OPTIONS
+--- a/hts.c
++++ b/hts.c
+@@ -40,7 +40,7 @@
+ usage (FILE *f, const char *me)
+ {
+   fprintf (f,
+-"Usage: %s [OPTION]... [PORT]\n"
++"Usage: %s [OPTION]... [HOST:][PORT]\n"
+ "Listen for incoming httptunnel connections at PORT (default port is %d).\n"
+ "When a connection is made, I/O is redirected to the destination specified\n"
+ "by the --device, --forward-port or --stdin-stdout switch.\n"
diff --git a/debian/patches/02-document-cmdline-options.patch b/debian/patches/02-document-cmdline-options.patch
new file mode 100644 (file)
index 0000000..7f0bcab
--- /dev/null
@@ -0,0 +1,48 @@
+Description: Document missing options 
+ -s / --stdin-stdout (hts)
+ -z / --proxy-authorization-file (htc)
+ -w / --no-daemon (hts/htc).
+Author: Gonéri Le Bouder <goneri@rulezlan.org>
+Bug-Debian: http://bugs.debian.org/438493
+--- a/htc.1
++++ b/htc.1
+@@ -42,7 +42,7 @@
+ .B \-A, \-\-proxy\-authorization USER:PASSWORD
+ proxy authorization
+ .TP
+-.B \-\-proxy\-authorization\-file FILE
++.B \-z, \-\-proxy\-authorization\-file FILE
+ proxy authorization file
+ .TP
+ .B \-B, \-\-proxy\-buffer\-size BYTES
+@@ -60,6 +60,9 @@
+ .TP
+ .B \-V, \-\-version
+ output version information and exit
++.TP
++.B \-w, \-\-no-daemon
++don't fork into the background
+ .SH AUTHOR
+ This manual page was contributed by Teemu Hukkanen <tjhukkan@iki.fi>,
+--- a/hts.1
++++ b/hts.1
+@@ -37,12 +37,18 @@
+ .B \-M, \-\-max\-connection\-age SEC
+ maximum time a connection will stay open is SEC seconds (default is 300)
+ .TP
++.B \-s, \-\-stdin\-stdout
++use stdin/stdout for communication (implies \-\-no\-daemon)
++.TP
+ .B \-S, \-\-strict\-content\-length
+ always write Content-Length bytes in requests
+ .TP
+ .B \-V, \-\-version
+ output version information and exit
+ .TP
++.B \-w, \-\-no-daemon
++don't fork into the background
++.TP
+ .B \-p, \-\-pid\-file LOCATION
+ write a PID file to LOCATION
+ .SH AUTHOR
diff --git a/debian/patches/03-quote-dashes-in-manpage.patch b/debian/patches/03-quote-dashes-in-manpage.patch
new file mode 100644 (file)
index 0000000..a133936
--- /dev/null
@@ -0,0 +1,32 @@
+Description: Quote dashes in the manpages
+Author: Teemu Hukkanen <tjhukkan@iki.fi>
+--- a/htc.1
++++ b/htc.1
+@@ -12,10 +12,10 @@
+ .B htc
+ sets up a httptunnel connection to PORT at HOST (default port is 8888).
+ When a connection is made, I/O is redirected from the source specified
+-by the --device or --forward-port switch to the tunnel.
++by the \-\-device or \-\-forward\-port switch to the tunnel.
+ .SH OPTIONS
+ The program follows the usual GNU command line syntax, with long
+-options starting with two dashes (`-').
++options starting with two dashes (`\-').
+ A summary of options are included below.
+ .TP
+ .B \-h, \-\-help
+--- a/hts.1
++++ b/hts.1
+@@ -13,10 +13,10 @@
+ listens for incoming httptunnel connections at PORT (default port is
+ 8888), and optionally binds to ip address HOST.
+ When a connection is made, I/O is redirected to the destination specified
+-by the --device or --forward-port switch.
++by the \-\-device or \-\-forward\-port switch.
+ .SH OPTIONS
+ The program follows the usual GNU command line syntax, with long
+-options starting with two dashes (`-').
++options starting with two dashes (`\-').
+ A summary of options are included below.
+ .TP
+ .B \-h, \-\-help
diff --git a/debian/patches/04-fix-stdin-stdout.patch b/debian/patches/04-fix-stdin-stdout.patch
new file mode 100644 (file)
index 0000000..9da1f4d
--- /dev/null
@@ -0,0 +1,15 @@
+Description: Fix stdin-stdout option
+Origin: upstream
+Bug-Debian: http://bugs.debian.org/429885
+Forwarded: not-needed
+--- a/common.c
++++ b/common.c
+@@ -314,7 +314,7 @@
+       /* If fd == 0, then we are using --stdin-stdout so write to stdout,
+        * not fd. */
+-      m = write_all (fd ? fd : 0, buf, (size_t)n);
++      m = write_all (fd ? fd : 1, buf, (size_t)n);
+       log_annoying ("write_all (%d, %p, %d) = %d", fd ? fd : 1, buf, n, m);
+       return m;
+     }
diff --git a/debian/patches/05-update-email-address.patch b/debian/patches/05-update-email-address.patch
new file mode 100644 (file)
index 0000000..7dc3465
--- /dev/null
@@ -0,0 +1,13 @@
+Description: Update my email address in the AUTHORS file
+Author: Teemu Hukkanen <tjhukkan@iki.fi>
+--- a/AUTHORS
++++ b/AUTHORS
+@@ -2,7 +2,7 @@
+ Research:             Stefan Berndtsson <stefan@nocrew.org>
+                       Magnus Lundström <logic@nocrew.org>
+ Disclaimer:           Barak Pearlmutter <bap@cs.unm.edu>
+-Documentation:                Teemu Hukkanen <tjhukkan@fishpool.fi>
++Documentation:                Teemu Hukkanen <tjhukkan@iki.fi>
+ getopt_long usage:    Taken from the manual page.
+ getopt_long code:     Taken from GNU fileutils-4.0.
+ Patches:              Tomas Berndtsson <tomas@nocrew.org> (Solaris)
diff --git a/debian/patches/06-fix-cppflags-usage.patch b/debian/patches/06-fix-cppflags-usage.patch
new file mode 100644 (file)
index 0000000..e72e92d
--- /dev/null
@@ -0,0 +1,17 @@
+Description: Use AM_CPPFLAGS instead of CPPFLAGS
+Author: Teemu Hukkanen <tjhukkan@iki.fi>
+
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -6,9 +6,9 @@
+ man_MANS = hts.1 htc.1
+ if SRCDIR
+-CPPFLAGS += -I$(VPATH)/port
++AM_CPPFLAGS = -I$(VPATH)/port
+ else
+-CPPFLAGS += -Iport
++AM_CPPFLAGS = -Iport
+ endif
+ htc_SOURCES = htc.c common.c tunnel.c http.c base64.c
diff --git a/debian/patches/07-quote-autoconf-definitions.patch b/debian/patches/07-quote-autoconf-definitions.patch
new file mode 100644 (file)
index 0000000..249588b
--- /dev/null
@@ -0,0 +1,23 @@
+Description: Quote autoconf macro names
+Author: Teemu Hukkanen <tjhukkan@iki.fi>
+
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -1,7 +1,7 @@
+ dnl HTTPTUNNEL_TYPE_SOCKLEN_T
+ dnl Check for the existance of type socklen_t.
+-AC_DEFUN(HTTPTUNNEL_TYPE_SOCKLEN_T,
++AC_DEFUN([HTTPTUNNEL_TYPE_SOCKLEN_T],
+ [AC_CACHE_CHECK([for socklen_t], ac_cv_httptunnel_type_socklen_t,
+ [
+   AC_TRY_COMPILE(
+@@ -20,7 +20,7 @@
+ dnl HTTPTUNNEL_DEFINE_INADDR_NONE
+ dnl Check for the existance of define INADDR_NONE
+-AC_DEFUN(HTTPTUNNEL_DEFINE_INADDR_NONE,
++AC_DEFUN([HTTPTUNNEL_DEFINE_INADDR_NONE],
+ [AC_CACHE_CHECK([whether INADDR_NONE is defined], ac_cv_httptunnel_define_inaddr_none,
+ [
+   AC_TRY_COMPILE(
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644 (file)
index 0000000..d075247
--- /dev/null
@@ -0,0 +1,7 @@
+01-document-bind-to-address.patch
+02-document-cmdline-options.patch
+03-quote-dashes-in-manpage.patch
+04-fix-stdin-stdout.patch
+05-update-email-address.patch
+06-fix-cppflags-usage.patch
+07-quote-autoconf-definitions.patch
diff --git a/debian/postinst b/debian/postinst
deleted file mode 100644 (file)
index da242e6..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-if [ "$1" = "configure" ]; then
-  if [ -d /usr/doc -a ! -e /usr/doc/httptunnel -a -d /usr/share/doc/httptunnel ]; then
-    ln -sf ../share/doc/httptunnel /usr/doc/httptunnel
-  fi
-fi
diff --git a/debian/prerm b/debian/prerm
deleted file mode 100755 (executable)
index cf26ec8..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-if [ \( "$1" = "upgrade" -o "$1" = "remove" \) -a -L /usr/doc/httptunnel ]; then
-  rm -f /usr/doc/httptunnel
-fi
index da015df..bc6eb05 100755 (executable)
@@ -1,87 +1,13 @@
 #!/usr/bin/make -f
-#-*- makefile -*-
 
-install                = install -o root -g root
-install_exec   = $(install) -m 755 -s
-install_dir    = $(install) -m 755 -d
-install_nonex  = $(install) -m 644
-install_script = $(install) -m 755
-install_zipped = gzip -9vc
-install_symlink        = ln -s
+%:
+       dh $@
 
-package                = httptunnel
-rootdir                = `pwd`/debian/tmp
-docdir         = $(rootdir)/usr/share/doc/$(package)
-bindir         = $(rootdir)/usr/bin
-mandir         = $(rootdir)/usr/share/man
-man1dir                = $(mandir)/man1
+override_dh_auto_configure:
+       autoreconf -fi
+       dh_auto_configure
 
-build: debian/build.stamp
-debian/build.stamp:
-       $(checkdir)
-       CFLAGS="-O2 -g -Wall" CC=gcc ./configure --prefix=/usr \
-               --mandir=/usr/share/man
-       $(MAKE)
-       touch $@
-
-clean-build:
-       $(RM) debian/build*.stamp
-       -$(MAKE) distclean
-
-binary: binary-arch binary-indep
-
-binary-indep: debian/binary-indep.stamp
-debian/binary-indep.stamp:
-       touch $@
-
-binary-arch: debian/binary-arch.stamp
-debian/binary-arch.stamp: build
-       $(checkdir)
-       $(RM) -r $(rootdir)
-       $(install_dir) $(rootdir)
-       $(install_dir) $(rootdir)/DEBIAN
-       $(install_dir) $(docdir)
-       $(install_dir) $(bindir)
-       $(install_dir) $(man1dir)
-       $(MAKE) install-strip prefix=`pwd`/debian/tmp/usr mandir=`pwd`/debian/tmp/usr/share/man
-#      changelogs
-       $(install_nonex) debian/changelog $(docdir)/changelog.Debian
-       $(install_nonex) ChangeLog $(docdir)/changelog
-#      docs
-       $(install_nonex) FAQ $(docdir)
-       $(install_nonex) INSTALL $(docdir)
-       $(install_nonex) NEWS $(docdir)
-       $(install_nonex) README $(docdir)
-       $(install_nonex) TODO $(docdir)
-       $(install_nonex) DISCLAIMER $(docdir)
-       $(install_nonex) AUTHORS $(docdir)
-       $(install_nonex) HACKING $(docdir)
-       gzip -9vfr $(docdir)/
-
-       gzip -9vfr $(man1dir)/
-
-#      copyright
-       $(install_nonex) debian/copyright $(docdir)
-#      control
-       $(install_script) debian/prerm $(rootdir)/DEBIAN
-       $(install_script) debian/postinst $(rootdir)/DEBIAN
-
-       dpkg-shlibdeps $(bindir)/hts $(bindir)/htc
-       dpkg-gencontrol -isp
-
-       chown -R root.root $(rootdir)
-       chmod -R g-ws $(rootdir)
-
-       dpkg --build $(rootdir) ..
-       touch $@
-
-define checkdir
-       test -f htc.c -a -f hts.c -a -f debian/rules
-endef
-
-clean-binary:
-       $(RM) debian/binary*.stamp
-       $(RM) *~
-       $(RM) -r debian/tmp debian/*~ debian/files debian/substvars
-
-clean: clean-build clean-binary
+override_dh_auto_clean:
+       dh_auto_clean
+       -rm -f config.cache config.h config.log config.status depcomp \
+           stamp-h Makefile port/Makefile port/sys/Makefile
diff --git a/debian/source/format b/debian/source/format
new file mode 100644 (file)
index 0000000..163aaf8
--- /dev/null
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/source/options b/debian/source/options
new file mode 100644 (file)
index 0000000..245d75c
--- /dev/null
@@ -0,0 +1 @@
+extend-diff-ignore = "(INSTALL|config.h.in|configure|mkinstalldirs|missing|Makefile.in|install-sh|aclocal.m4)$"
diff --git a/debian/watch b/debian/watch
new file mode 100644 (file)
index 0000000..a426f4c
--- /dev/null
@@ -0,0 +1,2 @@
+version=3
+opts="dversionmangle=s/\+dfsg//" http://ftp.gnu.org/gnu/httptunnel/httptunnel-(.*).tar.gz