head	1.10;
access;
symbols
	RELEASE_7_4_0:1.9
	RELEASE_8_2_0:1.9
	RELEASE_6_EOL:1.9
	RELEASE_8_1_0:1.9
	RELEASE_7_3_0:1.9
	RELEASE_8_0_0:1.9
	RELEASE_7_2_0:1.9
	RELEASE_7_1_0:1.9
	RELEASE_6_4_0:1.9
	RELEASE_5_EOL:1.9
	RELEASE_7_0_0:1.9
	RELEASE_6_3_0:1.9
	PRE_XORG_7:1.9
	RELEASE_4_EOL:1.9
	RELEASE_6_2_0:1.9
	RELEASE_6_1_0:1.9
	RELEASE_5_5_0:1.9
	RELEASE_6_0_0:1.9
	RELEASE_5_4_0:1.9
	RELEASE_4_11_0:1.9
	RELEASE_5_3_0:1.9
	RELEASE_4_10_0:1.9
	RELEASE_5_2_1:1.9
	RELEASE_5_2_0:1.9
	RELEASE_4_9_0:1.9
	RELEASE_5_1_0:1.9
	RELEASE_4_8_0:1.9
	RELEASE_5_0_0:1.8
	RELEASE_4_7_0:1.7
	RELEASE_4_6_2:1.6
	RELEASE_4_6_1:1.6
	ssh_1_2_33:1.7
	ssh_1_2_32:1.6
	ssh_1_2_31:1.6
	ssh_1_2_30:1.6
	ssh_1_2_29:1.6
	ssh_1_2_28:1.6
	ssh_1_2_27:1.6
	RELEASE_4_6_0:1.6
	RELEASE_5_0_DP1:1.6
	RELEASE_4_5_0:1.6
	RELEASE_4_4_0:1.6
	RELEASE_4_3_0:1.6
	RELEASE_4_2_0:1.6
	RELEASE_4_1_1:1.6
	RELEASE_4_1_0:1.6
	RELEASE_3_5_0:1.6
	RELEASE_4_0_0:1.4;
locks; strict;
comment	@# @;


1.10
date	2011.05.01.20.14.19;	author bapt;	state dead;
branches;
next	1.9;

1.9
date	2003.01.08.23.34.34;	author mdodd;	state Exp;
branches;
next	1.8;

1.8
date	2002.10.25.14.43.22;	author netchild;	state Exp;
branches;
next	1.7;

1.7
date	2002.06.30.03.57.57;	author obrien;	state Exp;
branches;
next	1.6;

1.6
date	2000.04.21.06.21.46;	author kris;	state Exp;
branches;
next	1.5;

1.5
date	2000.04.21.06.18.48;	author kris;	state Exp;
branches;
next	1.4;

1.4
date	2000.02.24.08.27.36;	author sumikawa;	state Exp;
branches;
next	1.3;

1.3
date	2000.02.20.17.30.54;	author sumikawa;	state Exp;
branches;
next	1.2;

1.2
date	2000.02.12.19.27.40;	author torstenb;	state Exp;
branches;
next	1.1;

1.1
date	2000.01.14.19.37.36;	author torstenb;	state Exp;
branches;
next	;


desc
@@


1.10
log
@Remove unmaintained expired ports from security

2011-05-01 security/aafid2: Upstream disapear and distfile is no more available
2011-05-01 security/bjorb: Upstream disapear and distfile is no more available
2011-05-01 security/borzoi: Upstream disapear and distfile is no more available
2011-05-01 security/cmd5checkpw: Upstream disapear and distfile is no more available
2011-05-01 security/cops: Upstream disapear and distfile is no more available
2011-05-01 security/find_ddos: Upstream disapear and distfile is no more available
2011-05-01 security/ftpmap: Upstream disapear and distfile is no more available
2011-05-01 security/hafiye: Upstream disapear and distfile is no more available
2011-05-01 security/ident2: Upstream disapear and distfile is no more available
2011-05-01 security/liedentd: Upstream disapear and distfile is no more available
2011-05-01 security/pam_pop3: Upstream disapear and distfile is no more available
2011-05-01 security/poc: Upstream disapear and distfile is no more available
2011-05-01 security/portscanner: Upstream disapear and distfile is no more available
2011-05-01 security/ppgen: Upstream disapear and distfile is no more available
2011-05-01 security/qident: Upstream disapear and distfile is no more available
2011-05-01 security/quintuple-agent: Upstream disapear and distfile is no more available
2011-05-01 security/rc5pipe: Upstream disapear and distfile is no more available
2011-05-01 security/rid: Upstream disapear and distfile is no more available
2011-05-01 security/ssh: Upstream disapear and distfile is no more available
2011-05-01 security/tea-total: Upstream disapear and distfile is no more available
2011-05-01 security/uberkey: Upstream disapear and distfile is no more available
@
text
@--- configure.in.orig	Thu Jan 17 08:36:05 2002
+++ configure.in	Wed Jan  8 18:24:51 2003
@@@@ -30,8 +30,140 @@@@
 fi
 
 AC_PROG_CC
+AC_PROG_CPP
 AC_ISC_POSIX
 
