summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2006-03-15 13:09:18 +1100
committerDamien Miller <djm@mindrot.org>2006-03-15 13:09:18 +1100
commit471e9b3ca6500cff8f97f0a472719b01fa3eeb09 (patch)
tree44e6b72fee8fdfec47d039f83b7b07b65d8371fa
parentdcf4ca110e751208400660317ae2cee6f28cbff9 (diff)
- (djm) [Makefile.in openbsd-compat/Makefile.in] Add added files
-rw-r--r--ChangeLog3
-rw-r--r--Makefile.in4
-rw-r--r--openbsd-compat/Makefile.in4
3 files changed, 6 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 1664c4fd0..fbdf12179 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -248,6 +248,7 @@
248 KEX support, should work with libc SHA256 support or OpenSSL 248 KEX support, should work with libc SHA256 support or OpenSSL
249 EVP_sha256 if present 249 EVP_sha256 if present
250 - (djm) [includes.h] Restore accidentally dropped netinet/in.h 250 - (djm) [includes.h] Restore accidentally dropped netinet/in.h
251 - (djm) [Makefile.in openbsd-compat/Makefile.in] Add added files
251 252
25220060313 25320060313
253 - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong) 254 - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong)
@@ -4149,4 +4150,4 @@
4149 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 4150 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
4150 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 4151 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
4151 4152
4152$Id: ChangeLog,v 1.4209 2006/03/15 02:07:48 djm Exp $ 4153$Id: ChangeLog,v 1.4210 2006/03/15 02:09:18 djm Exp $
diff --git a/Makefile.in b/Makefile.in
index 1baffb4df..57475f003 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
1# $Id: Makefile.in,v 1.275 2006/02/19 11:50:20 dtucker Exp $ 1# $Id: Makefile.in,v 1.276 2006/03/15 02:09:18 djm Exp $
2 2
3# uncomment if you run a non bourne compatable shell. Ie. csh 3# uncomment if you run a non bourne compatable shell. Ie. csh
4#SHELL = @SH@ 4#SHELL = @SH@
@@ -66,7 +66,7 @@ LIBSSH_OBJS=acss.o authfd.o authfile.o bufaux.o buffer.o \
66 canohost.o channels.o cipher.o cipher-acss.o cipher-aes.o \ 66 canohost.o channels.o cipher.o cipher-acss.o cipher-aes.o \
67 cipher-bf1.o cipher-ctr.o cipher-3des1.o cleanup.o \ 67 cipher-bf1.o cipher-ctr.o cipher-3des1.o cleanup.o \
68 compat.o compress.o crc32.o deattack.o fatal.o hostfile.o \ 68 compat.o compress.o crc32.o deattack.o fatal.o hostfile.o \
69 log.o match.o moduli.o nchan.o packet.o \ 69 log.o match.o md-sha256.o moduli.o nchan.o packet.o \
70 readpass.o rsa.o ttymodes.o xmalloc.o \ 70 readpass.o rsa.o ttymodes.o xmalloc.o \
71 atomicio.o key.o dispatch.o kex.o mac.o uidswap.o uuencode.o misc.o \ 71 atomicio.o key.o dispatch.o kex.o mac.o uidswap.o uuencode.o misc.o \
72 monitor_fdpass.o rijndael.o ssh-dss.o ssh-rsa.o dh.o kexdh.o \ 72 monitor_fdpass.o rijndael.o ssh-dss.o ssh-rsa.o dh.o kexdh.o \
diff --git a/openbsd-compat/Makefile.in b/openbsd-compat/Makefile.in
index 3a8703bc1..f1a706241 100644
--- a/openbsd-compat/Makefile.in
+++ b/openbsd-compat/Makefile.in
@@ -1,4 +1,4 @@
1# $Id: Makefile.in,v 1.37 2005/12/31 05:33:37 djm Exp $ 1# $Id: Makefile.in,v 1.38 2006/03/15 02:09:20 djm Exp $
2 2
3sysconfdir=@sysconfdir@ 3sysconfdir=@sysconfdir@
4piddir=@piddir@ 4piddir=@piddir@
@@ -16,7 +16,7 @@ RANLIB=@RANLIB@
16INSTALL=@INSTALL@ 16INSTALL=@INSTALL@
17LDFLAGS=-L. @LDFLAGS@ 17LDFLAGS=-L. @LDFLAGS@
18 18
19OPENBSD=base64.o basename.o bindresvport.o daemon.o dirname.o getcwd.o getgrouplist.o getopt.o getrrsetbyname.o glob.o inet_aton.o inet_ntoa.o inet_ntop.o mktemp.o readpassphrase.o realpath.o rresvport.o setenv.o setproctitle.o sigact.o strlcat.o strlcpy.o strmode.o strsep.o strtonum.o strtoll.o strtoul.o vis.o 19OPENBSD=base64.o basename.o bindresvport.o daemon.o dirname.o getcwd.o getgrouplist.o getopt.o getrrsetbyname.o glob.o inet_aton.o inet_ntoa.o inet_ntop.o mktemp.o readpassphrase.o realpath.o rresvport.o setenv.o setproctitle.o sha2.o sigact.o strlcat.o strlcpy.o strmode.o strsep.o strtonum.o strtoll.o strtoul.o vis.o
20 20
21COMPAT=bsd-arc4random.o bsd-asprintf.o bsd-closefrom.o bsd-cray.o bsd-cygwin_util.o bsd-getpeereid.o bsd-misc.o bsd-nextstep.o bsd-openpty.o bsd-snprintf.o bsd-waitpid.o fake-rfc2553.o openssl-compat.o xmmap.o xcrypt.o 21COMPAT=bsd-arc4random.o bsd-asprintf.o bsd-closefrom.o bsd-cray.o bsd-cygwin_util.o bsd-getpeereid.o bsd-misc.o bsd-nextstep.o bsd-openpty.o bsd-snprintf.o bsd-waitpid.o fake-rfc2553.o openssl-compat.o xmmap.o xcrypt.o
22 22