upgrade question

[andy at neu.net]

I just upgraded from 5.2.1.Release via cvsup to RELENG_5_2.  This is the
p3 security update for openssl issues.  The upgrade completed successfully
up to the last step, when I tried to run mergemaster.  I got the following
response:

*** The directory specified for the temporary root environment,
    /var/tmp/temproot, exists.  This can be a security risk if untrusted
    users have access to the system.

  Use 'd' to delete the old /var/tmp/temproot and continue
  Use 't' to select a new temporary root directory
  Use 'e' to exit mergemaster

  Default is to use /var/tmp/temproot as is

How should I deal with this? [Use the existing /var/tmp/temproot]
   *** Leaving /var/tmp/temproot intact

*** Creating the temporary root environment in /var/tmp/temproot
 *** /var/tmp/temproot ready for use
 *** Creating and populating directory structure in /var/tmp/temproot

mtree -deU  -f /usr/src/etc/mtree/BSD.root.dist -p /var/tmp/temproot/
*** Error code 1

Stop in /usr/src/etc.

  *** FATAL ERROR: Cannot 'cd' to /usr/src/etc and install files to
      the temproot environment





Before I did the OS upgrade, I upgraded openssl and openssh to the
following versions:

su-2.05b# /usr/local/sbin/sshd -version
sshd: illegal option -- v
sshd version OpenSSH_3.8p1, OpenSSL 0.9.7c 30 Sep 2003

su-2.05b# /usr/local/bin/ssh -version
OpenSSH_3.8p1, SSH protocols 1.5/2.0, OpenSSL 0.9.7c 30 Sep 2003

su-2.05b# openssl version
OpenSSL 0.9.7c-p1 30 Sep 2003



I have the following questions:


What happened to mergemaster, and what can I do to get it to run
sucessfully?

Assuming I get mergemaster to run, do I have to upgrade openssl or
openssh?

Do I have to upgrade Apapche?  If so, what command do I use to get Apache
to use the new version of openssl?


Output from uname:
 uname -a
FreeBSD duron.foo.bar 5.2.1-RELEASE-p3 FreeBSD 5.2.1-RELEASE-p3 #0: Sun
Mar 21 22:18:51 IST 2004
garvey at duron.foo.bar:/usr/obj/usr/src/sys/MYKERNEL  i386

Any help would be appreciated.

TIA,

Andy