+AC_MSG_CHECKING([whether to enable ipv6])
+AC_ARG_ENABLE(ipv6,
+[  --enable-ipv6		Enable ipv6 (with ipv4) support
+  --disable-ipv6		Disable ipv6 support],
+[ case "$enableval" in
+  no)
+       AC_MSG_RESULT(no)
+       ipv6=no
+       ;;
+  *)   AC_MSG_RESULT(yes)
+       AC_DEFINE(ENABLE_IPV6)
+       ipv6=yes
+       ;;
+  esac ],
+
+  AC_TRY_RUN([ /* AF_INET6 avalable check */
+#include <sys/types.h>
+#include <sys/socket.h>
+main()
+{
+ if (socket(AF_INET6, SOCK_STREAM, 0) < 0)
+   exit(1);
+ else
+   exit(0);
+}
+],
+  AC_MSG_RESULT(yes)
+  AC_DEFINE(ENABLE_IPV6)
+  ipv6=yes,
+  AC_MSG_RESULT(no)
+  ipv6=no,
+  AC_MSG_RESULT(no)
+  ipv6=no
+))
+
+ipv6type=unknown
+ipv6lib=none
+
+if test "$ipv6" = "yes"; then
+	AC_MSG_CHECKING([ipv6 stack type])
+	for i in inria kame linux toshiba v6d zeta; do
+		case $i in
+		inria)
+			dnl http://www.kame.net/
+			AC_EGREP_CPP(yes, [dnl
+#include <netinet/in.h>
+#ifdef IPV6_INRIA_VERSION
+yes
+#endif],
+				[ipv6type=$i;
+				CPPFLAGS="-DINET6 $CPPFLAGS"])
+			;;
+		kame)
+			dnl http://www.kame.net/
+			AC_EGREP_CPP(yes, [dnl
+#include <netinet/in.h>
+#ifdef __KAME__
+yes
+#endif],
+				[ipv6type=$i;
+				CPPFLAGS="-DINET6 $CPPFLAGS"])
+			;;
+		linux)
+			dnl http://www.v6.linux.or.jp/
+			if test -d /usr/inet6; then
+				ipv6type=$i
+				ipv6lib=inet6
+				ipv6libdir=/usr/inet6/lib
+				CPPFLAGS="-DINET6 -I/usr/inet6/include $CPPFLAGS"
+			fi
+			;;
+		toshiba)
+			AC_EGREP_CPP(yes, [dnl
+#include <sys/param.h>
+#ifdef _TOSHIBA_INET6
+yes
+#endif],
+				[ipv6type=$i;
+				ipv6lib=inet6;
+				ipv6libdir=/usr/local/v6/lib;
+				CPPFLAGS="-DINET6 $CPPFLAGS"])
+			;;
+		v6d)
+			AC_EGREP_CPP(yes, [dnl
+#include </usr/local/v6/include/sys/v6config.h>
+#ifdef __V6D__
+yes
+#endif],
+				[ipv6type=$i;
+				ipv6lib=v6;
+				ipv6libdir=/usr/local/v6/lib;
+				CPPFLAGS="-I/usr/local/v6/include $CPPFLAGS"])
+			;;
+		zeta)
+			AC_EGREP_CPP(yes, [dnl
+#include <sys/param.h>
+#ifdef _ZETA_MINAMI_INET6
+yes
+#endif],
+				[ipv6type=$i;
+				ipv6lib=inet6;
+				ipv6libdir=/usr/local/v6/lib;
+				CPPFLAGS="-DINET6 $CPPFLAGS"])
+			;;
+		esac
+		if test "$ipv6type" != "unknown"; then
+			break
+		fi
+	done
+	AC_MSG_RESULT($ipv6type)
+fi
+
+if test "$ipv6" = "yes" -a -f /usr/local/v6/lib/libinet6.a; then
+	ac_inet6_LDFLAGS="inet6"
+	ipv6libdir=/usr/local/v6/lib
+	LDFLAGS="$LDFLAGS -L/usr/local/v6/lib"
+	AC_CHECK_LIB(inet6, getaddrinfo, , ipv6lib="$ac_inet6_LDFLAGS")
+fi
+
+
+if test "$ipv6" = "yes" -a "$ipv6lib" != "none"; then
+	if test -d $ipv6libdir -a -f $ipv6libdir/lib$ipv6lib.a; then
+		LIBS="-L$ipv6libdir -l$ipv6lib $LIBS"
+	else
+		echo 'Fatal: no $ipv6lib library found.  cannot continue.'
+		echo "You need to fetch lib$ipv6lib.a from appropriate"
+		echo 'ipv6 kit and compile beforehand.'
+		exit 1
+	fi
+fi
+
 AC_DEFINE_UNQUOTED(HOSTTYPE, "$host")
 
 case "$host" in
@@@@ -313,7 +445,7 @@@@
 
 # Socket pairs appear to be broken on several systems.  I don't know exactly
 # where, so I'll use pipes everywhere for now.
-AC_DEFINE(USE_PIPES)
+# AC_DEFINE(USE_PIPES)
 
 AC_MSG_CHECKING([that the compiler works])
 AC_TRY_RUN([ main(int ac, char **av) { return 0; } ],
@@@@ -369,7 +501,7 @@@@
 
 AC_HEADER_STDC
 AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS(unistd.h rusage.h sys/time.h lastlog.h utmp.h shadow.h)
+AC_CHECK_HEADERS(unistd.h rusage.h sys/time.h lastlog.h login_cap.h utmp.h shadow.h)
 AC_CHECK_HEADERS(sgtty.h sys/select.h sys/ioctl.h machine/endian.h)
 AC_CHECK_HEADERS(paths.h usersec.h utime.h netinet/in_systm.h)
 AC_CHECK_HEADERS(netinet/in_system.h netinet/ip.h netinet/tcp.h ulimit.h)
@@@@ -399,6 +531,16 @@@@
 [ AC_DEFINE(HAVE_INCOMPATIBLE_SIGINFO)
   AC_MSG_RESULT(yes)] , AC_MSG_RESULT(no))
 
+AC_MSG_CHECKING([whether sys/socket.h have struct sockaddr_storage])
+AC_EGREP_HEADER(sockaddr_storage, sys/socket.h,
+  [ AC_DEFINE(HAVE_SOCKADDR_STORAGE) AC_MSG_RESULT(yes)], AC_MSG_RESULT(no))
+AC_MSG_CHECKING([whether sys/socket.h have __ss_family])
+AC_EGREP_HEADER(__ss_family, sys/socket.h,
+  [ AC_DEFINE(HAVE_NEW_SS_FAMILY) AC_MSG_RESULT(yes)], AC_MSG_RESULT(no))
+AC_MSG_CHECKING([whether sys/socket.h have sa_len])
+AC_EGREP_HEADER(sa_len, sys/socket.h,
+  [ AC_DEFINE(HAVE_SOCKADDR_LEN) AC_MSG_RESULT(yes)], AC_MSG_RESULT(no))
+
 AC_CHECK_LIB(c, crypt, [true], AC_CHECK_LIB(crypt, crypt))
 AC_CHECK_LIB(sec, getspnam)
 AC_CHECK_LIB(seq, get_process_stats)
@@@@ -438,6 +580,107 @@@@
 
 AC_REPLACE_FUNCS(strerror memmove remove random putenv crypt socketpair snprintf)
 
+AC_MSG_CHECKING(getaddrinfo bug)
+AC_TRY_RUN([
+#include <sys/types.h>
+#include <netdb.h>
+#include <string.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+
+main()
+{
+  int passive, gaierr, inet4 = 0, inet6 = 0;
+  struct addrinfo hints, *ai, *aitop;
+  char straddr[INET6_ADDRSTRLEN], strport[16];
+
+  for (passive = 0; passive <= 1; passive++) {
+    memset(&hints, 0, sizeof(hints));
+    hints.ai_family = AF_UNSPEC;
+    hints.ai_flags = passive ? AI_PASSIVE : 0;
+    hints.ai_socktype = SOCK_STREAM;
+    if ((gaierr = getaddrinfo(NULL, "54321", &hints, &aitop)) != 0) {
+      (void)gai_strerror(gaierr);
+      goto bad;
+    }
+    for (ai = aitop; ai; ai = ai->ai_next) {
+      if (ai->ai_addr == NULL ||
+          ai->ai_addrlen == 0 ||
+          getnameinfo(ai->ai_addr, ai->ai_addrlen,
+                      straddr, sizeof(straddr), strport, sizeof(strport),
+                      NI_NUMERICHOST|NI_NUMERICSERV) != 0) {
+        goto bad;
+      }
+      if (strcmp(strport, "54321") != 0) {
+        goto bad;
+      }
+      switch (ai->ai_family) {
+      case AF_INET:
+        if (passive) {
+          if (strcmp(straddr, "0.0.0.0") != 0) {
+            goto bad;
+          }
+        } else {
+          if (strcmp(straddr, "127.0.0.1") != 0) {
+            goto bad;
+          }
+        }
+        inet4++;
+        break;
+      case AF_INET6:
+        if (passive) {
+          if (strcmp(straddr, "::") != 0) {
+            goto bad;
+          }
+        } else {
+          if (strcmp(straddr, "::1") != 0) {
+            goto bad;
+          }
+        }
+        inet6++;
+        break;
+      case AF_UNSPEC:
+        goto bad;
+        break;
+      default:
+        /* another family support? */
+        break;
+      }
+    }
+  }
+
+  if (!(inet4 == 0 || inet4 == 2))
+    goto bad;
+  if (!(inet6 == 0 || inet6 == 2))
+    goto bad;
+
+  if (aitop)
+    freeaddrinfo(aitop);
+  exit(0);
+
+ bad:
+  if (aitop)
+    freeaddrinfo(aitop);
+  exit(1);
+}
+],
+AC_MSG_RESULT(good)
+buggygetaddrinfo=no,
+AC_MSG_RESULT(buggy)
+buggygetaddrinfo=yes,
+AC_MSG_RESULT(buggy)
+buggygetaddrinfo=yes)
+
+if test "$buggygetaddrinfo" = "yes"; then
+	if test "$ipv6" = "yes"; then
+		echo 'Fatal: You must get working getaddrinfo() function.'
+		echo '       or you can specify "--disable-ipv6"'.
+		exit 1
+	else
+		AC_REPLACE_FUNCS(getaddrinfo getnameinfo)
+	fi
+fi
+
 AC_PROG_LN_S
 AC_PROG_INSTALL
 AC_CHECK_PROG(AR, ar, ar, echo)
@@@@ -934,7 +1177,11 @@@@
   AC_DEFINE(KRB5)
   KERBEROS_ROOT="$with_kerberos5"
   KERBEROS_INCS="-I${KERBEROS_ROOT}/include"
-  KERBEROS_LIBS="-L${KERBEROS_ROOT}/lib -lgssapi_krb5 -lkrb5 -lcrypto -lcom_err"
+  if test -f ${KERBEROS_ROOT}/lib/libk5crypto.a ; then
+     KERBEROS_LIBS="-L${KERBEROS_ROOT}/lib -R${KERBEROS_ROOT}/lib -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err"
+  else
+     KERBEROS_LIBS="-L${KERBEROS_ROOT}/lib -R${KERBEROS_ROOT}/lib -lgssapi_krb5 -lkrb5 -lcrypto -lcom_err"
+  fi
   AC_CHECK_LIB(ndbm, dbm_open, KERBEROS_LIBS="$KERBEROS_LIBS -lndbm")
   KERBEROS_OBJS="auth-kerberos.o"
   ;;
@@@@ -1125,6 +1372,7 @@@@
     AC_DEFINE(Rdup2,SOCKSdup2)
     AC_DEFINE(Rfclose,SOCKSfclose)
     AC_DEFINE(Rgethostbyname,SOCKSgethostbyname)
+    AC_DEFINE(Rgetaddrinfo,SOCKSgetaddrinfo)
 fi
 
 AC_MSG_CHECKING(whether to use rsaref)
@@@@ -1254,6 +1502,38 @@@@
   AC_DEFINE(ENABLE_TCP_NODELAY)
 )
 
