- (bal) UnixWare 2.0 fixes by Tim Rice <tim@multitalents.net>
- (bal) Disable sftp-server if no 64bit int support exists. Based on patch by Tim Rice <tim@multitalents.net> - (bal) Makefile.in changes to uninstall: target to remove sftp-server and sftp-server.8 manpage.
This commit is contained in:
Ben Lindstrom
parent
70c4dce2fe
commit
3ad650a88d
|
|
@ -10,6 +10,11 @@
|
|||
strict_host_key_checking for host_status != HOST_CHANGED &&
|
||||
ip_status == HOST_CHANGED
|
||||
- (bal) authfile.c: Synced CVS ID tag
|
||||
- (bal) UnixWare 2.0 fixes by Tim Rice <tim@multitalents.net>
|
||||
- (bal) Disable sftp-server if no 64bit int support exists. Based on
|
||||
patch by Tim Rice <tim@multitalents.net>
|
||||
- (bal) Makefile.in changes to uninstall: target to remove sftp-server
|
||||
and sftp-server.8 manpage.
|
||||
|
||||
20010102
|
||||
- (bal) OpenBSD CVS Update
|
||||
|
|
|
|||
13
Makefile.in
13
Makefile.in
|
|
@ -33,7 +33,9 @@ SSH_MODE= @SSHMODE@
|
|||
|
||||
INSTALL_SSH_PRNG_CMDS=@INSTALL_SSH_PRNG_CMDS@
|
||||
|
||||
TARGETS=ssh$(EXEEXT) sshd$(EXEEXT) ssh-add$(EXEEXT) ssh-keygen$(EXEEXT) ssh-keyscan${EXEEXT} ssh-agent$(EXEEXT) scp$(EXEEXT) sftp-server$(EXEEXT)
|
||||
@NO_SFTP@SFTP-SERVER=sftp-server$(EXEEXT)
|
||||
|
||||
TARGETS=ssh$(EXEEXT) sshd$(EXEEXT) ssh-add$(EXEEXT) ssh-keygen$(EXEEXT) ssh-keyscan${EXEEXT} ssh-agent$(EXEEXT) scp$(EXEEXT) $(SFTP-SERVER)
|
||||
|
||||
LIBSSH_OBJS=atomicio.o authfd.o authfile.o bufaux.o buffer.o canohost.o channels.o cipher.o cli.o compat.o compress.o crc32.o cygwin_util.o deattack.o dispatch.o hmac.o hostfile.o key.o kex.o log.o match.o mpaux.o nchan.o packet.o radix.o rijndael.o entropy.o readpass.o rsa.o ssh-dss.o ssh-rsa.o tildexpand.o ttymodes.o uidswap.o util.o uuencode.o xmalloc.o
|
||||
|
||||
|
|
@ -155,7 +157,7 @@ install-files:
|
|||
$(INSTALL) -m 0755 -s ssh-keygen $(DESTDIR)$(bindir)/ssh-keygen
|
||||
$(INSTALL) -m 0775 -s ssh-keyscan $(DESTDIR)$(bindir)/ssh-keyscan
|
||||
$(INSTALL) -m 0755 -s sshd $(DESTDIR)$(sbindir)/sshd
|
||||
$(INSTALL) -m 0755 -s sftp-server $(DESTDIR)$(libexecdir)/sftp-server
|
||||
@NO_SFTP@$(INSTALL) -m 0755 -s sftp-server $(DESTDIR)$(libexecdir)/sftp-server
|
||||
$(INSTALL) -m 644 ssh.[01].out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh.1
|
||||
$(INSTALL) -m 644 scp.[01].out $(DESTDIR)$(mandir)/$(mansubdir)1/scp.1
|
||||
$(INSTALL) -m 644 ssh-add.[01].out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-add.1
|
||||
|
|
@ -163,7 +165,7 @@ install-files:
|
|||
$(INSTALL) -m 644 ssh-keygen.[01].out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keygen.1
|
||||
$(INSTALL) -m 644 ssh-keyscan.[01].out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keyscan.1
|
||||
$(INSTALL) -m 644 sshd.[08].out $(DESTDIR)$(mandir)/$(mansubdir)8/sshd.8
|
||||
$(INSTALL) -m 644 sftp-server.[08].out $(DESTDIR)$(mandir)/$(mansubdir)8/sftp-server.8
|
||||
@NO_SFTP@$(INSTALL) -m 644 sftp-server.[08].out $(DESTDIR)$(mandir)/$(mansubdir)8/sftp-server.8
|
||||
-rm -f $(DESTDIR)$(bindir)/slogin
|
||||
ln -s ssh$(EXEEXT) $(DESTDIR)$(bindir)/slogin
|
||||
-rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1
|
||||
|
|
@ -233,6 +235,7 @@ uninstallall: uninstall
|
|||
-rmdir $(DESTDIR)$(libexecdir)
|
||||
|
||||
uninstall:
|
||||
-rm -f $(DESTDIR)$(bindir)/slogin
|
||||
-rm -f $(DESTDIR)$(bindir)/ssh$(EXEEXT)
|
||||
-rm -f $(DESTDIR)$(bindir)/scp$(EXEEXT)
|
||||
-rm -f $(DESTDIR)$(bindir)/ssh-add$(EXEEXT)
|
||||
|
|
@ -240,6 +243,7 @@ uninstall:
|
|||
-rm -f $(DESTDIR)$(bindir)/ssh-keygen$(EXEEXT)
|
||||
-rm -f $(DESTDIR)$(bindir)/ssh-keyscan$(EXEEXT)
|
||||
-rm -f $(DESTDIR)$(sbindir)/sshd$(EXEEXT)
|
||||
-rm -r $(DESTDIR)$(libexecdir)/sftp-server$(EXEEXT)
|
||||
-rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh.1
|
||||
-rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/scp.1
|
||||
-rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-add.1
|
||||
|
|
@ -247,7 +251,6 @@ uninstall:
|
|||
-rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keygen.1
|
||||
-rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keyscan.1
|
||||
-rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/sshd.8
|
||||
-rm -f $(DESTDIR)$(bindir)/slogin
|
||||
-rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/sftp-server.8
|
||||
-rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1
|
||||
-rm -f $(DESTDIR)${ASKPASS_PROGRAM}
|
||||
-rmdir $(DESTDIR)$(libexecdir)/ssh ;
|
||||
|
|
|
|||
41
configure.in
41
configure.in
|
|
@ -188,7 +188,6 @@ mips-sony-bsd|mips-sony-newsos4)
|
|||
LDFLAGS="$LDFLAGS -L/usr/local/lib"
|
||||
MANTYPE='$(CATMAN)'
|
||||
mansubdir=cat
|
||||
LIBS="$LIBS -lgen -lsocket -lnsl -lresolv"
|
||||
enable_suid_ssh=no
|
||||
;;
|
||||
*-*-sysv5*)
|
||||
|
|
@ -196,7 +195,6 @@ mips-sony-bsd|mips-sony-newsos4)
|
|||
LDFLAGS="$LDFLAGS -L/usr/local/lib"
|
||||
MANTYPE='$(CATMAN)'
|
||||
mansubdir=cat
|
||||
LIBS="$LIBS -lgen -lsocket"
|
||||
enable_suid_ssh=no
|
||||
;;
|
||||
*-*-sysv*)
|
||||
|
|
@ -219,13 +217,14 @@ mips-sony-bsd|mips-sony-newsos4)
|
|||
rsh_path="/usr/bin/rcmd"
|
||||
AC_DEFINE(HAVE_SCO_PROTECTED_PW)
|
||||
AC_DEFINE(DISABLE_SHADOW)
|
||||
AC_DEFINE(HAVE_BOGUS_SYS_QUEUE_H)
|
||||
;;
|
||||
*-*-sco3.2v5*)
|
||||
CPPFLAGS="$CPPFLAGS -I/usr/local/include"
|
||||
LDFLAGS="$LDFLAGS -L/usr/local/lib"
|
||||
MANTYPE='$(CATMAN)'
|
||||
mansubdir=cat
|
||||
LIBS="$LIBS -lgen -lsocket -lprot -lx -ltinfo -lm"
|
||||
LIBS="$LIBS -lprot -lx -ltinfo -lm"
|
||||
no_dev_ptmx=1
|
||||
rsh_path="/usr/bin/rcmd"
|
||||
AC_DEFINE(HAVE_SCO_PROTECTED_PW)
|
||||
|
|
@ -284,6 +283,14 @@ AC_ARG_WITH(libs,
|
|||
|
||||
|
||||
# Checks for libraries.
|
||||
if test -z "$no_libsocket" ; then
|
||||
AC_CHECK_LIB(nsl, yp_match, , )
|
||||
fi
|
||||
if test -z "$no_libnsl" ; then
|
||||
AC_CHECK_LIB(socket, main, , )
|
||||
fi
|
||||
|
||||
AC_CHECK_LIB(gen, getspnam, LIBS="$LIBS -lgen")
|
||||
AC_CHECK_LIB(z, deflate, ,AC_MSG_ERROR([*** zlib missing - please install first ***]))
|
||||
AC_CHECK_LIB(util, login, AC_DEFINE(HAVE_LIBUTIL_LOGIN) LIBS="$LIBS -lutil")
|
||||
|
||||
|
|
@ -295,12 +302,13 @@ AC_CHECK_FUNC(regcomp,
|
|||
]
|
||||
)
|
||||
|
||||
if test -z "$no_libsocket" ; then
|
||||
AC_CHECK_LIB(nsl, yp_match, , )
|
||||
fi
|
||||
if test -z "$no_libnsl" ; then
|
||||
AC_CHECK_LIB(socket, main, , )
|
||||
fi
|
||||
dnl UnixWare 2.x
|
||||
AC_CHECK_FUNC(strcasecmp,
|
||||
[], [ AC_CHECK_LIB(resolv, strcasecmp, LIBS="$LIBS -lresolv") ]
|
||||
)
|
||||
AC_CHECK_FUNC(utimes,
|
||||
[], [ AC_CHECK_LIB(c89, utimes, LIBS="$LIBS -lc89") ]
|
||||
)
|
||||
|
||||
# Checks for header files.
|
||||
AC_CHECK_HEADERS(bstring.h endian.h floatingpoint.h getopt.h lastlog.h limits.h login.h login_cap.h maillock.h netdb.h netgroup.h netinet/in_systm.h paths.h poll.h pty.h shadow.h security/pam_appl.h sys/bitypes.h sys/bsdtty.h sys/cdefs.h sys/poll.h sys/queue.h sys/select.h sys/stat.h sys/stropts.h sys/sysmacros.h sys/time.h sys/ttcompat.h sys/un.h stddef.h time.h ttyent.h usersec.h util.h utmp.h utmpx.h vis.h)
|
||||
|
|
@ -801,6 +809,15 @@ if test "x$ac_cv_have_struct_addrinfo" = "xyes" ; then
|
|||
AC_DEFINE(HAVE_STRUCT_ADDRINFO)
|
||||
fi
|
||||
|
||||
# If we don't have int64_t then we can't compile sftp-server. So don't
|
||||
# even attempt to do it.
|
||||
if test "x$ac_cv_have_int64_t" = "xno" -a \
|
||||
"x$ac_cv_sizeof_long_int" != "x8" -a \
|
||||
"x$ac_cv_sizeof_long_long_int" = "x0" ; then
|
||||
NO_SFTP='#'
|
||||
AC_SUBST(NO_SFTP)
|
||||
fi
|
||||
|
||||
dnl Checks for structure members
|
||||
OSSH_CHECK_HEADER_FOR_FIELD(ut_host, utmp.h, HAVE_HOST_IN_UTMP)
|
||||
OSSH_CHECK_HEADER_FOR_FIELD(ut_host, utmpx.h, HAVE_HOST_IN_UTMPX)
|
||||
|
|
@ -1633,3 +1650,9 @@ if test ! -z "$BUILTIN_RNG" ; then
|
|||
echo "/dev/random in future versions of their OS."
|
||||
echo ""
|
||||
fi
|
||||
|
||||
if test ! -z "$NO_SFTP"; then
|
||||
echo "sftp-server will be disabled. Your compiler does not support"
|
||||
echo "64bit integers."
|
||||
echo ""
|
||||
fi
|
||||
|
|
|
|||
Loading…
Reference in New Issue