misc/177055: New Changes To 'install' Appear To Have Broken 'mergemaster'

[Tim Daneliuk]

>Number:         177055
>Category:       misc
>Synopsis:       New Changes To 'install' Appear To Have Broken 'mergemaster'
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Mar 17 20:00:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Tim Daneliuk
>Release:        9.1-STABLE
>Organization:
TundraWare Inc.
>Environment:
FreeBSD ozzie.tundraware.com 9.1-STABLE FreeBSD 9.1-STABLE #13 r247891: Wed Mar  6 10:00:21 CST 2013     root at ozzie.tundraware.com:/usr/obj/usr1/src-9-STABLE/sys/OZZIE  i386
>Description:
See attached file...


>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Script started on Sun Mar 17 14:49:48 2013

[root] ozzie.tundraware.com ~>sh -x /usr/sbin/mergemaster
+ PATH=/bin:/usr/bin:/usr/sbin
+ TEMPROOT=/var/tmp/temproot
+ [ -r /etc/mergemaster.rc ]
+ [ -r /root/.mergemasterrc ]
+ . /root/.mergemasterrc
+ IGNORE_FILES='/etc/hosts.allow             \
              /etc/mail/freebsd.cf         \
              /etc/mail/freebsd.submit.cf  \
              /etc/mail/sendmail.cf        \
              /etc/mail/submit.cf          \
              /etc/namedb/named.conf       \
              /root/.profile               \
             '
+ set --
+ unset var newopts
+ getopts :ascrvhipCPm:t:du:w:D:A:FU COMMAND_LINE_ARGUMENT
+ [ -n '' ]
+ MTREEDB=/var/db
+ MTREEFILE=/var/db/mergemaster.mtree
+ [ -n '' -a -z '' ]
+ [ -e /etc/fstab ]
+ grep -q nodev /etc/fstab
+ echo ''

+ [ -n less ]
+ check_pager
+ type less
+ PAGER=less
+ [ -n '' -a ! less = more ]
+ DIFF_FLAG=-u
+ SOURCEDIR=/usr/src
+ [ ! -f /usr/src/Makefile.inc1 -a -f /usr/src/../Makefile.inc1 ]
+ MM_MAKE='make  -m /usr/src/share/mk'
+ [ -n '' -a -s /var/db/mergemaster.mtree ]
+ [ -t 0 ]
+ tput columns
+ w=126
+ SCREEN_WIDTH=126
+ ID_TAG=FreeBSD
+ TEST_TEMP_ROOT=yes
+ [ yes = yes ]
+ [ -d /var/tmp/temproot ]
+ echo '*** The directory specified for the temporary root environment,'
*** The directory specified for the temporary root environment,
+ echo '    /var/tmp/temproot, exists.  This can be a security risk if untrusted'
    /var/tmp/temproot, exists.  This can be a security risk if untrusted
+ echo '    users have access to the system.'
    users have access to the system.
+ echo ''

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

+ echo '  Default is to use /var/tmp/temproot as is'
  Default is to use /var/tmp/temproot as is
+ echo ''

+ echo -n 'How should I deal with this? [Use the existing /var/tmp/temproot] '
How should I deal with this? [Use the existing /var/tmp/temproot] + read DELORNOT
d
+ echo ''

+ echo '   *** Deleting the old /var/tmp/temproot'
   *** Deleting the old /var/tmp/temproot
+ echo ''

+ delete_temproot
+ rm -rf /var/tmp/temproot
+ chflags -R 0 /var/tmp/temproot
+ rm -rf /var/tmp/temproot
+ unset TEST_TEMP_ROOT
+ [ '' = yes ]
+ echo '*** Creating the temporary root environment in /var/tmp/temproot'
*** Creating the temporary root environment in /var/tmp/temproot
+ mkdir -p /var/tmp/temproot
+ echo ' *** /var/tmp/temproot ready for use'
 *** /var/tmp/temproot ready for use
+ [ ! -d /var/tmp/temproot ]
+ echo ' *** Creating and populating directory structure in /var/tmp/temproot'
 *** Creating and populating directory structure in /var/tmp/temproot
+ echo ''

+ cd /usr/src
+ od=/var/tmp/temproot/usr/obj
+ make -m /usr/src/share/mk DESTDIR=/var/tmp/temproot distrib-dirs
+ MAKEOBJDIRPREFIX=/var/tmp/temproot/usr/obj make -m /usr/src/share/mk _obj SUBDIR_OVERRIDE=etc
+ MAKEOBJDIRPREFIX=/var/tmp/temproot/usr/obj make -m /usr/src/share/mk everything SUBDIR_OVERRIDE=etc
+ MAKEOBJDIRPREFIX=/var/tmp/temproot/usr/obj make -m /usr/src/share/mk DESTDIR=/var/tmp/temproot distribution
install: illegal option -- l
usage: install [-bCcMpSsv] [-B suffix] [-f flags] [-g group] [-m mode]
               [-o owner] file1 file2
       install [-bCcMpSsv] [-B suffix] [-f flags] [-g group] [-m mode]
               [-o owner] file1 ... fileN directory
       install -d [-v] [-g group] [-m mode] [-o owner] directory ...
+ echo ''

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

+ exit 1
[root] ozzie.tundraware.com ~>exit
exit

Script done on Sun Mar 17 14:50:02 2013


>Release-Note:
>Audit-Trail:
>Unformatted: