Skip to content

Commit d9db1d9

Browse files
agc-gitagc-git
committed
Move UCB-licensed code from 4-clause to 3-clause licence.
Patches provided by Joel Baker in PR 22308, verified by myself.
1 parent c6bd5d9 commit d9db1d9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

115 files changed

+607
-699
lines changed

‎sbin/fsck_ffs/SMM.doc/0.t‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.\" $NetBSD: 0.t,v 1.3 1996/04/05 01:45:40 cgd Exp $
1+
.\" $NetBSD: 0.t,v 1.4 2003/08/07 10:04:22 agc Exp $
22
.\"
33
.\" Copyright (c) 1986, 1993
44
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
1111
.\" 2. Redistributions in binary form must reproduce the above copyright
1212
.\" notice, this list of conditions and the following disclaimer in the
1313
.\" documentation and/or other materials provided with the distribution.
14-
.\" 3. All advertising materials mentioning features or use of this software
15-
.\" must display the following acknowledgement:
16-
.\" This product includes software developed by the University of
17-
.\" California, Berkeley and its contributors.
18-
.\" 4. Neither the name of the University nor the names of its contributors
14+
.\" 3. Neither the name of the University nor the names of its contributors
1915
.\" may be used to endorse or promote products derived from this software
2016
.\" without specific prior written permission.
2117
.\"

‎sbin/fsck_ffs/SMM.doc/1.t‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.\" $NetBSD: 1.t,v 1.3 1996/04/05 01:45:44 cgd Exp $
1+
.\" $NetBSD: 1.t,v 1.4 2003/08/07 10:04:22 agc Exp $
22
.\"
33
.\" Copyright (c) 1982, 1993
44
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
1111
.\" 2. Redistributions in binary form must reproduce the above copyright
1212
.\" notice, this list of conditions and the following disclaimer in the
1313
.\" documentation and/or other materials provided with the distribution.
14-
.\" 3. All advertising materials mentioning features or use of this software
15-
.\" must display the following acknowledgement:
16-
.\" This product includes software developed by the University of
17-
.\" California, Berkeley and its contributors.
18-
.\" 4. Neither the name of the University nor the names of its contributors
14+
.\" 3. Neither the name of the University nor the names of its contributors
1915
.\" may be used to endorse or promote products derived from this software
2016
.\" without specific prior written permission.
2117
.\"

‎sbin/fsck_ffs/SMM.doc/2.t‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.\" $NetBSD: 2.t,v 1.2 1995/03/18 14:56:08 cgd Exp $
1+
.\" $NetBSD: 2.t,v 1.3 2003/08/07 10:04:22 agc Exp $
22
.\"
33
.\" Copyright (c) 1982, 1993
44
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
1111
.\" 2. Redistributions in binary form must reproduce the above copyright
1212
.\" notice, this list of conditions and the following disclaimer in the
1313
.\" documentation and/or other materials provided with the distribution.
14-
.\" 3. All advertising materials mentioning features or use of this software
15-
.\" must display the following acknowledgement:
16-
.\" This product includes software developed by the University of
17-
.\" California, Berkeley and its contributors.
18-
.\" 4. Neither the name of the University nor the names of its contributors
14+
.\" 3. Neither the name of the University nor the names of its contributors
1915
.\" may be used to endorse or promote products derived from this software
2016
.\" without specific prior written permission.
2117
.\"

‎sbin/fsck_ffs/SMM.doc/3.t‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.\" $NetBSD: 3.t,v 1.5 2001/08/20 12:00:49 wiz Exp $
1+
.\" $NetBSD: 3.t,v 1.6 2003/08/07 10:04:22 agc Exp $
22
.\"
33
.\" Copyright (c) 1982, 1993
44
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
1111
.\" 2. Redistributions in binary form must reproduce the above copyright
1212
.\" notice, this list of conditions and the following disclaimer in the
1313
.\" documentation and/or other materials provided with the distribution.
14-
.\" 3. All advertising materials mentioning features or use of this software
15-
.\" must display the following acknowledgement:
16-
.\" This product includes software developed by the University of
17-
.\" California, Berkeley and its contributors.
18-
.\" 4. Neither the name of the University nor the names of its contributors
14+
.\" 3. Neither the name of the University nor the names of its contributors
1915
.\" may be used to endorse or promote products derived from this software
2016
.\" without specific prior written permission.
2117
.\"

‎sbin/fsck_ffs/SMM.doc/4.t‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.\" $NetBSD: 4.t,v 1.4 2001/11/21 19:14:25 wiz Exp $
1+
.\" $NetBSD: 4.t,v 1.5 2003/08/07 10:04:22 agc Exp $
22
.\"
33
.\" Copyright (c) 1982, 1993
44
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
1111
.\" 2. Redistributions in binary form must reproduce the above copyright
1212
.\" notice, this list of conditions and the following disclaimer in the
1313
.\" documentation and/or other materials provided with the distribution.
14-
.\" 3. All advertising materials mentioning features or use of this software
15-
.\" must display the following acknowledgement:
16-
.\" This product includes software developed by the University of
17-
.\" California, Berkeley and its contributors.
18-
.\" 4. Neither the name of the University nor the names of its contributors
14+
.\" 3. Neither the name of the University nor the names of its contributors
1915
.\" may be used to endorse or promote products derived from this software
2016
.\" without specific prior written permission.
2117
.\"

‎sbin/fsck_lfs/bufcache.h‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $NetBSD: bufcache.h,v 1.1 2003/03/28 08:09:52 perseant Exp $ */
1+
/* $NetBSD: bufcache.h,v 1.2 2003/08/07 10:04:22 agc Exp $ */
22

