3 files changed, 14 insertions, 79 deletions
diff --git a/security/ssh2/Makefile b/security/ssh2/Makefile
index d731d513463..9b892caec60 100644
--- a/security/ssh2/Makefile
+++ b/security/ssh2/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2002/09/24 00:24:37 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2003/01/12 15:15:51 seb Exp $
 #
 
-DISTNAME=	ssh-3.2.0
+DISTNAME=	ssh-3.2.2
 PKGNAME=	${DISTNAME:C/ssh-/ssh2-/}
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.ssh.com/pub/ssh/
diff --git a/security/ssh2/distinfo b/security/ssh2/distinfo
index 468255cbbb4..40082254fac 100644
--- a/security/ssh2/distinfo
+++ b/security/ssh2/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.2 2002/09/24 00:24:37 jlam Exp $
+$NetBSD: distinfo,v 1.3 2003/01/12 15:15:51 seb Exp $
 
-SHA1 (ssh-3.2.0.tar.gz) = 13cefe3d4a890004a37b680b00bc119542247c16
-Size (ssh-3.2.0.tar.gz) = 2256240 bytes
+SHA1 (ssh-3.2.2.tar.gz) = 19e8c9857d0fc14771c31223249eb56adb5ddf6b
+Size (ssh-3.2.2.tar.gz) = 2256690 bytes
 SHA1 (patch-aa) = eeec9d05b2360fe971a397cf53795caf3fd47bfb
 SHA1 (patch-ab) = 5e4d66e3f8f3f13c9f3926d181e2a1a568c20b4b
 SHA1 (patch-ac) = b87e967252b1eaafc6e6b7ee95d8e09550957bff
 SHA1 (patch-ad) = b6944222c0b84d5f906ad019b5260fb19ee299d9
 SHA1 (patch-ae) = 79288d501031c56fd155f966c905de2e4f5ffc35
-SHA1 (patch-af) = cc26be58b0eaf99119919d3353ba6b603b1449b0
+SHA1 (patch-af) = 640bb5f92dc6db36e6ac4337e085e3a9a525c755
 SHA1 (patch-ag) = 5990115dc53a9278f171158df1dcdd4754080e90
 SHA1 (patch-ah) = 5a4314cf70463638d18599dcb3fddbbc19d52b2a
diff --git a/security/ssh2/patches/patch-af b/security/ssh2/patches/patch-af
index d4890bc9081..ac9f0270d49 100644
--- a/security/ssh2/patches/patch-af
+++ b/security/ssh2/patches/patch-af
@@ -1,78 +1,13 @@
-$NetBSD: patch-af,v 1.2 2002/09/24 00:24:38 jlam Exp $
+$NetBSD: patch-af,v 1.3 2003/01/12 15:15:52 seb Exp $
 
---- configure.orig	Thu May 16 03:32:38 2002
+--- configure.orig	Sat Jan 11 23:22:52 2003
 +++ configure
-@@ -1590,49 +1590,27 @@ cat >> confdefs.h <<EOF
- EOF
- 
- 
--
--        echo $ac_n "checking for strerror in -lcposix""... $ac_c" 1>&6
--echo "configure:1596: checking for strerror in -lcposix" >&5
--ac_lib_var=`echo cposix'_'strerror | sed 'y%./+-%__p_%'`
--if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  ac_save_LIBS="$LIBS"
--LIBS="-lcposix  $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 1604 "configure"
--#include "confdefs.h"
--/* Override any gcc2 internal prototype to avoid an error.  */
--/* We use char because int might match the return type of a gcc2
--    builtin and then its argument prototype would still apply.  */
--char strerror();
--
--int main() {
--strerror()
--; return 0; }
-+echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6
-+echo "configure:1595: checking for POSIXized ISC" >&5
-+if test -d /etc/conf/kconfig.d &&
-+  grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
-+then
-+  echo "$ac_t""yes" 1>&6
-+  ISC=yes # If later tests want to check for ISC.
-+  cat >> confdefs.h <<\EOF
-+#define _POSIX_SOURCE 1
- EOF
--if { (eval echo configure:1615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
--  rm -rf conftest*
--  eval "ac_cv_lib_$ac_lib_var=yes"
--else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_lib_$ac_lib_var=no"
--fi
--rm -f conftest*
--LIBS="$ac_save_LIBS"
- 
--fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
--  LIBS="$LIBS -lcposix"
-+  if test "$GCC" = yes; then
-+    CC="$CC -posix"
-+  else
-+    CC="$CC -Xp"
-+  fi
- else
-   echo "$ac_t""no" 1>&6
-+  ISC=
- fi
- 
--  
--
- 
- #
- # vx_suffix is used if targeting VxWorks embedded OS
-@@ -8224,8 +8202,49 @@ else
+@@ -8203,8 +8203,49 @@ else
  fi
  
  fi
 +echo $ac_n "checking for openpty in -lutil""... $ac_c" 1>&6
-+echo "configure:8207: checking for openpty in -lutil" >&5
++echo "configure:8208: checking for openpty in -lutil" >&5
 +ac_lib_var=`echo util'_'openpty | sed 'y%./+-%__p_%'`
 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
 +  echo $ac_n "(cached) $ac_c" 1>&6
@@ -80,7 +15,7 @@ $NetBSD: patch-af,v 1.2 2002/09/24 00:24:38 jlam Exp $
 +  ac_save_LIBS="$LIBS"
 +LIBS="-lutil  $LIBS"
 +cat > conftest.$ac_ext <<EOF
-+#line 8215 "configure"
++#line 8216 "configure"
 +#include "confdefs.h"
 +/* Override any gcc2 internal prototype to avoid an error.  */
 +/* We use char because int might match the return type of a gcc2
@@ -91,7 +26,7 @@ $NetBSD: patch-af,v 1.2 2002/09/24 00:24:38 jlam Exp $
 +openpty()
 +; return 0; }
 +EOF
-+if { (eval echo configure:8226: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8227: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 +  rm -rf conftest*
 +  eval "ac_cv_lib_$ac_lib_var=yes"
 +else
@@ -113,8 +48,8 @@ $NetBSD: patch-af,v 1.2 2002/09/24 00:24:38 jlam Exp $
 +fi
 +
  echo $ac_n "checking for login in -lutil""... $ac_c" 1>&6
--echo "configure:8229: checking for login in -lutil" >&5
-+echo "configure:8248: checking for login in -lutil" >&5
+-echo "configure:8208: checking for login in -lutil" >&5
++echo "configure:8249: checking for login in -lutil" >&5
  ac_lib_var=`echo util'_'login | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6