diff options
author | Andrey A. Chernov <ache@FreeBSD.org> | 1999-02-05 06:11:36 +0000 |
---|---|---|
committer | Andrey A. Chernov <ache@FreeBSD.org> | 1999-02-05 06:11:36 +0000 |
commit | 83c6d7a174e0422ff9b57a3a35b5b194a082d938 (patch) | |
tree | d0b1646f583f6bafbe0f9b1a258af9f64c91cd8c /security/ssh2 | |
parent | Properly install and use resources. (diff) |
upgrade to 2.0.12
Notes
Notes:
svn path=/head/; revision=16540
Diffstat (limited to 'security/ssh2')
-rw-r--r-- | security/ssh2/Makefile | 6 | ||||
-rw-r--r-- | security/ssh2/distinfo | 2 | ||||
-rw-r--r-- | security/ssh2/files/patch-aa | 10 | ||||
-rw-r--r-- | security/ssh2/files/patch-ac | 11 | ||||
-rw-r--r-- | security/ssh2/files/patch-ag | 10 | ||||
-rw-r--r-- | security/ssh2/files/patch-ah | 23 |
6 files changed, 42 insertions, 20 deletions
diff --git a/security/ssh2/Makefile b/security/ssh2/Makefile index 12e8a8dc84b8..87d0fb64b084 100644 --- a/security/ssh2/Makefile +++ b/security/ssh2/Makefile @@ -1,14 +1,14 @@ # New ports collection makefile for: ssh2 -# Version required: 2.0.11 +# Version required: 2.0.* # Date created: 5 Oct 1998 # Whom: Issei Suzuki <issei@jp.FreeBSD.ORG> # -# $Id: Makefile,v 1.74 1998/12/01 09:33:58 obrien Exp $ +# $Id: Makefile,v 1.75 1998/12/01 11:10:33 obrien Exp $ # # Maximal ssh2 package requires YES values for # USE_SSH1, USE_TCPWRAP -DISTNAME= ssh-2.0.11 +DISTNAME= ssh-2.0.12 CATEGORIES= security net MASTER_SITES= ftp://ftp.cs.hut.fi/pub/ssh/ \ ftp://sunsite.unc.edu/pub/packages/security/ssh/ \ diff --git a/security/ssh2/distinfo b/security/ssh2/distinfo index 683c2807e76a..46cdd5a06caf 100644 --- a/security/ssh2/distinfo +++ b/security/ssh2/distinfo @@ -1 +1 @@ -MD5 (ssh-2.0.11.tar.gz) = 2c93c5fa0cb530178bee8675e92be785 +MD5 (ssh-2.0.12.tar.gz) = 506632f8a9c2f5201587e2130a4d5408 diff --git a/security/ssh2/files/patch-aa b/security/ssh2/files/patch-aa index 87e4f78e3908..f24db6ecb854 100644 --- a/security/ssh2/files/patch-aa +++ b/security/ssh2/files/patch-aa @@ -1,6 +1,6 @@ ---- lib/Makefile.in.old Tue Nov 24 18:18:33 1998 -+++ lib/Makefile.in Tue Nov 24 18:20:13 1998 -@@ -97,14 +97,14 @@ +--- lib/Makefile.in.orig Fri Jan 29 14:30:20 1999 ++++ lib/Makefile.in Fri Feb 5 08:38:26 1999 +@@ -98,14 +98,14 @@ AUTOMAKE_OPTIONS = 1.0 foreign dist-zip no-dependencies @@ -10,14 +10,14 @@ # sshtest testsuite lib_LIBRARIES = libssh.a - # libsshcrypt.kpure.a + # libsshcrypt.kpure.a -SUBLIBRARIES = sshmath/libsshmath.a zlib/libz.a sshutil/libsshutil.a sshapputil/libsshapputil.a sshcrypt/libsshcrypt.a sshproto/libsshproto.a sshsession/libsshsession.a sshreadline/libsshreadline.a +SUBLIBRARIES = sshmath/libsshmath.a sshutil/libsshutil.a sshapputil/libsshapputil.a sshcrypt/libsshcrypt.a sshproto/libsshproto.a sshsession/libsshsession.a sshreadline/libsshreadline.a mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../sshconf.h CONFIG_CLEAN_FILES = -@@ -367,11 +367,6 @@ +@@ -368,11 +368,6 @@ all-local: includes includes: -if test '!' -d ../include; then mkdir ../include; fi diff --git a/security/ssh2/files/patch-ac b/security/ssh2/files/patch-ac index 371c450ac128..2c46c780573b 100644 --- a/security/ssh2/files/patch-ac +++ b/security/ssh2/files/patch-ac @@ -1,11 +1,10 @@ ---- lib/sshcrypt/Makefile.in.old Tue Nov 24 18:24:57 1998 -+++ lib/sshcrypt/Makefile.in Tue Nov 24 18:25:21 1998 -@@ -173,7 +173,7 @@ - INCLUDES = -I../.. -I. -I$(srcdir) \ +--- lib/sshcrypt/Makefile.in.orig Fri Jan 29 14:30:22 1999 ++++ lib/sshcrypt/Makefile.in Fri Feb 5 08:42:04 1999 +@@ -176,7 +176,6 @@ -I$(top_builddir) -I$(top_srcdir) \ -I../sshutil -I$(srcdir)/../sshutil \ -- -I../sshmath -I$(srcdir)/../sshmath -I../zlib -I$(srcdir)/../zlib \ -+ -I../sshmath -I$(srcdir)/../sshmath \ + -I../sshmath -I$(srcdir)/../sshmath \ +- -I../zlib -I$(srcdir)/../zlib \ -I../sshscard -I$(srcdir)/../sshscard \ -I../trq -I$(srcdir)/../trq mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/security/ssh2/files/patch-ag b/security/ssh2/files/patch-ag index 8cbc44ea170b..b3d8946a403c 100644 --- a/security/ssh2/files/patch-ag +++ b/security/ssh2/files/patch-ag @@ -1,6 +1,6 @@ ---- configure.orig Mon Nov 16 15:24:41 1998 -+++ configure Fri Jan 29 00:24:27 1999 -@@ -4825,7 +4825,7 @@ +--- configure.orig Fri Jan 29 14:30:18 1999 ++++ configure Fri Feb 5 08:55:50 1999 +@@ -4874,7 +4874,7 @@ char tgetent(); int main() { @@ -8,8 +8,8 @@ +XXXtgetent() ; return 0; } EOF - if { (eval echo configure:4832: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then -@@ -4855,7 +4855,7 @@ + if { (eval echo configure:4881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +@@ -4904,7 +4904,7 @@ echo "$ac_t""no" 1>&6 fi diff --git a/security/ssh2/files/patch-ah b/security/ssh2/files/patch-ah new file mode 100644 index 000000000000..61bf08524171 --- /dev/null +++ b/security/ssh2/files/patch-ah @@ -0,0 +1,23 @@ +--- apps/ssh/sshchsession.c.bak Mon Jan 18 13:32:24 1999 ++++ apps/ssh/sshchsession.c Fri Feb 5 08:49:14 1999 +@@ -628,12 +628,20 @@ + char buff[100], *time_string; + + /* Check /etc/nologin. */ ++#ifdef __FreeBSD__ ++ f = fopen("/var/run/nologin", "r"); ++#else + f = fopen("/etc/nologin", "r"); ++#endif + if (f) + { /* /etc/nologin exists. Print its contents and exit. */ + /* Print a message about /etc/nologin existing; I am getting + questions because of this every week. */ ++#ifdef __FreeBSD__ ++ ssh_warning("Logins are currently denied by /var/run/nologin:"); ++#else + ssh_warning("Logins are currently denied by /etc/nologin:"); ++#endif + while (fgets(buf, sizeof(buf), f)) + fputs(buf, stderr); + fclose(f); |