Patch-ID# 103877-02
Keywords: teamware filemerge
Synopsis: SPARCworks/TeamWare 1.0.4: Patch for Solaris 1.1
Date: May/22/97

Solaris Release: 1.1

SunOS Release: 4.1.3

Unbundled Product: SPARCworks/TeamWare

Unbundled Release: 1.0.4

Relevant Architectures: sparc

BugId's fixed with this patch: 1235206 1239526 1239514 1243765 1243408 1251453 1256434 4028224

Changes incorporated in this version: 4028224

Patches accumulated and obsoleted by this patch: 

Patches which conflict with this patch: 

Patches required with this patch: 

Obsoleted by: 

Files included with this patch: 

CodeManager/bin/bringover
CodeManager/bin/codemgr
CodeManager/bin/codemgrtool
CodeManager/bin/def.dir.flp
CodeManager/bin/get
CodeManager/bin/putback
CodeManager/bin/resolve
CodeManager/bin/workspace
CodeManager/bin/ws_undo
CodeManager/etc/checkedout
CodeManager/etc/diff3_merge
CodeManager/lib/License_File=../../lib/License_File
CodeManager/lib/help=./locale/C/help
CodeManager/lib/icons/SUNW_SPRO_CodeManager_swm.xbm1
CodeManager/lib/icons/SUNW_SPRO_CodeManager_swm.xpm1 
CodeManager/lib/icons/SUNW_SPRO_CodeManager_swm.xpm8 
CodeManager/lib/icons/codemgrtool_swm.bw
CodeManager/lib/locale/C/LC_MESSAGES/codemanager_labels.po
CodeManager/lib/locale/C/LC_MESSAGES/codemgr.po
CodeManager/lib/locale/C/LC_MESSAGES/fchooser_labels.po
CodeManager/lib/locale/C/LC_MESSAGES/navigator_labels.po
CodeManager/lib/locale/C/help/checkedout.info
CodeManager/lib/locale/C/help/fchooser.info
CodeManager/lib/locale/C/help/nav.info
CodeManager/lib/locale/C/help/nav_del.info
CodeManager/lib/locale/C/help/nav_props.info
CodeManager/lib/locale/C/help/nav_trans.info
CodeManager/lib/locale/C/help/nav_wsp.info
CodeManager/lib/sunpro_defaults/CodeManager.swm
CodeManager/lib/usage_mail_addr
bin/bringover=../CodeManager/bin/bringover
bin/codemgr=../CodeManager/bin/codemgr
bin/codemgrtool=../CodeManager/bin/codemgrtool
bin/def.dir.flp=../CodeManager/bin/def.dir.flp
bin/get=../CodeManager/bin/get
bin/putback=../CodeManager/bin/putback
bin/resolve=../CodeManager/bin/resolve
bin/workspace=../CodeManager/bin/workspace
bin/ws_undo=../CodeManager/bin/ws_undo
etc/checkedout=../CodeManager/etc/checkedout
etc/diff3_merge=../CodeManager/etc/diff3_merge
lib/icons/SUNW_SPRO_CodeManager_swm.xbm1=../../CodeManager/lib/icons/SUNW_SPRO_CodeManager_swm.xbm1
lib/icons/SUNW_SPRO_CodeManager_swm.xpm1=../../CodeManager/lib/icons/SUNW_SPRO_CodeManager_swm.xpm1
lib/icons/SUNW_SPRO_CodeManager_swm.xpm8=../../CodeManager/lib/icons/SUNW_SPRO_CodeManager_swm.xpm8
lib/icons/codemgrtool_swm.bw=../../CodeManager/lib/icons/codemgrtool_swm.bw
lib/sunpro_defaults/CodeManager.swm=../../CodeManager/lib/sunpro_defaults/CodeManager.swm
FileMerge/bin/filemerge
FileMerge/lib/License_File=../../lib/License_File
FileMerge/lib/comments_mail_addr
FileMerge/lib/help=./locale/C/help
FileMerge/lib/icons/SUNW_SPRO_FileMerge_swm.xbm1
FileMerge/lib/icons/SUNW_SPRO_FileMerge_swm.xpm1
FileMerge/lib/icons/SUNW_SPRO_FileMerge_swm.xpm8
FileMerge/lib/icons/filemerge_swm.bw
FileMerge/lib/locale/C/LC_MESSAGES/SUNW_SPRO_License.po
FileMerge/lib/locale/C/LC_MESSAGES/aboutBox_labels.po
FileMerge/lib/locale/C/LC_MESSAGES/fchooser_labels.po
FileMerge/lib/locale/C/LC_MESSAGES/filediff_labels.po
FileMerge/lib/locale/C/LC_MESSAGES/filemerge.po 
FileMerge/lib/locale/C/LC_MESSAGES/filemerge_labels.po
FileMerge/lib/locale/C/LC_MESSAGES/find_labels.po 
FileMerge/lib/locale/C/LC_MESSAGES/line_number_labels.po
FileMerge/lib/locale/C/LC_MESSAGES/menu_labels.po
FileMerge/lib/locale/C/LC_MESSAGES/propsheet_labels.po 
FileMerge/lib/locale/C/LC_MESSAGES/store_as_labels.po
FileMerge/lib/locale/C/help/SUNW_SPRO_FileMerge.abox
FileMerge/lib/locale/C/help/filediff.info
FileMerge/lib/locale/C/help/filemerge.info
FileMerge/lib/locale/C/help/propsheet.info
FileMerge/lib/sunpro_defaults/FileMerge.swm
bin/filemerge=../FileMerge/bin/filemerge
lib/icons/SUNW_SPRO_FileMerge_swm.xbm1=../../FileMerge/lib/icons/SUNW_SPRO_FileMerge_swm.xbm1
lib/icons/SUNW_SPRO_FileMerge_swm.xpm1=../../FileMerge/lib/icons/SUNW_SPRO_FileMerge_swm.xpm1
lib/icons/SUNW_SPRO_FileMerge_swm.xpm8=../../FileMerge/lib/icons/SUNW_SPRO_FileMerge_swm.xpm8
lib/icons/filemerge_swm.bw=../../FileMerge/lib/icons/filemerge_swm.bw
lib/sunpro_defaults/FileMerge.swm=../../FileMerge/lib/sunpro_defaults/FileMerge.swm
FreezePoint/bin/freezept
FreezePoint/bin/freezepttool
FreezePoint/lib/License_File=../../lib/License_File
FreezePoint/lib/help=./locale/C/help
FreezePoint/lib/icons/SUNW_SPRO_FreezePoint_swm.xbm1
FreezePoint/lib/icons/SUNW_SPRO_FreezePoint_swm.xpm1
FreezePoint/lib/icons/SUNW_SPRO_FreezePoint_swm.xpm8
FreezePoint/lib/icons/freezepttool_swm.bw
FreezePoint/lib/locale/C/LC_MESSAGES/fchooser_labels.po
FreezePoint/lib/locale/C/LC_MESSAGES/freezept.po
FreezePoint/lib/locale/C/LC_MESSAGES/freezepttool_labels.po
FreezePoint/lib/locale/C/help/fchooser.info
FreezePoint/lib/locale/C/help/freezepttool.info 
FreezePoint/lib/sunpro_defaults/FreezePoint.swm 
FreezePoint/lib/usage_mail_addr
bin/freezept=../FreezePoint/bin/freezept
bin/freezepttool=../FreezePoint/bin/freezepttool
lib/icons/SUNW_SPRO_FreezePoint_swm.xbm1=../../FreezePoint/lib/icons/SUNW_SPRO_FreezePoint_swm.xbm1
lib/icons/SUNW_SPRO_FreezePoint_swm.xpm1=../../FreezePoint/lib/icons/SUNW_SPRO_FreezePoint_swm.xpm1
lib/icons/SUNW_SPRO_FreezePoint_swm.xpm8=../../FreezePoint/lib/icons/SUNW_SPRO_FreezePoint_swm.xpm8
lib/icons/freezepttool_swm.bw=../../FreezePoint/lib/icons/freezepttool_swm.bw
lib/sunpro_defaults/FreezePoint.swm=../../FreezePoint/lib/sunpro_defaults/FreezePoint.swm
ParallelMake/bin/make
ParallelMake/lib/License_File=../../lib/License_File
ParallelMake/lib/help=./locale/C/help
ParallelMake/lib/locale/C/LC_MESSAGES/pmake.po 
ParallelMake/lib/usage_mail_addr
VersionTool/bin/vertool
VersionTool/lib/License_File=../../lib/License_File
VersionTool/lib/help=./locale/C/help
VersionTool/lib/icons/SUNW_SPRO_VersionTool_swm.xbm1
VersionTool/lib/icons/SUNW_SPRO_VersionTool_swm.xpm1
VersionTool/lib/icons/SUNW_SPRO_VersionTool_swm.xpm8
VersionTool/lib/icons/vertool_swm.bw
VersionTool/lib/locale/C/LC_MESSAGES/fchooser_labels.po
VersionTool/lib/locale/C/LC_MESSAGES/vertool.po
VersionTool/lib/locale/C/LC_MESSAGES/vertool_labels.po 
VersionTool/lib/locale/C/help/vertool.info
VersionTool/lib/sunpro_defaults/VersionTool.swm
VersionTool/lib/usage_mail_addr
bin/vertool=../VersionTool/bin/vertool
lib/icons/SUNW_SPRO_VersionTool_swm.xbm1=../../VersionTool/lib/icons/SUNW_SPRO_VersionTool_swm.xbm1
lib/icons/SUNW_SPRO_VersionTool_swm.xpm1=../../VersionTool/lib/icons/SUNW_SPRO_VersionTool_swm.xpm1
lib/icons/SUNW_SPRO_VersionTool_swm.xpm8=../../VersionTool/lib/icons/SUNW_SPRO_VersionTool_swm.xpm8
lib/icons/vertool_swm.bw=../../VersionTool/lib/icons/vertool_swm.bw
lib/sunpro_defaults/VersionTool.swm=../../VersionTool/lib/sunpro_defaults/VersionTool.swm