+AC_MSG_CHECKING(whether to enable another port try support)
+AC_ARG_ENABLE(another-port-try,
+[  --enable-another-port-try	Enable another port try support (default)
+  --disable-another-port-try	Disable another port try support],
+[ case "$enableval" in
+  no)
+       AC_MSG_RESULT(no)
+       ;;
+  *)   AC_MSG_RESULT(yes)
+       AC_DEFINE(ENABLE_ANOTHER_PORT_TRY)
+       ;;
+  esac ],
+  AC_MSG_RESULT(yes)
+  AC_DEFINE(ENABLE_ANOTHER_PORT_TRY)
+)
+
+AC_MSG_CHECKING(whether to enable logging auth info support)
+AC_ARG_ENABLE(log-auth,
+[  --enable-log-auth	Enable logging auth info support (default)
+  --disable-log-auth	Disable logging auth info support],
+[ case "$enableval" in
+  no)
+       AC_MSG_RESULT(no)
+       ;;
+  *)   AC_MSG_RESULT(yes)
+       AC_DEFINE(ENABLE_LOG_AUTH)
+       ;;
+  esac ],
+  AC_MSG_RESULT(yes)
+  AC_DEFINE(ENABLE_LOG_AUTH)
+)
+
 AC_MSG_CHECKING(whether to enable SO_LINGER)
 AC_ARG_ENABLE(so-linger,
 [  --enable-so-linger      Enable setting SO_LINGER socket option],
@@@@ -1313,6 +1593,8 @@@@
   AC_DEFINE(SCP_ALL_STATISTICS_ENABLED)
 )
 
