Skip to content

Commit aa34e3c

Browse files
swinslowswinslow
authored
Merge pull request #1078 from swinslow/bsd-2-clause-freebsd-deprecate
Deprecate BSD-2-Clause-FreeBSD and add generic version
2 parents e7e2786 + 40b6df9 commit aa34e3c

File tree

3 files changed

+67
-1
lines changed

3 files changed

+67
-1
lines changed

‎src/BSD-2-Clause-FreeBSD.xml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<SPDXLicenseCollection xmlns="http://www.spdx.org/license">
33
<license isOsiApproved="false" licenseId="BSD-2-Clause-FreeBSD"
4-
name="BSD 2-Clause FreeBSD License">
4+
name="BSD 2-Clause FreeBSD License"
5+
isDeprecated="true" deprecatedVersion="3.10">
56
<crossRefs>
67
<crossRef>http://www.freebsd.org/copyright/freebsd-license.html</crossRef>
78
</crossRefs>
9+
<notes>
10+
This license was deprecated because BSD-2-Clause-Views has been added, as a more generalized version; and
11+
because FreeBSD project community members have indicated that the final sentence is not part of that
12+
project's code license.
13+
</notes>
814
<text>
915
<titleText>
1016
<p>The FreeBSD Copyright</p>

‎src/BSD-2-Clause-Views.xml

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<SPDXLicenseCollection xmlns="http://www.spdx.org/license">
3+
<license isOsiApproved="false" licenseId="BSD-2-Clause-Views"
4+
name="BSD 2-Clause with views sentence" listVersionAdded="3.10">
5+
<crossRefs>
6+
<crossRef>http://www.freebsd.org/copyright/freebsd-license.html</crossRef>
7+
<crossRef>https://people.freebsd.org/~ivoras/wine/patch-wine-nvidia.sh</crossRef>
8+
<crossRef>https://github.com/protegeproject/protege/blob/master/license.txt</crossRef>
9+
</crossRefs>
10+
<notes>
11+
This is a more generalized version of BSD-2-Clause-FreeBSD, which is now deprecated. It is identical to
12+
BSD-2-Clause with the addition of the "views and conclusions" sentence at the end.
13+
</notes>
14+
<text>
15+
<copyrightText>
16+
<p>Copyright (c) &lt;year&gt; &lt;owner&gt; All rights reserved.</p>
17+
</copyrightText>
18+
19+
<p>Redistribution and use in source and binary forms, with or without modification, are permitted provided
20+
that the following conditions are met:</p>
21+
<list>
22+
<item>
23+
<bullet>1.</bullet>
24+
Redistributions of source code must retain the above copyright notice, this list of conditions
25+
and the following disclaimer.
26+
</item>
27+
<item>
28+
<bullet>2.</bullet>
29+
Redistributions in binary form must reproduce the above copyright notice, this list of conditions
30+
and the following disclaimer in the documentation and/or other materials provided with the
31+
distribution.
32+
</item>
33+
</list>
34+
<p>THIS SOFTWARE IS PROVIDED BY
35+
<alt match=".+" name="copyrightHolderAsIs">THE COPYRIGHT HOLDERS AND CONTRIBUTORS</alt> "AS IS" AND ANY
36+
<alt match="EXPRESS(ED)?" name="express">EXPRESS</alt> OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
37+
AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
38+
<alt match=".+" name="copyrightHolderLiability">THE COPYRIGHT HOLDER OR CONTRIBUTORS</alt> BE LIABLE FOR
39+
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
40+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
41+
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
42+
TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
43+
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</p>
44+
<p>The views and conclusions contained in the software and documentation are those of the authors and should
45+
not be interpreted as representing official policies, either expressed or implied, of <alt match=".+"
46+
name="copyrightHolderViews">the copyright holders or contributors.</alt></p>
47+
</text>
48+
</license>
49+
</SPDXLicenseCollection>

‎test/simpleTestForGenerator/BSD-2-Clause-Views.txt

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
Copyright (c) <year> <owner> All rights reserved.
2+
3+
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
4+
5+
1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
6+
7+
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.
8+
9+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS 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 COPYRIGHT HOLDER OR 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.
10+
11+
The views and conclusions contained in the software and documentation are those of the authors and should not be interpreted as representing official policies, either expressed or implied, of the copyright holders or contributors.

0 commit comments

Comments
 (0)