update to ssh-1.2.25
This commit is contained in:
marc
parent
ef307d696e
commit
90618d1e0a
@ -1,15 +1,15 @@
|
||||
# OpenBSD makefile for: ssh
|
||||
# Version required: 1.2.23
|
||||
# Version required: 1.2.25
|
||||
# Date created: 16 Nov 1997
|
||||
# Whom: todd@OpenBSD.ORG
|
||||
#
|
||||
# $OpenBSD: Makefile,v 1.22 1998/06/02 18:09:46 marc Exp $
|
||||
# $OpenBSD: Makefile,v 1.23 1998/06/12 03:26:50 marc Exp $
|
||||
#
|
||||
# Maximal ssh package requires YES values for
|
||||
# USE_PERL, USE_TCPWRAP
|
||||
#
|
||||
|
||||
DISTNAME= ssh-1.2.23
|
||||
DISTNAME= ssh-1.2.25
|
||||
CATEGORIES= security net
|
||||
NO_CDROM= "CRYPTO: Third party crypto not allowed."
|
||||
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
MD5 (ssh-1.2.23.tar.gz) = b8355cba289cf6f4cab91ed8c58b8bc1
|
||||
MD5 (ssh-1.2.25.tar.gz) = f16c579f8d60d2f0eaabd3c30e46ca2c
|
||||
MD5 (rsaref2.tar.gz) = 0b474c97bf1f1c0d27e5a95f1239c08d
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
--- configure.~1~ Mon May 11 15:38:33 1998
|
||||
+++ configure Sun May 31 12:41:39 1998
|
||||
@@ -1764,13 +1764,6 @@
|
||||
--- configure.orig Thu Jun 11 07:01:48 1998
|
||||
+++ configure Thu Jun 11 19:52:41 1998
|
||||
@@ -1911,13 +1911,6 @@
|
||||
|
||||
export CFLAGS CC
|
||||
|
||||
@ -12,9 +12,9 @@
|
||||
-
|
||||
-
|
||||
echo $ac_n "checking that the compiler works""... $ac_c" 1>&6
|
||||
echo "configure:1776: checking that the compiler works" >&5
|
||||
echo "configure:1923: checking that the compiler works" >&5
|
||||
if test "$cross_compiling" = yes; then
|
||||
@@ -7218,7 +7211,7 @@
|
||||
@@ -7435,7 +7428,7 @@
|
||||
|
||||
cat >> $CONFIG_STATUS <<EOF
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
EOF
|
||||
cat >> $CONFIG_STATUS <<\EOF
|
||||
for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
|
||||
@@ -7422,6 +7415,8 @@
|
||||
@@ -7639,6 +7632,8 @@
|
||||
done
|
||||
|
||||
for ac_config_dir in gmp-2.0.2-ssh-2; do
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
--- Makefile.in.orig Mon May 11 15:37:58 1998
|
||||
+++ Makefile.in Sun May 31 12:44:06 1998
|
||||
@@ -276,12 +276,17 @@
|
||||
--- Makefile.in.orig Thu Jun 11 07:01:13 1998
|
||||
+++ Makefile.in Thu Jun 11 19:52:41 1998
|
||||
@@ -287,12 +287,17 @@
|
||||
SHELL = /bin/sh
|
||||
|
||||
GMPDIR = gmp-2.0.2-ssh-2
|
||||
@ -22,7 +22,7 @@
|
||||
|
||||
RSAREFDIR = rsaref2
|
||||
RSAREFSRCDIR = $(RSAREFDIR)/source
|
||||
@@ -385,7 +390,7 @@
|
||||
@@ -397,7 +402,7 @@
|
||||
$(CC) -o rfc-pg rfc-pg.o
|
||||
|
||||
.c.o:
|
||||
@ -31,7 +31,7 @@
|
||||
|
||||
sshd: $(SSHD_OBJS) $(GMPDEP) $(RSAREFDEP) $(ZLIBDEP)
|
||||
-rm -f sshd
|
||||
@@ -428,19 +433,19 @@
|
||||
@@ -440,19 +445,19 @@
|
||||
sed "s#&PERL&#$(PERL)#" <$(srcdir)/make-ssh-known-hosts.pl >make-ssh-known-hosts
|
||||
chmod +x make-ssh-known-hosts
|
||||
|
||||
@ -64,7 +64,7 @@
|
||||
|
||||
$(RSAREFSRCDIR)/librsaref.a:
|
||||
-if test '!' -d $(RSAREFDIR); then \
|
||||
@@ -497,7 +502,7 @@
|
||||
@@ -509,7 +514,7 @@
|
||||
# (otherwise it can only log in as the user it runs as, and must be
|
||||
# bound to a non-privileged port). Also, password authentication may
|
||||
# not be available if non-root and using shadow passwords.
|
||||
@ -73,7 +73,7 @@
|
||||
-rm -f $(install_prefix)$(bindir)/ssh1.old
|
||||
-mv $(install_prefix)$(bindir)/ssh1 $(install_prefix)$(bindir)/ssh1.old
|
||||
-chmod 755 $(install_prefix)$(bindir)/ssh1.old
|
||||
@@ -653,15 +658,15 @@
|
||||
@@ -665,15 +670,15 @@
|
||||
|
||||
clean:
|
||||
-rm -f *.o gmon.out *core $(PROGRAMS) rfc-pg
|
||||
@ -91,9 +91,9 @@
|
||||
+# cd $(GMPDIR); $(MAKE) distclean
|
||||
+# cd $(ZLIBDIR); $(MAKE) distclean
|
||||
|
||||
dist: dist-free
|
||||
dist: dist-commercial
|
||||
|
||||
@@ -690,12 +695,12 @@
|
||||
@@ -702,12 +707,12 @@
|
||||
-mkdir $(DISTNAME)
|
||||
cp $(DISTFILES) $(DISTNAME)
|
||||
for i in $(DISTSRCS); do cp $(srcdir)/$$i $(DISTNAME); done
|
||||
@ -110,7 +110,7 @@
|
||||
|
||||
#ifdef F_SECURE_COMMERCIAL
|
||||
#
|
||||
@@ -723,7 +728,7 @@
|
||||
@@ -735,7 +740,7 @@
|
||||
(echo "s/\.$$old_version\"/.$$new_version\"/g"; echo w; echo q) | ed $(srcdir)/version.h >/dev/null
|
||||
|
||||
depend:
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
--- servconf.c.orig Mon May 11 15:37:44 1998
|
||||
+++ servconf.c Sun May 31 12:48:17 1998
|
||||
@@ -209,7 +209,7 @@
|
||||
--- servconf.c.orig Thu Jun 11 07:01:12 1998
|
||||
+++ servconf.c Thu Jun 11 19:52:42 1998
|
||||
@@ -222,7 +222,7 @@
|
||||
if (options->idle_timeout == -1)
|
||||
options->idle_timeout = 0;
|
||||
if (options->check_mail == -1)
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
--- sshd.8.in.orig Mon May 11 15:37:57 1998
|
||||
+++ sshd.8.in Sun May 31 12:52:10 1998
|
||||
@@ -378,7 +378,7 @@
|
||||
--- sshd.8.in.orig Thu Jun 11 07:00:44 1998
|
||||
+++ sshd.8.in Thu Jun 11 19:52:42 1998
|
||||
@@ -406,7 +406,7 @@
|
||||
should print information whether you have new mail or not
|
||||
when a user logs in interactively. (On some systems it is also
|
||||
printed by the shell, /etc/profile, or equivalent.) The default is
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
--- sshconnect.c.orig Mon May 11 15:37:47 1998
|
||||
+++ sshconnect.c Sun May 31 12:54:46 1998
|
||||
@@ -326,6 +326,12 @@
|
||||
--- sshconnect.c.orig Thu Jun 11 07:01:13 1998
|
||||
+++ sshconnect.c Thu Jun 11 19:52:42 1998
|
||||
@@ -332,6 +332,12 @@
|
||||
{
|
||||
struct sockaddr_in sin;
|
||||
int p;
|
||||
@ -13,7 +13,7 @@
|
||||
for (p = 1023; p > 512; p--)
|
||||
{
|
||||
sock = socket(AF_INET, SOCK_STREAM, 0);
|
||||
@@ -353,6 +359,7 @@
|
||||
@@ -359,6 +365,7 @@
|
||||
}
|
||||
fatal("bind: %.100s", strerror(errno));
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
--- newchannels.c.orig Mon May 11 15:37:39 1998
|
||||
+++ newchannels.c Sun May 31 12:57:33 1998
|
||||
@@ -2336,6 +2336,10 @@
|
||||
--- newchannels.c.orig Thu Jun 11 07:01:12 1998
|
||||
+++ newchannels.c Thu Jun 11 19:52:43 1998
|
||||
@@ -2383,6 +2383,10 @@
|
||||
ssh-agent connections on your system */
|
||||
old_umask = umask(S_IRUSR|S_IXUSR|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH);
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user