Import of OpenSSH 4.3p2

diff --git a/openssh/ChangeLog b/openssh/ChangeLog
index 226880e43ffc8a066de8f396c4a272c287658638..5bb99a7a7485200cba06adf233250fac624711e6 100644 (file)
--- a/openssh/ChangeLog
+++ b/openssh/ChangeLog
@@ -1,3 +1,36 @@
+20060211
+ - (dtucker) [README] Bump release notes URL.
+ - (djm) Release 4.3p2
+
+20060208
+ - (tim) [session.c] Logout records were not updated on systems with
+   post auth privsep disabled due to bug 1086 changes. Analysis and patch
+   by vinschen at redhat.com. OK tim@, dtucker@.
+ - (dtucker) [configure.ac] Typo in Ultrix and NewsOS sections (NEED_SETPRGP
+   -> NEED_SETPGRP), reported by Berhard Simon.  ok tim@
+
+20060206
+ - (tim) [configure.ac] Remove unnecessary tests for net/if.h and 
+   netinet/in_systm.h. OK dtucker@.
+
+20060205
+ - (tim) [configure.ac] Add AC_REVISION. Add sys/time.h to lastlog.h test
+   for Solaris. OK dtucker@.
+ - (tim) [configure.ac] Bug #1149. Changes in QNX section only. Patch by
+   kraai at ftbfs.org.
+
+20060203
+ - (tim) [configure.ac] test for egrep (AC_PROG_EGREP) before first
+   AC_CHECK_HEADERS test. Without it, if AC_CHECK_HEADERS is first run
+   by a platform specific check, builtin standard includes tests will be
+   skipped on the other platforms.
+   Analysis and suggestion by vinschen at redhat.com, patch by dtucker@.
+   OK tim@, djm@.
+
+20060202
+ - (dtucker) [configure.ac] Bug #1148: Fix "crippled AES" test so that it
+   works with picky compilers.  Patch from alex.kiernan at thus.net.
+
 20060201
  - (djm) [regress/test-exec.sh] Try 'logname' as well as 'whoami' to 
    determine the user's login name - needed for regress tests on Solaris 

diff --git a/openssh/README b/openssh/README
index 1558cc4c0e91c158765e4bb8666748994ffdbaaf..0567aa8185f322b1e740bc25e30f7f0e2a729a2c 100644 (file)
--- a/openssh/README
+++ b/openssh/README
@@ -1,4 +1,4 @@
-See http://www.openssh.com/txt/release-4.3 for the release notes.
+See http://www.openssh.com/txt/release-4.3p2 for the release notes.
 
 - A Japanese translation of this document and of the OpenSSH FAQ is
 - available at http://www.unixuser.org/~haruyama/security/openssh/index.html

diff --git a/openssh/configure.ac b/openssh/configure.ac
index 4fedaaae5d1ac5433f28974f53def5da8d5cb395..f2c86a53acd51ef4f3ccac87590ce32f591d7f0f 100644 (file)
--- a/openssh/configure.ac
+++ b/openssh/configure.ac
@@ -15,6 +15,7 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org)
+AC_REVISION($Revision$)
 AC_CONFIG_SRCDIR([ssh.c])
 
 AC_CONFIG_HEADER(config.h)
@@ -27,6 +28,7 @@ AC_PROG_AWK
 AC_PROG_CPP
 AC_PROG_RANLIB
 AC_PROG_INSTALL
+AC_PROG_EGREP
 AC_PATH_PROG(AR, ar)
 AC_PATH_PROG(CAT, cat)
 AC_PATH_PROG(KILL, kill)
@@ -343,7 +345,7 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16))
        fi
        ;;
 mips-sony-bsd|mips-sony-newsos4)
-       AC_DEFINE(NEED_SETPRGP, 1, [Need setpgrp to acquire controlling tty])
+       AC_DEFINE(NEED_SETPGRP, 1, [Need setpgrp to acquire controlling tty])
        SONY=1
        ;;
 *-*-netbsd*)
@@ -575,18 +577,19 @@ mips-sony-bsd|mips-sony-newsos4)
        AC_DEFINE(BROKEN_SETREGID)
        ;;
 
-*-*-nto-qnx)
+*-*-nto-qnx*)
        AC_DEFINE(USE_PIPES)
        AC_DEFINE(NO_X11_UNIX_SOCKETS)
        AC_DEFINE(MISSING_NFDBITS, 1, [Define on *nto-qnx systems])
        AC_DEFINE(MISSING_HOWMANY, 1, [Define on *nto-qnx systems])
        AC_DEFINE(MISSING_FD_MASK, 1, [Define on *nto-qnx systems])
