diff options
author | Colin Watson <cjwatson@debian.org> | 2007-06-12 16:16:35 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2007-06-12 16:16:35 +0000 |
commit | b7e40fa9da0b5491534a429dadb321eab5a77558 (patch) | |
tree | bed1da11e9f829925797aa093e379fc0b5868ecd /Makefile.in | |
parent | 4f84beedf1005e44ff33c854abd6b711ffc0adb7 (diff) | |
parent | 086ea76990b1e6287c24b6db74adffd4605eb3b0 (diff) |
* New upstream release (closes: #395507, #397961, #420035). Important
changes not previously backported to 4.3p2:
- 4.4/4.4p1 (http://www.openssh.org/txt/release-4.4):
+ On portable OpenSSH, fix a GSSAPI authentication abort that could be
used to determine the validity of usernames on some platforms.
+ Implemented conditional configuration in sshd_config(5) using the
"Match" directive. This allows some configuration options to be
selectively overridden if specific criteria (based on user, group,
hostname and/or address) are met. So far a useful subset of
post-authentication options are supported and more are expected to
be added in future releases.
+ Add support for Diffie-Hellman group exchange key agreement with a
final hash of SHA256.
+ Added a "ForceCommand" directive to sshd_config(5). Similar to the
command="..." option accepted in ~/.ssh/authorized_keys, this forces
the execution of the specified command regardless of what the user
requested. This is very useful in conjunction with the new "Match"
option.
+ Add a "PermitOpen" directive to sshd_config(5). This mirrors the
permitopen="..." authorized_keys option, allowing fine-grained
control over the port-forwardings that a user is allowed to
establish.
+ Add optional logging of transactions to sftp-server(8).
+ ssh(1) will now record port numbers for hosts stored in
~/.ssh/known_hosts when a non-standard port has been requested
(closes: #50612).
+ Add an "ExitOnForwardFailure" option to cause ssh(1) to exit (with a
non-zero exit code) when requested port forwardings could not be
established.
+ Extend sshd_config(5) "SubSystem" declarations to allow the
specification of command-line arguments.
+ Replacement of all integer overflow susceptible invocations of
malloc(3) and realloc(3) with overflow-checking equivalents.
+ Many manpage fixes and improvements.
+ Add optional support for OpenSSL hardware accelerators (engines),
enabled using the --with-ssl-engine configure option.
+ Tokens in configuration files may be double-quoted in order to
contain spaces (closes: #319639).
+ Move a debug() call out of a SIGCHLD handler, fixing a hang when the
session exits very quickly (closes: #307890).
+ Fix some incorrect buffer allocation calculations (closes: #410599).
+ ssh-add doesn't ask for a passphrase if key file permissions are too
liberal (closes: #103677).
+ Likewise, ssh doesn't ask either (closes: #99675).
- 4.6/4.6p1 (http://www.openssh.org/txt/release-4.6):
+ sshd now allows the enabling and disabling of authentication methods
on a per user, group, host and network basis via the Match directive
in sshd_config.
+ Fixed an inconsistent check for a terminal when displaying scp
progress meter (closes: #257524).
+ Fix "hang on exit" when background processes are running at the time
of exit on a ttyful/login session (closes: #88337).
* Update to current GSSAPI patch from
http://www.sxw.org.uk/computing/patches/openssh-4.6p1-gsskex-20070312.patch;
install ChangeLog.gssapi.
Diffstat (limited to 'Makefile.in')
-rw-r--r-- | Makefile.in | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/Makefile.in b/Makefile.in index ea738aac1..1e79ab913 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: Makefile.in,v 1.274 2006/01/01 08:47:05 djm Exp $ | 1 | # $Id: Makefile.in,v 1.283 2006/10/23 21:44:47 tim 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@ |
@@ -11,6 +11,7 @@ bindir=@bindir@ | |||
11 | sbindir=@sbindir@ | 11 | sbindir=@sbindir@ |
12 | libexecdir=@libexecdir@ | 12 | libexecdir=@libexecdir@ |
13 | datadir=@datadir@ | 13 | datadir=@datadir@ |
14 | datarootdir=@datarootdir@ | ||
14 | mandir=@mandir@ | 15 | mandir=@mandir@ |
15 | mansubdir=@mansubdir@ | 16 | mansubdir=@mansubdir@ |
16 | sysconfdir=@sysconfdir@ | 17 | sysconfdir=@sysconfdir@ |
@@ -44,6 +45,7 @@ CFLAGS=@CFLAGS@ | |||
44 | CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@ | 45 | CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@ |
45 | LIBS=@LIBS@ | 46 | LIBS=@LIBS@ |
46 | LIBSELINUX=@LIBSELINUX@ | 47 | LIBSELINUX=@LIBSELINUX@ |
48 | SSHDLIBS=@SSHDLIBS@ | ||
47 | LIBEDIT=@LIBEDIT@ | 49 | LIBEDIT=@LIBEDIT@ |
48 | LIBPAM=@LIBPAM@ | 50 | LIBPAM=@LIBPAM@ |
49 | LIBWRAP=@LIBWRAP@ | 51 | LIBWRAP=@LIBWRAP@ |
@@ -63,11 +65,11 @@ INSTALL_SSH_RAND_HELPER=@INSTALL_SSH_RAND_HELPER@ | |||
63 | 65 | ||
64 | TARGETS=ssh$(EXEEXT) sshd$(EXEEXT) ssh-add$(EXEEXT) ssh-keygen$(EXEEXT) ssh-keyscan${EXEEXT} ssh-keysign${EXEEXT} ssh-agent$(EXEEXT) scp$(EXEEXT) ssh-rand-helper${EXEEXT} sftp-server$(EXEEXT) sftp$(EXEEXT) | 66 | TARGETS=ssh$(EXEEXT) sshd$(EXEEXT) ssh-add$(EXEEXT) ssh-keygen$(EXEEXT) ssh-keyscan${EXEEXT} ssh-keysign${EXEEXT} ssh-agent$(EXEEXT) scp$(EXEEXT) ssh-rand-helper${EXEEXT} sftp-server$(EXEEXT) sftp$(EXEEXT) |
65 | 67 | ||
66 | LIBSSH_OBJS=acss.o authfd.o authfile.o bufaux.o buffer.o \ | 68 | LIBSSH_OBJS=acss.o authfd.o authfile.o bufaux.o bufbn.o buffer.o \ |
67 | canohost.o channels.o cipher.o cipher-acss.o cipher-aes.o \ | 69 | canohost.o channels.o cipher.o cipher-acss.o cipher-aes.o \ |
68 | cipher-bf1.o cipher-ctr.o cipher-3des1.o cleanup.o \ | 70 | cipher-bf1.o cipher-ctr.o cipher-3des1.o cleanup.o \ |
69 | compat.o compress.o crc32.o deattack.o fatal.o hostfile.o \ | 71 | compat.o compress.o crc32.o deattack.o fatal.o hostfile.o \ |
70 | log.o match.o moduli.o nchan.o packet.o \ | 72 | log.o match.o md-sha256.o moduli.o nchan.o packet.o \ |
71 | readpass.o rsa.o ttymodes.o xmalloc.o \ | 73 | readpass.o rsa.o ttymodes.o xmalloc.o \ |
72 | atomicio.o key.o dispatch.o kex.o mac.o uidswap.o uuencode.o misc.o \ | 74 | atomicio.o key.o dispatch.o kex.o mac.o uidswap.o uuencode.o misc.o \ |
73 | monitor_fdpass.o rijndael.o ssh-dss.o ssh-rsa.o dh.o kexdh.o \ | 75 | monitor_fdpass.o rijndael.o ssh-dss.o ssh-rsa.o dh.o kexdh.o \ |
@@ -78,7 +80,7 @@ SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \ | |||
78 | sshconnect.o sshconnect1.o sshconnect2.o | 80 | sshconnect.o sshconnect1.o sshconnect2.o |
79 | 81 | ||
80 | SSHDOBJS=sshd.o auth-rhosts.o auth-passwd.o auth-rsa.o auth-rh-rsa.o \ | 82 | SSHDOBJS=sshd.o auth-rhosts.o auth-passwd.o auth-rsa.o auth-rh-rsa.o \ |
81 | sshpty.o sshlogin.o servconf.o serverloop.o selinux.o \ | 83 | sshpty.o sshlogin.o servconf.o serverloop.o \ |
82 | auth.o auth1.o auth2.o auth-options.o session.o \ | 84 | auth.o auth1.o auth2.o auth-options.o session.o \ |
83 | auth-chall.o auth2-chall.o groupaccess.o \ | 85 | auth-chall.o auth2-chall.o groupaccess.o \ |
84 | auth-skey.o auth-bsdauth.o auth2-hostbased.o auth2-kbdint.o \ | 86 | auth-skey.o auth-bsdauth.o auth2-hostbased.o auth2-kbdint.o \ |
@@ -87,7 +89,7 @@ SSHDOBJS=sshd.o auth-rhosts.o auth-passwd.o auth-rsa.o auth-rh-rsa.o \ | |||
87 | auth-krb5.o \ | 89 | auth-krb5.o \ |
88 | auth2-gss.o gss-serv.o gss-serv-krb5.o kexgsss.o\ | 90 | auth2-gss.o gss-serv.o gss-serv-krb5.o kexgsss.o\ |
89 | loginrec.o auth-pam.o auth-shadow.o auth-sia.o md5crypt.o \ | 91 | loginrec.o auth-pam.o auth-shadow.o auth-sia.o md5crypt.o \ |
90 | audit.o audit-bsm.o | 92 | audit.o audit-bsm.o platform.o |
91 | 93 | ||
92 | MANPAGES = scp.1.out ssh-add.1.out ssh-agent.1.out ssh-keygen.1.out ssh-keyscan.1.out ssh.1.out sshd.8.out sftp-server.8.out sftp.1.out ssh-rand-helper.8.out ssh-keysign.8.out sshd_config.5.out ssh_config.5.out | 94 | MANPAGES = scp.1.out ssh-add.1.out ssh-agent.1.out ssh-keygen.1.out ssh-keyscan.1.out ssh.1.out sshd.8.out sftp-server.8.out sftp.1.out ssh-rand-helper.8.out ssh-keysign.8.out sshd_config.5.out ssh_config.5.out |
93 | MANPAGES_IN = scp.1 ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh-keyscan.1 ssh.1 sshd.8 sftp-server.8 sftp.1 ssh-rand-helper.8 ssh-keysign.8 sshd_config.5 ssh_config.5 | 95 | MANPAGES_IN = scp.1 ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh-keyscan.1 ssh.1 sshd.8 sftp-server.8 sftp.1 ssh-rand-helper.8 ssh-keysign.8 sshd_config.5 ssh_config.5 |
@@ -108,7 +110,7 @@ PATHSUBS = \ | |||
108 | -e 's|/etc/ssh/ssh_host_rsa_key|$(sysconfdir)/ssh_host_rsa_key|g' \ | 110 | -e 's|/etc/ssh/ssh_host_rsa_key|$(sysconfdir)/ssh_host_rsa_key|g' \ |
109 | -e 's|/var/run/sshd.pid|$(piddir)/sshd.pid|g' \ | 111 | -e 's|/var/run/sshd.pid|$(piddir)/sshd.pid|g' \ |
110 | -e 's|/etc/ssh/moduli|$(sysconfdir)/moduli|g' \ | 112 | -e 's|/etc/ssh/moduli|$(sysconfdir)/moduli|g' \ |
111 | -e 's|/etc/sshrc|$(sysconfdir)/sshrc|g' \ | 113 | -e 's|/etc/ssh/sshrc|$(sysconfdir)/sshrc|g' \ |
112 | -e 's|/usr/X11R6/bin/xauth|$(XAUTH_PATH)|g' \ | 114 | -e 's|/usr/X11R6/bin/xauth|$(XAUTH_PATH)|g' \ |
113 | -e 's|/var/empty|$(PRIVSEP_PATH)|g' \ | 115 | -e 's|/var/empty|$(PRIVSEP_PATH)|g' \ |
114 | -e 's|/usr/bin:/bin:/usr/sbin:/sbin|@user_path@|g' | 116 | -e 's|/usr/bin:/bin:/usr/sbin:/sbin|@user_path@|g' |
@@ -137,7 +139,7 @@ ssh$(EXEEXT): $(LIBCOMPAT) libssh.a $(SSHOBJS) | |||
137 | $(LD) -o $@ $(SSHOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) | 139 | $(LD) -o $@ $(SSHOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) |
138 | 140 | ||
139 | sshd$(EXEEXT): libssh.a $(LIBCOMPAT) $(SSHDOBJS) | 141 | sshd$(EXEEXT): libssh.a $(LIBCOMPAT) $(SSHDOBJS) |
140 | $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBWRAP) $(LIBPAM) $(LIBSELINUX) $(LIBS) | 142 | $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBWRAP) $(LIBPAM) $(LIBSELINUX) $(SSHDLIBS) $(LIBS) |
141 | 143 | ||
142 | scp$(EXEEXT): $(LIBCOMPAT) libssh.a scp.o progressmeter.o | 144 | scp$(EXEEXT): $(LIBCOMPAT) libssh.a scp.o progressmeter.o |
143 | $(LD) -o $@ scp.o progressmeter.o bufaux.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) | 145 | $(LD) -o $@ scp.o progressmeter.o bufaux.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) |
@@ -202,8 +204,9 @@ clean: regressclean | |||
202 | 204 | ||
203 | distclean: regressclean | 205 | distclean: regressclean |
204 | rm -f *.o *.a $(TARGETS) logintest config.cache config.log | 206 | rm -f *.o *.a $(TARGETS) logintest config.cache config.log |
205 | rm -f *.out core opensshd.init | 207 | rm -f *.out core opensshd.init openssh.xml |
206 | rm -f Makefile buildpkg.sh config.h config.status ssh_prng_cmds survey.sh *~ | 208 | rm -f Makefile buildpkg.sh config.h config.status ssh_prng_cmds |
209 | rm -f survey.sh openbsd-compat/regress/Makefile *~ | ||
207 | rm -rf autom4te.cache | 210 | rm -rf autom4te.cache |
208 | (cd openbsd-compat && $(MAKE) distclean) | 211 | (cd openbsd-compat && $(MAKE) distclean) |
209 | (cd scard && $(MAKE) distclean) | 212 | (cd scard && $(MAKE) distclean) |
@@ -411,6 +414,9 @@ tests: $(TARGETS) | |||
411 | EXEEXT="$(EXEEXT)" \ | 414 | EXEEXT="$(EXEEXT)" \ |
412 | $@ | 415 | $@ |
413 | 416 | ||
417 | compat-tests: $(LIBCOMPAT) | ||
418 | (cd openbsd-compat/regress && $(MAKE)) | ||
419 | |||
414 | regressclean: | 420 | regressclean: |
415 | if [ -f regress/Makefile ] && [ -r regress/Makefile ]; then \ | 421 | if [ -f regress/Makefile ] && [ -r regress/Makefile ]; then \ |
416 | (cd regress && $(MAKE) clean) \ | 422 | (cd regress && $(MAKE) clean) \ |