Problem Description: 

(Rev 2)
4028224 BART SunOS filemerge accessing network files

(Rev 1)
  bug 1225498: No support for DNS-based domains in SCHOLARpass-licensing
  bug 1218889: domain licensing doesn't work w/ DNS; NIS is required.

  Earlier versions of this product implemented domain licensing such that
  NIS/NIS+ was required; DNS was not used.  This was changed in the
  Solaris 2.x version of the product in the Developer Products 4.0 release,
  but was not changed in the Solaris 1.x version.  No new licenses are
  required with this patch.  Providing this enhancement only affects those
  sites with domain (ScholarPass or GoldPass) licenses.
 
			Filed against
BugId	  Escalation    OS Version      Synopsis
-----	  ----------    ----------      -------------------------------------
1235206   504240        4.1.3 5.4       bringover results in " internal error "
1239526   None          4.1.3           sparcworks: bringover results in error
                                        2513
1239514   None          4.1.3           Conflict resolution works on old files
                                        versions 
1243765   505002        5.3             filemerge 2.1.2 doesn't highlight the 
                                        glyph to reflect current merge
1243408   505477       4.1.3_U1         vertool coredumps when double-click on
                                        the file history icon
1251453   505641       5.3              Problem with putback using teamware
                                        1.0.4 with 103333-01 installed. 
1256434   None         sol2.4_hw11_94   cannot bringover/putback EUC pathname.


Patch Installation Instructions:
--------------------------------
Extract the patch-tarfile in /usr/lang (or wherever the product is installed)

Other specific or unique installation instructions may also be
necessary and should be described below.


Special Install Instructions:
-----------------------------
1.  Become super-user.

2.  Apply the patch by typing:

        <dir>/<patchnum>/installpatch

    where <dir> is the directory containing the patch.
