diff -u -P -r openssh-2.9p2/README.dante openssh-2.9p2+dante/README.dante
--- openssh-2.9p2/README.dante Thu Jan 1 09:00:00 1970
+++ openssh-2.9p2+dante/README.dante Sun Jul 22 21:58:58 2001
@@ -0,0 +1,24 @@
+README for OpenSSH + Dante patch
+================================
+
+This patch enables OpenSSH to support the Dante SOCKS library
+.
+
+This patch itself is public domain; you can distribute or modify it.
+
+How to install
+--------------
+
+1. unpack the OpenSSH distribution and change to the extracted directory.
+2. apply this patch.
+ % patch -p1
+The Graduate School of Arts and Sciences, The University of Tokyo.
diff -u -P -r openssh-2.9p2/acconfig.h openssh-2.9p2+dante/acconfig.h
--- openssh-2.9p2/acconfig.h Wed May 9 05:34:32 2001
+++ openssh-2.9p2+dante/acconfig.h Sat Jul 21 00:39:03 2001
@@ -1,4 +1,4 @@
-/* $Id: openssh+dante.patch,v 1.1 2001/07/29 14:57:38 nishi Exp $ */
+/* $Id: openssh+dante.patch,v 1.1 2001/07/29 14:57:38 nishi Exp $ */
#ifndef _CONFIG_H
#define _CONFIG_H
@@ -101,6 +101,9 @@
/* Define if you want to install preformatted manpages.*/
#undef MANTYPE
+/* Define if using the Dante SOCKS library. */
+#undef DANTE
+
/* Define if your ssl headers are included with #include */
#undef HAVE_OPENSSL
diff -u -P -r openssh-2.9p2/configure.in openssh-2.9p2+dante/configure.in
--- openssh-2.9p2/configure.in Tue May 29 02:21:44 2001
+++ openssh-2.9p2+dante/configure.in Sat Jul 21 20:41:04 2001
@@ -1,4 +1,4 @@
-# $Id: openssh+dante.patch,v 1.1 2001/07/29 14:57:38 nishi Exp $
+# $Id: openssh+dante.patch,v 1.1 2001/07/29 14:57:38 nishi Exp $
AC_INIT(ssh.c)
@@ -552,6 +552,26 @@
)
fi
+# Check whether user wants Dante SOCKS library support
+DANTE_MSG="no"
+AC_ARG_WITH(dante,
+ [ --with-dante=PATH Enable Dante SOCKS support],
+ [
+ if test "x$withval" != "xno" ; then
+ if test "x$withval" != "xyes" ; then
+ CPPFLAGS="$CPPFLAGS -I${withval}/include"
+ LDFLAGS="$LDFLAGS -L${withval}/lib"
+ fi
+ AC_CHECK_HEADER(socks.h,,
+ [AC_MSG_ERROR([*** socks.h missing - please install dante-1.1.7 or higher ***])]
+ )
+ LIBS="$LIBS -lsocks"
+ AC_DEFINE(DANTE)
+ DANTE_MSG="yes"
+ fi
+ ]
+)
+
# The big search for OpenSSL
AC_ARG_WITH(ssl-dir,
[ --with-ssl-dir=PATH Specify path to OpenSSL installation ],
@@ -1937,6 +1957,7 @@
echo " S/KEY support: $SKEY_MSG"
echo " TCP Wrappers support: $TCPW_MSG"
echo " MD5 password support: $MD5_MSG"
+echo " Dante SOCKS support: $DANTE_MSG"
echo " IP address in \$DISPLAY hack: $DISPLAY_HACK_MSG"
echo " Use IPv4 by default hack: $IPV4_HACK_MSG"
echo " Translate v4 in v6 hack: $IPV4_IN6_HACK_MSG"
diff -u -P -r openssh-2.9p2/defines.h openssh-2.9p2+dante/defines.h
--- openssh-2.9p2/defines.h Wed May 9 09:39:19 2001
+++ openssh-2.9p2+dante/defines.h Sat Jul 21 20:25:33 2001
@@ -1,7 +1,7 @@
#ifndef _DEFINES_H
#define _DEFINES_H
-/* $Id: openssh+dante.patch,v 1.1 2001/07/29 14:57:38 nishi Exp $ */
+/* $Id: openssh+dante.patch,v 1.1 2001/07/29 14:57:38 nishi Exp $ */
/* Some platforms need this for the _r() functions */
#if !defined(_REENTRANT) && !defined(SNI)
@@ -10,6 +10,9 @@
/* Necessary headers */
+#ifdef DANTE
+# include
+#endif
#include /* For [u]intxx_t */
#include /* For SHUT_XXXX */
#include /* For MAXPATHLEN and roundup() */