______________________________________________________________________________
*Gate Info*: ______________________________________________________________________________ RTI: 324516 Gates: 5.11 Type: Marketing Release Consolidation: on http://webrti.sfbay.sun.com/rti/view.php?consolidation=on&r=324516 ______________________________________________________________________________ *Status Info*: ______________________________________________________________________________ ### 5.11 Gate ### State: Submitted ______________________________________________________________________________ *General Info*: ______________________________________________________________________________ ### Common (Gates: 5.11) ### Approved: (Not Yet Approved) Evaluator: Valerie.Bubb at Sun.COM CTE Escalation #: None Patch Requestor: None Code Reviewed By: Mike.Kupfer at Sun.COM James.D.Carlson at Sun.COM richlowe at richlowe.net James.McPherson at Sun.COM Danek.Duvall at Sun.COM dan.price at sun.com Darren.Moffat at Sun.COM William.Fiveash at Sun.COM MailCC: Dean.Roehrich at Sun.COM Stuart.Marks at Sun.COM mgerdts at gmail.com Bonnie.Corwin at Sun.COM scm-migration-dev at opensolaris.org ______________________________________________________________________________ *CR (Bug) IDs*: ______________________________________________________________________________ ### Common (Gates: 5.11) ### Security Bug: No Responsible Engineers: mark.j.nelson at sun.com (6538468) james.d.carlson at sun.com (6658967) Bugid P S Impact Risk Synopsis: 6538468 3 1 2,pdo 2 add Mercurial support to ON developer tools [Release=solaris_nevada, Status=Fix_in_Progress, RE=mark.j.nelson at sun.com] 6658967 4 4 1,p 1 /etc/publickey entries get removed on upgrade [Release=solaris_nevada, Status=Fix_in_Progress, RE=james.d.carlson at sun.com] ______________________________________________________________________________ *ARC Case*: ______________________________________________________________________________ ### Common (Gates: 5.11) ### [empty] ______________________________________________________________________________ *putback -n*: ______________________________________________________________________________ ### 5.11 Gate ### Machine Name and Source Path for each gate: /net/mrliberal.central/export/ws/mjnelson/onnv-scm-tools-wx putback -n output: Parent workspace: /net/anthrax.central/export/clones/onnv Child workspace: /export/ws/mjnelson/scm-tools-putback/onnv-scm-tools-wx putback: Directory "/net/anthrax.central/export/clones/onnv" is mounted read-only (Warning 2627) Examined files: 101 Would put back contents changes: 97 Would put back name changes: 5 update: usr/src/Makefile.master update: usr/src/pkgdefs/SUNWpcmci/Makefile update: usr/src/pkgdefs/SUNWpcmci/pkginfo.tmpl update: usr/src/pkgdefs/SUNWpcmci/prototype_i386 update: usr/src/pkgdefs/SUNWpcmci/prototype_sparc update: usr/src/pkgdefs/SUNWpsdcr/Makefile update: usr/src/pkgdefs/SUNWpsdcr/pkginfo.tmpl update: usr/src/pkgdefs/SUNWpsdcr/prototype_i386 update: usr/src/pkgdefs/SUNWrmodr/i.master update: usr/src/pkgdefs/common_files/i.cronroot update: usr/src/pkgdefs/common_files/i.devallocdefs update: usr/src/pkgdefs/common_files/i.devlinktab_i386 update: usr/src/pkgdefs/common_files/i.devlinktab_sparc update: usr/src/pkgdefs/common_files/i.dialers update: usr/src/pkgdefs/common_files/i.etcprofile update: usr/src/pkgdefs/common_files/i.etcrpc update: usr/src/pkgdefs/common_files/i.etcsystem update: usr/src/pkgdefs/common_files/i.hosts update: usr/src/pkgdefs/common_files/i.ibnexconf update: usr/src/pkgdefs/common_files/i.inetdconf update: usr/src/pkgdefs/common_files/i.inittab update: usr/src/pkgdefs/common_files/i.kclasses_i386 update: usr/src/pkgdefs/common_files/i.kclasses_sparc update: usr/src/pkgdefs/common_files/i.locallogin update: usr/src/pkgdefs/common_files/i.localprofile update: usr/src/pkgdefs/common_files/i.mailxrc update: usr/src/pkgdefs/common_files/i.mptconf update: usr/src/pkgdefs/common_files/i.powerconf update: usr/src/pkgdefs/common_files/i.publickey update: usr/src/pkgdefs/common_files/i.rbac update: usr/src/pkgdefs/common_files/i.scsivhciconf update: usr/src/pkgdefs/common_files/i.sdconf_i386 update: usr/src/pkgdefs/common_files/i.syslogconf update: usr/src/pkgdefs/common_files/i.ttysrch update: usr/src/tools/Makefile update: usr/src/tools/Makefile.tools update: usr/src/tools/README.tools update: usr/src/tools/SUNWonbld/Makefile update: usr/src/tools/SUNWonbld/prototype_com update: usr/src/tools/findunref/Makefile update: usr/src/tools/findunref/findunref.c update: usr/src/tools/scripts/Makefile update: usr/src/tools/scripts/bldenv.sh update: usr/src/tools/scripts/checkpaths.sh update: usr/src/tools/scripts/cstyle.pl update: usr/src/tools/scripts/flg.flp.sh update: usr/src/tools/scripts/jstyle.pl update: usr/src/tools/scripts/nightly.1 update: usr/src/tools/scripts/nightly.sh update: usr/src/tools/scripts/sdrop.sh update: usr/src/tools/scripts/webrev.1 update: usr/src/tools/scripts/webrev.sh update: usr/src/tools/scripts/ws.sh update: usr/src/tools/scripts/wx.1 update: usr/src/tools/scripts/wx.sh update: usr/src/tools/scripts/xref.sh create: usr/src/tools/findunref/README.exception_lists create: usr/src/tools/findunref/exception_list.closed create: usr/src/tools/findunref/exception_list.common create: usr/src/tools/findunref/exception_list.mercurial rename from: usr/src/tools/findunref/exception_list to: usr/src/tools/findunref/exception_list.open update: usr/src/tools/findunref/exception_list.open create: usr/src/tools/findunref/exception_list.teamware create: usr/src/tools/onbld/Checks/CStyle.py create: usr/src/tools/onbld/Checks/Cddl.py create: usr/src/tools/onbld/Checks/Comments.py create: usr/src/tools/onbld/Checks/Copyright.py create: usr/src/tools/onbld/Checks/DbLookups.py create: usr/src/tools/onbld/Checks/HdrChk.py create: usr/src/tools/onbld/Checks/JStyle.py create: usr/src/tools/onbld/Checks/Keywords.py create: usr/src/tools/onbld/Checks/Makefile create: usr/src/tools/onbld/Checks/ProcessCheck.py create: usr/src/tools/onbld/Checks/Rti.py create: usr/src/tools/onbld/Checks/__init__.py create: usr/src/tools/onbld/Makefile create: usr/src/tools/onbld/Scm/Backup.py create: usr/src/tools/onbld/Scm/Makefile create: usr/src/tools/onbld/Scm/Version.py create: usr/src/tools/onbld/Scm/WorkSpace.py create: usr/src/tools/onbld/Scm/__init__.py create: usr/src/tools/onbld/__init__.py create: usr/src/tools/onbld/hgext/Makefile create: usr/src/tools/onbld/hgext/__init__.py create: usr/src/tools/onbld/hgext/cdm.py create: usr/src/tools/scripts/cddlchk.1 create: usr/src/tools/scripts/cddlchk.py create: usr/src/tools/scripts/copyrightchk.py create: usr/src/tools/scripts/hdrchk.1 create: usr/src/tools/scripts/hdrchk.py create: usr/src/tools/scripts/hg-active.py create: usr/src/tools/scripts/hgsetup.1 create: usr/src/tools/scripts/hgsetup.sh create: usr/src/tools/scripts/rtichk.py create: usr/src/tools/scripts/which_scm.1 create: usr/src/tools/scripts/which_scm.sh create: usr/src/tools/scripts/wx2hg.1 create: usr/src/tools/scripts/wx2hg.sh rename from: usr/src/pkgdefs/common_files/i.confupdate to: deleted_files/usr/src/pkgdefs/common_files/i.confupdate rename from: usr/src/pkgdefs/common_files/i.pcicconf to: deleted_files/usr/src/pkgdefs/common_files/i.pcicconf rename from: usr/src/tools/scripts/cddlchk.pl to: deleted_files/usr/src/tools/scripts/cddlchk.pl rename from: usr/src/tools/scripts/hdrchk.pl to: deleted_files/usr/src/tools/scripts/hdrchk.pl Examined files: 101 Contents Summary: 40 create 57 update 4 no action (unchanged) 2 differentiate child Names Summary: 5 renamed 5 update children's name history No changes were put back ______________________________________________________________________________ *Comments*: ______________________________________________________________________________ ### Common (Gates: 5.11) ### ** [Wed Jul 9 21:06:26 PDT 2008] [state=NO_CHANGE submitter=Mark.J.Nelson at Sun.COM] ** As Rich points out, my TPS answers are overly paranoid. All of the GPL code we're integrating was written by members of the project team, under either Sun Employment Agreements or Sun Contributor Agreements. ** [Wed Jul 9 17:36:10 PDT 2008] [state=S_SUBMITTED submitter=Mark.J.Nelson at Sun.COM] ** Val: please reassign if appropriate, just (obviously) not to me, nor to any advocate that can't evaluate this in a timely fashion. Let me know if you want any hg/wx workspace comparison info. Running sanity builds tonight, using (of course) these tools; see testing information below. Please pay careful attention to the TPS section of this RTI. I have listed some team members (and primary contributors, even) as code reviewers. Everything being putback has been reviewed by somebody besides its author. I did not deem it worth my time to research the release/build in which the i.publickey bug was introduced. ______________________________________________________________________________ *Test Results*: ______________________________________________________________________________ ### Common (Gates: 5.11) ### Sparc/Teamware/full build, x86/Mercurial/open build from tools in putback workspace. Months of use on zhadum and trigati, and by various project teams. No doc bugs because the docs for these are all part of ON. ______________________________________________________________________________ *Manpages & Docs*: ______________________________________________________________________________ ### Common (Gates: 5.11) ### ______________________________________________________________________________ *Third Party Source*: ______________________________________________________________________________ ### Common (Gates: 5.11) ### Selected Options: * Some or all of the new code introduced in this putback came from outside Sun: * New code introduced in this putback was written by an individual contributor to OpenSolaris. Details: Rich Lowe: SCA OS0007 Mike Gerdts: SCA OS0018 Steve Lau: when asked if he did any SCM tools work after leaving Sun, he replied "not consciously." Additionally, Dean Roehrich and Stuart Marks were listed in Mercurial log comments as contributors. Because they are Sun employees, I have removed that explicit attribution for the TeamWare putback. Some of the new Python code is GPL, because it is clearly derivative of Mercurial. I believe that this new code is appropriate under the existing OSRs for Mercurial, most notably OSR 4629 (integration of Mercurial 0.7) and OSR 4507 (upgrade of Mercurial to 0.9). If you disagree, I will file an expedited inbound OSR. To put this another way: I think the correct answer to this question is covered under "The code you are modifying is previously-approved third- party source, and the modifications you are making came from the same place as the existing code, and the licensing terms remain unchanged. This may be open source code, freeware, or code from a third-party vendor, as long as it was previously approved for inclusion in Solaris," but the tests for "came from the same place" and "was previously approved" are not phrased inclusively for derivative works. In other words: we're doing the right thing by honoring the viral nature of the GPL in Mercurial. I don't think this needs another OSR. But I'm also not the CRT Advocate for this putback. Bonnie, if you're reading this, how come I couldn't find an OSR for the Mercurial 1.0 upgrade?