+CFLAGS="$CPPFLAGS $CFLAGS"
+
 # We include this here only to make it visible in --help; this is only used
 # in the gmp subdirectory.
 AC_ARG_ENABLE(asm,
@@@@ -1326,7 +1608,7 @@@@
 fi
 AC_MSG_RESULT($PIDDIR)
 
-AC_CONFIG_SUBDIRS(gmp-2.0.2-ssh-2)
+#AC_CONFIG_SUBDIRS(gmp-2.0.2-ssh-2)
 
 AC_ARG_PROGRAM
 
@@@@ -1357,4 +1639,4 @@@@
 AC_SUBST(SSHDCONFOBJS)
 AC_SUBST(SSHINSTALLMODE)
 
-AC_OUTPUT(Makefile sshd.8 ssh.1 make-ssh-known-hosts.1 zlib-1.0.4/Makefile)
+AC_OUTPUT(Makefile sshd.8 ssh.1 make-ssh-known-hosts.1 make-ssh-known-hosts.pl)
@


1.9
log
@- Correctly order KERBEROS_LIBS so that the build doesn't try to
  link against system krb5 libs.
- Specify a runtime linker path option.
@
text
@@


1.8
log
@Quoting the submitter:
---snip---
- Revert the partially enabled building and usage of the libgmp version
  shipping with ssh introduced with the upgrade to 1.2.33. For -current
  depend on math/libgmp-freebsd and use the libgmp in the base system
  for -stable like this port did before. This fixes compilation on
  -current and turns of the annoying errors when the configure of the
  ssh-enclosed libgmp tests the optimisations using the wrong assembler-
  syntax on 4-stable. The later causes configure to hang on 3-stable.
- Don't define 'REALLY_WANT_SSH=1' in the Makefile else the FORBIDDEN
  for FreeBSD systems shipping with OpenSSH in the base-distribution and
  not defining 'REALLY_WANT_SSH' is useless. This was also broken with
  the last commit.

Tested on 5.0-current, 4-stable and 3-stable.
---snip---

Submitted by:	marius@@alchemy.franken.de
@
text
@d1 2
a2 2
--- configure.in.orig	Wed May 12 04:20:02 1999
+++ configure.in	Wed Apr 19 01:02:34 2000
d179 1
a179 1
@@@@ -436,6 +578,107 @@@@
d287 1
a287 1
@@@@ -932,7 +1175,11 @@@@
d293 1
a293 1
+     KERBEROS_LIBS="-L${KERBEROS_ROOT}/lib -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err"
d295 1
a295 1
+     KERBEROS_LIBS="-L${KERBEROS_ROOT}/lib -lgssapi_krb5 -lkrb5 -lcrypto -lcom_err"
d300 1
a300 1
@@@@ -1123,6 +1370,7 @@@@
d308 1
a308 1
@@@@ -1252,6 +1500,38 @@@@
d347 1
a347 1
@@@@ -1311,6 +1591,8 @@@@
d356 1
a356 1
@@@@ -1324,7 +1606,7 @@@@
d365 1
a365 1
@@@@ -1336,4 +1618,4 @@@@
@


1.7
log
@Update to version 1.2.33.
@
text
@d361 1
a361 1
+AC_CONFIG_SUBDIRS(gmp-2.0.2-ssh-2)
@


1.6
log
@Unbreak Kerberos5 support.
@
text
@d361 1
a361 1
+#AC_CONFIG_SUBDIRS(gmp-2.0.2-ssh-2)
@


1.5
log
@Convert patch to unidiff; no functional changes.
@
text
@d2 1
a2 1
+++ configure.in	Thu Apr 20 23:12:36 2000
d292 1
a292 1
+  if [ -f ${KERBEROS_ROOT}/lib/libk5crypto.a ]; then
@


1.4
log
@Make IPv6-enable ssh works on socks environment.

Submitted by:	Masahide -mac- NODA <mac@@clave.gr.jp>
Reviewed by:	shin, Robert Muir <rmuir@@looksharp.net>
		Toshihiko Kodama <kodama@@ayame.mfd.cs.fujitsu.co.jp>
Approved by:	torstenb
@
text
@d1 293
a293 33
*** configure.in.orig	Wed May 12 13:20:02 1999
--- configure.in	Thu Feb 24 17:12:10 2000
***************
*** 30,37 ****
--- 30,169 ----
  fi
  
  AC_PROG_CC
+ AC_PROG_CPP
  AC_ISC_POSIX
  
+ AC_MSG_CHECKING([whether to enable ipv6])
+ AC_ARG_ENABLE(ipv6,
+ [  --enable-ipv6		Enable ipv6 (with ipv4) support
+   --disable-ipv6		Disable ipv6 support],
+ [ case "$enableval" in
+   no)
+        AC_MSG_RESULT(no)
+        ipv6=no
+        ;;
+   *)   AC_MSG_RESULT(yes)
+        AC_DEFINE(ENABLE_IPV6)
+        ipv6=yes
+        ;;
+   esac ],
+ 
+   AC_TRY_RUN([ /* AF_INET6 avalable check */
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ main()
+ {
+  if (socket(AF_INET6, SOCK_STREAM, 0) < 0)
+    exit(1);
d295 76
a370 385
+    exit(0);
+ }
+ ],
+   AC_MSG_RESULT(yes)
+   AC_DEFINE(ENABLE_IPV6)
+   ipv6=yes,
+   AC_MSG_RESULT(no)
+   ipv6=no,
+   AC_MSG_RESULT(no)
+   ipv6=no
+ ))
+ 
+ ipv6type=unknown
+ ipv6lib=none
+ 
+ if test "$ipv6" = "yes"; then
+ 	AC_MSG_CHECKING([ipv6 stack type])
+ 	for i in inria kame linux toshiba v6d zeta; do
+ 		case $i in
+ 		inria)
+ 			dnl http://www.kame.net/
+ 			AC_EGREP_CPP(yes, [dnl
+ #include <netinet/in.h>
+ #ifdef IPV6_INRIA_VERSION
+ yes
+ #endif],
+ 				[ipv6type=$i;
+ 				CPPFLAGS="-DINET6 $CPPFLAGS"])
+ 			;;
+ 		kame)
+ 			dnl http://www.kame.net/
+ 			AC_EGREP_CPP(yes, [dnl
+ #include <netinet/in.h>
+ #ifdef __KAME__
+ yes
+ #endif],
+ 				[ipv6type=$i;
+ 				CPPFLAGS="-DINET6 $CPPFLAGS"])
+ 			;;
+ 		linux)
+ 			dnl http://www.v6.linux.or.jp/
+ 			if test -d /usr/inet6; then
+ 				ipv6type=$i
+ 				ipv6lib=inet6
+ 				ipv6libdir=/usr/inet6/lib
+ 				CPPFLAGS="-DINET6 -I/usr/inet6/include $CPPFLAGS"
+ 			fi
+ 			;;
+ 		toshiba)
+ 			AC_EGREP_CPP(yes, [dnl
+ #include <sys/param.h>
+ #ifdef _TOSHIBA_INET6
+ yes
+ #endif],
+ 				[ipv6type=$i;
+ 				ipv6lib=inet6;
+ 				ipv6libdir=/usr/local/v6/lib;
+ 				CPPFLAGS="-DINET6 $CPPFLAGS"])
+ 			;;
+ 		v6d)
+ 			AC_EGREP_CPP(yes, [dnl
+ #include </usr/local/v6/include/sys/v6config.h>
+ #ifdef __V6D__
+ yes
+ #endif],
+ 				[ipv6type=$i;
+ 				ipv6lib=v6;
+ 				ipv6libdir=/usr/local/v6/lib;
+ 				CPPFLAGS="-I/usr/local/v6/include $CPPFLAGS"])
+ 			;;
+ 		zeta)
+ 			AC_EGREP_CPP(yes, [dnl
+ #include <sys/param.h>
+ #ifdef _ZETA_MINAMI_INET6
+ yes
+ #endif],
+ 				[ipv6type=$i;
+ 				ipv6lib=inet6;
+ 				ipv6libdir=/usr/local/v6/lib;
+ 				CPPFLAGS="-DINET6 $CPPFLAGS"])
+ 			;;
+ 		esac
+ 		if test "$ipv6type" != "unknown"; then
+ 			break
+ 		fi
+ 	done
+ 	AC_MSG_RESULT($ipv6type)
+ fi
+ 
+ if test "$ipv6" = "yes" -a -f /usr/local/v6/lib/libinet6.a; then
+ 	ac_inet6_LDFLAGS="inet6"
+ 	ipv6libdir=/usr/local/v6/lib
+ 	LDFLAGS="$LDFLAGS -L/usr/local/v6/lib"
+ 	AC_CHECK_LIB(inet6, getaddrinfo, , ipv6lib="$ac_inet6_LDFLAGS")
+ fi
+ 
+ 
+ if test "$ipv6" = "yes" -a "$ipv6lib" != "none"; then
+ 	if test -d $ipv6libdir -a -f $ipv6libdir/lib$ipv6lib.a; then
+ 		LIBS="-L$ipv6libdir -l$ipv6lib $LIBS"
+ 	else
+ 		echo 'Fatal: no $ipv6lib library found.  cannot continue.'
+ 		echo "You need to fetch lib$ipv6lib.a from appropriate"
+ 		echo 'ipv6 kit and compile beforehand.'
+ 		exit 1
+ 	fi
+ fi
+ 
  AC_DEFINE_UNQUOTED(HOSTTYPE, "$host")
  
  case "$host" in
***************
*** 313,319 ****
  
  # Socket pairs appear to be broken on several systems.  I don't know exactly
  # where, so I'll use pipes everywhere for now.
! AC_DEFINE(USE_PIPES)
  
  AC_MSG_CHECKING([that the compiler works])
  AC_TRY_RUN([ main(int ac, char **av) { return 0; } ],
--- 445,451 ----
  
  # Socket pairs appear to be broken on several systems.  I don't know exactly
  # where, so I'll use pipes everywhere for now.
! # AC_DEFINE(USE_PIPES)
  
  AC_MSG_CHECKING([that the compiler works])
  AC_TRY_RUN([ main(int ac, char **av) { return 0; } ],
***************
*** 369,375 ****
  
  AC_HEADER_STDC
  AC_HEADER_SYS_WAIT
! AC_CHECK_HEADERS(unistd.h rusage.h sys/time.h lastlog.h utmp.h shadow.h)
  AC_CHECK_HEADERS(sgtty.h sys/select.h sys/ioctl.h machine/endian.h)
  AC_CHECK_HEADERS(paths.h usersec.h utime.h netinet/in_systm.h)
  AC_CHECK_HEADERS(netinet/in_system.h netinet/ip.h netinet/tcp.h ulimit.h)
--- 501,507 ----
  
  AC_HEADER_STDC
  AC_HEADER_SYS_WAIT
! AC_CHECK_HEADERS(unistd.h rusage.h sys/time.h lastlog.h login_cap.h utmp.h shadow.h)
  AC_CHECK_HEADERS(sgtty.h sys/select.h sys/ioctl.h machine/endian.h)
  AC_CHECK_HEADERS(paths.h usersec.h utime.h netinet/in_systm.h)
  AC_CHECK_HEADERS(netinet/in_system.h netinet/ip.h netinet/tcp.h ulimit.h)
***************
*** 399,404 ****
--- 531,546 ----
  [ AC_DEFINE(HAVE_INCOMPATIBLE_SIGINFO)
    AC_MSG_RESULT(yes)] , AC_MSG_RESULT(no))
  
+ AC_MSG_CHECKING([whether sys/socket.h have struct sockaddr_storage])
+ AC_EGREP_HEADER(sockaddr_storage, sys/socket.h,
+   [ AC_DEFINE(HAVE_SOCKADDR_STORAGE) AC_MSG_RESULT(yes)], AC_MSG_RESULT(no))
+ AC_MSG_CHECKING([whether sys/socket.h have __ss_family])
+ AC_EGREP_HEADER(__ss_family, sys/socket.h,
+   [ AC_DEFINE(HAVE_NEW_SS_FAMILY) AC_MSG_RESULT(yes)], AC_MSG_RESULT(no))
+ AC_MSG_CHECKING([whether sys/socket.h have sa_len])
+ AC_EGREP_HEADER(sa_len, sys/socket.h,
+   [ AC_DEFINE(HAVE_SOCKADDR_LEN) AC_MSG_RESULT(yes)], AC_MSG_RESULT(no))
+ 
  AC_CHECK_LIB(c, crypt, [true], AC_CHECK_LIB(crypt, crypt))
  AC_CHECK_LIB(sec, getspnam)
  AC_CHECK_LIB(seq, get_process_stats)
***************
*** 436,441 ****
--- 578,684 ----
  
  AC_REPLACE_FUNCS(strerror memmove remove random putenv crypt socketpair snprintf)
  
+ AC_MSG_CHECKING(getaddrinfo bug)
+ AC_TRY_RUN([
+ #include <sys/types.h>
+ #include <netdb.h>
+ #include <string.h>
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+ 
+ main()
+ {
+   int passive, gaierr, inet4 = 0, inet6 = 0;
+   struct addrinfo hints, *ai, *aitop;
+   char straddr[INET6_ADDRSTRLEN], strport[16];
+ 
+   for (passive = 0; passive <= 1; passive++) {
+     memset(&hints, 0, sizeof(hints));
+     hints.ai_family = AF_UNSPEC;
+     hints.ai_flags = passive ? AI_PASSIVE : 0;
+     hints.ai_socktype = SOCK_STREAM;
+     if ((gaierr = getaddrinfo(NULL, "54321", &hints, &aitop)) != 0) {
+       (void)gai_strerror(gaierr);
+       goto bad;
+     }
+     for (ai = aitop; ai; ai = ai->ai_next) {
+       if (ai->ai_addr == NULL ||
+           ai->ai_addrlen == 0 ||
+           getnameinfo(ai->ai_addr, ai->ai_addrlen,
+                       straddr, sizeof(straddr), strport, sizeof(strport),
+                       NI_NUMERICHOST|NI_NUMERICSERV) != 0) {
+         goto bad;
+       }
+       if (strcmp(strport, "54321") != 0) {
+         goto bad;
+       }
+       switch (ai->ai_family) {
+       case AF_INET:
+         if (passive) {
+           if (strcmp(straddr, "0.0.0.0") != 0) {
+             goto bad;
+           }
+         } else {
+           if (strcmp(straddr, "127.0.0.1") != 0) {
+             goto bad;
+           }
+         }
+         inet4++;
+         break;
+       case AF_INET6:
+         if (passive) {
+           if (strcmp(straddr, "::") != 0) {
+             goto bad;
+           }
+         } else {
+           if (strcmp(straddr, "::1") != 0) {
+             goto bad;
+           }
+         }
+         inet6++;
+         break;
+       case AF_UNSPEC:
+         goto bad;
+         break;
+       default:
+         /* another family support? */
+         break;
+       }
+     }
+   }
+ 
+   if (!(inet4 == 0 || inet4 == 2))
+     goto bad;
+   if (!(inet6 == 0 || inet6 == 2))
+     goto bad;
+ 
+   if (aitop)
+     freeaddrinfo(aitop);
+   exit(0);
+ 
+  bad:
+   if (aitop)
+     freeaddrinfo(aitop);
+   exit(1);
+ }
+ ],
+ AC_MSG_RESULT(good)
+ buggygetaddrinfo=no,
+ AC_MSG_RESULT(buggy)
+ buggygetaddrinfo=yes,
+ AC_MSG_RESULT(buggy)
+ buggygetaddrinfo=yes)
+ 
+ if test "$buggygetaddrinfo" = "yes"; then
+ 	if test "$ipv6" = "yes"; then
+ 		echo 'Fatal: You must get working getaddrinfo() function.'
+ 		echo '       or you can specify "--disable-ipv6"'.
+ 		exit 1
+ 	else
+ 		AC_REPLACE_FUNCS(getaddrinfo getnameinfo)
+ 	fi
+ fi
+ 
  AC_PROG_LN_S
  AC_PROG_INSTALL
  AC_CHECK_PROG(AR, ar, ar, echo)
***************
*** 932,938 ****
    AC_DEFINE(KRB5)
    KERBEROS_ROOT="$with_kerberos5"
    KERBEROS_INCS="-I${KERBEROS_ROOT}/include"
!   KERBEROS_LIBS="-L${KERBEROS_ROOT}/lib -lgssapi_krb5 -lkrb5 -lcrypto -lcom_err"
    AC_CHECK_LIB(ndbm, dbm_open, KERBEROS_LIBS="$KERBEROS_LIBS -lndbm")
    KERBEROS_OBJS="auth-kerberos.o"
    ;;
--- 1175,1185 ----
    AC_DEFINE(KRB5)
    KERBEROS_ROOT="$with_kerberos5"
    KERBEROS_INCS="-I${KERBEROS_ROOT}/include"
!   if [ -f ${KERBEROS_ROOT}/lib/libk5crypto.a ]; then
!      KERBEROS_LIBS="-L${KERBEROS_ROOT}/lib -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err"
!   else
!      KERBEROS_LIBS="-L${KERBEROS_ROOT}/lib -lgssapi_krb5 -lkrb5 -lcrypto -lcom_err"
!   fi
    AC_CHECK_LIB(ndbm, dbm_open, KERBEROS_LIBS="$KERBEROS_LIBS -lndbm")
    KERBEROS_OBJS="auth-kerberos.o"
    ;;
***************
*** 1123,1128 ****
--- 1370,1376 ----
      AC_DEFINE(Rdup2,SOCKSdup2)
      AC_DEFINE(Rfclose,SOCKSfclose)
      AC_DEFINE(Rgethostbyname,SOCKSgethostbyname)
+     AC_DEFINE(Rgetaddrinfo,SOCKSgetaddrinfo)
  fi
  
  AC_MSG_CHECKING(whether to use rsaref)
***************
*** 1252,1257 ****
--- 1500,1537 ----
    AC_DEFINE(ENABLE_TCP_NODELAY)
  )
  
+ AC_MSG_CHECKING(whether to enable another port try support)
+ AC_ARG_ENABLE(another-port-try,
+ [  --enable-another-port-try	Enable another port try support (default)
+   --disable-another-port-try	Disable another port try support],
+ [ case "$enableval" in
+   no)
+        AC_MSG_RESULT(no)
+        ;;
+   *)   AC_MSG_RESULT(yes)
+        AC_DEFINE(ENABLE_ANOTHER_PORT_TRY)
+        ;;
+   esac ],
+   AC_MSG_RESULT(yes)
+   AC_DEFINE(ENABLE_ANOTHER_PORT_TRY)
+ )
+ 
+ AC_MSG_CHECKING(whether to enable logging auth info support)
+ AC_ARG_ENABLE(log-auth,
+ [  --enable-log-auth	Enable logging auth info support (default)
+   --disable-log-auth	Disable logging auth info support],
+ [ case "$enableval" in
+   no)
+        AC_MSG_RESULT(no)
+        ;;
+   *)   AC_MSG_RESULT(yes)
+        AC_DEFINE(ENABLE_LOG_AUTH)
+        ;;
+   esac ],
+   AC_MSG_RESULT(yes)
+   AC_DEFINE(ENABLE_LOG_AUTH)
+ )
+ 
  AC_MSG_CHECKING(whether to enable SO_LINGER)
  AC_ARG_ENABLE(so-linger,
  [  --enable-so-linger      Enable setting SO_LINGER socket option],
***************
*** 1311,1316 ****
--- 1591,1598 ----
    AC_DEFINE(SCP_ALL_STATISTICS_ENABLED)
  )
  
