changeset 11395:251b48e66150

6908006 nightly build noise from CR 6902616 libresolve fix: cylink references not removed 6909064 integration for CR 6289479 broke the CRYPT_SRC build of ONNV gate
author Rao Shoaib <Rao.Shoaib@Sun.COM>
date Wed, 23 Dec 2009 21:02:35 -0800
parents 4c46a0ebc7bd
children 2cc9a03f7e33
files usr/src/Makefile usr/src/lib/libresolv2/THIRDPARTYLICENSE usr/src/xmod/xmod_files
diffstat 3 files changed, 0 insertions(+), 40 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/Makefile	Thu Dec 24 09:58:28 2009 +0800
+++ b/usr/src/Makefile	Wed Dec 23 21:02:35 2009 -0800
@@ -307,7 +307,6 @@
 	@cd $(CLOSED)/lib/libike;   pwd; $(MAKE) CRYPT_SRC
 	@cd lib/libnsl;	 pwd; $(MAKE) CRYPT_SRC
 	@cd lib/libsasl;	 pwd; $(MAKE) CRYPT_SRC
-	@cd lib/libresolv2;	 pwd; $(MAKE) CRYPT_SRC
 	@cd lib/sasl_plugins; pwd; $(MAKE) CRYPT_SRC
 	@cd lib/pam_modules/krb5;   pwd; $(MAKE) CRYPT_SRC
 	@cd uts/common/gssapi;    pwd; $(MAKE) CRYPT_SRC
--- a/usr/src/lib/libresolv2/THIRDPARTYLICENSE	Thu Dec 24 09:58:28 2009 +0800
+++ b/usr/src/lib/libresolv2/THIRDPARTYLICENSE	Wed Dec 23 21:02:35 2009 -0800
@@ -138,44 +138,6 @@
  City, California 94065, USA, to discuss alternate licensing
  arrangements.
 
- * Cylink Corporation \251 1998
- *
- * This software is licensed by Cylink to the Internet Software Consortium to
- * promote implementation of royalty free public key cryptography within IETF
- * standards.  Cylink wishes to expressly thank the contributions of Dr.
- * Martin Hellman, Whitfield Diffie, Ralph Merkle and Stanford University for
- * their contributions to Internet Security.  In accordance with the terms of
- * this license, ISC is authorized to distribute and sublicense this software
- * for the practice of IETF standards.
- *
- * The software includes BigNum, written by Colin Plumb and licensed by Philip
- * R. Zimmermann for royalty free use and distribution with Cylink's
- * software.  Use of BigNum as a stand alone product or component is
- * specifically prohibited.
- *
- * Disclaimer of All Warranties. THIS SOFTWARE IS BEING PROVIDED "AS IS",
- * WITHOUT ANY EXPRESSED OR IMPLIED WARRANTY OF ANY KIND WHATSOEVER. IN
- * PARTICULAR, WITHOUT LIMITATION ON THE GENERALITY OF THE FOREGOING, CYLINK
- * MAKES NO REPRESENTATION OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR
- * PURPOSE.
- *
- * Cylink or its representatives shall not be liable for tort, indirect,
- * special or consequential damages such as loss of profits or loss of
- * goodwill from the use or inability to use the software for any purpose or
- * for any reason whatsoever.
- *
- * EXPORT LAW: Export of the Foundations Suite may be subject to compliance
- * with the rules and regulations promulgated from time to time by the Bureau
- * of Export Administration, United States Department of Commerce, which
- * restrict the export and re-export of certain products and technical data.
- * If the export of the Foundations Suite is controlled under such rules and
- * regulations, then the Foundations Suite shall not be exported or
- * re-exported, directly or indirectly, (a) without all export or re-export
- * licenses and governmental approvals required by any applicable laws, or (b)
- * in violation of any applicable prohibition against the export or re-export
- * of any part of the Foundations Suite. All export licenses for software
- * containing the Foundations Suite are the sole responsibility of the licensee.
-
  * Portions Copyright (c) 1995-1998 by Trusted Information Systems, Inc.
  *
  * Permission to use, copy modify, and distribute this software for any
--- a/usr/src/xmod/xmod_files	Thu Dec 24 09:58:28 2009 +0800
+++ b/usr/src/xmod/xmod_files	Wed Dec 23 21:02:35 2009 -0800
@@ -44,7 +44,6 @@
 ../closed/uts/intel/sdpib
 ../closed/uts/common/io/ib/clients/sdpib
 ../closed/uts/common/sys/ib/clients/sdpib
-lib/libresolv2/cylink
 ../closed/lib/gss_mechs/mech_dh/backend/Makefile.export
 ../closed/lib/gss_mechs/mech_dh/backend/mapfile-vers-export
 ../closed/lib/gss_mechs/mech_dh/dh1024/Makefile.export