diff options
| author | jschauma <jschauma@pkgsrc.org> | 2003-06-10 21:00:45 +0000 |
|---|---|---|
| committer | jschauma <jschauma@pkgsrc.org> | 2003-06-10 21:00:45 +0000 |
| commit | a9f758d4a25087b0d4a7338ba139b2101cb2d616 (patch) | |
| tree | 776a4b49a2c9ecf985607a7b37411f4b364a2fde | |
| parent | 29f667be0cef18c9dd7c03326c277963df4d3d4a (diff) | |
| download | pkgsrc-a9f758d4a25087b0d4a7338ba139b2101cb2d616.tar.gz | |
Upgrade to 3.6.1p2:
- (djm) Add back radix.o (used by AFS support), after it went missing from
Makefile many moons ago
- (djm) Apply "owl-always-auth" patch from Openwall/Solar Designer
- (djm) Fix blibpath specification for AIX/gcc
- (djm) Some systems have basename in -lgen. Fix from ayamura@ayamura.org
(This last fix makes this compile on IRIX again.)
| -rw-r--r-- | security/openssh/Makefile | 6 | ||||
| -rw-r--r-- | security/openssh/distinfo | 8 | ||||
| -rw-r--r-- | security/openssh/patches/patch-aa | 16 |
3 files changed, 15 insertions, 15 deletions
diff --git a/security/openssh/Makefile b/security/openssh/Makefile index 00b0d238b25..5edd8ede8dc 100644 --- a/security/openssh/Makefile +++ b/security/openssh/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.100 2003/06/02 01:17:14 jschauma Exp $ +# $NetBSD: Makefile,v 1.101 2003/06/10 21:00:45 jschauma Exp $ -DISTNAME= openssh-3.6.1p1 -PKGNAME= openssh-3.6.1.1 +DISTNAME= openssh-3.6.1p2 +PKGNAME= openssh-3.6.1.2 SVR4_PKGNAME= ossh CATEGORIES= security MASTER_SITES= ftp://ftp7.usa.openbsd.org/pub/os/OpenBSD/OpenSSH/portable/ \ diff --git a/security/openssh/distinfo b/security/openssh/distinfo index 292a87b26d2..229674464ba 100644 --- a/security/openssh/distinfo +++ b/security/openssh/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.24 2003/04/10 12:34:15 wiz Exp $ +$NetBSD: distinfo,v 1.25 2003/06/10 21:00:45 jschauma Exp $ -SHA1 (openssh-3.6.1p1.tar.gz) = 545abce6a007bf511706cd9bfb75d90b53a33fb9 -Size (openssh-3.6.1p1.tar.gz) = 875806 bytes -SHA1 (patch-aa) = 63aa7c0acb4c568545b684cd9838410a82659bac +SHA1 (openssh-3.6.1p2.tar.gz) = dafe5b6ee2c8ced12c2ee8961530b4e51c2f0bcf +Size (openssh-3.6.1p2.tar.gz) = 879629 bytes +SHA1 (patch-aa) = 20abe6938aba07ab7b6c7eab5d24a303f0cd2298 SHA1 (patch-ab) = 1069fe256b7925fcf404781ef14e5c492f52c21e SHA1 (patch-ah) = 9913c868bde5d318915b1dee2c05dcf454a0f506 diff --git a/security/openssh/patches/patch-aa b/security/openssh/patches/patch-aa index 4445f258df2..279229ebf29 100644 --- a/security/openssh/patches/patch-aa +++ b/security/openssh/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.27 2003/01/19 01:26:38 seb Exp $ +$NetBSD: patch-aa,v 1.28 2003/06/10 21:00:46 jschauma Exp $ ---- configure.orig Sun Jan 19 00:38:52 2003 -+++ configure -@@ -4697,6 +4697,9 @@ _ACEOF +--- configure.orig Tue Apr 29 02:37:28 2003 ++++ configure Tue Jun 10 13:38:01 2003 +@@ -4939,6 +4939,9 @@ ;; esac @@ -12,9 +12,9 @@ $NetBSD: patch-aa,v 1.27 2003/01/19 01:26:38 seb Exp $ # Allow user to specify flags # Check whether --with-cflags or --without-cflags was given. -@@ -6616,6 +6619,10 @@ echo $ECHO_N "checking for libwrap... $E - #line $LINENO "configure" - #include "confdefs.h" +@@ -7030,6 +7033,10 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +#ifdef HAVE_SYS_CDEFS_H +#include <sys/cdefs.h> @@ -23,7 +23,7 @@ $NetBSD: patch-aa,v 1.27 2003/01/19 01:26:38 seb Exp $ #include <tcpd.h> int deny_severity = 0, allow_severity = 0; -@@ -17846,7 +17853,7 @@ echo "OpenSSH has been configured with t +@@ -19123,7 +19130,7 @@ echo " User binaries: $B" echo " System binaries: $C" echo " Configuration files: $D" |