[pkgsrc/trunk]: pkgsrc/security/ssh2 Update to version 3.2.5

[seb <seb%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6fc2bd495ba5
branches:  trunk
changeset: 459948:6fc2bd495ba5
user:      seb <seb%pkgsrc.org@localhost>
date:      Tue Aug 12 19:08:55 2003 +0000

description:
Update to version 3.2.5

Previous versions have a security issue. Please update!

Thanks to gendalia@ for testing.

Changes since version 3.2.2:

2003-05-09  Sami J. Lehtinen  <sjl%ssh.com@localhost>

        * ssh-3.2.5.

        * Fixed a critical security bug with RSA signature
          verification. Mitigating factors: DSA is used by default (not
          vulnerable). Also, the attack requires that attacker has the
          public key and the attacker needs to precompute the signature
          data so, that it looks like a valid PKCS#1 signature. This is a
          non-trivial task to perform without the private
          key. Nonetheless, all users should update their servers and
          clients as soon as convenient. Workarounds are to not use RSA
          keys as host keys (though connecting to existing hosts with RSA
          hostkeys poses a serious risk with a vulnerable client), and
          disabling publickey authentication. Update your clients and
          servers.

2003-04-22  Sami J. Lehtinen  <sjl%ssh.com@localhost>

        * ssh-3.2.4.

        * sshd2: Binary (generated by us) is tagged as a "supported
          binary" for SecurID. (no actual code changes)

        * Previous: ssh-3.2.3.1.

2003-02-06  Sami J. Lehtinen  <sjl%ssh.com@localhost>

        * sftp2 (etc): Fixed a bug with readline jamming when pressing
          backspace (etc) on AIX and some other platforms.

2003-01-12  Sami J. Lehtinen  <sjl%ssh.com@localhost>

        * ssh-3.2.3.

2003-01-03  Sami J. Lehtinen  <sjl%ssh.com@localhost>

        * scp2: Removed broken special handling for SIGHUP, so that
          "nohup" can again work.

        * ssh2: Check whether we should ignore SIGQUIT, SIGINT, and do so,
          if necessary. Thanks for J. Schilling for pointing this one out.

        * ssh-add2: Make sure fgets() from pipe to ssh-askpass2 recovers
          from if interrupted by signal, i.e. SIGCHLD.

        * ssh2 (lib/sshsession/sshtty.c): As entry above, but for tcsetattr().

        * During "make install", use default size of key instead of hardcoded
          1024 when generating hostkey.

2002-12-18  Sami J. Lehtinen  <sjl%ssh.com@localhost>

        * scp2,sftp2: Print progress output to stdout, to make it
          distinguishable from errors in cron jobs etc.

2002-12-17  Sami J. Lehtinen  <sjl%ssh.com@localhost>

        * apps/ssh/sshchsession.c: Fixed a bug which caused sshd2 child
          server to jam occasionally after logging an event, if nsswitch had
          been configured to use LDAP.

2002-12-13  Sami J. Lehtinen  <sjl%ssh.com@localhost>

        * sshd2: Previous (by Tomi Mickelsson): Fixed a bug where
          specifying a local forwarding endpoint as an IP-address which was
          unresolvable would result in a crash.

2002-12-12  Sami J. Lehtinen  <sjl%ssh.com@localhost>

        * scp2: Fixed a bug/missing feature from scp2. It now reports
          information also when run when there is no tty. Also implemented
          --statistics=[no,yes,simple], where "yes" is old-style, "no" is
          analogous to "-Q" command-line option, and "simple" is the way
          the statistics are printed when there is no tty (no intermittent
          reporting, file size, transfer time and full file name are printed
          after the transfer for the specific file is finished).

2002-12-11  Sami J. Lehtinen  <sjl%ssh.com@localhost>

        * ssh-keygen2: respect "-P" and "-p" options when converting
          ssh1-keys.

2002-12-10  Sami J. Lehtinen  <sjl%ssh.com@localhost>

        * lib/sshutil/sshcore/sshdebug.c: Fixed a compilation problem
          manifested on older AIX and debugging enabled (as is default).

        * scp2: You can now specify the newline convention when using the
          "-a" option. See manual page scp2(1).

2002-11-08  Sami J. Lehtinen  <sjl%ssh.com@localhost>

        * Removed ssh-pubkeymgr and ssh-chrootmgr from the distribution
          (they didn't work too well).

        * apps/ssh/lib/sshproto/trcommon.c: Fixed a crash if hostkey
          algorithms or kex-methods couldn't be negotiated.

2002-11-05  Sami J. Lehtinen  <sjl%ssh.com@localhost>

        * lib/sshapputil/sshuserfile.c: Changed to use
          lib/sshsession/sigchld.c, instead of using wait() directly. This
          fixes the bug where the number of connections would slowly rise to
          the maximum when using MaxConnections and tcp-wrappers (it was a
          race-condition).

        * lib/sshsession/sigchld.c: Sigchld now keeps a list of recently
          exited children. This fixes a race condition, where the child
          process could exit before the mother process had registered a
          handler for it.

        * lib/sshsession: Fixed NetBSD 1.6 compilation. Also, NetBSD 1.6
          supports openpty style ptys, so fixed check to actually detect
          them on NetBSD. Don't use utmpx on NetBSD, as it doesn't seem to
          work (at least not in the way we use it).

        * lib/sshsession/sshunixuser.c: Make sure we have room for the
          NULL pointer in the groups array.

        * ssh2 (ssh1-emulation): Fixed a bug, which in some cases caused
          an assertion failure later.

2002-10-29  Sami J. Lehtinen  <sjl%ssh.com@localhost>

        * configure: Added /usr/X11R6/bin and /usr/X11/bin to search PATH
          for xauth to ease installation on pristine systems.

2002-10-22  Sami J. Lehtinen  <sjl%ssh.com@localhost>

        * lib/sshutil/sshnet/sshtcp.c: (by Tomi Ollila) Fixed a bug with
          SOCKS handling.

2002-10-01  Sami J. Lehtinen  <sjl%ssh.com@localhost>

        * lib/sshutil/sshpacketstream/sshpacketwrapper.c: (by Tomi Kause)
          Fixed a latent (in ssh2) bug, when writing to the stream from the
          received_cb.

        * lib/sshutil/sshnet/sshsocks.c: (by Tomi Ollila) Decode
          ipv6-mapped-ipv4-addresses when doing SOCKS4, as SOCKS4 only
          supports plain ipv4-addresses.

        * scp2: Implemented --overwrite, which controls whether to
          overwrite the destination file(s). Default is "yes",
          i.e. to overwrite.

        * scp2: Implemented interactive mode, i.e. you can make scp2
          prompt you whether to overwrite an existing destination
          file. Works by giving --interactive (-I) on the command-line.

2002-08-15  Sami J. Lehtinen  <sjl%ssh.com@localhost>

        * sshd2: Fixed a bug with originator-pat with ForwardACLs.

2002-08-02  Sami J. Lehtinen  <sjl%ssh.com@localhost>

        * scp2, sftp2: Fixed a bug, which caused file transfer to stall,
          if trying to transfer a zero sized file with ascii transfer
          (newline mangling).

2002-07-21  Sami J. Lehtinen  <sjl%ssh.com@localhost>

        * sftp2: Added option "S" and "r" to "ls" (for sorting by size and
          reversing the sort order, respectively).

        * sftp2: "ls" works much better now. Tab completion understand
          directories (appends a '/', for easier directory traversal).

        * sftp2, scp2: Extensive rewrite of SshFileCopy, and as a
          consequence, of both scp2 and sftp2 core functionality.

2002-06-13  Sami J. Lehtinen  <sjl%ssh.com@localhost>

        * ssh2: Fixed a bug with one-shot forwarding.

diffstat:

 security/ssh2/Makefile.common  |   14 ++-
 security/ssh2/PLIST            |    6 +-
 security/ssh2/distinfo         |   21 ++--
 security/ssh2/patches/patch-aa |  149 ++++++++----------------------------
 security/ssh2/patches/patch-ab |   38 ++------
 security/ssh2/patches/patch-ac |  148 ++++++++++++++++++++++++++++++++++---
 security/ssh2/patches/patch-ad |   75 ++++++++++++++++--
 security/ssh2/patches/patch-ae |  164 ++++++++++++++++++++++++++++++++++++++--
 security/ssh2/patches/patch-af |  105 +++++++++++++-------------
 security/ssh2/patches/patch-ag |   57 +++++++++++---
 security/ssh2/patches/patch-ah |   18 ----
 11 files changed, 520 insertions(+), 275 deletions(-)

diffs (truncated from 944 to 300 lines):

diff -r bc893ee9ed0d -r 6fc2bd495ba5 security/ssh2/Makefile.common
--- a/security/ssh2/Makefile.common     Tue Aug 12 18:20:31 2003 +0000
+++ b/security/ssh2/Makefile.common     Tue Aug 12 19:08:55 2003 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.4 2003/07/24 20:59:04 jwise Exp $
+# $NetBSD: Makefile.common,v 1.5 2003/08/12 19:08:55 seb Exp $
 #
 
-DISTNAME=      ssh-3.2.2
+DISTNAME=      ssh-3.2.5
 CATEGORIES=    security
 MASTER_SITES=  ftp://ftp.ssh.com/pub/ssh/
 
@@ -37,8 +37,16 @@
 LICENSE=               no-commercial-use
 .endif
 
+.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "sparc64"
+# Later we may want to put an upper version bound on OS_VERSION or on
+# gcc version for this.
+CONFIGURE_ARGS+=       --disable-compiler-optimizations
+.endif
+
 SSH_PID_DIR=           /var/run        # default directory for PID files
-SSH_PID_DIR.SunOS=      /etc           # Solaris doesn't have a /var/run
+.if ${OPSYS} == "SunOS" && !empty(OS_VERSION:M5.[012345678])
+SSH_PID_DIR.SunOS=      /etc           # Older Solaris doesn't have a /var/run
+.endif
 
 .if defined(SSH_PID_DIR.${OPSYS})
 SSH_PID_DIR=           ${SSH_PID_DIR.${OPSYS}}
diff -r bc893ee9ed0d -r 6fc2bd495ba5 security/ssh2/PLIST
--- a/security/ssh2/PLIST       Tue Aug 12 18:20:31 2003 +0000
+++ b/security/ssh2/PLIST       Tue Aug 12 19:08:55 2003 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2003/05/10 10:02:34 seb Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/08/12 19:08:55 seb Exp $
 bin/scp
 bin/scp2
 bin/sftp
@@ -12,13 +12,11 @@
 bin/ssh-agent2
 ${X11_SUPPORT}bin/ssh-askpass
 ${X11_SUPPORT}bin/ssh-askpass2
-bin/ssh-chrootmgr
 bin/ssh-dummy-shell
 bin/ssh-keygen
 bin/ssh-keygen2
 bin/ssh-probe
 bin/ssh-probe2
-bin/ssh-pubkeymgr
 bin/ssh-signer
 bin/ssh-signer2
 bin/ssh2
@@ -31,13 +29,11 @@
 man/man1/ssh-add2.1
 man/man1/ssh-agent.1
 man/man1/ssh-agent2.1
-man/man1/ssh-chrootmgr.1
 man/man1/ssh-dummy-shell.1
 man/man1/ssh-keygen.1
 man/man1/ssh-keygen2.1
 man/man1/ssh-probe.1
 man/man1/ssh-probe2.1
-man/man1/ssh-pubkeymgr.1
 man/man1/ssh.1
 man/man1/ssh2.1
 man/man1/sshregex.1
diff -r bc893ee9ed0d -r 6fc2bd495ba5 security/ssh2/distinfo
--- a/security/ssh2/distinfo    Tue Aug 12 18:20:31 2003 +0000
+++ b/security/ssh2/distinfo    Tue Aug 12 19:08:55 2003 +0000
@@ -1,12 +1,11 @@
-$NetBSD: distinfo,v 1.4 2003/05/10 10:02:34 seb Exp $
+$NetBSD: distinfo,v 1.5 2003/08/12 19:08:55 seb Exp $
 
-SHA1 (ssh-3.2.2.tar.gz) = 19e8c9857d0fc14771c31223249eb56adb5ddf6b
-Size (ssh-3.2.2.tar.gz) = 2256690 bytes
-SHA1 (patch-aa) = 7781e4c7a567f6465829cdf9026920e45241bca5
-SHA1 (patch-ab) = 450267a0f18684f0b8f8ff611e290a8f478068ad
-SHA1 (patch-ac) = b87e967252b1eaafc6e6b7ee95d8e09550957bff
-SHA1 (patch-ad) = b6944222c0b84d5f906ad019b5260fb19ee299d9
-SHA1 (patch-ae) = 79288d501031c56fd155f966c905de2e4f5ffc35
-SHA1 (patch-af) = 640bb5f92dc6db36e6ac4337e085e3a9a525c755
-SHA1 (patch-ag) = 5990115dc53a9278f171158df1dcdd4754080e90
-SHA1 (patch-ah) = 5a4314cf70463638d18599dcb3fddbbc19d52b2a
+SHA1 (ssh-3.2.5.tar.gz) = 390023a395a6b4cfd42bf0e37b472f0ca44791ce
+Size (ssh-3.2.5.tar.gz) = 2258425 bytes
+SHA1 (patch-aa) = 34353e23d81916202216dc401e99f17b08f3d6fb
+SHA1 (patch-ab) = 314e2e4165fb1d429297f235c9712ddc0d924865
+SHA1 (patch-ac) = d5b564f88105cc2ac58577d37a1b336ce78c1393
+SHA1 (patch-ad) = dcaaf5f545bd4650784dc6fd0dbcaae48cf3f9d3
+SHA1 (patch-ae) = 0d1f358bd97290118002cc0fc489cbf7e334e681
+SHA1 (patch-af) = e7c956b858d02dfaf20e1fe1bfc36322d9eb6d67
+SHA1 (patch-ag) = 0f7a448875262e2536255ace27cf1a8f0c2a0517
diff -r bc893ee9ed0d -r 6fc2bd495ba5 security/ssh2/patches/patch-aa
--- a/security/ssh2/patches/patch-aa    Tue Aug 12 18:20:31 2003 +0000
+++ b/security/ssh2/patches/patch-aa    Tue Aug 12 19:08:55 2003 +0000
@@ -1,121 +1,40 @@
-$NetBSD: patch-aa,v 1.2 2003/05/10 10:02:35 seb Exp $
+$NetBSD: patch-aa,v 1.3 2003/08/12 19:08:56 seb Exp $
 
---- apps/ssh/Makefile.am.orig  2002-10-29 09:27:42.000000000 +0000
-+++ apps/ssh/Makefile.am
-@@ -18,7 +18,8 @@ WINCONF_OPTIONS = maintainer=sjl%ssh.com@localhost
- etcdir = @ETCDIR@
- known_hosts_dir = $(etcdir)/knownhosts
- host_keys_dir = $(etcdir)/hostkeys
--subconfig_dir = $(etcdir)/subconfig
-+egdir = $(prefix)/share/examples/${PKGBASE}
-+subconfig_dir = $(egdir)/subconfig
- STATIC_FLAG = @STATIC_FLAG@
+--- acconfig.h.orig    2003-06-30 12:22:25.000000000 +0000
++++ acconfig.h
+@@ -253,6 +253,10 @@ library. */
+    and logwtmp() calls. */
+ #undef HAVE_LIBUTIL_LOGIN
  
- #
-@@ -576,13 +577,13 @@ COMPILE = $(CC) $(KERBEROS_INCS) $(INCLU
- #
- LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
- #
-+INSTALL_DATA_DIR=     $(BSD_INSTALL_DATA_DIR)
-+#
- includes:
++/* Define this if libutil.a contains loginx(), logoutx(),
++   and logwtmpx() calls. */
++#undef HAVE_LIBUTIL_LOGINX
++
+ /* Location of system mail spool directory. */
+ #undef MAIL_SPOOL_DIRECTORY
  
- make-install-dirs:
--      -if test '!' -d $(DESTDIR)$(etcdir); then mkdir -p $(DESTDIR)$(etcdir); fi
--      -if test '!' -d $(DESTDIR)$(known_hosts_dir); then mkdir -p $(DESTDIR)$(known_hosts_dir); fi
--      -if test '!' -d $(DESTDIR)$(host_keys_dir); then mkdir -p $(DESTDIR)$(host_keys_dir); fi
--      -if test '!' -d $(DESTDIR)$(subconfig_dir); then mkdir -p $(DESTDIR)$(subconfig_dir); fi
-+      $(INSTALL_DATA_DIR) $(DESTDIR)$(egdir)
-+      $(INSTALL_DATA_DIR) $(DESTDIR)$(subconfig_dir)
- 
- generate-host-key:
-       -@if test -f $(DESTDIR)$(etcdir)/hostkey; \
-@@ -593,36 +594,20 @@ generate-host-key:
-         fi
+@@ -268,9 +272,15 @@ library. */
+ /* Define this if a prototype for logout() is defined in system headers. */
+ #undef HAVE_PROTO_LOGOUT
  
- install-symlinks:
--      -mv -f $(DESTDIR)$(bindir)/ssh $(DESTDIR)$(bindir)/ssh.old
--      -mv -f $(DESTDIR)$(bindir)/ssh-agent $(DESTDIR)$(bindir)/ssh-agent.old
--      -mv -f $(DESTDIR)$(bindir)/ssh-add $(DESTDIR)$(bindir)/ssh-add.old
--      -mv -f $(DESTDIR)$(bindir)/ssh-askpass $(DESTDIR)$(bindir)/ssh-askpass.old
--      -mv -f $(DESTDIR)$(bindir)/ssh-keygen $(DESTDIR)$(bindir)/ssh-keygen.old
--      -mv -f $(DESTDIR)$(bindir)/scp $(DESTDIR)$(bindir)/scp.old
--      -mv -f $(DESTDIR)$(bindir)/sftp $(DESTDIR)$(bindir)/sftp.old
--      -mv -f $(DESTDIR)$(bindir)/sftp-server $(DESTDIR)$(bindir)/sftp-server.old
--      -mv -f $(DESTDIR)$(bindir)/ssh-signer $(DESTDIR)$(bindir)/ssh-signer.old
--      -mv -f $(DESTDIR)$(bindir)/ssh-probe $(DESTDIR)$(bindir)/ssh-probe.old
--
-       (cd $(DESTDIR)$(bindir) && $(LN_S) ssh2 ssh)
-       (cd $(DESTDIR)$(bindir) && $(LN_S) ssh-agent2 ssh-agent)
-       (cd $(DESTDIR)$(bindir) && $(LN_S) ssh-add2 ssh-add)
--      (cd $(DESTDIR)$(bindir) && $(LN_S) ssh-askpass2 ssh-askpass)
-+      case x"@CONFPROGRAMS@" in                                       \
-+      x*askpass*)                                                     \
-+      (cd $(DESTDIR)$(bindir) && $(LN_S) ssh-askpass2 ssh-askpass) ;; \
-+      esac
-       (cd $(DESTDIR)$(bindir) && $(LN_S) ssh-keygen2 ssh-keygen)
-       (cd $(DESTDIR)$(bindir) && $(LN_S) scp2 scp)
-       (cd $(DESTDIR)$(bindir) && $(LN_S) sftp2 sftp)
-       (cd $(DESTDIR)$(bindir) && $(LN_S) sftp-server2 sftp-server)
-       (cd $(DESTDIR)$(bindir) && $(LN_S) ssh-signer2 ssh-signer)
-       (cd $(DESTDIR)$(bindir) && $(LN_S) ssh-probe2 ssh-probe)
--      -mv -f $(DESTDIR)$(sbindir)/sshd $(DESTDIR)$(sbindir)/sshd.old
-       (cd $(DESTDIR)$(sbindir) && $(LN_S) sshd2 sshd)
--      -mv -f $(DESTDIR)$(mandir)/man1/ssh.1 $(DESTDIR)$(mandir)/man1/ssh.old.1
--      -mv -f $(DESTDIR)$(mandir)/man1/ssh-add.1 $(DESTDIR)$(mandir)/man1/ssh-add.old.1
--      -mv -f $(DESTDIR)$(mandir)/man1/ssh-agent.1 $(DESTDIR)$(mandir)/man1/ssh-agent.old.1
--      -mv -f $(DESTDIR)$(mandir)/man1/ssh-keygen.1 $(DESTDIR)$(mandir)/man1/ssh-keygen.old.1
--      -mv -f $(DESTDIR)$(mandir)/man1/scp.1 $(DESTDIR)$(mandir)/man1/scp.old.1
--      -mv -f $(DESTDIR)$(mandir)/man1/sftp.1 $(DESTDIR)$(mandir)/man1/sftp.old.1
--      -mv -f $(DESTDIR)$(mandir)/man1/ssh-probe.1 $(DESTDIR)$(mandir)/man1/ssh-probe.old.1
-       (cd $(DESTDIR)$(mandir)/man1 && $(LN_S) ssh2.1 ssh.1)
-       (cd $(DESTDIR)$(mandir)/man1 && $(LN_S) ssh-add2.1 ssh-add.1)
-       (cd $(DESTDIR)$(mandir)/man1 && $(LN_S) ssh-agent2.1 ssh-agent.1)
-@@ -630,7 +615,6 @@ install-symlinks:
-       (cd $(DESTDIR)$(mandir)/man1 && $(LN_S) scp2.1 scp.1)
-       (cd $(DESTDIR)$(mandir)/man1 && $(LN_S) sftp2.1 sftp.1)
-       (cd $(DESTDIR)$(mandir)/man1 && $(LN_S) ssh-probe2.1 ssh-probe.1)
--      -mv -f $(DESTDIR)$(mandir)/man8/sshd.8 $(DESTDIR)$(mandir)/man8/sshd.old.8
-       (cd $(DESTDIR)$(mandir)/man8 && $(LN_S) sshd2.8 sshd.8)
++/* Define this if a prototype for logoutx() is defined in system headers. */
++#undef HAVE_PROTO_LOGOUTX
++
+ /* Define this if a prototype for logwtmp() is defined in system headers. */
+ #undef HAVE_PROTO_LOGWTMP
  
- clean-up-old:
-@@ -649,23 +633,13 @@ install-exec-hook:
-       -chown root $(DESTDIR)$(bindir)/ssh-signer2
-       -chmod $(SSH_SIGNER_INSTALL_MODE) $(DESTDIR)$(bindir)/ssh-signer2
++/* Define this if a prototype for logwtmpx() is defined in system headers. */
++#undef HAVE_PROTO_LOGWTMPX
++
+ /* Define this if a prototype for initgroups() is defined in system headers. */
+ #undef HAVE_PROTO_INITGROUPS
  
--install-data-hook: make-install-dirs generate-host-key install-symlinks
--      -@if test '!' -f $(DESTDIR)$(etcdir)/sshd2_config ; then \
--       echo Installing $(DESTDIR)$(etcdir)/sshd2_config ; \
-+install-data-hook: make-install-dirs install-symlinks
-+       echo Installing $(DESTDIR)$(egdir)/sshd2_config ; \
-        $(INSTALL_DATA) $(srcdir)/sshd2_config \
--                         $(DESTDIR)$(etcdir)/sshd2_config ; \
--      fi
--       echo Updating $(DESTDIR)$(etcdir)/sshd2_config.example ;
--       $(INSTALL_DATA) $(srcdir)/sshd2_config \
--                         $(DESTDIR)$(etcdir)/sshd2_config.example ;
--      -@if test '!' -f $(DESTDIR)$(etcdir)/ssh2_config ; then \
--       echo Installing $(DESTDIR)$(etcdir)/ssh2_config ; \
--       $(INSTALL_DATA) $(srcdir)/ssh2_config \
--                         $(DESTDIR)$(etcdir)/ssh2_config ; \
--      fi
--       echo Updating $(DESTDIR)$(etcdir)/ssh2_config.example ;
-+                         $(DESTDIR)$(egdir)/sshd2_config ;
-+       echo Installing $(DESTDIR)$(egdir)/ssh2_config ; \
-        $(INSTALL_DATA) $(srcdir)/ssh2_config \
--                         $(DESTDIR)$(etcdir)/ssh2_config.example ;
-+                         $(DESTDIR)$(egdir)/ssh2_config ;
-        echo Updating $(DESTDIR)$(subconfig_dir)/host_ext.example ;
-        $(INSTALL_DATA) $(srcdir)/subconfig/host_ext.example \
-                          $(DESTDIR)$(subconfig_dir)/host_ext.example ;
-@@ -678,8 +652,6 @@ install-data-hook: make-install-dirs gen
-        echo Updating $(DESTDIR)$(subconfig_dir)/user.example ;
-        $(INSTALL_DATA) $(srcdir)/subconfig/user.example \
-                          $(DESTDIR)$(subconfig_dir)/user.example ;
--      -@if test '!' -f $(DESTDIR)$(etcdir)/ssh_dummy_shell.out ; then \
--       echo Installing $(DESTDIR)$(etcdir)/ssh_dummy_shell.out ; \
-+       echo Installing $(DESTDIR)$(egdir)/ssh_dummy_shell.out ; \
-        $(INSTALL_DATA) $(srcdir)/ssh_dummy_shell.out \
--                         $(DESTDIR)$(etcdir)/ssh_dummy_shell.out ; \
--      fi
-+                         $(DESTDIR)$(egdir)/ssh_dummy_shell.out ;
+@@ -425,6 +435,8 @@ library. */
+ /* Define this to point to where sshd2 should store it's pidfile. */
+ #undef SSHD_PIDDIR
+ 
++/* Define if both utmp and utmpx entries should be handled */
++#undef SSH_UTMP_UTMPX
+ 
+ 
+ 
diff -r bc893ee9ed0d -r 6fc2bd495ba5 security/ssh2/patches/patch-ab
--- a/security/ssh2/patches/patch-ab    Tue Aug 12 18:20:31 2003 +0000
+++ b/security/ssh2/patches/patch-ab    Tue Aug 12 19:08:55 2003 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2003/05/10 10:02:35 seb Exp $
+$NetBSD: patch-ab,v 1.3 2003/08/12 19:08:56 seb Exp $
 
---- apps/ssh/Makefile.in.orig  2002-10-29 09:27:59.000000000 +0000
-+++ apps/ssh/Makefile.in
-@@ -124,7 +124,8 @@ WINCONF_OPTIONS = maintainer=sjl%ssh.com@localhost
+--- apps/ssh/Makefile.am.orig  2003-06-30 12:22:11.000000000 +0000
++++ apps/ssh/Makefile.am
+@@ -18,7 +18,8 @@ WINCONF_OPTIONS = maintainer=sjl%ssh.com@localhost
  etcdir = @ETCDIR@
  known_hosts_dir = $(etcdir)/knownhosts
  host_keys_dir = $(etcdir)/hostkeys
@@ -12,25 +12,12 @@
  STATIC_FLAG = @STATIC_FLAG@
  
  #
-@@ -455,6 +456,8 @@ SSH_DEFS = -DETCDIR=\"$(etcdir)\" -DSSH_
- COMPILE = $(CC) $(KERBEROS_INCS) $(INCLUDES) $(SSH_DEFS) $(DEFS) $(CPPFLAGS) $(CFLAGS) $(X_CFLAGS)
+@@ -569,13 +570,13 @@ COMPILE = $(CC) $(KERBEROS_INCS) $(INCLU
  #
  LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
+ #
++INSTALL_DATA_DIR=     $(BSD_INSTALL_DATA_DIR)
 +#
-+INSTALL_DATA_DIR = $(BSD_INSTALL_DATA_DIR)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../sshconf.h
- CONFIG_CLEAN_FILES = 
-@@ -892,7 +895,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE
-         awk '    { files[$$0] = 1; } \
-              END { for (i in files) print i; }'`; \
-       test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
--        || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags  $$unique $(LISP))
-+        || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
- 
- mostlyclean-tags:
- 
-@@ -1026,10 +1029,8 @@ maintainer-clean-generic clean mostlycle
  includes:
  
  make-install-dirs:
@@ -43,7 +30,7 @@