33
/*-
44
* Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
@@ -54,11 +54,7 @@
5454
* 2. Redistributions in binary form must reproduce the above copyright
5555
* notice, this list of conditions and the following disclaimer in the
5656
* documentation and/or other materials provided with the distribution.
57-
* 3. All advertising materials mentioning features or use of this software
58-
* must display the following acknowledgement:
59-
* This product includes software developed by the University of
60-
* California, Berkeley and its contributors.
61-
* 4. Neither the name of the University nor the names of its contributors
57+
* 3. Neither the name of the University nor the names of its contributors
6258
* may be used to endorse or promote products derived from this software
6359
* without specific prior written permission.
6460
*

‎sbin/fsck_lfs/dir.c‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $NetBSD: dir.c,v 1.10 2003/07/13 08:13:19 itojun Exp $ */
1+
/* $NetBSD: dir.c,v 1.11 2003/08/07 10:04:22 agc Exp $ */
22

33
/*
44
* Copyright (c) 1980, 1986, 1993
@@ -12,11 +12,7 @@
1212
* 2. Redistributions in binary form must reproduce the above copyright
1313
* notice, this list of conditions and the following disclaimer in the
1414
* documentation and/or other materials provided with the distribution.
15-
* 3. All advertising materials mentioning features or use of this software
16-
* must display the following acknowledgement:
17-
* This product includes software developed by the University of
18-
* California, Berkeley and its contributors.
19-
* 4. Neither the name of the University nor the names of its contributors
15+
* 3. Neither the name of the University nor the names of its contributors
2016
* may be used to endorse or promote products derived from this software
2117
* without specific prior written permission.
2218
*

‎sbin/fsck_lfs/fsck.h‎

Lines changed: 32 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
/* $NetBSD: fsck.h,v 1.10 2003/04/02 10:39:27 fvdl Exp $ */
1+
/* $NetBSD: fsck.h,v 1.11 2003/08/07 10:04:22 agc Exp $ */
22

33
/*
4-
* Copyright (c) 1997
5-
* Konrad Schroder. All rights reserved.
64
* Copyright (c) 1980, 1986, 1993
75
* The Regents of the University of California. All rights reserved.
86
*
@@ -14,6 +12,37 @@
1412
* 2. Redistributions in binary form must reproduce the above copyright
1513
* notice, this list of conditions and the following disclaimer in the
1614
* documentation and/or other materials provided with the distribution.
15+
* 3. Neither the name of the University nor the names of its contributors
16+
* may be used to endorse or promote products derived from this software
17+
* without specific prior written permission.
18+
*
19+
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
20+
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
21+
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
22+
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
23+
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
24+
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
25+
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
26+
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
27+
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
28+
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
29+
* SUCH DAMAGE.
30+
*
31+
* @(#)fsck.h 8.1 (Berkeley) 6/5/93
32+
*/
33+
34+
/*
35+
* Copyright (c) 1997
36+
* Konrad Schroder. All rights reserved.
37+
*
38+
* Redistribution and use in source and binary forms, with or without
39+
* modification, are permitted provided that the following conditions
40+
* are met:
41+
* 1. Redistributions of source code must retain the above copyright
42+
* notice, this list of conditions and the following disclaimer.
43+
* 2. Redistributions in binary form must reproduce the above copyright
44+
* notice, this list of conditions and the following disclaimer in the
45+
* documentation and/or other materials provided with the distribution.
1746
* 3. All advertising materials mentioning features or use of this software
1847
* must display the following acknowledgement:
1948
* This product includes software developed by the University of

‎sbin/fsck_lfs/fsck_lfs.8‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.\" $NetBSD: fsck_lfs.8,v 1.14 2003/04/16 11:58:43 wiz Exp $
1+
.\" $NetBSD: fsck_lfs.8,v 1.15 2003/08/07 10:04:23 agc Exp $
22
.\"
33
.\" Copyright (c) 1980, 1989, 1991, 1993
44
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
1111
.\" 2. Redistributions in binary form must reproduce the above copyright
1212
.\" notice, this list of conditions and the following disclaimer in the
1313
.\" documentation and/or other materials provided with the distribution.
14-
.\" 3. All advertising materials mentioning features or use of this software
15-
.\" must display the following acknowledgement:
16-
.\" This product includes software developed by the University of
17-
.\" California, Berkeley and its contributors.
18-
.\" 4. Neither the name of the University nor the names of its contributors
14+
.\" 3. Neither the name of the University nor the names of its contributors
1915
.\" may be used to endorse or promote products derived from this software
2016
.\" without specific prior written permission.
2117
.\"

‎sbin/fsck_lfs/fsck_vars.h‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $NetBSD: fsck_vars.h,v 1.7 2003/04/02 10:39:27 fvdl Exp $ */
1+
/* $NetBSD: fsck_vars.h,v 1.8 2003/08/07 10:04:23 agc Exp $ */
22

33
/*
44
* Copyright (c) 1980, 1986, 1993
@@ -12,11 +12,7 @@
1212
* 2. Redistributions in binary form must reproduce the above copyright
1313
* notice, this list of conditions and the following disclaimer in the
1414
* documentation and/or other materials provided with the distribution.
15-
* 3. All advertising materials mentioning features or use of this software
16-
* must display the following acknowledgement:
17-
* This product includes software developed by the University of
18-
* California, Berkeley and its contributors.
19-
* 4. Neither the name of the University nor the names of its contributors
15+
* 3. Neither the name of the University nor the names of its contributors
2016
* may be used to endorse or promote products derived from this software
2117
* without specific prior written permission.
2218
*

0 commit comments

Comments
 (0)