aboutsummaryrefslogtreecommitdiff
path: root/security/ssh
diff options
context:
space:
mode:
authorMunechika SUMIKAWA <sumikawa@FreeBSD.org>2000-02-20 17:30:54 +0000
committerMunechika SUMIKAWA <sumikawa@FreeBSD.org>2000-02-20 17:30:54 +0000
commit7b2ffcdb39781b6307ad7b5231879d01ebadd005 (patch)
tree898f6ad8c4b2ecc71c2de876912186c9a99cd493 /security/ssh
parent2f25cab541a7d5e82250e29e3a1945cb7252db1c (diff)
downloadports-7b2ffcdb39781b6307ad7b5231879d01ebadd005.tar.gz
ports-7b2ffcdb39781b6307ad7b5231879d01ebadd005.zip
Notes
Diffstat (limited to 'security/ssh')
-rw-r--r--security/ssh/Makefile12
-rw-r--r--security/ssh/files/patch-be16
2 files changed, 11 insertions, 17 deletions
diff --git a/security/ssh/Makefile b/security/ssh/Makefile
index 45193bc0fe26..405a2e13bd50 100644
--- a/security/ssh/Makefile
+++ b/security/ssh/Makefile
@@ -10,7 +10,7 @@
#
DISTNAME= ssh-1.2.27
-CATEGORIES= security net # ipv6 (see below)
+CATEGORIES= security net ipv6
MASTER_SITES= ftp://ftp.cs.hut.fi/pub/ssh/
MAINTAINER= torstenb@FreeBSD.org
@@ -141,15 +141,7 @@ LIB_DEPENDS+= wrap.7:${PORTSDIR}/security/tcp_wrapper
# We still use USE_INET6 here and try to support pre 4.0 machines with kame
# IPv6 stack
.if ${OSVERSION} >= 400014 || ( ${OSVERSION} < 400014 && defined(USE_INET6) )
-##
-## Disable ipv6 until it will be fixed.
-## Configure fails with latest -current:
-## checking getaddrinfo bug... buggy
-## Fatal: You must get working getaddrinfo() function.
-## or you can specify "--disable-ipv6".
-##
-## CONFIGURE_ARGS+= --enable-ipv6
-CONFIGURE_ARGS+= --disable-ipv6
+CONFIGURE_ARGS+= --enable-ipv6
.else
CONFIGURE_ARGS+= --disable-ipv6
.endif
diff --git a/security/ssh/files/patch-be b/security/ssh/files/patch-be
index cd3fd3890ea3..c4e537fd0855 100644
--- a/security/ssh/files/patch-be
+++ b/security/ssh/files/patch-be
@@ -198,7 +198,7 @@
AC_CHECK_LIB(seq, get_process_stats)
***************
*** 436,441 ****
---- 578,682 ----
+--- 578,684 ----
AC_REPLACE_FUNCS(strerror memmove remove random putenv crypt socketpair snprintf)
@@ -271,7 +271,9 @@
+ }
+ }
+
-+ if (inet6 != 2 || inet4 != 2)
++ if (!(inet4 == 0 || inet4 == 2))
++ goto bad;
++ if (!(inet6 == 0 || inet6 == 2))
+ goto bad;
+
+ if (aitop)
@@ -313,7 +315,7 @@
AC_CHECK_LIB(ndbm, dbm_open, KERBEROS_LIBS="$KERBEROS_LIBS -lndbm")
KERBEROS_OBJS="auth-kerberos.o"
;;
---- 1173,1183 ----
+--- 1175,1185 ----
AC_DEFINE(KRB5)
KERBEROS_ROOT="$with_kerberos5"
KERBEROS_INCS="-I${KERBEROS_ROOT}/include"
@@ -327,7 +329,7 @@
;;
***************
*** 1252,1257 ****
---- 1497,1534 ----
+--- 1499,1536 ----
AC_DEFINE(ENABLE_TCP_NODELAY)
)
@@ -368,7 +370,7 @@
[ --enable-so-linger Enable setting SO_LINGER socket option],
***************
*** 1311,1316 ****
---- 1588,1595 ----
+--- 1590,1597 ----
AC_DEFINE(SCP_ALL_STATISTICS_ENABLED)
)
@@ -386,7 +388,7 @@
AC_ARG_PROGRAM
---- 1603,1609 ----
+--- 1605,1611 ----
fi
AC_MSG_RESULT($PIDDIR)
@@ -400,7 +402,7 @@
AC_SUBST(SSHINSTALLMODE)
! AC_OUTPUT(Makefile sshd.8 ssh.1 make-ssh-known-hosts.1 zlib-1.0.4/Makefile)
---- 1615,1618 ----
+--- 1617,1620 ----
AC_SUBST(SSHDCONFOBJS)
AC_SUBST(SSHINSTALLMODE)