+       AC_DEFINE(DISABLE_LASTLOG)
        ;;
 
 *-*-ultrix*)
        AC_DEFINE(BROKEN_GETGROUPS, 1, [getgroups(0,NULL) will return -1])
        AC_DEFINE(BROKEN_MMAP, 1, [Ultrix mmap can't map files])
-       AC_DEFINE(NEED_SETPRGP)
+       AC_DEFINE(NEED_SETPGRP)
        AC_DEFINE(HAVE_SYS_SYSLOG_H, 1, [Force use of sys/syslog.h on Ultrix])
        ;;
 
@@ -672,16 +675,13 @@ AC_CHECK_HEADERS( \
        glob.h \
        ia.h \
        iaf.h \
-       lastlog.h \
        limits.h \
        login.h \
        login_cap.h \
        maillock.h \
        ndir.h \
-       net/if.h \
        netdb.h \
        netgroup.h \
-       netinet/in_systm.h \
        pam/pam_appl.h \
        paths.h \
        pty.h \
@@ -723,6 +723,13 @@ AC_CHECK_HEADERS( \
        vis.h \
 )
 
+# lastlog.h requires sys/time.h to be included first on Solaris
+AC_CHECK_HEADERS(lastlog.h, [], [], [
+#ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
+#endif
+])
+
 # sys/ptms.h requires sys/stream.h to be included first on Solaris
 AC_CHECK_HEADERS(sys/ptms.h, [], [], [
 #ifdef HAVE_SYS_STREAM_H
@@ -1832,7 +1839,7 @@ AC_COMPILE_IFELSE(
        [AC_LANG_SOURCE([[
 #include <string.h>
 #include <openssl/evp.h>
-int main(void) { exit(EVP_aes_192_cbc() == NULL || EVP_aes_256_cbc() == NULL)}
+int main(void) { exit(EVP_aes_192_cbc() == NULL || EVP_aes_256_cbc() == NULL);}
        ]])],
        [
                AC_MSG_RESULT(no)

diff --git a/openssh/contrib/caldera/openssh.spec b/openssh/contrib/caldera/openssh.spec
index 3a97b0934a8a1cd713a6c2549166606d9114a6ae..1748d9e54afb2a4ffb742c527e8edc636deb2ead 100644 (file)
--- a/openssh/contrib/caldera/openssh.spec
+++ b/openssh/contrib/caldera/openssh.spec
@@ -17,7 +17,7 @@
 #old cvs stuff.  please update before use.  may be deprecated.
 %define use_stable     1
 %if %{use_stable}
-  %define version      4.3p1
+  %define version      4.3p2
   %define cvs          %{nil}
   %define release      1
 %else

diff --git a/openssh/contrib/redhat/openssh.spec b/openssh/contrib/redhat/openssh.spec
index 545e27b648c813424431d9ed9f11721751b2c468..cbdf7bbc79a084db3880b0173e5afefee4fa4108 100644 (file)
--- a/openssh/contrib/redhat/openssh.spec
+++ b/openssh/contrib/redhat/openssh.spec
@@ -1,4 +1,4 @@
-%define ver 4.3p1
+%define ver 4.3p2
 %define rel 1
 
 # OpenSSH privilege separation requires a user & group ID

diff --git a/openssh/contrib/suse/openssh.spec b/openssh/contrib/suse/openssh.spec
index e7739bd91deacde4704d29a6a15a229b48cb7586..b49e78c65e62ace5cd2c93177e38e085e2557ad2 100644 (file)
--- a/openssh/contrib/suse/openssh.spec
+++ b/openssh/contrib/suse/openssh.spec
@@ -13,7 +13,7 @@
 
 Summary:       OpenSSH, a free Secure Shell (SSH) protocol implementation
 Name:          openssh
-Version:       4.3p1
+Version:       4.3p2
 URL:           http://www.openssh.com/
 Release:       1
 Source0:       openssh-%{version}.tar.gz

diff --git a/openssh/session.c b/openssh/session.c
index 2bf9044048b6b97d324353f9aebcc16107ff94ff..0cbd5fbb227028855c3daff49301bbad2939af2c 100644 (file)
--- a/openssh/session.c
+++ b/openssh/session.c
@@ -2176,7 +2176,6 @@ session_exit_message(Session *s, int status)
 
        /* disconnect channel */
        debug("session_exit_message: release channel %d", s->chanid);
-       s->pid = 0;
 
        /*
         * Adjust cleanup callback attachment to send close messages when
@@ -2238,6 +2237,7 @@ session_close_by_pid(pid_t pid, int status)
                session_exit_message(s, status);
        if (s->ttyfd != -1)
                session_pty_cleanup(s);
+       s->pid = 0;
 }
 
 /*

diff --git a/openssh/version.h b/openssh/version.h
index 2b729524e220661d937c467b6b0caea4f1e392c0..d5fd0c6ce6886d5d14ef29026e272667b4663a63 100644 (file)
--- a/openssh/version.h
+++ b/openssh/version.h
@@ -2,5 +2,5 @@
 
 #define SSH_VERSION    "OpenSSH_4.3"
 
-#define SSH_PORTABLE   "p1"
+#define SSH_PORTABLE   "p2"
 #define SSH_RELEASE    SSH_VERSION SSH_PORTABLE