--- dante-1.1.19.dfsg.orig/debian/watch
+++ dante-1.1.19.dfsg/debian/watch
@@ -0,0 +1,3 @@
+version=3
+opts="dversionmangle=s/\.dfsg//" \
+ftp://ftp.inet.no/pub/socks/dante-(.*)\.tar\.gz
--- dante-1.1.19.dfsg.orig/debian/compat
+++ dante-1.1.19.dfsg/debian/compat
@@ -0,0 +1 @@
+7
--- dante-1.1.19.dfsg.orig/debian/README.source
+++ dante-1.1.19.dfsg/debian/README.source
@@ -0,0 +1,17 @@
+The dante package uses quilt to maintain local changes to
+the dante distribution.  The Debian-specific patches are maintained
+in the debian/patches/ directory.
+
+To apply all the patches, preparing the source for building, use:
+  debian/rules patch
+
+To revert the patches, preparing to build a source package, use:
+  debian/rules unpatch
+
+You do not need to manually execute these targets when building
+the package; they are part of the debian/rules target chain.
+
+For more information on the quilt integration with Debian packages,
+as well as editing, adding or removing patches, please see
+the quilt documentation; in recent versions of the Debian package of
+quilt, start at the /usr/share/doc/quilt/README.source file.
--- dante-1.1.19.dfsg.orig/debian/dante-server.init
+++ dante-1.1.19.dfsg/debian/dante-server.init
@@ -0,0 +1,92 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides:          danted
+# Required-Start:    $remote_fs $syslog
+# Required-Stop:     $remote_fs $syslog
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: SOCKS (v4 and v5) proxy daemon (danted)
+### END INIT INFO
+#
+# dante SOCKS server init.d file. Based on /etc/init.d/skeleton:
+# Version:	@(#)skeleton  1.8  03-Mar-1998  miquels@cistron.nl
+
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+DAEMON=/usr/sbin/danted
+NAME=danted
+DESC="Dante SOCKS daemon"
+PIDFILE=/var/run/$NAME.pid
+CONFFILE=/etc/$NAME.conf
+
+test -f $DAEMON || exit 0
+
+set -e
+
+# This function makes sure that the Dante server can write to the pid-file.
+touch_pidfile ()
+{
+  if [ -r $CONFFILE ]; then
+    uid="`sed -n -e 's/[[:space:]]//g' -e 's/#.*//' -e '/^user\.privileged/{s/[^:]*://p;q;}' $CONFFILE`"
+    if [ -n "$uid" ]; then
+      touch $PIDFILE
+      chown $uid $PIDFILE
+    fi
+  fi
+}
+		
+case "$1" in
+  start)
+	if ! egrep -cve '^ *(#|$)' \
+	    -e '^(logoutput|user\.((not)?privileged|libwrap)):' \
+	    $CONFFILE > /dev/null
+	then
+		echo "Not starting $DESC: not configured."
+		exit 0
+	fi
+	echo -n "Starting $DESC: "
+	touch_pidfile
+	start-stop-daemon --start --quiet --oknodo --pidfile $PIDFILE \
+		--exec $DAEMON -- -D
+	echo "$NAME."
+	;;
+  stop)
+	echo -n "Stopping $DESC: "
+	start-stop-daemon --stop --quiet --oknodo --pidfile $PIDFILE \
+		--exec $DAEMON
+	echo "$NAME."
+	;;
+  reload|force-reload)
+	#
+	#	If the daemon can reload its config files on the fly
+	#	for example by sending it SIGHUP, do it here.
+	#
+	#	If the daemon responds to changes in its config file
+	#	directly anyway, make this a do-nothing entry.
+	#
+	 echo "Reloading $DESC configuration files."
+	 start-stop-daemon --stop --signal 1 --quiet --pidfile \
+		$PIDFILE --exec $DAEMON -- -D
+  ;;
+  restart)
+	#
+	#	If the "reload" option is implemented, move the "force-reload"
+	#	option to the "reload" entry above. If not, "force-reload" is
+	#	just the same as "restart".
+	#
+	echo -n "Restarting $DESC: "
+	start-stop-daemon --stop --quiet --pidfile $PIDFILE --exec $DAEMON
+	sleep 1
+	touch_pidfile
+	start-stop-daemon --start --quiet --pidfile $PIDFILE \
+	  --exec $DAEMON -- -D
+	echo "$NAME."
+	;;
+  *)
+	N=/etc/init.d/$NAME
+	# echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2
+	echo "Usage: $N {start|stop|restart|force-reload}" >&2
+	exit 1
+	;;
+esac
+
+exit 0
--- dante-1.1.19.dfsg.orig/debian/dante-server.examples
+++ dante-1.1.19.dfsg/debian/dante-server.examples
@@ -0,0 +1,3 @@
+contrib/sockd-stat.awk
+example/renamed/danted.conf
+example/renamed/danted-*.conf
--- dante-1.1.19.dfsg.orig/debian/socks.h
+++ dante-1.1.19.dfsg/debian/socks.h
@@ -0,0 +1,22 @@
+/* renamed functions for SOCKS wrappers */
+
+#define connect Rconnect
+#define bind Rbind
+#define getsockname Rgetsockname
+#define getpeername Rgetpeername
+#define accept Raccept
+#define rresvport Rrresvport
+#define bindresvport Rbindresvport
+#define gethostbyname Rgethostbyname
+#define gethostbyname2 Rgethostbyname2
+#define sendto Rsendto
+#define recvfrom Rrecvfrom
+#define recvfrom Rrecvfrom
+#define write Rwrite
+#define writev Rwritev
+#define send Rsend
+#define sendmsg Rsendmsg
+#define read Rread
+#define readv Rreadv
+#define recv Rrecv
+#define recvmsg Rrecvmsg
--- dante-1.1.19.dfsg.orig/debian/copyright
+++ dante-1.1.19.dfsg/debian/copyright
@@ -0,0 +1,62 @@
+Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat?recall=184
+Upstream-Name: dante
+Upstream-Source: http://www.inet.no/dante/
+
+Files: *
+Copyright: Copyright (c) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+           Inferno Nettverk A/S, Norway.  All rights reserved.
+License: other
+ * $Id: LICENSE,v 1.17 2005/01/24 10:24:18 karls Exp $
+ *
+ * Copyright (c) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+ *      Inferno Nettverk A/S, Norway.  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. The above copyright notice, this list of conditions and the following
+ *    disclaimer must appear in all copies of the software, derivative works
+ *    or modified versions, and any portions thereof, aswell as in all
+ *    supporting documentation.
+ * 2. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *      This product includes software developed by
+ *      Inferno Nettverk A/S, Norway.
+ * 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 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.
+ *
+ * Inferno Nettverk A/S requests users of this software to return to
+ *
+ *  Software Distribution Coordinator  or  sdc@inet.no
+ *  Inferno Nettverk A/S
+ *  Oslo Research Park
+ *  GaustadallĂŠen 21
+ *  NO-0349 Oslo
+ *  Norway
+ *
+ * any improvements or extensions that they make and grant Inferno Nettverk A/S
+ * the rights to redistribute these changes.
+
+Files: debian/*
+Copyright: Copyright (C) 1999-2005  Adrian Bridgett <bridgett@debian.org>
+           Copyright (C) 2006  Thijs Kinkhorst <thijs@debian.org>
+           Copyright (C) 2007  Julien Cristau <jcristau@debian.org>
+           Copyright (C) 2008  Peter Pentchev <roam@ringlet.net>
+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; either version 2 of the License,
+ or (at your option) any later version.
+ .
+ On Debian systems the full text of the GNU General Public License can be found
+ in the `/usr/share/common-licenses/GPL-2' file.
--- dante-1.1.19.dfsg.orig/debian/dante-client.examples
+++ dante-1.1.19.dfsg/debian/dante-client.examples
@@ -0,0 +1,2 @@
+example/renamed/dante.conf
+example/renamed/dante-*.conf
--- dante-1.1.19.dfsg.orig/debian/libdsocksd0.install
+++ dante-1.1.19.dfsg/debian/libdsocksd0.install
@@ -0,0 +1 @@
+usr/lib/libdsocksd.so.* usr/lib
--- dante-1.1.19.dfsg.orig/debian/changelog
+++ dante-1.1.19.dfsg/debian/changelog
@@ -0,0 +1,430 @@
+dante (1.1.19.dfsg-3.5.201403190327) ucs4-0-0-0; urgency=low
+
+  * UCS auto build. No patches were applied to the original source package
+
+ -- Univention builddaemon <buildd@univention.de>  Wed, 19 Mar 2014 03:27:58 +0100
+
+dante (1.1.19.dfsg-3) unstable; urgency=low
+
+  * Make libsocksd0-dev installable by fixing its dependency on libsocksd0!
+  * Add misc:Depends to all binary packages, just in case.
+  * Add comments to the patches that did not have any.
+  * Override the "dfsg version with period" lintian warning.
+  * Properly refer to GPL-2 instead of just GPL in the copyright file.
+  * Improve the long descriptions of all packages.
+  * Bump Standards-Version to 3.8.1:
+    - make the dante-server init script exit successfully if the server
+      is already running
+  * Drop the versioned build-dependency on quilt - in this day and age,
+    we are virtually guaranteed a quilt >= 0.40.
+
+ -- Peter Pentchev <roam@ringlet.net>  Wed, 25 Mar 2009 14:18:11 +0200
+
+dante (1.1.19.dfsg-2) unstable; urgency=low
+
+  * Since the "new" binary package libdsocksd0 extracts a library that
+    was formerly in dante-client, it should conflict and replace old
+    versions of dante-client.  Closes: #494712.
+  * Remove the "debian/copyright line too long" lintian overrides, since
+    the check was dropped from lintian in both unstable and testing.
+
+ -- Peter Pentchev <roam@ringlet.net>  Fri, 22 Aug 2008 13:02:45 +0300
+
+dante (1.1.19.dfsg-1) unstable; urgency=low
+
+  * New maintainer.  Closes: #486756
+  * Do not start danted if the config file contains nothing but
+    the default settings.  Closes: #232574, #368322, #466082.
+  * Use quilt to manage the patches, converting all existing ones.
+  * Fix some lintian warnings
+  * Add a watch file and README.source
+  * Honor DEB_BUILD_OPTIONS
+  * Separate the dante client library into a package of its own
+  * Minimize the rules file by using debhelper 7
+  * Add the Vcs-Svn and Vcs-Browser source control fields
+  * Add symbols files for the libraries
+  * Convert the copyright file the machine-parseable format
+  * Fix some C compiler warnings, mainly related to printf format strings
+  * Enable build hardening unless DEB_BUILD_OPTIONS contains "nohardening"
+  * New upstream version
+    - remove the sockd/serverconfig.c upstream patch
+    - doc/README.msproxy was removed
+  * Install all sample configuration files
+
+  * debian/README.source
+    - create this file with some information about quilt
+  * debian/compat
+    - create this file, setting the compatibility level to 7
+  * debian/control
+    - record myself as maintainer
+    - add a build-dependency on quilt >= 0.40 for quilt.make
+    - change the debhelper build-dependency to version 7
+    - add the Homepage field to the source stanza
+    - rename the library packages from libsocksd{,-dev} to libsocksd0{,-dev}
+      to include the library SONAME
+    - add the libdsocksd0 package for the client library used by socksify
+    - update to standards version 3.8.0
+      - README.source
+      - honor DEB_BUILD_OPTIONS
+      - Homepage
+      - libsocksd -> libsocksd0
+      - libdsocksd0
+    - add the Vcs-Svn and Vcs-Browser fields to the source stanza
+  * debian/copyright
+    - rename this file from copyright.top
+    - add the LICENSE file converted to UTF-8
+    - convert the whole thing to the machine-parseable format and add
+      the copyright information for the debian/* files
+  * debian/dante-server.init
+    - do not start danted if the only uncommented settins in
+      the config file are the ones placed there by default
+    - provide a Short-Description LSB line
+  * debian/dante-client.lintian-overrides
+    debian/dante-server.lintian-overrides
+    debian/libdsocksd0.lintian-overrides
+    debian/libsocksd0.lintian-overrides
+    debian/libsocksd0-dev.lintian-overrides
+    - create these files and override the "copyright line too long"
+      warning for the first line, the machine-readable copyright's
+      format specification
+  * debian/dante-client.postinst
+    debian/dante-server.postinst
+    debian/libsocksd.postinst
+    - remove postinst files that will be autogenerated by debhelper
+  * debian/libdsocks0.symbols
+    debian/libsocks0.symbols
+    - create these files
+  * debian/patches
+    - convert the existing Debian source patch to patches 01 through 11
+  * debian/patches/02-rename-programs.patch
+    - inherit the socks -> dante change from the existing diff.gz
+    - update several instances new in dante-1.1.19
+  * debian/patches/03-configure
+    - inherit the libtool and libdl fixes from the existing diff.gz
+    - honor DEB_BUILD_OPTIONS by not adding "-g -O2" to the CFLAGS that
+      have already been set up by dpkg-buildpackage and debian/rules
+  * debian/patches/12-man-errors.patch
+    - replace some mdoc macros that have somehow crept up into the manual
+      pages with man (an.tmac) ones
+  * debian/patches/13-c-warnings.patch
+    - fix some C compiler warnings, mainly related to printf format strings
+  * debian/patches/14-httpproxy-underrun.patch
+    - fix a possible buffer underrun in lib/httpproxy.c
+  * debian/rules
+    - comment out DH_VERBOSE
+    - use quilt.make to apply and deapply patches
+    - remove the DH_COMPAT setting, moved to debian/compat
+    - reoder the dh_* calls to add an ldconfig postrm invocation and
+      fix a lintian warning
+    - do not ignore the "make distclean" exit code
+    - honor DEB_BUILD_OPTIONS by appending to the CFLAGS already set up by
+      dpkg-buildpackage, not overriding them
+    - no longer build debian/copyright dynamically
+    - change "libsocksd" to "libsocksd0" in the package names
+    - separate the client library into its own libdsocksd0 package
+    - simplify most targets by using debhelper 7's "dh" wrapper
+    - enable build hardening unless DEB_BUILD_OPTIONS contains "nohardening"
+    - install all sample configuration files
+  * debian/watch
+    - create this file
+
+ -- Peter Pentchev <roam@ringlet.net>  Thu, 17 Jul 2008 15:14:50 +0300
+
+dante (1.1.18.dfsg-0.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Added LSB formatted dependency info in init.d script (closes: #469750)
+  * Removed *.conffiles files, obsoleted by debhelper 3
+  * Changed section of libsocksd-dev to libdevel
+
+ -- Peter Eisentraut <petere@debian.org>  Fri, 04 Apr 2008 14:09:07 +0200
+
+dante (1.1.18.dfsg-0.1) unstable; urgency=low
+
+  * Non-maintainer upload with maintainer approval.
+  * Remove non-free RFC 1928 and 1929 from the upstream tarball
+    (closes: #393361).
+
+ -- Julien Cristau <jcristau@debian.org>  Tue, 04 Sep 2007 04:11:23 +0200
+
+dante (1.1.18-2.1) unstable; urgency=high
+
+  * Non-maintainer upload for RC bug.
+  * Make sure changelogs are installed into all packages (Closes: #393568).
+
+ -- Thijs Kinkhorst <thijs@debian.org>  Thu, 19 Oct 2006 12:09:39 +0200
+
+dante (1.1.18-2) unstable; urgency=low
+
+  * applied patch from upstream (same as patch sent by Nicolas Leonard)
+    to fix PAM authentication failures.  Many thanks to Nicolas for 
+    his work! (closes: #331538)
+
+ -- Adrian Bridgett <bridgett@debian.org>  Sun,  9 Oct 2005 11:24:13 +0100
+
+dante (1.1.18-1) unstable; urgency=low
+
+  * new upstream (fixes logging to syslog)
+
+ -- Adrian Bridgett <bridgett@debian.org>  Sat, 17 Sep 2005 15:50:50 +0100
+
+dante (1.1.17-1) unstable; urgency=low
+
+  * new upstream release (closes: #304037)
+
+ -- Adrian Bridgett <bridgett@debian.org>  Mon, 29 Aug 2005 15:51:20 +0100
+
+dante (1.1.14-2) unstable; urgency=low
+
+  * improve extended descriptions (closes: #209510, #210116)
+
+ -- Adrian Bridgett <bridgett@debian.org>  Sat, 15 Nov 2003 18:59:33 +0000
+
+dante (1.1.14-1) unstable; urgency=low
+
+  * new upstream
+  * removed SO_BSDCOMPAT call as it's pointless and causes annoying
+    messages in 2.6.x (closes: #206487)
+  * set libwrap uid to nobody (default was root)
+
+ -- Adrian Bridgett <bridgett@debian.org>  Sun, 24 Aug 2003 16:20:28 +0100
+
+dante (1.1.13-1) unstable; urgency=low
+
+  * new upstream (closes: #168434)
+  * this fixes the Bad file descriptor errors (closes: #135275)
+  * build issues dissappeared (new libc/gcc?)
+    applied previous workaround anyway (closes: #167092)
+
+ -- Adrian Bridgett <bridgett@debian.org>  Sat,  4 Jan 2003 22:11:38 +0000
+
+dante (1.1.12-2) unstable; urgency=low
+
+  * hopefully work around the case when netlink isn't compiled into
+    the kernel.  This isn't the ideal fix, but one step at a time (closes:
+    #139434)
+
+ -- Adrian Bridgett <bridgett@debian.org>  Sun, 14 Apr 2002 18:09:14 +0100
+
+dante (1.1.12-1) unstable; urgency=low
+
+  * new upstream
+
+ -- Adrian Bridgett <bridgett@debian.org>  Sun, 14 Apr 2002 16:00:22 +0100
+
+dante (1.1.11.12p1-4) unstable; urgency=low
+
+  * use Andreas Voegele's init.d script so that dante can write its pidfile
+    (closes: #72215, #121672). Thanks Andreas!
+
+ -- Adrian Bridgett <bridgett@debian.org>  Sun,  7 Apr 2002 12:45:55 +0100
+
+dante (1.1.11.12p1-3) unstable; urgency=low
+
+  * apply fix for dynamic port forwarding - thanks to Peter Amstutz
+    (closes: 140730) 
+  * improve libsocksd package description (closes: #135755)
+
+ -- Adrian Bridgett <bridgett@debian.org>  Mon,  1 Apr 2002 10:29:31 +0100
+
+dante (1.1.11.12p1-2) unstable; urgency=low
+
+  * socksify should use /usr/lib/libdsocksd.so.0 - thanks to Matt Taggart
+    (closes: #135417)
+
+ -- Adrian Bridgett <bridgett@debian.org>  Mon, 25 Feb 2002 18:38:51 +0000
+
+dante (1.1.11.12p1-1) unstable; urgency=low
+
+  * updated to 1.1.12-pre1
+  * fixed references to socks and sockd in manpages (and I grepped for others)
+    (closes: #126428, #130070)
+
+ -- Adrian Bridgett <bridgett@debian.org>  Wed, 20 Feb 2002 20:08:46 +0000
+
+dante (1.1.10-4) unstable; urgency=low
+
+  * (1.1.10-3 not released)
+  * add libpam0g-dev adn libwrap0-dev to build-depends so we link against
+    them (closes: #106655, #86100)
+  * Add pt_BR translations (thanks to Fernando Carreira, Luis Alberto Garcia
+    Cipriano
+
+ -- Adrian Bridgett <bridgett@debian.org>  Wed, 26 Sep 2001 20:48:55 +0100
+
+dante (1.1.10-3) unstable; urgency=low
+
+  * better fix for 100375 from Philip Kendall <pak21@srcf.ucam.org>
+    - run clientinit() before log message so it goes to the right place
+
+ -- Adrian Bridgett <bridgett@debian.org>  Sun, 12 Aug 2001 21:44:42 +0100
+
+dante (1.1.10-2) unstable; urgency=low
+
+  * patch from dme@dme.org for memory overrun
+  * kill off debug message since I think it's confusing ssh (see #100375)
+
+ -- Adrian Bridgett <bridgett@debian.org>  Wed, 25 Jul 2001 23:46:41 +0100
+
+dante (1.1.10-1) unstable; urgency=low
+
+  * new upstream
+  * always use config.{sub,guess} provided by autotools-dev (closes: #94953)
+
+ -- Adrian Bridgett <bridgett@debian.org>  Sun,  3 Jun 2001 23:19:19 +0100
+
+dante (1.1.9-1) unstable; urgency=low
+
+  * new upstream
+
+ -- Adrian Bridgett <bridgett@debian.org>  Sun, 22 Apr 2001 23:14:18 +0100
+
+dante (1.1.8-1) unstable; urgency=low
+
+  * new upstream
+
+ -- Adrian Bridgett <bridgett@debian.org>  Sun,  4 Mar 2001 22:23:31 +0000
+
+dante (1.1.6-1) unstable; urgency=low
+
+  * new upstream
+
+ -- Adrian Bridgett <bridgett@debian.org>  Sat, 23 Dec 2000 19:39:38 +0000
+
+dante (1.1.5-1) unstable; urgency=low
+
+  * new upstream
+
+ -- Adrian Bridgett <bridgett@debian.org>  Wed, 18 Oct 2000 11:42:27 +0100
+
+dante (1.1.4-1) unstable; urgency=low
+
+  * new upstream
+  * fix faq's reference to libdsocksd.so (should be libdsocksd.so.0) and add
+    a BIG warning that this is dangerous and not the way to do it
+    (closes: #69017)
+
+ -- Adrian Bridgett <bridgett@debian.org>  Thu, 12 Oct 2000 15:09:27 +0100
+
+dante (1.1.2-2) unstable; urgency=low
+
+  * added two builddeps (closes: #66782, #66865)
+
+ -- Adrian Bridgett <bridgett@debian.org>  Tue, 11 Jul 2000 18:44:44 +0100
+
+dante (1.1.2-1) unstable; urgency=low
+
+  * new upstream
+  * fix typo in description (closes: #66250)
+
+ -- Adrian Bridgett <bridgett@debian.org>  Mon, 26 Jun 2000 20:56:21 +0100
+
+dante (1.1.1-4) frozen unstable; urgency=low
+
+  * hard code libdl.so to /lib/libdl.so.2 to prevent it from finding
+    /usr/lib/libdl.so (which is from libc6-dev)
+    RM: this effectively fixes a dependancy problem (by fixing the real cause)
+
+ -- Adrian Bridgett <bridgett@debian.org>  Thu, 10 Feb 2000 22:34:32 +0000
+
+dante (1.1.1-3) frozen unstable; urgency=low
+
+  * call library libsocksd rather than libsocks to avoid conlict
+    with libsocks4 (for 52475)
+  * added Build-Depends and updated Standards-Version
+  * I'm on holiday for a week (back 24th Jan)
+
+ -- Adrian Bridgett <bridgett@debian.org>  Sat, 15 Jan 2000 14:07:00 +0000
+
+dante (1.1.1-2) frozen unstable; urgency=low
+
+  * add socksify manpage
+
+ -- Adrian Bridgett <bridgett@debian.org>  Mon, 10 Jan 2000 14:37:39 +0000
+
+dante (1.1.1-1) frozen unstable; urgency=low
+
+  * new upstream version
+
+ -- Adrian Bridgett <bridgett@debian.org>  Wed,  5 Jan 2000 20:56:12 +0000
+
+dante (1.1.0-2) unstable; urgency=low
+
+  * fix init.d script fully [closes: #50056]
+
+ -- Adrian Bridgett <bridgett@debian.org>  Tue, 30 Nov 1999 20:38:44 +0000
+
+dante (1.1.0-1) unstable; urgency=low
+
+  * new upstream version
+  * FHS
+
+ -- Adrian Bridgett <bridgett@debian.org>  Mon, 27 Sep 1999 22:41:16 +0100
+
+dante (1.0.9-pre2-2) unstable; urgency=low
+
+  * fix init.d script [closes: #42801]
+
+ -- Adrian Bridgett <bridgett@debian.org>  Sun, 15 Aug 1999 20:16:45 +0100
+
+dante (1.0.9-pre2-1) unstable; urgency=low
+
+  * new upstream (actually 1.1.0-pre2)
+  * AFAIK the removed patches aren't needed
+  * /etc/init.d/danted now calls danted with -D [closes #41719]
+
+ -- Adrian Bridgett <bridgett@debian.org>  Thu, 22 Jul 1999 21:41:31 +0100
+
+dante (1.0.1-1) unstable; urgency=low
+
+  * new upstream
+  * patch from Christopher C Chimelis <chris@beezer.med.miami.edu> for Alpha
+    [closes #40132, #39193, #37447]
+  * force off SO_{SND/RCV}LOWAT options since Linux doesn't support them
+  * fix some setuid/seteuid problems
+
+ -- Adrian Bridgett <adrian.bridgett@zetnet.co.uk>  Sun,  4 Jul 1999 14:48:07 +0100
+
+dante (1.0.0-1) unstable; urgency=low
+
+  * new upstream
+  * renamed sockd to danted for consistency and to avoid conflicts
+  * fix dante-server install [close #37653]
+
+ -- Adrian Bridgett <bridgett@debian.org>  Mon, 31 May 1999 21:50:29 +0100
+
+dante (1.0.0-pre1-1) unstable; urgency=low
+
+  * new upstream version
+  * fix references to /etc/sock*
+  * (unreleased)
+
+ -- Adrian Bridgett <bridgett@debian.org>  Sun, 16 May 1999 15:13:06 +0100
+
+dante (0.92.0-pre3-4) unstable; urgency=low
+
+  * I forgot to upload that last one :-( I've already fixed the libs (closes
+    #37076)
+
+ -- Adrian Bridgett <bridgett@debian.org>  Mon,  3 May 1999 20:00:57 +0100
+
+dante (0.92.0-pre3-3) unstable; urgency=low
+
+  * /etc/init.d/dante now used --oknodo on "stop"
+  * use /etc/dante* rather than /etc/socks* due to conflicts [closes #35187]
+  * fix library locations (libsocks.a is in libsocks-dev, not libsocks;
+    libdsocks is in dante-clients, not dante-server)
+
+ -- Adrian Bridgett <bridgett@debian.org>  Mon, 29 Mar 1999 21:16:17 +0100
+
+dante (0.92.0-pre3-2) unstable; urgency=low
+
+  * fixed locations of libsocks and libsocks-dev
+
+ -- Adrian Bridgett <bridgett@debian.org>  Thu, 25 Mar 1999 22:58:52 +0000
+
+dante (0.92.0-pre3-1) unstable; urgency=low
+
+  * Initial release.
+
+ -- Adrian Bridgett <bridgett@debian.org>  Sun, 21 Mar 1999 16:45:45 +0000
--- dante-1.1.19.dfsg.orig/debian/libdsocksd0.symbols
+++ dante-1.1.19.dfsg/debian/libdsocksd0.symbols
@@ -0,0 +1,228 @@
+libdsocksd.so.0 libdsocksd0 #MINVER#
+ Raccept@Base 1.1.19
+ Rbind@Base 1.1.19
+ Rbindresvport@Base 1.1.19
+ Rconnect@Base 1.1.19
+ Rgetaddrinfo@Base 1.1.19
+ Rgethostbyname2@Base 1.1.19
+ Rgethostbyname@Base 1.1.19
+ Rgetpeername@Base 1.1.19
+ Rgetsockname@Base 1.1.19
+ Rlisten@Base 1.1.19
+ Rread@Base 1.1.19
+ Rreadv@Base 1.1.19
+ Rrecv@Base 1.1.19
+ Rrecvfrom@Base 1.1.19
+ Rrecvmsg@Base 1.1.19
+ Rrresvport@Base 1.1.19
+ Rselect@Base 1.1.19
+ Rsend@Base 1.1.19
+ Rsendmsg@Base 1.1.19
+ Rsendto@Base 1.1.19
+ Rwrite@Base 1.1.19
+ Rwritev@Base 1.1.19
+ SOCKSinit@Base 1.1.19
+ accept@Base 1.1.19
+ acceptn@Base 1.1.19
+ addressmatch@Base 1.1.19
+ addroute@Base 1.1.19
+ bind@Base 1.1.19
+ bindresvport@Base 1.1.19
+ bitcount@Base 1.1.19
+ clientinit@Base 1.1.19
+ clientmethod_uname@Base 1.1.19
+ closen@Base 1.1.19
+ closev@Base 1.1.19
+ command2string@Base 1.1.19
+ commands2string@Base 1.1.19
+ connect@Base 1.1.19
+ errno2reply@Base 1.1.19
+ extensions2string@Base 1.1.19
+ fakesockaddr2sockshost@Base 1.1.19
+ fakesockshost2sockaddr@Base 1.1.19
+ fdisopen@Base 1.1.19
+ fdsetop@Base 1.1.19
+ freedescriptors@Base 1.1.19
+ genericinit@Base 1.1.19
+ getaddrinfo@Base 1.1.19
+ gethostbyname2@Base 1.1.19
+ gethostbyname@Base 1.1.19
+ getpeername@Base 1.1.19
+ getsockname@Base 1.1.19
+ hostentdup@Base 1.1.19
+ hostentfree@Base 1.1.19
+ hostname2sockaddr@Base 1.1.19
+ httpproxy_negotiate@Base 1.1.19
+ ifname2sockaddr@Base 1.1.19
+ initsetproctitle@Base 1.1.19
+ issetugid@Base 1.1.19
+ mem2sockshost@Base 1.1.19
+ method2string@Base 1.1.19
+ methodisset@Base 1.1.19
+ methods2string@Base 1.1.19
+ msproxy_init@Base 1.1.19
+ msproxy_negotiate@Base 1.1.19
+ msproxy_sigio@Base 1.1.19
+ negotiate_method@Base 1.1.19
+ newprocinit@Base 1.1.19
+ operator2string@Base 1.1.19
+ protocol2string@Base 1.1.19
+ protocols2string@Base 1.1.19
+ proxyprotocols2string@Base 1.1.19
+ read@Base 1.1.19
+ readconfig@Base 1.1.19
+ readn@Base 1.1.19
+ readv@Base 1.1.19
+ recv@Base 1.1.19
+ recv_mspresponse@Base 1.1.19
+ recvfrom@Base 1.1.19
+ recvmsg@Base 1.1.19
+ recvmsgn@Base 1.1.19
+ resolveprotocol2string@Base 1.1.19
+ rresvport@Base 1.1.19
+ ruleaddress2sockshost@Base 1.1.19
+ ruleaddress2string@Base 1.1.19
+ selectn@Base 1.1.19
+ send@Base 1.1.19
+ send_msprequest@Base 1.1.19
+ sendmsg@Base 1.1.19
+ sendmsgn@Base 1.1.19
+ sendto@Base 1.1.19
+ serr@Base 1.1.19
+ serrx@Base 1.1.19
+ serverreplyisok@Base 1.1.19
+ setproctitle@Base 1.1.19
+ showmethod@Base 1.1.19
+ showroute@Base 1.1.19
+ showstate@Base 1.1.19
+ slog@Base 1.1.19
+ snprintfn@Base 1.1.19
+ sockaddr2ruleaddress@Base 1.1.19
+ sockaddr2sockshost@Base 1.1.19
+ sockaddr2string@Base 1.1.19
+ sockaddr2udpheader@Base 1.1.19
+ sockaddrareeq@Base 1.1.19
+ socketoptdup@Base 1.1.19
+ socks_addaddr@Base 1.1.19
+ socks_addfakeip@Base 1.1.19
+ socks_addfd@Base 1.1.19
+ socks_addrcontrol@Base 1.1.19
+ socks_addrisok@Base 1.1.19
+ socks_addrmatch@Base 1.1.19
+ socks_badroute@Base 1.1.19
+ socks_configtype@Base 1.1.19
+ socks_connect@Base 1.1.19
+ socks_connectroute@Base 1.1.19
+ socks_getaddr@Base 1.1.19
+ socks_getfakehost@Base 1.1.19
+ socks_getfakeip@Base 1.1.19
+ socks_getpassword@Base 1.1.19
+ socks_getpwnam@Base 1.1.19
+ socks_getroute@Base 1.1.19
+ socks_getusername@Base 1.1.19
+ socks_isaddr@Base 1.1.19
+ socks_isfd@Base 1.1.19
+ socks_lock@Base 1.1.19
+ socks_logmatch@Base 1.1.19
+ socks_mklock@Base 1.1.19
+ socks_nbconnectroute@Base 1.1.19
+ socks_negotiate@Base 1.1.19
+ socks_packet2string@Base 1.1.19
+ socks_parseinit@Base 1.1.19
+ socks_recvfrom@Base 1.1.19
+ socks_recvresponse@Base 1.1.19
+ socks_requestpolish@Base 1.1.19
+ socks_rmaddr@Base 1.1.19
+ socks_rmfd@Base 1.1.19
+ socks_sendrequest@Base 1.1.19
+ socks_sendto@Base 1.1.19
+ socks_socketisbound@Base 1.1.19
+ socks_unlock@Base 1.1.19
+ socks_yy_create_buffer@Base 1.1.19
+ socks_yy_delete_buffer@Base 1.1.19
+ socks_yy_flush_buffer@Base 1.1.19
+ socks_yy_init_buffer@Base 1.1.19
+ socks_yy_load_buffer_state@Base 1.1.19
+ socks_yy_scan_buffer@Base 1.1.19
+ socks_yy_scan_bytes@Base 1.1.19
+ socks_yy_scan_string@Base 1.1.19
+ socks_yy_switch_to_buffer@Base 1.1.19
+ socks_yychar@Base 1.1.19
+ socks_yycheck@Base 1.1.19
+ socks_yydebug@Base 1.1.19
+ socks_yydefred@Base 1.1.19
+ socks_yydgoto@Base 1.1.19
+ socks_yyerrflag@Base 1.1.19
+ socks_yyerror@Base 1.1.19
+ socks_yygindex@Base 1.1.19
+ socks_yyin@Base 1.1.19
+ socks_yylen@Base 1.1.19
+ socks_yyleng@Base 1.1.19
+ socks_yylex@Base 1.1.19
+ socks_yylhs@Base 1.1.19
+ socks_yylineno@Base 1.1.19
+ socks_yylval@Base 1.1.19
+ socks_yyname@Base 1.1.19
+ socks_yynerrs@Base 1.1.19
+ socks_yyout@Base 1.1.19
+ socks_yyparse@Base 1.1.19
+ socks_yyrestart@Base 1.1.19
+ socks_yyrindex@Base 1.1.19
+ socks_yyrule@Base 1.1.19
+ socks_yysindex@Base 1.1.19
+ socks_yyss@Base 1.1.19
+ socks_yysslim@Base 1.1.19
+ socks_yyssp@Base 1.1.19
+ socks_yystacksize@Base 1.1.19
+ socks_yytable@Base 1.1.19
+ socks_yytext@Base 1.1.19
+ socks_yyval@Base 1.1.19
+ socks_yyvs@Base 1.1.19
+ socks_yyvsp@Base 1.1.19
+ socks_yywarn@Base 1.1.19
+ sockscf@Base 1.1.19
+ sockscode@Base 1.1.19
+ socksfddup@Base 1.1.19
+ sockshost2mem@Base 1.1.19
+ sockshost2ruleaddress@Base 1.1.19
+ sockshost2sockaddr@Base 1.1.19
+ sockshost2string@Base 1.1.19
+ sockshostareeq@Base 1.1.19
+ str2vis@Base 1.1.19
+ strcheck@Base 1.1.19
+ string2method@Base 1.1.19
+ string2operator@Base 1.1.19
+ string2udpheader@Base 1.1.19
+ strvis@Base 1.1.19
+ strvisx@Base 1.1.19
+ swarn@Base 1.1.19
+ swarnx@Base 1.1.19
+ symbolcheck@Base 1.1.19
+ symbolfunction@Base 1.1.19
+ sys_accept@Base 1.1.19
+ sys_bind@Base 1.1.19
+ sys_bindresvport@Base 1.1.19
+ sys_connect@Base 1.1.19
+ sys_getaddrinfo@Base 1.1.19
+ sys_gethostbyname2@Base 1.1.19
+ sys_gethostbyname@Base 1.1.19
+ sys_getpeername@Base 1.1.19
+ sys_getsockname@Base 1.1.19
+ sys_read@Base 1.1.19
+ sys_readv@Base 1.1.19
+ sys_recv@Base 1.1.19
+ sys_recvfrom@Base 1.1.19
+ sys_recvmsg@Base 1.1.19
+ sys_rresvport@Base 1.1.19
+ sys_send@Base 1.1.19
+ sys_sendmsg@Base 1.1.19
+ sys_sendto@Base 1.1.19
+ sys_write@Base 1.1.19
+ sys_writev@Base 1.1.19
+ udpheader_add@Base 1.1.19
+ udpsetup@Base 1.1.19
+ vis@Base 1.1.19
+ vslog@Base 1.1.19
+ write@Base 1.1.19
+ writen@Base 1.1.19
+ writev@Base 1.1.19
--- dante-1.1.19.dfsg.orig/debian/dante-client.preinst
+++ dante-1.1.19.dfsg/debian/dante-client.preinst
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+set -e
+
+# copy across old configuration before rename
+if [ "$1" = "upgrade" ] && [ "$2" = "0.92.0-pre3-2" ] ; then
+  cp /etc/socks.conf /etc/dante.conf
+fi
+
+#DEBHELPER#
--- dante-1.1.19.dfsg.orig/debian/TODO
+++ dante-1.1.19.dfsg/debian/TODO
@@ -0,0 +1 @@
+something to convert NEC socks (v4 and v5) client/server files to Dante
--- dante-1.1.19.dfsg.orig/debian/source.lintian-overrides
+++ dante-1.1.19.dfsg/debian/source.lintian-overrides
@@ -0,0 +1 @@
+dante source: dfsg-version-with-period 1.1.19.dfsg-3
--- dante-1.1.19.dfsg.orig/debian/libsocksd0-dev.install
+++ dante-1.1.19.dfsg/debian/libsocksd0-dev.install
@@ -0,0 +1,2 @@
+usr/lib/libsocksd.a usr/lib
+usr/include/socks.h usr/include
--- dante-1.1.19.dfsg.orig/debian/dante-client.install
+++ dante-1.1.19.dfsg/debian/dante-client.install
@@ -0,0 +1,4 @@
+doc/socksify.1 usr/share/man/man1
+example/renamed/dante.conf etc
+usr/bin/socksify usr/bin
+usr/share/man/man5/dante.conf.5 usr/share/man/man5
--- dante-1.1.19.dfsg.orig/debian/dante-server.install
+++ dante-1.1.19.dfsg/debian/dante-server.install
@@ -0,0 +1,4 @@
+example/renamed/danted.conf etc
+usr/sbin/danted usr/sbin
+usr/share/man/man5/danted.conf.5 usr/share/man/man5
+usr/share/man/man8/danted.8 usr/share/man/man8
--- dante-1.1.19.dfsg.orig/debian/control
+++ dante-1.1.19.dfsg/debian/control
@@ -0,0 +1,75 @@
+Source: dante
+Section: net
+Priority: optional
+Maintainer: Peter Pentchev <roam@ringlet.net>
+Build-Depends: flex,debhelper(>=7),quilt,libtool,autotools-dev,libwrap0-dev,libpam0g-dev
+Homepage: http://www.inet.no/dante/
+Standards-Version: 3.8.1
+Vcs-Svn: http://svn.ringlet.net/svn/ringlet/net/dante/trunk/dante-pkg/debian
+Vcs-Browser: http://svn.ringlet.net/cgi-bin/viewvc/viewvc.cgi/ringlet/net/dante/trunk/dante-pkg/debian/
+
+Package: libdsocksd0
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: dante-client (<< 1.1.19.dfsg)
+Replaces: dante-client (<< 1.1.19.dfsg)
+Description: SOCKS library for internal use by the dante client
+ Dante is a circuit-level firewall/proxy that can be used to provide
+ convenient and secure network connectivity to a wide range of hosts
+ while requiring only the server Dante runs on to have external network
+ connectivity.
+ .
+ This package provides the actual SOCKS wrapper library, which should only
+ be used via the dante-client package's socksify(1) executable.
+
+Package: libsocksd0
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: SOCKS library for packages built using libsocksd-dev
+ Dante is a circuit-level firewall/proxy that can be used to provide
+ convenient and secure network connectivity to a wide range of hosts
+ while requiring only the server Dante runs on to have external network
+ connectivity.
+ .
+ This package provides the Dante SOCKS support library and will generally
+ be automatically selected by packages that require it.
+  
+Package: libsocksd0-dev
+Architecture: any
+Section: libdevel
+Depends: libsocksd0 (= ${binary:Version}), ${misc:Depends}
+Description: Development files for compiling programs with SOCKS support
+ Dante is a circuit-level firewall/proxy that can be used to provide
+ convenient and secure network connectivity to a wide range of hosts
+ while requiring only the server Dante runs on to have external network
+ connectivity.
+ .
+ This package provides header files and instructions for compiling programs
+ with SOCKS support.
+
+Package: dante-client
+Architecture: any
+Depends: ${shlibs:Depends}, libdsocksd0 (= ${binary:Version}), ${misc:Depends}
+Description: SOCKS wrapper for users behind a firewall
+ Dante is a circuit-level firewall/proxy that can be used to provide
+ convenient and secure network connectivity to a wide range of hosts
+ while requiring only the server Dante runs on to have external network
+ connectivity.
+ .
+ This package provides the "socksify" client program - a tool which
+ forwards network requests from any program to a SOCKS server (v4 or v5)
+ which then performs them on your behalf. 
+
+Package: dante-server
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: SOCKS (v4 and v5) proxy daemon (danted)
+ Dante is a circuit-level firewall/proxy that can be used to provide
+ convenient and secure network connectivity to a wide range of hosts
+ while requiring only the server Dante runs on to have external network
+ connectivity.
+ .
+ This package provides the socks proxy daemon (danted). The server part
+ of Dante allows socks clients to connect through it to the network.
--- dante-1.1.19.dfsg.orig/debian/libsocksd0.symbols
+++ dante-1.1.19.dfsg/debian/libsocksd0.symbols
@@ -0,0 +1,186 @@
+libsocksd.so.0 libsocksd0 #MINVER#
+ Raccept@Base 1.1.19
+ Rbind@Base 1.1.19
+ Rbindresvport@Base 1.1.19
+ Rconnect@Base 1.1.19
+ Rgetaddrinfo@Base 1.1.19
+ Rgethostbyname2@Base 1.1.19
+ Rgethostbyname@Base 1.1.19
+ Rgetpeername@Base 1.1.19
+ Rgetsockname@Base 1.1.19
+ Rlisten@Base 1.1.19
+ Rread@Base 1.1.19
+ Rreadv@Base 1.1.19
+ Rrecv@Base 1.1.19
+ Rrecvfrom@Base 1.1.19
+ Rrecvmsg@Base 1.1.19
+ Rrresvport@Base 1.1.19
+ Rselect@Base 1.1.19
+ Rsend@Base 1.1.19
+ Rsendmsg@Base 1.1.19
+ Rsendto@Base 1.1.19
+ Rwrite@Base 1.1.19
+ Rwritev@Base 1.1.19
+ SOCKSinit@Base 1.1.19
+ acceptn@Base 1.1.19
+ addressmatch@Base 1.1.19
+ addroute@Base 1.1.19
+ bitcount@Base 1.1.19
+ clientinit@Base 1.1.19
+ clientmethod_uname@Base 1.1.19
+ closen@Base 1.1.19
+ closev@Base 1.1.19
+ command2string@Base 1.1.19
+ commands2string@Base 1.1.19
+ errno2reply@Base 1.1.19
+ extensions2string@Base 1.1.19
+ fakesockaddr2sockshost@Base 1.1.19
+ fakesockshost2sockaddr@Base 1.1.19
+ fdisopen@Base 1.1.19
+ fdsetop@Base 1.1.19
+ freedescriptors@Base 1.1.19
+ genericinit@Base 1.1.19
+ hostentdup@Base 1.1.19
+ hostentfree@Base 1.1.19
+ hostname2sockaddr@Base 1.1.19
+ httpproxy_negotiate@Base 1.1.19
+ ifname2sockaddr@Base 1.1.19
+ initsetproctitle@Base 1.1.19
+ issetugid@Base 1.1.19
+ mem2sockshost@Base 1.1.19
+ method2string@Base 1.1.19
+ methodisset@Base 1.1.19
+ methods2string@Base 1.1.19
+ msproxy_init@Base 1.1.19
+ msproxy_negotiate@Base 1.1.19
+ msproxy_sigio@Base 1.1.19
+ negotiate_method@Base 1.1.19
+ newprocinit@Base 1.1.19
+ operator2string@Base 1.1.19
+ protocol2string@Base 1.1.19
+ protocols2string@Base 1.1.19
+ proxyprotocols2string@Base 1.1.19
+ readconfig@Base 1.1.19
+ readn@Base 1.1.19
+ recv_mspresponse@Base 1.1.19
+ recvmsgn@Base 1.1.19
+ resolveprotocol2string@Base 1.1.19
+ ruleaddress2sockshost@Base 1.1.19
+ ruleaddress2string@Base 1.1.19
+ selectn@Base 1.1.19
+ send_msprequest@Base 1.1.19
+ sendmsgn@Base 1.1.19
+ serr@Base 1.1.19
+ serrx@Base 1.1.19
+ serverreplyisok@Base 1.1.19
+ setproctitle@Base 1.1.19
+ showmethod@Base 1.1.19
+ showroute@Base 1.1.19
+ showstate@Base 1.1.19
+ slog@Base 1.1.19
+ snprintfn@Base 1.1.19
+ sockaddr2ruleaddress@Base 1.1.19
+ sockaddr2sockshost@Base 1.1.19
+ sockaddr2string@Base 1.1.19
+ sockaddr2udpheader@Base 1.1.19
+ sockaddrareeq@Base 1.1.19
+ socketoptdup@Base 1.1.19
+ socks_addaddr@Base 1.1.19
+ socks_addfakeip@Base 1.1.19
+ socks_addfd@Base 1.1.19
+ socks_addrcontrol@Base 1.1.19
+ socks_addrisok@Base 1.1.19
+ socks_addrmatch@Base 1.1.19
+ socks_badroute@Base 1.1.19
+ socks_configtype@Base 1.1.19
+ socks_connect@Base 1.1.19
+ socks_connectroute@Base 1.1.19
+ socks_getaddr@Base 1.1.19
+ socks_getfakehost@Base 1.1.19
+ socks_getfakeip@Base 1.1.19
+ socks_getpassword@Base 1.1.19
+ socks_getpwnam@Base 1.1.19
+ socks_getroute@Base 1.1.19
+ socks_getusername@Base 1.1.19
+ socks_isaddr@Base 1.1.19
+ socks_isfd@Base 1.1.19
+ socks_lock@Base 1.1.19
+ socks_logmatch@Base 1.1.19
+ socks_mklock@Base 1.1.19
+ socks_nbconnectroute@Base 1.1.19
+ socks_negotiate@Base 1.1.19
+ socks_packet2string@Base 1.1.19
+ socks_parseinit@Base 1.1.19
+ socks_recvfrom@Base 1.1.19
+ socks_recvresponse@Base 1.1.19
+ socks_requestpolish@Base 1.1.19
+ socks_rmaddr@Base 1.1.19
+ socks_rmfd@Base 1.1.19
+ socks_sendrequest@Base 1.1.19
+ socks_sendto@Base 1.1.19
+ socks_socketisbound@Base 1.1.19
+ socks_unlock@Base 1.1.19
+ socks_yy_create_buffer@Base 1.1.19
+ socks_yy_delete_buffer@Base 1.1.19
+ socks_yy_flush_buffer@Base 1.1.19
+ socks_yy_init_buffer@Base 1.1.19
+ socks_yy_load_buffer_state@Base 1.1.19
+ socks_yy_scan_buffer@Base 1.1.19
+ socks_yy_scan_bytes@Base 1.1.19
+ socks_yy_scan_string@Base 1.1.19
+ socks_yy_switch_to_buffer@Base 1.1.19
+ socks_yychar@Base 1.1.19
+ socks_yycheck@Base 1.1.19
+ socks_yydebug@Base 1.1.19
+ socks_yydefred@Base 1.1.19
+ socks_yydgoto@Base 1.1.19
+ socks_yyerrflag@Base 1.1.19
+ socks_yyerror@Base 1.1.19
+ socks_yygindex@Base 1.1.19
+ socks_yyin@Base 1.1.19
+ socks_yylen@Base 1.1.19
+ socks_yyleng@Base 1.1.19
+ socks_yylex@Base 1.1.19
+ socks_yylhs@Base 1.1.19
+ socks_yylineno@Base 1.1.19
+ socks_yylval@Base 1.1.19
+ socks_yyname@Base 1.1.19
+ socks_yynerrs@Base 1.1.19
+ socks_yyout@Base 1.1.19
+ socks_yyparse@Base 1.1.19
+ socks_yyrestart@Base 1.1.19
+ socks_yyrindex@Base 1.1.19
+ socks_yyrule@Base 1.1.19
+ socks_yysindex@Base 1.1.19
+ socks_yyss@Base 1.1.19
+ socks_yysslim@Base 1.1.19
+ socks_yyssp@Base 1.1.19
+ socks_yystacksize@Base 1.1.19
+ socks_yytable@Base 1.1.19
+ socks_yytext@Base 1.1.19
+ socks_yyval@Base 1.1.19
+ socks_yyvs@Base 1.1.19
+ socks_yyvsp@Base 1.1.19
+ socks_yywarn@Base 1.1.19
+ sockscf@Base 1.1.19
+ sockscode@Base 1.1.19
+ socksfddup@Base 1.1.19
+ sockshost2mem@Base 1.1.19
+ sockshost2ruleaddress@Base 1.1.19
+ sockshost2sockaddr@Base 1.1.19
+ sockshost2string@Base 1.1.19
+ sockshostareeq@Base 1.1.19
+ str2vis@Base 1.1.19
+ strcheck@Base 1.1.19
+ string2method@Base 1.1.19
+ string2operator@Base 1.1.19
+ string2udpheader@Base 1.1.19
+ strvis@Base 1.1.19
+ strvisx@Base 1.1.19
+ swarn@Base 1.1.19
+ swarnx@Base 1.1.19
+ udpheader_add@Base 1.1.19
+ udpsetup@Base 1.1.19
+ vis@Base 1.1.19
+ vslog@Base 1.1.19
+ writen@Base 1.1.19
--- dante-1.1.19.dfsg.orig/debian/libsocksd0.install
+++ dante-1.1.19.dfsg/debian/libsocksd0.install
@@ -0,0 +1 @@
+usr/lib/libsocksd.so.* usr/lib
--- dante-1.1.19.dfsg.orig/debian/dante-server.preinst
+++ dante-1.1.19.dfsg/debian/dante-server.preinst
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+set -e
+
+# copy across old configuration before rename
+if [ "$1" = "upgrade" ] && [ "$2" = "0.92.0-pre3-2" ] ; then
+  cp /etc/sockd.conf /etc/danted.conf
+fi
+
+#DEBHELPER#
--- dante-1.1.19.dfsg.orig/debian/rules
+++ dante-1.1.19.dfsg/debian/rules
@@ -0,0 +1,76 @@
+#!/usr/bin/make -f
+
+# This script uses debhelper by Joey Hess
+#export DH_VERBOSE=1
+DEB=$(CURDIR)/debian/tmp
+DEV=debian/libsocksd0-dev
+
+include /usr/share/quilt/quilt.make
+
+ifeq (,$(filter nohardening,$(DEB_BUILD_OPTIONS)))
+export DEB_BUILD_HARDENING=1
+else
+export DEB_BUILD_HARDENING=0
+endif
+CFLAGS+=	-D_REENTRANT
+
+build:	build-stamp
+
+build-stamp: ${QUILT_STAMPFN}
+	dh build --before dh_auto_configure
+	cp /usr/share/misc/config.guess /usr/share/misc/config.sub . 
+	dh_auto_configure -- CFLAGS="${CFLAGS}" --prefix=/usr \
+	  --with-socks-conf=/etc/dante.conf \
+	  --with-sockd-conf=/etc/danted.conf \
+	  --with-pidfile=/var/run/danted.pid
+	cp lib/config_parse.c lib/config_scan.c dlib/
+	cp lib/config_parse.c lib/config_scan.c sockd/
+	dh build --remaining
+	touch build-stamp
+
+clean:
+	dh "$@" --before dh_clean
+	for d in sockd dlib; do \
+	  cd $$d; \
+	  for i in *; do \
+	    if [ -L "$$i" ]; then rm $$i; cp -a ../lib/$$i . ; fi \
+	  done; \
+	  cd ..; \
+	done
+	$(MAKE) -f debian/rules unpatch
+	rm -rf example/renamed
+	dh_clean config.guess config.sub \
+	  dlib/config_parse.c dlib/config_scan.c \
+	  sockd/config_parse.c sockd/config_scan.c
+	dh clean --remaining
+
+install:	build
+	dh "$@" --before dh_install
+	cp $(DEB)/usr/share/man/man5/socks.conf.5  $(DEB)/usr/share/man/man5/dante.conf.5
+	cp $(DEB)/usr/share/man/man5/sockd.conf.5  $(DEB)/usr/share/man/man5/danted.conf.5
+	cp $(DEB)/usr/share/man/man8/sockd.8 $(DEB)/usr/share/man/man8/danted.8
+	cp $(DEB)/usr/sbin/sockd $(DEB)/usr/sbin/danted
+	mkdir -p example/renamed
+	for i in example/sockd*.conf; do \
+		sed -e 's/sample sockd.conf/sample danted.conf/' < "$$i" > example/renamed/"`basename $$i | sed -e s/sockd/danted/`"; \
+	done
+	for i in example/socks*.conf; do \
+		sed -e 's/sample socks.conf/sample dante.conf/' < "$$i" > example/renamed/"`basename $$i | sed -e s/socks/dante/`"; \
+	done
+	dh_installdocs -A README doc/faq.tex doc/README.usage doc/README.survey BUGS CREDITS TODO SUPPORT
+	dh_installdocs -pdante-client doc/README.socksify
+	dh_installdocs -pdante-client -pdante-server
+	dh_installdocs -pdante-server doc/SOCKS4.protocol
+	dh_installchangelogs NEWS
+	dh_installinit -pdante-server -r --init-script=danted
+	dh_link -plibsocksd0-dev /usr/lib/libsocksd0.so.0 /usr/lib/libsocksd.so
+	dh "$@" --remaining
+
+binary-indep:	build install
+	# Nothing to do here
+
+binary-arch:	build install
+	dh "$@"
+
+binary:	binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary
--- dante-1.1.19.dfsg.orig/debian/patches/06-socksify-manpage.patch
+++ dante-1.1.19.dfsg/debian/patches/06-socksify-manpage.patch
@@ -0,0 +1,40 @@
+Add a manual page for socksify(1).
+
+--- /dev/null
++++ b/doc/socksify.1
+@@ -0,0 +1,35 @@
++.TH SOCKSIFY 1
++.\" NAME should be all caps, SECTION should be 1-8, maybe w/ subsection
++.\" other parms are allowed: see man(7), man(1)
++.SH NAME
++socksify \- dynamically SOCKSifies a program
++.SH SYNOPSIS
++.B socksify
++.I program
++[
++.I arguments
++]
++
++.SH "DESCRIPTION"
++.B socksify
++is Dante's equivalent of the NEC SOCKS'
++.BR runsocks .
++sockisfy uses
++.B LD_PRELOAD
++environment variable to wrap all networking-related system calls 
++so that programs can go thought a SOCKS server that was installed as part of
++a firewall.
++.SH "SEE ALSO"
++.\" Always quote multiple words for .SH
++.BR dante.conf(5)
++.SH NOTES
++A more permanent solution would be to add the 
++.I LD_PRELOAD
++environment
++value to the shell startup files.  Then all non-set[ug]id applications
++that are linked dynamically would be socksified.  However this can have bad
++side-effects.
++.SH AUTHOR
++Dante was developed for Inferno Nettverk A/S, Norway by:
++ - Michael Shuldman <michaels@inet.no>: Design and implementation.
++ - Karl-André Skevik <karls@inet.no>: Autoconf and porting.
--- dante-1.1.19.dfsg.orig/debian/patches/series
+++ dante-1.1.19.dfsg/debian/patches/series
@@ -0,0 +1,13 @@
+01-rename-library.patch
+02-rename-programs.patch
+03-configure.patch
+04-faq.patch
+05-readme-functions.patch
+06-socksify-manpage.patch
+07-rconnect.patch
+09-getifa-address.patch
+10-config-users.patch
+11-linux-eccentricities.patch
+12-man-errors.patch
+13-c-warnings.patch
+14-httpproxy-underrun.patch
--- dante-1.1.19.dfsg.orig/debian/patches/01-rename-library.patch
+++ dante-1.1.19.dfsg/debian/patches/01-rename-library.patch
@@ -0,0 +1,158 @@
+Rename the libdsocks library to libdsocskd to avoid a conflict with
+the libsocks4 package (#52475).
+
+--- a/bin/socksify.in
++++ b/bin/socksify.in
+@@ -52,7 +52,7 @@
+ LIBDIR="@LIBRARY_PREFIX@"
+ 
+ #XXX shared library name should be generated too (possibly including version)
+-LIBRARY="${SOCKS_LIBRARY-${LIBDIR}/libdsocks.@SOLIB_POSTFIX@}"
++LIBRARY="${SOCKS_LIBRARY-${LIBDIR}/libdsocksd.@SOLIB_POSTFIX@}.0"
+ 
+ PRELOAD_SEPERATOR="@PRELOAD_SEPERATOR@"
+ PRELOAD_POSTFIX="@PRELOAD_POSTFIX@"
+--- a/doc/faq.tex
++++ b/doc/faq.tex
+@@ -475,7 +475,7 @@
+    edit the file /etc/ld.so.preload
+    and add two lines saying:
+       libdl.so
+-      libdsocks.so
++      libdsocksd.so
+   \end{verbatim}
+  \emph{Thanks to: Dag Wieers <dag@wieers.com>.}
+ 
+@@ -489,7 +489,7 @@
+   you could add
+ 
+   \begin{verbatim}
+-   LD_PRELOAD="libdl.so libdsocks.so"
++   LD_PRELOAD="libdl.so libdsocksd.so.0"
+    export LD_PRELOAD
+   \end{verbatim}
+   to the environment. (/etc/profile ~/.profile ~/.bashrc)
+@@ -528,7 +528,7 @@
+   the result becomes the the same as not using socksify on them.
+ 
+   Solution: strip off the suid bit if possible or recompile the binary
+-  (rsh, ssh, etc) with explicit socks support (adding "-ldsocks"
++  (rsh, ssh, etc) with explicit socks support (adding "-ldsocksd"
+   to the linkoptions is usually enough.)
+ 
+  \subsection{Why doesn't socksify work on HP-UX 11.00?}
+--- a/doc/README.socksify
++++ b/doc/README.socksify
+@@ -2,7 +2,7 @@
+ 
+ The shell script socksify in the bin directory is meant to aid in
+ using socks with already compiled dynamic binaries.  This works by
+-setting the LD_PRELOAD environment variable to libdsocks.  It will
++setting the LD_PRELOAD environment variable to libdsocksd.  It will
+ then wrap all networking-related system calls.
+ 
+ When used the script can socksify a program by simply giving it as a
+--- a/doc/README.usage
++++ b/doc/README.usage
+@@ -7,15 +7,15 @@
+ 	The simplest way to add socks support to an already
+ (dynamically) complied application is to use the LD_PRELOAD facility
+ to replace the standard library functions with socksified ones.  The
+-libdsocks library is provided for this purpose.  See the
++libdsocksd library is provided for this purpose.  See the
+ README.socksify file for more information.  This will probably only
+ work with non-setuid applications since LD_PRELOAD is usually ignored
+ otherwise.  If setting LD_PRELOAD is not possible, compilation is
+ another possibility.
+ 
+ 	If the application can be compiled dynamically socks support
+-can be added explicitly by linking with libdsocks (usually done by adding
+-'-ldsocks').  This will automagically give the application socks
++can be added explicitly by linking with libdsocksd (usually done by adding
++'-ldsocksd').  This will automagically give the application socks
+ support without making any code changes.
+ 
+ Static Compilation
+@@ -24,8 +24,8 @@
+ changed to use socks, even if it is not linked dynamically.
+ Several systemcalls and librarycalls must be changed to use the
+ socksified versions instead of the standard ones.  The application
+-is then linked with the libsocks library in the distribution (-lsocks,
+-not -ldsocks).
++is then linked with the libsocks library in the distribution (-lsocksd,
++not -ldsocksd).
+ 
+ These function calls can be found in the socks library:
+ Raccept
+@@ -71,6 +71,6 @@
+ Libraries
+ 	In total there are three libraries distributed with this package:
+ 
+- libsocks.so  - standard shared library, contains Rfoo type functions.
+- libsocks.a   - static version of the above.
+- libdsocks.so - shared library which does "on the fly" socksification.
++ libsocksd.so  - standard shared library, contains Rfoo type functions.
++ libsocksd.a   - static version of the above.
++ libdsocksd.so - shared library which does "on the fly" socksification.
+--- a/lib/Makefile.in
++++ b/lib/Makefile.in
+@@ -213,7 +213,7 @@
+ subdirs = @subdirs@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-lib_LTLIBRARIES = libsocks.la
++lib_LTLIBRARIES = libsocksd.la
+ libsocks_la_SOURCES = config_parse.y config_scan.l Raccept.c Rbind.c \
+ 	Rgetpeername.c Rgetsockname.c Rrresvport.c io.c    \
+ 	address.c authneg.c client.c clientconfig.c clientprotocol.c \
+@@ -302,7 +302,7 @@
+ 	  rm -f config_parse.c; \
+ 	  $(MAKE) config_parse.c; \
+ 	else :; fi
+-libsocks.la: $(libsocks_la_OBJECTS) $(libsocks_la_DEPENDENCIES) 
++libsocksd.la: $(libsocks_la_OBJECTS) $(libsocks_la_DEPENDENCIES) 
+ 	$(LINK) -rpath $(libdir) $(libsocks_la_LDFLAGS) $(libsocks_la_OBJECTS) $(libsocks_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+--- a/dlib/int_osf3.c
++++ b/dlib/int_osf3.c
+@@ -81,7 +81,7 @@
+ #undef sendto
+ 
+ /* XXX Attempt to support old library calls, which use old version of
+-   sockaddr and msghdr struct. Other parts of libdsocks are compiled
++   sockaddr and msghdr struct. Other parts of libdsocksd are compiled
+    using the new versions. */
+ 
+ /* sockaddr struct, with sa_len */
+--- a/dlib/Makefile.in
++++ b/dlib/Makefile.in
+@@ -214,7 +214,7 @@
+ subdirs = @subdirs@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-lib_LTLIBRARIES = libdsocks.la
++lib_LTLIBRARIES = libdsocksd.la
+ libdsocks_la_SOURCES = interposition.c int_osf1.c int_osf2.c int_osf3.c \
+ 	../lib/config_parse.y ../lib/io.c ../lib/debug.c ../lib/udp.c \
+ 	../lib/Rgetpeername.c ../lib/Rgetsockname.c \
+@@ -304,7 +304,7 @@
+ 	  rm -f config_parse.c; \
+ 	  $(MAKE) config_parse.c; \
+ 	else :; fi
+-libdsocks.la: $(libdsocks_la_OBJECTS) $(libdsocks_la_DEPENDENCIES) 
++libdsocksd.la: $(libdsocks_la_OBJECTS) $(libdsocks_la_DEPENDENCIES) 
+ 	$(LINK) -rpath $(libdir) $(libdsocks_la_LDFLAGS) $(libdsocks_la_OBJECTS) $(libdsocks_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+--- a/include/socks.h
++++ b/include/socks.h
+@@ -237,7 +237,7 @@
+ __BEGIN_DECLS
+ 
+ /*
+- * libsocks function declarations
++ * libsocksd function declarations
+  */
+ 
+ void
--- dante-1.1.19.dfsg.orig/debian/patches/14-httpproxy-underrun.patch
+++ dante-1.1.19.dfsg/debian/patches/14-httpproxy-underrun.patch
@@ -0,0 +1,14 @@
+Do not try to process a zero-length buffer at all, thus avoiding
+a possible buffer underrun.
+
+--- a/lib/httpproxy.c
++++ b/lib/httpproxy.c
+@@ -104,6 +104,8 @@
+ 				eof = 1;
+ 				break;
+ 		}
++		if (eof)
++			break;
+ 
+ 		/*
+ 		 * if last char we read is start of terminator,
--- dante-1.1.19.dfsg.orig/debian/patches/13-c-warnings.patch
+++ dante-1.1.19.dfsg/debian/patches/13-c-warnings.patch
@@ -0,0 +1,240 @@
+Fix a whole slew of warnings from the C compiler with and without
+the Debian hardening wrapper.
+
+--- a/include/common.h
++++ b/include/common.h
+@@ -1692,7 +1692,7 @@
+  */
+ 
+ char *
+-udpheader_add __P((const struct sockshost_t *host, char *msg, size_t *len,
++udpheader_add __P((const struct sockshost_t *host, const char *msg, size_t *len,
+ 						 size_t msgsize));
+ /*
+  * Prefixes the udpheader_t version of "host" to a copy of "msg",
+--- a/lib/udp_util.c
++++ b/lib/udp_util.c
+@@ -64,7 +64,7 @@
+ char *
+ udpheader_add(host, msg, len, msgsize)
+ 	const struct sockshost_t *host;
+-	char *msg;
++	const char *msg;
+ 	size_t *len;
+ 	size_t msgsize;
+ {
+--- a/lib/config.c
++++ b/lib/config.c
+@@ -621,7 +621,7 @@
+ 			break;
+ 	}
+ 
+-	slog(LOG_DEBUG, function);
++	slog(LOG_DEBUG, "%s", function);
+ 	return NULL;
+ }
+ #endif /* SOCKS_CLIENT */
+@@ -649,24 +649,24 @@
+ 	if (state->command.udpreply)
+ 		bufused += snprintfn(&buf[bufused], sizeof(buf) - bufused, "%s, ",
+ 		SOCKS_UDPREPLYs);
+-	slog(LOG_INFO, buf);
++	slog(LOG_INFO, "%s", buf);
+ 
+ 	bufused = snprintfn(buf, sizeof(buf), "extension(s): ");
+ 	if (state->extension.bind)
+ 		bufused += snprintfn(&buf[bufused], sizeof(buf) - bufused, "bind");
+-	slog(LOG_INFO, buf);
++	slog(LOG_INFO, "%s", buf);
+ 
+ 	bufused = snprintfn(buf, sizeof(buf), "protocol(s): ");
+ 	protocols2string(&state->protocol,
+ 	&buf[bufused], sizeof(buf) - bufused);
+-	slog(LOG_INFO, buf);
++	slog(LOG_INFO, "%s", buf);
+ 
+ 	showmethod(state->methodc, state->methodv);
+ 
+ 	bufused = snprintfn(buf, sizeof(buf), "proxyprotocol(s): ");
+ 	proxyprotocols2string(&state->proxyprotocol,
+ 	&buf[bufused], sizeof(buf) - bufused);
+-	slog(LOG_INFO, buf);
++	slog(LOG_INFO, "%s", buf);
+ 
+ }
+ 
+--- a/lib/connectchild.c
++++ b/lib/connectchild.c
+@@ -419,7 +419,7 @@
+ 	fd_set rset;
+ 	struct sigaction sig;
+ 
+-	slog(LOG_DEBUG, function);
++	slog(LOG_DEBUG, "%s", function);
+ #if 0
+ 	sleep(20);
+ #endif
+--- a/lib/httpproxy.c
++++ b/lib/httpproxy.c
+@@ -59,7 +59,7 @@
+ 	struct sockaddr addr;
+ 	socklen_t addrlen;
+ 
+-	slog(LOG_DEBUG, function);
++	slog(LOG_DEBUG, "%s", function);
+ 
+ 	sockshost2string(&packet->req.host, host, sizeof(host));
+ 
+--- a/lib/msproxy_clientprotocol.c
++++ b/lib/msproxy_clientprotocol.c
+@@ -299,7 +299,7 @@
+ 	struct sockaddr_in addr;
+ 	socklen_t len;
+ 
+-	slog(LOG_DEBUG, function);
++	slog(LOG_DEBUG, "%s", function);
+ 
+ #if 0
+ 
+@@ -523,7 +523,7 @@
+ 	struct sockaddr_in addr;
+ 	socklen_t len;
+ 
+-	slog(LOG_DEBUG, function);
++	slog(LOG_DEBUG, "%s", function);
+ 
+ 	bzero(&req, sizeof(req));
+ 	req.clientid		= packet->state.msproxy.clientid;
+@@ -687,7 +687,7 @@
+ 	struct timeval timeout;
+ 	int dbits;
+ 
+-	slog(LOG_DEBUG, function);
++	slog(LOG_DEBUG, "%s", function);
+ 
+ 	/*
+ 	 * Find the socket we were signalled for.
+@@ -1869,7 +1869,7 @@
+ 	int i, max;
+ 	struct socksfd_t *socksfd;
+ 
+-	slog(LOG_DEBUG, function);
++	slog(LOG_DEBUG, "%s", function);
+ 
+ 	for (i = 0, max = getdtablesize(); i < max; ++i) {
+ 		if ((socksfd = socks_getaddr((unsigned int)i)) == NULL)
+@@ -1890,7 +1890,7 @@
+ 	const char *function = "msproxy_sessionend()";
+ 	struct msproxy_request_t req;
+ 
+-	slog(LOG_DEBUG, function);
++	slog(LOG_DEBUG, "%s", function);
+ 
+ 	bzero(&req, sizeof(req));
+ 	*req.username		= NUL;
+@@ -1915,7 +1915,7 @@
+ 	struct socksfd_t *socksfd;
+ 	int i, max;
+ 
+-	slog(LOG_DEBUG, function);
++	slog(LOG_DEBUG, "%s", function);
+ 
+ 	for (i = 0, max = getdtablesize(); i < max; ++i) {
+ 		if ((socksfd = socks_getaddr((unsigned int)i)) == NULL)
+--- a/sockd/auth_pam.c
++++ b/sockd/auth_pam.c
+@@ -91,7 +91,7 @@
+ 	_pam_priv_data = NULL;
+ #endif /* HAVE_SOLARIS_PAM_BUG */
+ 
+-	slog(LOG_DEBUG, function);
++	slog(LOG_DEBUG, "%s", function);
+ 
+ 	socks_seteuid(&euid, sockscf.uid.privileged);
+ 
+--- a/sockd/serverconfig.c
++++ b/sockd/serverconfig.c
+@@ -473,13 +473,13 @@
+ 	for (i = 0; (size_t)i < sockscf->methodc; ++i)
+ 		bufused += snprintfn(&buf[bufused], sizeof(buf) - bufused, "%s%s",
+ 		i > 0 ? ", " : "", method2string(sockscf->methodv[i]));
+-	slog(LOG_DEBUG, buf);
++	slog(LOG_DEBUG, "%s", buf);
+ 
+ 	bufused = snprintfn(buf, sizeof(buf), "clientmethod(s): ");
+ 	for (i = 0; (size_t)i < sockscf->clientmethodc; ++i)
+ 		bufused += snprintfn(&buf[bufused], sizeof(buf) - bufused, "%s%s",
+ 		i > 0 ? ", " : "", method2string(sockscf->clientmethodv[i]));
+-	slog(LOG_DEBUG, buf);
++	slog(LOG_DEBUG, "%s", buf);
+ 
+ 	if (sockscf->option.debug) {
+ 		struct rule_t *rule;
+--- a/sockd/sockd.c
++++ b/sockd/sockd.c
+@@ -974,7 +974,7 @@
+ 	uid_t euid;
+ 	int p;
+ 
+-	slog(LOG_INFO, function);
++	slog(LOG_INFO, "%s", function);
+ 
+ 	resetconfig();
+ 	optioninit();
+--- a/sockd/sockd_child.c
++++ b/sockd/sockd_child.c
+@@ -112,7 +112,7 @@
+ 	 */
+ 	if (freedescriptors(NULL) < reserved) {
+ 		errno = EMFILE;
+-		swarn(function);
++		swarn("%s", function);
+ 		return NULL;
+ 	}
+ 
+--- a/lib/config_parse.c
++++ b/lib/config_parse.c
+@@ -932,8 +932,8 @@
+ 	va_end(ap);
+ 
+ 	if (errno)
+-		serr(EXIT_FAILURE, buf);
+-	serrx(EXIT_FAILURE, buf);
++		serr(EXIT_FAILURE, "%s", buf);
++	serrx(EXIT_FAILURE, "%s", buf);
+ }
+ 
+ void
+@@ -967,8 +967,8 @@
+ 	va_end(ap);
+ 
+ 	if (errno)
+-		swarn(buf);
+-	swarnx(buf);
++		swarn("%s", buf);
++	swarnx("%s", buf);
+ }
+ 
+ static void
+--- a/lib/config_scan.c
++++ b/lib/config_scan.c
+@@ -1583,7 +1583,7 @@
+ /* This used to be an fputs(), but since the string might contain NUL's,
+  * we now use fwrite().
+  */
+-#define ECHO (void) fwrite( yytext, yyleng, 1, yyout )
++#define ECHO if (fwrite( yytext, yyleng, 1, yyout ) != 1) yy_fatal_error("flex: config_scan.c: fwrite() failed")
+ #endif
+ 
+ /* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
+--- a/sockd/sockd_util.c
++++ b/sockd/sockd_util.c
+@@ -175,7 +175,7 @@
+ 	int mainmother;
+ 	static int init;
+ 
+-	slog(LOG_DEBUG, function);
++	slog(LOG_DEBUG, "%s", function);
+ 
+ 	/*
+ 	 * we are terminating, don't want to receive SIGTERM while terminating,
--- dante-1.1.19.dfsg.orig/debian/patches/02-rename-programs.patch
+++ dante-1.1.19.dfsg/debian/patches/02-rename-programs.patch
@@ -0,0 +1,124 @@
+Rename some files to reflect that this is Dante, not the original SOCKS:
+- /etc/socks.conf => /etc/dante.conf
+- /etc/sockd.conf => /etc/danted.conf
+- /usr/sbin/sockd => /usr/sbin/danted
+
+--- a/INSTALL
++++ b/INSTALL
+@@ -264,8 +264,8 @@
+ 
+ No configuration-files are installed, these must be installed
+ manually.
+-The Dante server expects it's configuration file to be in /etc/sockd.conf.
+-The client library uses the file /etc/socks.conf.
++The Dante server expects it's configuration file to be in /etc/danted.conf.
++The client library uses the file /etc/dante.conf.
+ 
+ The file bin/socksify.sh contains a shell script that allows one
+ to dynamically socksify a dynamicly linked application at runtime.
+--- a/doc/sockd.8
++++ b/doc/sockd.8
+@@ -40,11 +40,11 @@
+ .\" any improvements or extensions that they make and grant Inferno Nettverk A/S
+ .\" the rights to redistribute these changes.
+ .\"
+-.TH SOCKD 8 "Feb 17, 2001"
++.TH DANTED 8 "Feb 17, 2001"
+ .SH NAME
+-sockd \- network proxyserver
++danted \- network proxyserver
+ .SH SYNOPSIS
+-.B sockd
++.B danted
+ .RB [ \-DLVdhnv ]
+ .RB [ \-N
+ .IR number ]
+@@ -112,7 +112,7 @@
+ be set to a (local) filesystem with low latency.
+ .SH FILES
+ .TP
+-/etc/sockd.conf
++/etc/danted.conf
+ .B Dante
+ server configuration file.
+ .SH AUTHORS
+@@ -120,7 +120,7 @@
+  Michael Shuldman <michaels@inet.no>: Design and implementation.
+  Karl-Andre' Skevik <karls@inet.no>: Autoconf and porting.
+ .SH SEE ALSO
+-socks.conf(5) sockd.conf(5)
++dante.conf(5) danted.conf(5)
+ .PP
+ Information about new releases and other related issues can be found
+ on the
+--- a/doc/sockd.conf.5
++++ b/doc/sockd.conf.5
+@@ -40,9 +40,9 @@
+ .\" any improvements or extensions that they make and grant Inferno Nettverk A/S
+ .\" the rights to redistribute these changes.
+ .\"
+-.TH SOCKD.CONF 5 "May 11, 2001"
++.TH DANTED.CONF 5 "May 11, 2001"
+ .SH NAME
+-sockd.conf \- \fBDante\fP server configuration file syntax
++danted.conf \- \fBDante\fP server configuration file syntax
+ .SH DESCRIPTION
+ The configuration file for the \fBDante\fP server controls both access
+ controls and logging.  It is divided into three parts; server settings,
+@@ -308,7 +308,7 @@
+ .SH ROUTES
+ The routes are specified with a \fBroute\fP keyword.
+ Inside a pair of parens ({}) a set of keywords control the behavior of
+-the route.  See socks.conf(5) for a description.  This is used to
++the route.  See dante.conf(5) for a description.  This is used to
+ perform so-called "server-chaining", where one socks-server connects
+ to another socks-server futher upstream.  
+ .SH EXAMPLES
+@@ -316,7 +316,7 @@
+ .SH FILES
+ .nf
+ .ta \w 1
+-/etc/sockd.conf	\fBDante\fP server configuration file.
++/etc/danted.conf	\fBDante\fP server configuration file.
+ /etc/passwd	file used when checking username/passwords.
+ .fi
+ .SH AUTHORS
+@@ -324,7 +324,7 @@
+  Michael Shuldman <michaels@inet.no>: Design and implementation.
+  Karl-Andre' Skevik <karls@inet.no>: Autoconf and porting.
+ .SH SEE ALSO
+-sockd(8), socks.conf(5), hosts_access(5)
++danted(8), dante.conf(5), hosts_access(5)
+ .Pp
+ Information about new releases and other related issues can be found
+ on the
+--- a/doc/socks.conf.5
++++ b/doc/socks.conf.5
+@@ -40,9 +40,9 @@
+ .\" any improvements or extensions that they make and grant Inferno Nettverk A/S
+ .\" the rights to redistribute these changes.
+ .\"
+-.TH SOCKS.CONF 5 "February 17, 2001"
++.TH DANTE.CONF 5 "February 17, 2001"
+ .SH NAME
+-socks.conf \- socks client configuration file syntax
++dante.conf \- socks client configuration file syntax
+ .SH DESCRIPTION
+ The configuration file for the socks client library allow control over
+ logging and server selection.  It is divided into two parts,
+@@ -119,13 +119,13 @@
+ authentication.  Not recommended as other users on the system 
+ might be able to see your password.
+ .SH FILES
+-.I /etc/socks.conf
++.I /etc/dante.conf
+ .SH AUTHORS
+ For Inferno Nettverk A/S, Norway:
+  Michael Shuldman <michaels@inet.no>: Design and implementation.
+  Karl-Andre' Skevik <karls@inet.no>: Autoconf and porting.
+ .SH SEE ALSO
+-sockd(8) sockd.conf(5)
++danted(8) danted.conf(5)
+ .Pp
+ Information about new releases and other related issues can be found
+ on the
--- dante-1.1.19.dfsg.orig/debian/patches/11-linux-eccentricities.patch
+++ dante-1.1.19.dfsg/debian/patches/11-linux-eccentricities.patch
@@ -0,0 +1,14 @@
+Debian is not eccentric :)
+
+--- a/include/common.h
++++ b/include/common.h
+@@ -68,7 +68,8 @@
+ #define __attribute__(a)
+ #endif
+ 
+-#if HAVE_LINUX_ECCENTRICITIES
++/*#if HAVE_LINUX_ECCENTRICITIES*/
++#if 0
+ /*
+  * XXX This is a hack. Avoid transparent sockaddr union used in Linux
+  *  to avoid the use of the union in the code. Mainly used in
--- dante-1.1.19.dfsg.orig/debian/patches/07-rconnect.patch
+++ dante-1.1.19.dfsg/debian/patches/07-rconnect.patch
@@ -0,0 +1,15 @@
+Initialize the client at first connection for programs that have not done so.
+
+--- a/lib/Rconnect.c
++++ b/lib/Rconnect.c
+@@ -75,6 +75,10 @@
+ 		return connect(s, name, namelen);
+ 	}
+ 
++#if SOCKS_CLIENT /* may be called before normal init, log to right place */
++	clientinit();
++#endif     
++   
+ 	slog(LOG_DEBUG, "%s: %s",
+ 	function, sockaddr2string(name, namestring, sizeof(namestring)));
+ 
--- dante-1.1.19.dfsg.orig/debian/patches/05-readme-functions.patch
+++ dante-1.1.19.dfsg/debian/patches/05-readme-functions.patch
@@ -0,0 +1,53 @@
+Remove the list of overridden functions; it is better to include socks.h.
+
+--- a/doc/README.usage
++++ b/doc/README.usage
+@@ -27,29 +27,8 @@
+ is then linked with the libsocks library in the distribution (-lsocksd,
+ not -ldsocksd).
+ 
+-These function calls can be found in the socks library:
+-Raccept
+-Rbind 
+-Rbindresvport
+-Rconnect
+-Rgetaddrinfo()
+-Rgethostbyname
+-Rgethostbyname2
+-Rgetipnodebyname()
+-Rgetpeername
+-Rgetsockname
+-Rread
+-Rreadv
+-Rrecv
+-Rrecvfrom
+-Rrecvfrom
+-Rrecvmsg
+-Rrresvport
+-Rsend
+-Rsendmsg
+-Rsendto
+-Rwrite
+-Rwritev
++These system calls can be found in the socks include file "socks.h"
++which should be added to all relevant source files.
+ 
+ These calls currently does nothing and are only provided for
+ compatibility with programs which use them:
+@@ -57,16 +36,6 @@
+ Rselect
+ SOCKSinit
+ 
+-The source can either be modified directly, or by using defines to
+-change the source during compilation, as following:
+-
+-Either add this line to the command compilation line (e.g. CFLAGS):
+--Dconnect=Rconnect -Dbind=Rbind -Dgetsockname=Rgetsockname -Dgetpeername=Rgetpeername -Daccept=Raccept -Drresvport=Rrresvport -Dbindresvport=Rbindresvport -Dgethostbyname=Rgethostbyname -Dgethostbyname2=Rgethostbyname2 -Dsendto=Rsendto -Drecvfrom=Rrecvfrom -Drecvfrom=Rrecvfrom -Dwrite=Rwrite -Dwritev=Rwritev -Dsend=Rsend -Dsendmsg=Rsendmsg -Dread=Rread -Dreadv=Rreadv -Drecv=Rrecv -Drecvmsg=Rrecvmsg -Dgetaddrinfo=Rgetaddrinfo -Dgetipnodebyname=Rgetipnodebyname
+-
+-or add "include <socks.h>" to every C file in the program you are
+-compiling.
+-
+-
+ 
+ Libraries
+ 	In total there are three libraries distributed with this package:
--- dante-1.1.19.dfsg.orig/debian/patches/04-faq.patch
+++ dante-1.1.19.dfsg/debian/patches/04-faq.patch
@@ -0,0 +1,16 @@
+Warn against using ld.so.preload to use the Dante library for everything.
+
+--- a/doc/faq.tex
++++ b/doc/faq.tex
+@@ -477,7 +477,10 @@
+       libdl.so
+       libdsocksd.so
+   \end{verbatim}
+- \emph{Thanks to: Dag Wieers <dag@wieers.com>.}
++ \emph{Thanks to: Dag Wieers <dag@wieers.com>.}   However I \emph{strongly}
++ suggest that you do not do it as if things go wrong you may need to use a
++ rescue disk to recover. Please use the method below instead.
++
+ 
+  Dag Wieers also has a (RedHat) SPEC file which contains scripts for
+  doing this automatically. It can be found at:
--- dante-1.1.19.dfsg.orig/debian/patches/10-config-users.patch
+++ dante-1.1.19.dfsg/debian/patches/10-config-users.patch
@@ -0,0 +1,25 @@
+Do not invent our own users for dante-server, use "proxy" and "nobody".
+
+--- a/example/sockd.conf
++++ b/example/sockd.conf
+@@ -77,15 +77,15 @@
+ #
+ 
+ # when doing something that can require privilege, it will use the
+-# userid "sockd".
+-#user.privileged: sockd
++# userid:
++user.privileged: proxy
+ 
+-# when running as usual, it will use the unprivileged userid of "sockd".
+-#user.notprivileged: sockd
++# when running as usual, it will use the unprivileged userid of:
++user.notprivileged: nobody
+ 
+ # If you compiled with libwrap support, what userid should it use
+ # when executing your libwrap commands?  "libwrap".
+-#user.libwrap: libwrap
++user.libwrap: nobody
+ 
+ 
+ #
--- dante-1.1.19.dfsg.orig/debian/patches/12-man-errors.patch
+++ dante-1.1.19.dfsg/debian/patches/12-man-errors.patch
@@ -0,0 +1,39 @@
+Fix the manual page errors - these are man (an.tmac) pages, not mdoc ones :)
+
+--- a/doc/sockd.conf.5
++++ b/doc/sockd.conf.5
+@@ -290,10 +290,10 @@
+ \fBredirect\fP statement.  The syntax of the statement is
+ as follows:
+ 
+-.D1
++.IP
+ \fBredirect\fP from: \fBADDRESS\fP
+ 
+-.D1
++.IP
+ \fBredirect\fP to: \fBADDRESS\fP
+ 
+ The semantics of \fBfrom\fP and \fBto\fP vary according to
+@@ -325,8 +325,8 @@
+  Karl-Andre' Skevik <karls@inet.no>: Autoconf and porting.
+ .SH SEE ALSO
+ danted(8), dante.conf(5), hosts_access(5)
+-.Pp
++.PP
+ Information about new releases and other related issues can be found
+ on the
+-.Nm \fBDante\fP
++.B Dante
+ WWW home page at http://www.inet.no/dante.
+--- a/doc/socks.conf.5
++++ b/doc/socks.conf.5
+@@ -126,7 +126,7 @@
+  Karl-Andre' Skevik <karls@inet.no>: Autoconf and porting.
+ .SH SEE ALSO
+ danted(8) danted.conf(5)
+-.Pp
++.PP
+ Information about new releases and other related issues can be found
+ on the
+ \fBDante\fP
--- dante-1.1.19.dfsg.orig/debian/patches/03-configure.patch
+++ dante-1.1.19.dfsg/debian/patches/03-configure.patch
@@ -0,0 +1,34 @@
+Always use Debian's libtool and libdl.so.2.
+Do not add "-g -O2" to the Debian build's CFLAGS.
+
+--- a/configure
++++ b/configure
+@@ -2693,7 +2693,7 @@
+   CFLAGS=$ac_save_CFLAGS
+ elif test $ac_cv_prog_cc_g = yes; then
+   if test "$GCC" = yes; then
+-    CFLAGS="-g -O2"
++    CFLAGS=""
+   else
+     CFLAGS="-g"
+   fi
+@@ -18541,8 +18541,8 @@
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+ 
+-# Always use our own libtool.
+-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
++# Always use Debian's libtool.
++LIBTOOL='/usr/bin/libtool'
+ 
+ # Prevent multiple expansion
+ 
+@@ -29645,7 +29645,7 @@
+ 		;;
+ 
+ 		*)
+-		    LIBRARY_DLOPEN="${base_library_path}libdl.${SOLIB_POSTFIX}"
++		    LIBRARY_DLOPEN="/lib/libdl.so.2"
+ 		;;
+ 	    esac
+ 	    SOCKSIFY_PRELOAD_LIBS="${SOCKSIFY_PRELOAD_LIBS}${LIBRARY_DLOPEN:+${PRELOAD_SEPERATOR}}${LIBRARY_DLOPEN}"
--- dante-1.1.19.dfsg.orig/debian/patches/09-getifa-address.patch
+++ dante-1.1.19.dfsg/debian/patches/09-getifa-address.patch
@@ -0,0 +1,14 @@
+Try harder to get an address.
+
+--- a/sockd/getifa.c
++++ b/sockd/getifa.c
+@@ -120,8 +120,7 @@
+ 
+ 	if (rtnetlink_sk == -1) {
+ 		swarn("%s: socket(NETLINK_ROUTE)", function);
+-		close(rtnetlink_sk);
+-		return inaddr_none;
++		return getdefaultexternal();
+ 	}
+ 
+ 	/*===================================================================