+ CFLAGS="$CPPFLAGS $CFLAGS"
+ 
  # We include this here only to make it visible in --help; this is only used
  # in the gmp subdirectory.
  AC_ARG_ENABLE(asm,
***************
*** 1324,1330 ****
  fi
  AC_MSG_RESULT($PIDDIR)
  
! AC_CONFIG_SUBDIRS(gmp-2.0.2-ssh-2)
  
  AC_ARG_PROGRAM
  
--- 1606,1612 ----
  fi
  AC_MSG_RESULT($PIDDIR)
  
! #AC_CONFIG_SUBDIRS(gmp-2.0.2-ssh-2)
  
  AC_ARG_PROGRAM
  
***************
*** 1336,1339 ****
  AC_SUBST(SSHDCONFOBJS)
  AC_SUBST(SSHINSTALLMODE)
  
! AC_OUTPUT(Makefile sshd.8 ssh.1 make-ssh-known-hosts.1 zlib-1.0.4/Makefile)
--- 1618,1621 ----
  AC_SUBST(SSHDCONFOBJS)
  AC_SUBST(SSHINSTALLMODE)
  
! AC_OUTPUT(Makefile sshd.8 ssh.1 make-ssh-known-hosts.1 make-ssh-known-hosts.pl)
@


1.3
log
@Make buildable on IPv4-only kernel.

Specified by:	ache
Reviewed by:	torstenb
@
text
@d2 1
a2 1
--- configure.in	Sat Feb 12 15:32:11 2000
d331 10
d342 1
a342 1
--- 1499,1536 ----
d383 1
a383 1
--- 1590,1597 ----
d401 1
a401 1
--- 1605,1611 ----
d415 1
a415 1
--- 1617,1620 ----
@


1.2
log
@Checfor OSVERSION _or_ USE_INET6 when deciding if IPv6 support should
be added. This is done to support the build on pre 4.0 machines with
the KAME IPv6 stack installed. It has been verified to build+work
with both 4.0 and 3.4+kame.

Org. patch Submitted By: Munechika SUMIKAWA <sumikawa@@ebina.hitachi.co.jp>
@
text
@d201 1
a201 1
--- 578,682 ----
d274 3
a276 1
+   if (inet6 != 2 || inet4 != 2)
d318 1
a318 1
--- 1173,1183 ----
d332 1
a332 1
--- 1497,1534 ----
d373 1
a373 1
--- 1588,1595 ----
d391 1
a391 1
--- 1603,1609 ----
d405 1
a405 1
--- 1615,1618 ----
@


1.1
log
@Add IPv6 support to ssh.
The IPv6 patch was obtained from the kame repository and has been
been writen by KIKUCHI Takahiro <kick@@kyoto.wide.ad.jp>

Due to the whole mess with different patches it was necessary to include
both the IPv6 patch and patch-ssh-1.2.27-bsd.tty.chown in ${PATCHDIR}.
Since both patches modify the configure script it was also necessary
to rebuild it via autoconf from configure.in. I've decided to use
USE_AUTOCONF instead of including the re-build configure script in
${FILESDIR}

Obtained from:	KAME/WIDE
@
text
@d2 1
a2 1
--- configure.in	Tue Jan 11 22:55:20 2000
d5 1
a5 1
--- 30,163 ----
a71 2
+ 				ipv6lib=inet6;
+ 				ipv6libdir=/usr/local/v6/lib;
d124 8
d155 1
a155 1
--- 439,445 ----
d172 1
a172 1
--- 495,501 ----
d182 1
a182 1
--- 525,540 ----
d201 1
a201 1
--- 572,676 ----
d316 1
a316 1
--- 1167,1177 ----
d330 1
a330 1
--- 1491,1528 ----
d371 1
a371 1
--- 1582,1589 ----
d389 1
a389 1
--- 1597,1603 ----
d403 1
a403 1
--- 1609,1612 ----
@

