summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--security/openssh/Makefile4
-rw-r--r--security/openssh/files/md54
-rw-r--r--security/openssh/files/patch-sum7
-rw-r--r--security/openssh/patches/patch-aa74
-rw-r--r--security/openssh/patches/patch-ah71
-rw-r--r--security/openssh/patches/patch-an13
-rw-r--r--security/openssh/patches/patch-ao11
-rw-r--r--security/openssh/pkg/PLIST14
8 files changed, 43 insertions, 155 deletions
diff --git a/security/openssh/Makefile b/security/openssh/Makefile
index 9eb4598063b..2045df67e1c 100644
--- a/security/openssh/Makefile
+++ b/security/openssh/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.39 2001/02/17 17:49:56 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2001/02/20 16:33:13 itojun Exp $
-DISTNAME= openssh-2.3.0p1
+DISTNAME= openssh-2.5.1p1
CATEGORIES= security
MASTER_SITES= ftp://gd.tuwien.ac.at/OpenBSD/OpenSSH/portable/ \
ftp://ftp.openssh.com/pub/OpenBSD/OpenSSH/portable/ \
diff --git a/security/openssh/files/md5 b/security/openssh/files/md5
index 3f902968112..4d7a377d4b2 100644
--- a/security/openssh/files/md5
+++ b/security/openssh/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.10 2000/11/09 09:18:24 itojun Exp $
+$NetBSD: md5,v 1.11 2001/02/20 16:33:13 itojun Exp $
-MD5 (openssh-2.3.0p1.tar.gz) = b3d53dfb45da6e7bf88aaaf65b528aac
+MD5 (openssh-2.5.1p1.tar.gz) = 3f1b92058f0ff58ff13c3c2f127fc012
diff --git a/security/openssh/files/patch-sum b/security/openssh/files/patch-sum
index 1cc1a718c77..e6674ff20de 100644
--- a/security/openssh/files/patch-sum
+++ b/security/openssh/files/patch-sum
@@ -1,6 +1,3 @@
-$NetBSD: patch-sum,v 1.23 2000/11/11 01:51:19 itojun Exp $
+$NetBSD: patch-sum,v 1.24 2001/02/20 16:33:14 itojun Exp $
-MD5 (patch-aa) = c56c29774b368e412e942b73d64d55a6
-MD5 (patch-ah) = a73b90de7d5096baa1761d06c475d74e
-MD5 (patch-an) = eccf8c19bcee913de49eb2b38999e609
-MD5 (patch-ao) = 3b9482035cd8859839b753a6d2a4df85
+MD5 (patch-ah) = fc5173c752d5a94f45d83d928bc198f4
diff --git a/security/openssh/patches/patch-aa b/security/openssh/patches/patch-aa
deleted file mode 100644
index 25699584041..00000000000
--- a/security/openssh/patches/patch-aa
+++ /dev/null
@@ -1,74 +0,0 @@
-$NetBSD: patch-aa,v 1.13 2000/11/09 09:18:24 itojun Exp $
-
---- 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
- tryssldir="$tryssldir $prefix"
- fi
-@@ -405,12 +406,25 @@
- LDFLAGS="$saved_LDFLAGS"
- fi
-
-- LIBS="$saved_LIBS -lcrypto"
--
-- # Basic test to check for compatible version and correct linking
-- # *does not* test for RSA - that comes later.
-- AC_TRY_RUN(
-- [
-+ # Some ELF systems can't resolve all the symbols in libcrypto
-+ # if libcrypto was linked against RSAREF, and fail to link the
-+ # test program correctly, even though a correct installation
-+ # of OpenSSL exists. So we test the linking three times in
-+ # case the RSAREF libraries are needed right away. We'll test
-+ # for them explicitly later on.
-+ #
-+ for libcrypto in \
-+ "-lcrypto" \
-+ "-lcrypto -lrsaref" \
-+ "-lcrypto -lRSAglue -lrsaref"
-+ do
-+ LIBS="$saved_LIBS $libcrypto"
-+
-+ # Basic test to check for compatible version and
-+ # correct linking *does not* test for RSA - that comes
-+ # later.
-+ AC_TRY_RUN(
-+ [
- #include <string.h>
- #include <openssl/rand.h>
- int main(void)
-@@ -420,12 +434,14 @@
- RAND_add(a, sizeof(a), sizeof(a));
- return(RAND_status() <= 0);
- }
-- ],
-- [
-- found_crypto=1
-- break;
-- ], []
-- )
-+ ],
-+ [
-+ found_crypto=1
-+ crypto_LIBS=$libcrypto
-+ break;
-+ ], []
-+ )
-+ done
-
- 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"
-
- # Now test RSA support
- saved_LIBS="$LIBS"
diff --git a/security/openssh/patches/patch-ah b/security/openssh/patches/patch-ah
index c098575dec5..9e5a0d9afa8 100644
--- a/security/openssh/patches/patch-ah
+++ b/security/openssh/patches/patch-ah
@@ -1,60 +1,49 @@
-$NetBSD: patch-ah,v 1.9 2000/11/09 09:18:24 itojun Exp $
+$NetBSD: patch-ah,v 1.10 2001/02/20 16:33:14 itojun Exp $
-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@
+--- Makefile.in.orig Mon Feb 19 04:13:33 2001
++++ Makefile.in Wed Feb 21 01:28:06 2001
+@@ -10,2 +10,3 @@
sysconfdir=@sysconfdir@
-+examplesdir=@prefix@/share/examples/ssh
++examplesdir=@prefix@/share/examples/openssh
piddir=@piddir@
- srcdir=@srcdir@
- top_srcdir=@top_srcdir@
-@@ -15,7 +16,7 @@
- VPATH=@srcdir@
-
+@@ -17,3 +18,3 @@
SSH_PROGRAM=@bindir@/ssh
-ASKPASS_PROGRAM=$(libexecdir)/ssh-askpass
+ASKPASS_PROGRAM=/usr/X11R6/bin/ssh-askpass
-
- CC=@CC@
- LD=@LD@
-@@ -119,7 +120,7 @@
- distprep: catman-do
- autoreconf
+ SFTP_SERVER=$(libexecdir)/sftp-server
+@@ -152,3 +153,3 @@
-install: manpages $(TARGETS) install-files host-key
+install: manpages $(TARGETS) install-files
- install-files:
- $(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 \
-- $(srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir); \
+@@ -161,2 +162,3 @@
+ $(srcdir)/mkinstalldirs $(DESTDIR)$(libexecdir)
++ $(srcdir)/mkinstalldirs $(DESTDIR)$(examplesdir)
+ $(INSTALL) -m $(SSH_MODE) -s ssh $(DESTDIR)$(bindir)/ssh
+@@ -187,19 +189,7 @@
+ fi
+- if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_config ]; then \
- $(INSTALL) -m 644 ssh_config.out $(DESTDIR)$(sysconfdir)/ssh_config; \
+- else \
+- echo "$(DESTDIR)$(sysconfdir)/ssh_config already exists, install will not overwrite"; \
+- fi
+- if [ ! -f $(DESTDIR)$(sysconfdir)/sshd_config ]; then \
- $(INSTALL) -m 644 sshd_config.out $(DESTDIR)$(sysconfdir)/sshd_config; \
-+ if [ ! -f $(DESTDIR)$(examplesdir)/ssh_config -a ! -f $(DESTDIR)$(examplesdir)/sshd_config ]; then \
-+ $(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
+- else \
+- echo "$(DESTDIR)$(sysconfdir)/sshd_config already exists, install will not overwrite"; \
+- fi
++ $(INSTALL) -m 644 ssh_config.out $(DESTDIR)$(examplesdir)/ssh_config; \
++ $(INSTALL) -m 644 sshd_config.out $(DESTDIR)$(examplesdir)/sshd_config; \
if [ -f ssh_prng_cmds -a ! -z "$(INSTALL_SSH_PRNG_CMDS)" ]; then \
$(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 ; \
+- else \
+- echo "$(DESTDIR)$(sysconfdir)/ssh_prng_cmds already exists, install will not overwrite"; \
+- fi ; \
++ $(INSTALL) -m 644 ssh_prng_cmds.out $(DESTDIR)$(examplesdir)/ssh_prng_cmds; \
fi
-
-@@ -178,10 +179,10 @@
- $(srcdir)/ssh-keygen -d -f $(DESTDIR)$(sysconfdir)/ssh_host_dsa_key -N ""
-
+@@ -236,6 +226,6 @@
uninstallall: uninstall
- -rm -f $(DESTDIR)$(sysconfdir)/ssh_config
- -rm -f $(DESTDIR)$(sysconfdir)/sshd_config
@@ -65,5 +54,3 @@ ssh-askpass: assumes NetBSD 1.5 path, could be wrong
+ -rm -f $(DESTDIR)$(examplesdir)/ssh_prng_cmds
+ -rmdir $(DESTDIR)$(examplesdir)
-rmdir $(DESTDIR)$(bindir)
- -rmdir $(DESTDIR)$(sbindir)
- -rmdir $(DESTDIR)$(mandir)/$(mansubdir)1
diff --git a/security/openssh/patches/patch-an b/security/openssh/patches/patch-an
deleted file mode 100644
index a4fa6af8fc1..00000000000
--- a/security/openssh/patches/patch-an
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-an,v 1.1 2000/07/04 11:08:39 itojun Exp $
-
---- sshd_config- Tue Jul 4 19:28:40 2000
-+++ sshd_config Tue Jul 4 19:28:43 2000
-@@ -2,7 +2,7 @@
-
- Port 22
- #Protocol 2,1
--ListenAddress 0.0.0.0
-+#ListenAddress 0.0.0.0
- #ListenAddress ::
- HostKey /etc/ssh_host_key
- ServerKeyBits 768
diff --git a/security/openssh/patches/patch-ao b/security/openssh/patches/patch-ao
deleted file mode 100644
index 4d02a752e25..00000000000
--- a/security/openssh/patches/patch-ao
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-ao,v 1.3 2000/11/11 01:51:19 itojun Exp $
-
-ftp://ftp.openbsd.org/pub/OpenBSD/patches/2.8/common/002_sshskey.patch
-
---- auth1.c- Sat Nov 11 10:48:34 2000
-+++ auth1.c Sat Nov 11 10:48:47 2000
-@@ -275,3 +275,3 @@
- if (pw != NULL)
-- skey_keyinfo(pw->pw_name);
-+ skeyinfo = skey_keyinfo(pw->pw_name);
- if (skeyinfo == NULL) {
diff --git a/security/openssh/pkg/PLIST b/security/openssh/pkg/PLIST
index d55e7143dbf..54041cb6cac 100644
--- a/security/openssh/pkg/PLIST
+++ b/security/openssh/pkg/PLIST
@@ -1,21 +1,23 @@
-@comment $NetBSD: PLIST,v 1.6 2000/11/09 09:18:25 itojun Exp $
+@comment $NetBSD: PLIST,v 1.7 2001/02/20 16:33:15 itojun Exp $
bin/scp
-bin/slogin
+bin/sftp
bin/ssh
bin/ssh-add
bin/ssh-agent
bin/ssh-keygen
+bin/ssh-keyscan
etc/rc.d/sshd
libexec/sftp-server
man/man1/scp.1
-man/man1/slogin.1
+man/man1/sftp.1
man/man1/ssh-add.1
man/man1/ssh-agent.1
man/man1/ssh-keygen.1
+man/man1/ssh-keyscan.1
man/man1/ssh.1
man/man8/sftp-server.8
man/man8/sshd.8
sbin/sshd
-share/examples/ssh/ssh_config
-share/examples/ssh/sshd_config
-@dirrm share/examples/ssh
+share/examples/openssh/ssh_config
+share/examples/openssh/sshd_config
+@dirrm share/examples/openssh
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-06 15:32:30 +0000