From e536d18f8403c5e1212db0c35689efcd019b61a3 Mon Sep 17 00:00:00 2001 From: Josef 'Jeff' Sipek Date: Fri, 28 Sep 2018 18:10:53 -0400 Subject: [PATCH] pkg: stop shipping the OSBL We've been free of closed bins for a long time, so we don't need to ship the OSBL as it doesn't apply. --- usr/src/pkg/license_files/lic_OSBL | 190 --------------------- usr/src/pkg/license_files/lic_OSBL_preamble | 6 - usr/src/pkg/manifests/developer-linker.mf | 2 - usr/src/pkg/manifests/driver-network-ib.inc | 2 - usr/src/pkg/manifests/driver-network-sdp.inc | 2 - usr/src/pkg/manifests/driver-network-tavor.inc | 2 - usr/src/pkg/manifests/service-storage-ndmp.mf | 2 - usr/src/pkg/manifests/system-file-system-nfs.mf | 2 - usr/src/pkg/manifests/system-library.inc | 2 - .../manifests/system-network-udapl-udapl-tavor.mf | 2 - 10 files changed, 212 deletions(-) delete mode 100644 usr/src/pkg/license_files/lic_OSBL delete mode 100644 usr/src/pkg/license_files/lic_OSBL_preamble diff --git a/usr/src/pkg/license_files/lic_OSBL b/usr/src/pkg/license_files/lic_OSBL deleted file mode 100644 index ec304cfdd0..0000000000 --- a/usr/src/pkg/license_files/lic_OSBL +++ /dev/null @@ -1,190 +0,0 @@ -Sun Microsystems, Inc. Binary Code License Agreement - -SUN MICROSYSTEMS, INC. ("SUN") IS WILLING TO LICENSE THE SOFTWARE TO YOU -ONLY UPON THE CONDITION THAT YOU ACCEPT ALL OF THE TERMS CONTAINED IN -THIS BINARY CODE LICENSE AGREEMENT ("AGREEMENT"). PLEASE READ THE -AGREEMENT CAREFULLY. BY DOWNLOADING OR INSTALLING THIS SOFTWARE, YOU -ACCEPT THE FULL TERMS OF THIS AGREEMENT. - -1. Definitions. - -"Software" means all software provided to You in binary code form by Sun -under this License as indicated on the opensolaris.org website. Software -includes any updates or error corrections or documentation relating to -Software provided to You by Sun under this License as indicated on the -opensolaris.org website. - -2. Permitted Uses. - -Subject to the terms and conditions of this Agreement and restrictions and -exceptions set forth in the Software's documentation, Sun grants you a -non-exclusive, non-transferable, limited license without fees to - -(a) reproduce and use internally the Software for the purposes of -developing or running an Open Solaris distribution. - -(b) reproduce and distribute the Software (and also portions of Software -identified as Redistributable in the documentation accompanying Software), -provided that you (i) distribute the Software or Redistributables bundled -as part of, and for the sole purpose of running, OpenSolaris code; -(ii) do not remove or alter any proprietary legends or notices contained -in or on the Software or Redistributables, (iii) only distribute the -Software or Redistributables subject to a license agreement that protects -Sun's interests consistent with the terms contained in this Agreement, -and (iv) you agree to defend and indemnify Sun and its licensors from and -against any damages, costs, liabilities, settlement amounts and/or -expenses (including attorneys' fees) incurred in connection with any claim, -lawsuit or action by any third party that arises or results from the use -or distribution of any and all Programs, Software, or Redistributables. - -3. Restrictions. - -(a) The copies of Software provided to you under this Agreement is -licensed, not sold, to you by Sun. Sun reserves all rights not expressly -granted. - -(b) You may not modify Software. However if the documentation -accompanying Software lists specific portions of Software, such as header -files, class libraries, reference source code, and/or redistributable -files, that may be handled differently, you may do so only as provided in -the documentation. - -(c) You may not rent, lease, lend or encumber Software. - -(d) You do not remove or alter any proprietary legends or notices -contained in the Software, - -(e) Unless enforcement is prohibited by applicable law, you may not -decompile, or reverse engineer Software. - -(f) The terms and conditions of this Agreement will apply to any Software -updates, provided to you at Sun's discretion, that replace and/or -supplement the original Software, unless such update contains a separate -license. - -(g) Software is copyrighted. - -(h) Software is not designed, licensed or intended for use in the design, -construction, operation or maintenance of any nuclear facility and Sun -and its licensors disclaim any express or implied warranty of fitness for -such uses. - -(i) No right, title or interest in or to any trademark, service mark, -logo or trade name of Sun or its licensors is granted under this -Agreement. - -(j) If your Permitted Use in this Agreement permits the distribution -Software or portions of the Software, you may only distribute the Software -subject to a license agreement that protects Sun's interests consistent -with the terms contained in this Agreement. - -4. Java Compatibility and Open Source. - -Software may contain Java technology. You may not create additional -classes to, or modifications of, the Java technology, except under -compatibility requirements available under a separate agreement available -at www.java.net. - -Sun supports and benefits from the global community of open source -developers, and thanks the community for its important contributions and -open standards-based technology, which Sun has adopted into many of its -products. - -Please note that portions of Software may be provided with notices and -open source licenses from such communities and third parties that govern -the use of those portions, and any licenses granted hereunder do not -alter any rights and obligations you may have under such open source -licenses, however, the disclaimer of warranty and limitation of -liability provisions in this Agreement will apply to all Software in -this distribution. - -5. Term and Termination. - -The Agreement is effective on the Date you recieve the Software and -remains effective until terminated. Your rights under this Agreement -will terminate immediately without notice from Sun if you materially -breach it or take any action in derogation of Sun's and/or its -licensors' rights to Software. Sun may terminate this Agreement should -any Software become, or in Sun's reasonable opinion likely to become, -the subject of a claim of intellectual property infringement or trade -secret misappropriation. Upon termination, you will cease use of, and -destroy, Software and confirm compliance in writing to Sun. Sections 1, -3, 4, 5, and 7-13 will survive termination of the Agreement. - -6. Limited Warranty. - -Sun warrants to you that for a period of 90 days from the date of -receipt, the media on which Software is furnished (if any) will be free -of defects in materials and workmanship under normal use. Except for -the foregoing, Software is provided "AS IS". Your exclusive remedy and -Sun's entire liability under this limited warranty will be at Sun's -option to replace Software media or refund the fee paid for Software. -Some states do not allow limitations on certain implied warranties, so -the above may not apply to you. This limited warranty gives you -specific legal rights. You may have others, which vary from state to -state. - -7. Disclaimer of Warranty. - -UNLESS SPECIFIED IN THIS AGREEMENT, ALL EXPRESS OR IMPLIED CONDITIONS, -REPRESENTATIONS AND WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT -ARE DISCLAIMED, EXCEPT TO THE EXTENT THAT THESE DISCLAIMERS ARE HELD TO -BE LEGALLY INVALID. - -8. Limitation of Liability. - -TO THE EXTENT NOT PROHIBITED BY LAW, IN NO EVENT WILL SUN OR ITS -LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR SPECIAL, -INDIRECT, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED -REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF OR RELATED TO THE -USE OF OR INABILITY TO USE SOFTWARE, EVEN IF SUN HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. In no event will Sun's liability to you, -whether in contract, tort (including negligence), or otherwise, exceed -the amount paid by you for Software under this Agreement. The foregoing -limitations will apply even if the above stated warranty fails of its -essential purpose. Some states do not allow the exclusion of incidental -or consequential damages, so some of the terms above may not be -applicable to you. - -9. Export Regulations. - -All Software, documents, technical data, and any other materials -delivered under this Agreement are subject to U.S. export control laws -and may be subject to export or import regulations in other countries. -You agree to comply strictly with these laws and regulations and -acknowledge that you have the responsibility to obtain any licenses to -export, re-export, or import as may be required after delivery to you. - -10. U.S. Government Restricted Rights. - -If Software is being acquired by or on behalf of the U.S. Government or -by a U.S. Government prime contractor or subcontractor (at any tier), -then the Government's rights in Software and accompanying documentation -will be only as set forth in this Agreement; this is in accordance with -48 CFR 227.7201 through 227.7202-4 (for Department of Defense (DOD) -acquisitions) and with 48 CFR 2.101 and 12.212 (for non-DOD acquisitions). - -11. Governing Law. - -Any action related to this Agreement will be governed by California law -and controlling U.S. federal law. No choice of law rules of any -jurisdiction will apply. - -12. Severability. - -If any provision of this Agreement is held to be unenforceable, this -Agreement will remain in effect with the provision omitted, unless -omission would frustrate the intent of the parties, in which case this -Agreement will immediately terminate. - -13. Integration. - -This Agreement is the entire agreement between you and Sun relating to -its subject matter. It supersedes all prior or contemporaneous oral or -written communications, proposals, representations and warranties and -prevails over any conflicting or additional terms of any quote, order, -acknowledgment, or other communication between the parties relating to -its subject matter during the term of this Agreement. No modification -of this Agreement will be binding, unless in writing and signed by an -authorized representative of each party. diff --git a/usr/src/pkg/license_files/lic_OSBL_preamble b/usr/src/pkg/license_files/lic_OSBL_preamble deleted file mode 100644 index 927bc83912..0000000000 --- a/usr/src/pkg/license_files/lic_OSBL_preamble +++ /dev/null @@ -1,6 +0,0 @@ -Some or all of the code in this package is subject to and you are bound -by the terms of the OpenSolaris Binary License (below); except that, if -you are receiving this package as part of Solaris, the code is subject to -and you are bound by the applicable Sun Microsystems, Inc. Software License -Agreement or Technology Evaluation License. If the OpenSolaris Binary -License applies, then the code is "Redistributable" subject to its terms. diff --git a/usr/src/pkg/manifests/developer-linker.mf b/usr/src/pkg/manifests/developer-linker.mf index f2604f191e..b596e5b252 100644 --- a/usr/src/pkg/manifests/developer-linker.mf +++ b/usr/src/pkg/manifests/developer-linker.mf @@ -101,8 +101,6 @@ hardlink path=usr/bin/truss target=../../usr/lib/isaexec license cr_ATT license=cr_ATT license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL -license lic_OSBL license=lic_OSBL -license lic_OSBL_preamble license=lic_OSBL_preamble link path=usr/lib/ld/$(ARCH64)/map.above4G target=../map.above4G link path=usr/lib/ld/$(ARCH64)/map.below4G target=../map.below4G link path=usr/lib/ld/$(ARCH64)/map.default target=../map.default diff --git a/usr/src/pkg/manifests/driver-network-ib.inc b/usr/src/pkg/manifests/driver-network-ib.inc index ca42f97927..dd79699db0 100644 --- a/usr/src/pkg/manifests/driver-network-ib.inc +++ b/usr/src/pkg/manifests/driver-network-ib.inc @@ -50,5 +50,3 @@ file path=usr/share/man/man7d/ibdm.7d file path=usr/share/man/man7d/ibtl.7d license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL -license lic_OSBL license=lic_OSBL -license lic_OSBL_preamble license=lic_OSBL_preamble diff --git a/usr/src/pkg/manifests/driver-network-sdp.inc b/usr/src/pkg/manifests/driver-network-sdp.inc index 9c1c415da5..0e6ba8c2f7 100644 --- a/usr/src/pkg/manifests/driver-network-sdp.inc +++ b/usr/src/pkg/manifests/driver-network-sdp.inc @@ -47,5 +47,3 @@ file path=kernel/drv/sdp.conf group=sys file path=usr/share/man/man7d/sdp.7d license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL -license lic_OSBL license=lic_OSBL -license lic_OSBL_preamble license=lic_OSBL_preamble diff --git a/usr/src/pkg/manifests/driver-network-tavor.inc b/usr/src/pkg/manifests/driver-network-tavor.inc index 73ac61cdc6..92a5da0d91 100644 --- a/usr/src/pkg/manifests/driver-network-tavor.inc +++ b/usr/src/pkg/manifests/driver-network-tavor.inc @@ -40,5 +40,3 @@ driver name=tavor perms="* 0666 root sys" \ file path=kernel/drv/tavor group=sys file path=kernel/drv/tavor.conf group=sys license cr_Sun license=cr_Sun -license lic_OSBL license=lic_OSBL -license lic_OSBL_preamble license=lic_OSBL_preamble diff --git a/usr/src/pkg/manifests/service-storage-ndmp.mf b/usr/src/pkg/manifests/service-storage-ndmp.mf index 8ed207cb8b..62fb82edb5 100644 --- a/usr/src/pkg/manifests/service-storage-ndmp.mf +++ b/usr/src/pkg/manifests/service-storage-ndmp.mf @@ -63,8 +63,6 @@ file path=usr/share/man/man8/ndmpd.8 file path=usr/share/man/man8/ndmpstat.8 file path=usr/share/man/man4/ndmp.4 license cr_Sun license=cr_Sun -license lic_OSBL license=lic_OSBL -license lic_OSBL_preamble license=lic_OSBL_preamble license usr/src/cmd/ndmpd/LICENSE license=usr/src/cmd/ndmpd/LICENSE link path=usr/lib/$(ARCH64)/libndmp.so target=libndmp.so.1 link path=usr/lib/libndmp.so target=libndmp.so.1 diff --git a/usr/src/pkg/manifests/system-file-system-nfs.mf b/usr/src/pkg/manifests/system-file-system-nfs.mf index eb152f5830..a59ae65b82 100644 --- a/usr/src/pkg/manifests/system-file-system-nfs.mf +++ b/usr/src/pkg/manifests/system-file-system-nfs.mf @@ -96,8 +96,6 @@ hardlink path=kernel/sys/nfs target=../../kernel/fs/nfs license cr_ATT license=cr_ATT license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL -license lic_OSBL license=lic_OSBL -license lic_OSBL_preamble license=lic_OSBL_preamble link path=usr/lib/fs/nfs/mount target=../../../../etc/fs/nfs/mount link path=usr/lib/nfs/libmapid.so target=libmapid.so.1 link path=usr/sbin/showmount target=../lib/fs/nfs/showmount diff --git a/usr/src/pkg/manifests/system-library.inc b/usr/src/pkg/manifests/system-library.inc index 0545efb9de..e4008ad0ba 100644 --- a/usr/src/pkg/manifests/system-library.inc +++ b/usr/src/pkg/manifests/system-library.inc @@ -480,8 +480,6 @@ license cr_Sun license=cr_Sun license include/sys/THIRDPARTYLICENSE.unicode \ license=include/sys/THIRDPARTYLICENSE.unicode license lic_CDDL license=lic_CDDL -license lic_OSBL license=lic_OSBL -license lic_OSBL_preamble license=lic_OSBL_preamble license share/man/man3c/THIRDPARTYLICENSE.arc4random \ license=share/man/man3c/THIRDPARTYLICENSE.arc4random license share/man/man3c/THIRDPARTYLICENSE.getentropy \ diff --git a/usr/src/pkg/manifests/system-network-udapl-udapl-tavor.mf b/usr/src/pkg/manifests/system-network-udapl-udapl-tavor.mf index 1028148fb4..3c35012da7 100644 --- a/usr/src/pkg/manifests/system-network-udapl-udapl-tavor.mf +++ b/usr/src/pkg/manifests/system-network-udapl-udapl-tavor.mf @@ -55,5 +55,3 @@ file path=usr/share/dat/SUNWudaplt.conf group=sys mode=0644 hardlink path=etc/rc2.d/S81dodatadm.udaplt \ target=../../etc/init.d/dodatadm.udaplt license cr_Sun license=cr_Sun -license lic_OSBL license=lic_OSBL -license lic_OSBL_preamble license=lic_OSBL_preamble -- 2.11.4.GIT