Arrggh. It appears that in the process of generated my new webrev, I ended up copying the wrong bits into my special webrev workspace. I apologize for not checking my work last night. I fixed this.
Here is the brand new good webrev: [http://cr.opensolaris.org/~mwaterl/6739234.changes_only.3/webrev/] thanks, Moriah <additional comments regarding feedback in-line> Richard Lowe wrote: > Moriah Waterland <Moriah.Waterland at Sun.COM> writes: > >> I have generated a new webrev for: >> 6739234 move SVR4 packaging to ONNV gate >> >> This webrev includes the changes that I detailed in my responses to code >> review comments. >> >> Updated Webrev (2nd ed.): >> [http://cr.opensolaris.org/~mwaterl/6739234.changes_only.2/webrev/] > > I took a really really really brief look: > > .../cmd/Makefile.cmd:100 > The XXXmw comment, should either be dealt with or that line removed > (I think) Yes, this had been removed. And I verified that it is not in my good bits or the updated webrev above. > THIRDPARTYLICENSE.*: > I may have missed some prior discussion here. > > Do you really need a THIRDPARTYLICENSE file for the AT&T derived > bits? I'd think that was common enough it would be covered some > other way (also, given the actual license is the CDDL, is this > right at all?) Some of the source (usr/src/lib/libpkg/common/p12lib.[c|h]) in libpkg is derived from "The OpenSSL Project" . The THIRDPARTYLICENSE in libpkg covers this copyright and license. The package that delivers libpkg needs to include the text from the THIRDPARTYLICENSE in its copyright file as well as the AT&T copyright. The copyright file for SUNWpkgcmdsu contains the following: Copyright 2009 Sun Microsystems, Inc. All rights reserved. Use is subject to license terms. -------------------------------------------------------------------- CDDL HEADER START The contents of this file are subject to the terms of the Common Development and Distribution License (the "License"). You may not use this file except in compliance with the License. You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing. See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner] CDDL HEADER END -------------------------------------------------------------------- /* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */ /* All Rights Reserved */ -------------------------------------------------------------------- * ==================================================================== * Copyright (c) 1999 The OpenSSL Project. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. * * 3. All advertising materials mentioning features or use of this * software must display the following acknowledgment: * "This product includes software developed by the OpenSSL Project * for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)" * * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to * endorse or promote products derived from this software without * prior written permission. For written permission, please contact * licensing at OpenSSL.org. * * 5. Products derived from this software may not be called "OpenSSL" * nor may "OpenSSL" appear in their names without prior written * permission of the OpenSSL Project. * * 6. Redistributions of any form whatsoever must retain the following * acknowledgment: * "This product includes software developed by the OpenSSL Project * for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)" * * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED * OF THE POSSIBILITY OF SUCH DAMAGE. * ==================================================================== * * This product includes cryptographic software written by Eric Young * (eay at cryptsoft.com). This product includes software written by Tim * Hudson (tjh at cryptsoft.com).