summaryrefslogtreecommitdiff
path: root/security/openssh
diff options
context:
space:
mode:
Diffstat (limited to 'security/openssh')
-rw-r--r--security/openssh/Makefile8
-rw-r--r--security/openssh/distinfo10
-rw-r--r--security/openssh/patches/patch-aa154
-rw-r--r--security/openssh/patches/patch-ab58
4 files changed, 19 insertions, 211 deletions
diff --git a/security/openssh/Makefile b/security/openssh/Makefile
index bacd45d0440..694ca6b0e7f 100644
--- a/security/openssh/Makefile
+++ b/security/openssh/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.91 2002/09/19 09:04:22 jlam Exp $
+# $NetBSD: Makefile,v 1.92 2003/01/19 01:26:35 seb Exp $
-DISTNAME= openssh-3.4p1
-PKGNAME= openssh-3.4.0.1
+DISTNAME= openssh-3.5p1
+PKGNAME= openssh-3.5.0.1
SVR4_PKGNAME= ossh
CATEGORIES= security
#MASTER_SITES= ftp://gd.tuwien.ac.at/opsys/OpenBSD/OpenSSH/portable/ \
@@ -15,7 +15,7 @@ HOMEPAGE= http://www.openssh.com/
COMMENT= Open Source Secure shell client and server (remote login program)
CONFLICTS= sftp-[0-9]*
-CONFLICTS+= ssh-[0-9]* ssh6-[0-9]*
+CONFLICTS+= ssh-[0-9]* ssh6-[0-9]* ssh2-[0-9]*
USE_PERL5= build
diff --git a/security/openssh/distinfo b/security/openssh/distinfo
index a81a0dedd2b..08f7fa32f00 100644
--- a/security/openssh/distinfo
+++ b/security/openssh/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.22 2002/09/09 20:16:22 jlam Exp $
+$NetBSD: distinfo,v 1.23 2003/01/19 01:26:36 seb Exp $
-SHA1 (openssh-3.4p1.tar.gz) = 8841326bf79b2c8a88d7a6e371739ec21cee73bc
-Size (openssh-3.4p1.tar.gz) = 837668 bytes
-SHA1 (patch-aa) = 6ef5aad9f5db134be3b6c2fa34a3e5ab158b7a58
-SHA1 (patch-ab) = a8021e0af1bbc2ea2e74ca117f1210fbd2837699
+SHA1 (openssh-3.5p1.tar.gz) = 44025609bc882933ae8626dd012fd866f07af935
+Size (openssh-3.5p1.tar.gz) = 851486 bytes
+SHA1 (patch-aa) = 63aa7c0acb4c568545b684cd9838410a82659bac
+SHA1 (patch-ab) = 1069fe256b7925fcf404781ef14e5c492f52c21e
SHA1 (patch-ah) = 9913c868bde5d318915b1dee2c05dcf454a0f506
diff --git a/security/openssh/patches/patch-aa b/security/openssh/patches/patch-aa
index 15b80194482..4445f258df2 100644
--- a/security/openssh/patches/patch-aa
+++ b/security/openssh/patches/patch-aa
@@ -1,75 +1,8 @@
-$NetBSD: patch-aa,v 1.26 2002/09/09 20:16:25 jlam Exp $
+$NetBSD: patch-aa,v 1.27 2003/01/19 01:26:38 seb Exp $
---- configure.orig Wed Jun 26 07:08:18 2002
+--- configure.orig Sun Jan 19 00:38:52 2003
+++ configure
-@@ -3683,10 +3683,49 @@ _ACEOF
-
- ;;
- *-*-darwin*)
-+ echo "$as_me:$LINENO: checking if we have working getaddrinfo" >&5
-+echo $ECHO_N "checking if we have working getaddrinfo... $ECHO_C" >&6
-+ if test "$cross_compiling" = yes; then
-+ echo "$as_me:$LINENO: result: assume it is working" >&5
-+echo "${ECHO_T}assume it is working" >&6
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+#include "confdefs.h"
-+#include <mach-o/dyld.h>
-+main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16))
-+ exit(0);
-+ else
-+ exit(1);
-+}
-+_ACEOF
-+rm -f conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ echo "$as_me:$LINENO: result: working" >&5
-+echo "${ECHO_T}working" >&6
-+else
-+ echo "$as_me: program exited with status $ac_status" >&5
-+echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+( exit $ac_status )
-+echo "$as_me:$LINENO: result: buggy" >&5
-+echo "${ECHO_T}buggy" >&6
- cat >>confdefs.h <<\_ACEOF
- #define BROKEN_GETADDRINFO 1
- _ACEOF
-
-+fi
-+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+fi
- ;;
- *-*-hpux10.26)
- if test -z "$GCC"; then
-@@ -3920,6 +3959,7 @@ _ACEOF
- SONY=1
- ;;
- *-*-netbsd*)
-+ check_for_libcrypt_before=1
- need_dash_r=1
- ;;
- *-*-freebsd*)
-@@ -3950,8 +3990,6 @@ _ACEOF
- CFLAGS="$CFLAGS"
- ;;
- *-*-solaris*)
-- CPPFLAGS="$CPPFLAGS -I/usr/local/include"
-- LDFLAGS="$LDFLAGS -L/usr/local/lib -R/usr/local/lib"
- need_dash_r=1
- cat >>confdefs.h <<\_ACEOF
- #define PAM_SUN_CODEBASE 1
-@@ -4406,6 +4444,9 @@ _ACEOF
+@@ -4697,6 +4697,9 @@ _ACEOF
;;
esac
@@ -79,7 +12,7 @@ $NetBSD: patch-aa,v 1.26 2002/09/09 20:16:25 jlam Exp $
# Allow user to specify flags
# Check whether --with-cflags or --without-cflags was given.
-@@ -6319,6 +6360,10 @@ echo $ECHO_N "checking for libwrap... $E
+@@ -6616,6 +6619,10 @@ echo $ECHO_N "checking for libwrap... $E
#line $LINENO "configure"
#include "confdefs.h"
@@ -90,84 +23,7 @@ $NetBSD: patch-aa,v 1.26 2002/09/09 20:16:25 jlam Exp $
#include <tcpd.h>
int deny_severity = 0, allow_severity = 0;
-@@ -8090,6 +8135,76 @@ fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
-
-+# Some systems want crypt() from libcrypt, *not* the version in OpenSSL,
-+# because the system crypt() is more featureful.
-+if test "x$check_for_libcrypt_before" = "x1"; then
-+
-+echo "$as_me:$LINENO: checking for crypt in -lcrypt" >&5
-+echo $ECHO_N "checking for crypt in -lcrypt... $ECHO_C" >&6
-+if test "${ac_cv_lib_crypt_crypt+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lcrypt $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+#include "confdefs.h"
-+
-+/* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char crypt ();
-+#ifdef F77_DUMMY_MAIN
-+# ifdef __cplusplus
-+ extern "C"
-+# endif
-+ int F77_DUMMY_MAIN() { return 1; }
-+#endif
-+int
-+main ()
-+{
-+crypt ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_lib_crypt_crypt=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+ac_cv_lib_crypt_crypt=no
-+fi
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_crypt" >&5
-+echo "${ECHO_T}$ac_cv_lib_crypt_crypt" >&6
-+if test $ac_cv_lib_crypt_crypt = yes; then
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_LIBCRYPT 1
-+_ACEOF
-+
-+ LIBS="-lcrypt $LIBS"
-+
-+fi
-+
-+fi
-+
- # Search for OpenSSL
- saved_CPPFLAGS="$CPPFLAGS"
- saved_LDFLAGS="$LDFLAGS"
-@@ -17497,7 +17612,7 @@ echo "OpenSSH has been configured with t
+@@ -17846,7 +17853,7 @@ echo "OpenSSH has been configured with t
echo " User binaries: $B"
echo " System binaries: $C"
echo " Configuration files: $D"
diff --git a/security/openssh/patches/patch-ab b/security/openssh/patches/patch-ab
index af0c28a8918..cb659caa00f 100644
--- a/security/openssh/patches/patch-ab
+++ b/security/openssh/patches/patch-ab
@@ -1,43 +1,8 @@
-$NetBSD: patch-ab,v 1.13 2002/09/09 20:16:26 jlam Exp $
+$NetBSD: patch-ab,v 1.14 2003/01/19 01:26:40 seb Exp $
---- configure.ac.orig Tue Jun 25 15:35:16 2002
+--- configure.ac.orig Thu Sep 26 00:38:47 2002
+++ configure.ac
-@@ -93,7 +93,16 @@ case "$host" in
- AC_DEFINE(IP_TOS_IS_BROKEN)
- ;;
- *-*-darwin*)
-- AC_DEFINE(BROKEN_GETADDRINFO)
-+ AC_MSG_CHECKING(if we have working getaddrinfo)
-+ AC_TRY_RUN([#include <mach-o/dyld.h>
-+main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16))
-+ exit(0);
-+ else
-+ exit(1);
-+}], [AC_MSG_RESULT(working)],
-+ [AC_MSG_RESULT(buggy)
-+ AC_DEFINE(BROKEN_GETADDRINFO)],
-+ [AC_MSG_RESULT(assume it is working)])
- ;;
- *-*-hpux10.26)
- if test -z "$GCC"; then
-@@ -167,6 +176,7 @@ mips-sony-bsd|mips-sony-newsos4)
- SONY=1
- ;;
- *-*-netbsd*)
-+ check_for_libcrypt_before=1
- need_dash_r=1
- ;;
- *-*-freebsd*)
-@@ -185,8 +195,6 @@ mips-sony-bsd|mips-sony-newsos4)
- CFLAGS="$CFLAGS"
- ;;
- *-*-solaris*)
-- CPPFLAGS="$CPPFLAGS -I/usr/local/include"
-- LDFLAGS="$LDFLAGS -L/usr/local/lib -R/usr/local/lib"
- need_dash_r=1
- AC_DEFINE(PAM_SUN_CODEBASE)
- AC_DEFINE(LOGIN_NEEDS_UTMPX)
-@@ -312,6 +320,9 @@ mips-sony-bsd|mips-sony-newsos4)
+@@ -341,6 +341,9 @@ mips-sony-bsd|mips-sony-newsos4)
;;
esac
@@ -47,7 +12,7 @@ $NetBSD: patch-ab,v 1.13 2002/09/09 20:16:26 jlam Exp $
# Allow user to specify flags
AC_ARG_WITH(cflags,
[ --with-cflags Specify additional flags to pass to compiler],
-@@ -545,6 +556,10 @@ AC_ARG_WITH(tcp-wrappers,
+@@ -575,6 +578,10 @@ AC_ARG_WITH(tcp-wrappers,
AC_MSG_CHECKING(for libwrap)
AC_TRY_LINK(
[
@@ -58,20 +23,7 @@ $NetBSD: patch-ab,v 1.13 2002/09/09 20:16:26 jlam Exp $
#include <tcpd.h>
int deny_severity = 0, allow_severity = 0;
],
-@@ -723,6 +738,12 @@ if test "x$PAM_MSG" = "xyes" ; then
- )
- fi
-
-+# Some systems want crypt() from libcrypt, *not* the version in OpenSSL,
-+# because the system crypt() is more featureful.
-+if test "x$check_for_libcrypt_before" = "x1"; then
-+ AC_CHECK_LIB(crypt, crypt)
-+fi
-+
- # Search for OpenSSL
- saved_CPPFLAGS="$CPPFLAGS"
- saved_LDFLAGS="$LDFLAGS"
-@@ -2385,7 +2406,7 @@ echo "OpenSSH has been configured with t
+@@ -2449,7 +2456,7 @@ echo "OpenSSH has been configured with t
echo " User binaries: $B"
echo " System binaries: $C"
echo " Configuration files: $D"
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-02 22:07:08 +0000