diff options
-rw-r--r-- | security/openssh/Makefile | 4 | ||||
-rw-r--r-- | security/openssh/files/md5 | 4 | ||||
-rw-r--r-- | security/openssh/files/patch-sum | 9 | ||||
-rw-r--r-- | security/openssh/patches/patch-aa | 35 | ||||
-rw-r--r-- | security/openssh/patches/patch-ae | 24 | ||||
-rw-r--r-- | security/openssh/patches/patch-ah | 40 | ||||
-rw-r--r-- | security/openssh/patches/patch-aj | 12 | ||||
-rw-r--r-- | security/openssh/pkg/PLIST | 6 |
8 files changed, 73 insertions, 61 deletions
diff --git a/security/openssh/Makefile b/security/openssh/Makefile index c8034c0a55d..af2b4cdb9b4 100644 --- a/security/openssh/Makefile +++ b/security/openssh/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.30 2000/09/28 16:31:15 hubertf Exp $ +# $NetBSD: Makefile,v 1.31 2000/11/09 09:18:23 itojun Exp $ # -DISTNAME= openssh-2.2.0p1 +DISTNAME= openssh-2.3.0p1 CATEGORIES= security MASTER_SITES= http://the.wiretapped.net/security/cryptography/ssh/OpenSSH/files/ \ http://www.firedrake.org/openssh/files/ \ diff --git a/security/openssh/files/md5 b/security/openssh/files/md5 index c44456a5d87..3f902968112 100644 --- a/security/openssh/files/md5 +++ b/security/openssh/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.9 2000/09/04 00:47:50 itojun Exp $ +$NetBSD: md5,v 1.10 2000/11/09 09:18:24 itojun Exp $ -MD5 (openssh-2.2.0p1.tar.gz) = 8da6e2ad58be86e195cbdf82f7803feb +MD5 (openssh-2.3.0p1.tar.gz) = b3d53dfb45da6e7bf88aaaf65b528aac diff --git a/security/openssh/files/patch-sum b/security/openssh/files/patch-sum index b2ea70f4165..6e65c44e9ed 100644 --- a/security/openssh/files/patch-sum +++ b/security/openssh/files/patch-sum @@ -1,7 +1,6 @@ -$NetBSD: patch-sum,v 1.20 2000/10/15 14:17:13 itojun Exp $ +$NetBSD: patch-sum,v 1.21 2000/11/09 09:18:24 itojun Exp $ -MD5 (patch-aa) = f03194df0ea8e068b57f3ea71ef2f5aa -MD5 (patch-ae) = efdaabad2d0ac4c40c5b7d4cb833feaf -MD5 (patch-ah) = 4259ece36472f4c21a6344ce61e6b344 -MD5 (patch-aj) = 5397d9fbfe54544fd186831cfe979329 +MD5 (patch-aa) = c56c29774b368e412e942b73d64d55a6 +MD5 (patch-ae) = 62661f8a920ea0b12a1604c1a6c0a490 +MD5 (patch-ah) = a73b90de7d5096baa1761d06c475d74e MD5 (patch-an) = eccf8c19bcee913de49eb2b38999e609 diff --git a/security/openssh/patches/patch-aa b/security/openssh/patches/patch-aa index 97d6fe53b6d..25699584041 100644 --- a/security/openssh/patches/patch-aa +++ b/security/openssh/patches/patch-aa @@ -1,12 +1,18 @@ -$NetBSD: patch-aa,v 1.12 2000/10/15 14:17:14 itojun Exp $ +$NetBSD: patch-aa,v 1.13 2000/11/09 09:18:24 itojun Exp $ ---- configure.in.orig Thu Aug 31 07:20:05 2000 -+++ configure.in Thu Oct 12 09:23:08 2000 -@@ -337,2 +337,3 @@ +--- configure.in.orig Sun Nov 5 18:08:45 2000 ++++ configure.in Thu Nov 9 18:03:33 2000 +@@ -389,6 +389,7 @@ + saved_LIBS="$LIBS" + saved_LDFLAGS="$LDFLAGS" saved_CFLAGS="$CFLAGS" +crypto_LIBS="" if test "x$prefix" != "xNONE" ; then -@@ -353,8 +354,21 @@ + tryssldir="$tryssldir $prefix" + fi +@@ -405,12 +406,25 @@ + LDFLAGS="$saved_LDFLAGS" + fi - LIBS="$saved_LIBS -lcrypto" - @@ -34,7 +40,11 @@ $NetBSD: patch-aa,v 1.12 2000/10/15 14:17:14 itojun Exp $ + AC_TRY_RUN( + [ #include <string.h> -@@ -368,8 +382,10 @@ + #include <openssl/rand.h> + int main(void) +@@ -420,12 +434,14 @@ + RAND_add(a, sizeof(a), sizeof(a)); + return(RAND_status() <= 0); } - ], - [ @@ -51,13 +61,14 @@ $NetBSD: patch-aa,v 1.12 2000/10/15 14:17:14 itojun Exp $ + ) + done -@@ -403,3 +419,3 @@ + if test ! -z "$found_crypto" ; then + break; +@@ -455,7 +471,7 @@ + blibpath="$blibpath:$ssldir:$ssldir/lib" + fi fi -LIBS="$saved_LIBS -lcrypto" +LIBS="$saved_LIBS $crypto_LIBS" -@@ -764,3 +780,3 @@ - ], -- [ struct passwd p s; p.pw_class = NULL; ], -+ [ struct passwd p; p.pw_class = NULL; ], - [ ac_cv_have_pw_class_in_struct_passwd="yes" ], + # Now test RSA support + saved_LIBS="$LIBS" diff --git a/security/openssh/patches/patch-ae b/security/openssh/patches/patch-ae index 9031cf082cc..a9753b53edb 100644 --- a/security/openssh/patches/patch-ae +++ b/security/openssh/patches/patch-ae @@ -1,12 +1,20 @@ -$NetBSD: patch-ae,v 1.5 2000/09/04 00:47:50 itojun Exp $ +$NetBSD: patch-ae,v 1.6 2000/11/09 09:18:24 itojun Exp $ ---- ssh-add.1.orig Tue Aug 29 09:33:51 2000 -+++ ssh-add.1 Mon Sep 4 09:39:21 2000 -@@ -68,2 +68,3 @@ - .Pp +--- ssh-add.1.orig Sat Sep 16 11:29:10 2000 ++++ ssh-add.1 Thu Nov 9 18:03:59 2000 +@@ -66,6 +66,7 @@ + .Bl -tag -width Ds + .It Fl l + Lists fingerprints of all identities currently represented by the agent. +.El + .It Fl L + Lists public key parameters of all identities currently represented by the agent. + .It Fl d +@@ -91,6 +92,7 @@ + Contains the DSA authentication identity of the user. + .El .Sh ENVIRONMENT -@@ -93,2 +94,3 @@ - to make this work.) +.El - .Sh AUTHOR + .Bl -tag -width Ds + .It Ev "DISPLAY" and "SSH_ASKPASS" + If diff --git a/security/openssh/patches/patch-ah b/security/openssh/patches/patch-ah index 8e23dc53de9..c098575dec5 100644 --- a/security/openssh/patches/patch-ah +++ b/security/openssh/patches/patch-ah @@ -1,7 +1,9 @@ -$NetBSD: patch-ah,v 1.8 2000/08/11 05:19:44 jlam Exp $ +$NetBSD: patch-ah,v 1.9 2000/11/09 09:18:24 itojun Exp $ ---- Makefile.in.orig Tue Jul 11 07:34:34 2000 -+++ Makefile.in Fri Aug 11 01:10:25 2000 +ssh-askpass: assumes NetBSD 1.5 path, could be wrong + +--- Makefile.in.orig Mon Nov 6 06:13:45 2000 ++++ Makefile.in Thu Nov 9 18:11:16 2000 @@ -6,6 +6,7 @@ mandir=@mandir@ mansubdir=@mansubdir@ @@ -14,12 +16,12 @@ $NetBSD: patch-ah,v 1.8 2000/08/11 05:19:44 jlam Exp $ VPATH=@srcdir@ SSH_PROGRAM=@bindir@/ssh --ASKPASS_LOCATION=@libexecdir@/ssh -+#ASKPASS_LOCATION=@libexecdir@/ssh - ASKPASS_PROGRAM=$(ASKPASS_LOCATION)/ssh-askpass +-ASKPASS_PROGRAM=$(libexecdir)/ssh-askpass ++ASKPASS_PROGRAM=/usr/X11R6/bin/ssh-askpass CC=@CC@ -@@ -115,7 +116,7 @@ + LD=@LD@ +@@ -119,7 +120,7 @@ distprep: catman-do autoreconf @@ -27,29 +29,31 @@ $NetBSD: patch-ah,v 1.8 2000/08/11 05:19:44 jlam Exp $ +install: manpages $(TARGETS) install-files install-files: - ./mkinstalldirs $(DESTDIR)$(bindir) -@@ -139,14 +140,14 @@ - ln -s ssh $(DESTDIR)$(bindir)/slogin + $(srcdir)/mkinstalldirs $(DESTDIR)$(bindir) +@@ -147,15 +148,15 @@ -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 ln -s ssh.1 $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 + @FILEPRIV@ -f dev,filesys,driver $(DESTDIR)$(bindir)/ssh $(DESTDIR)$(bindir)/slogin - if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_config -a ! -f $(DESTDIR)$(sysconfdir)/sshd_config ]; then \ -- ./mkinstalldirs $(DESTDIR)$(sysconfdir); \ +- $(srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir); \ - $(INSTALL) -m 644 ssh_config.out $(DESTDIR)$(sysconfdir)/ssh_config; \ - $(INSTALL) -m 644 sshd_config.out $(DESTDIR)$(sysconfdir)/sshd_config; \ + if [ ! -f $(DESTDIR)$(examplesdir)/ssh_config -a ! -f $(DESTDIR)$(examplesdir)/sshd_config ]; then \ -+ ./mkinstalldirs $(DESTDIR)$(examplesdir); \ ++ $(srcdir)/mkinstalldirs $(DESTDIR)$(examplesdir); \ + $(INSTALL) -m 644 ssh_config.out $(DESTDIR)$(examplesdir)/ssh_config; \ + $(INSTALL) -m 644 sshd_config.out $(DESTDIR)$(examplesdir)/sshd_config; \ fi if [ -f ssh_prng_cmds -a ! -z "$(INSTALL_SSH_PRNG_CMDS)" ]; then \ - $(PERL) fixprogs ssh_prng_cmds $(ENT); \ -- $(INSTALL) -m 644 ssh_prng_cmds.out $(DESTDIR)$(sysconfdir)/ssh_prng_cmds; \ -+ $(INSTALL) -m 644 ssh_prng_cmds.out $(DESTDIR)$(examplesdir)/ssh_prng_cmds; \ + $(PERL) $(srcdir)/fixprogs ssh_prng_cmds $(ENT); \ +- if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_prng_cmds ] ; then \ +- $(INSTALL) -m 644 ssh_prng_cmds.out $(DESTDIR)$(sysconfdir)/ssh_prng_cmds; \ ++ if [ ! -f $(DESTDIR)$(examplesdir)/ssh_prng_cmds ] ; then \ ++ $(INSTALL) -m 644 ssh_prng_cmds.out $(DESTDIR)$(examplesdir)/ssh_prng_cmds; \ + fi ; \ fi - host-key: ssh-keygen -@@ -168,10 +169,10 @@ - ./ssh-keygen -d -f $(DESTDIR)$(sysconfdir)/ssh_host_dsa_key -N "" +@@ -178,10 +179,10 @@ + $(srcdir)/ssh-keygen -d -f $(DESTDIR)$(sysconfdir)/ssh_host_dsa_key -N "" uninstallall: uninstall - -rm -f $(DESTDIR)$(sysconfdir)/ssh_config diff --git a/security/openssh/patches/patch-aj b/security/openssh/patches/patch-aj deleted file mode 100644 index 1111a969841..00000000000 --- a/security/openssh/patches/patch-aj +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-aj,v 1.2 2000/06/15 04:56:51 itojun Exp $ - ---- ssh.1.orig Wed Jun 7 18:55:44 2000 -+++ ssh.1 Thu Jun 15 13:46:26 2000 -@@ -948,2 +948,3 @@ - .Pa /usr/X11R6/bin/xauth . -+.El - .Sh ENVIRONMENT -@@ -1191,2 +1192,3 @@ - is required for proper operation. -+.El - .Sh AUTHOR diff --git a/security/openssh/pkg/PLIST b/security/openssh/pkg/PLIST index c9f27721648..d55e7143dbf 100644 --- a/security/openssh/pkg/PLIST +++ b/security/openssh/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2000/09/20 04:49:19 jlam Exp $ +@comment $NetBSD: PLIST,v 1.6 2000/11/09 09:18:25 itojun Exp $ bin/scp bin/slogin bin/ssh @@ -6,12 +6,14 @@ bin/ssh-add bin/ssh-agent bin/ssh-keygen etc/rc.d/sshd -man/man1/ssh.1 +libexec/sftp-server man/man1/scp.1 man/man1/slogin.1 man/man1/ssh-add.1 man/man1/ssh-agent.1 man/man1/ssh-keygen.1 +man/man1/ssh.1 +man/man8/sftp-server.8 man/man8/sshd.8 sbin/sshd share/examples/ssh/ssh_config |