Skip to content

Commit 6abef8e

Browse files
committed
Change license of all code from the 4 clause license to the 3 clause license
Signed-off-by: Benjamin C Meyer <[email protected]>
1 parent d878274 commit 6abef8e

File tree

9 files changed

+12
-40
lines changed

9 files changed

+12
-40
lines changed

contrib/commit-msg/duplicate-signedoffby

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,7 @@
1010
# 2. Redistributions in binary form must reproduce the above copyright
1111
# notice, this list of conditions and the following disclaimer in the
1212
# documentation and/or other materials provided with the distribution.
13-
# 3. All advertising materials mentioning features or use of this software
14-
# must display the following acknowledgement:
15-
# This product includes software developed by Benjamin C. Meyer.
16-
# 4. Neither the name of the project nor the
13+
# 3. Neither the name of the project nor the
1714
# names of its contributors may be used to endorse or promote products
1815
# derived from this software without specific prior written permission.
1916
#

contrib/commit-msg/spellcheck

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,7 @@
1010
# 2. Redistributions in binary form must reproduce the above copyright
1111
# notice, this list of conditions and the following disclaimer in the
1212
# documentation and/or other materials provided with the distribution.
13-
# 3. All advertising materials mentioning features or use of this software
14-
# must display the following acknowledgement:
15-
# This product includes software developed by Benjamin C. Meyer.
16-
# 4. Neither the name of the project nor the
13+
# 3. Neither the name of the project nor the
1714
# names of its contributors may be used to endorse or promote products
1815
# derived from this software without specific prior written permission.
1916
#

contrib/pre-commit/bash_syntax

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,7 @@
1010
# 2. Redistributions in binary form must reproduce the above copyright
1111
# notice, this list of conditions and the following disclaimer in the
1212
# documentation and/or other materials provided with the distribution.
13-
# 3. All advertising materials mentioning features or use of this software
14-
# must display the following acknowledgement:
15-
# This product includes software developed by Benjamin C. Meyer.
16-
# 4. Neither the name of the project nor the
13+
# 3. Neither the name of the project nor the
1714
# names of its contributors may be used to endorse or promote products
1815
# derived from this software without specific prior written permission.
1916
#

contrib/pre-commit/copyright_year

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,7 @@
1010
# 2. Redistributions in binary form must reproduce the above copyright
1111
# notice, this list of conditions and the following disclaimer in the
1212
# documentation and/or other materials provided with the distribution.
13-
# 3. All advertising materials mentioning features or use of this software
14-
# must display the following acknowledgement:
15-
# This product includes software developed by Benjamin C. Meyer.
16-
# 4. Neither the name of the project nor the
13+
# 3. Neither the name of the project nor the
1714
# names of its contributors may be used to endorse or promote products
1815
# derived from this software without specific prior written permission.
1916
#

contrib/pre-commit/whitespace

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,7 @@
1010
# 2. Redistributions in binary form must reproduce the above copyright
1111
# notice, this list of conditions and the following disclaimer in the
1212
# documentation and/or other materials provided with the distribution.
13-
# 3. All advertising materials mentioning features or use of this software
14-
# must display the following acknowledgement:
15-
# This product includes software developed by Benjamin C. Meyer.
16-
# 4. Neither the name of the project nor the
13+
# 3. Neither the name of the project nor the
1714
# names of its contributors may be used to endorse or promote products
1815
# derived from this software without specific prior written permission.
1916
#

contrib/pre-receive/freespace

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,7 @@
1010
# 2. Redistributions in binary form must reproduce the above copyright
1111
# notice, this list of conditions and the following disclaimer in the
1212
# documentation and/or other materials provided with the distribution.
13-
# 3. All advertising materials mentioning features or use of this software
14-
# must display the following acknowledgement:
15-
# This product includes software developed by Benjamin C. Meyer.
16-
# 4. Neither the name of the project nor the
13+
# 3. Neither the name of the project nor the
1714
# names of its contributors may be used to endorse or promote products
1815
# derived from this software without specific prior written permission.
1916
#

git-hooks

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,7 @@
1010
# 2. Redistributions in binary form must reproduce the above copyright
1111
# notice, this list of conditions and the following disclaimer in the
1212
# documentation and/or other materials provided with the distribution.
13-
# 3. All advertising materials mentioning features or use of this software
14-
# must display the following acknowledgement:
15-
# This product includes software developed by Benjamin C. Meyer.
16-
# 4. Neither the name of the project nor the
13+
# 3. Neither the name of the project nor the
1714
# names of its contributors may be used to endorse or promote products
1815
# derived from this software without specific prior written permission.
1916
#

git_hooks/commit-msg/signed-off-by

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,7 @@
1010
# 2. Redistributions in binary form must reproduce the above copyright
1111
# notice, this list of conditions and the following disclaimer in the
1212
# documentation and/or other materials provided with the distribution.
13-
# 3. All advertising materials mentioning features or use of this software
14-
# must display the following acknowledgement:
15-
# This product includes software developed by Benjamin C. Meyer.
16-
# 4. Neither the name of the project nor the
13+
# 3. Neither the name of the project nor the
1714
# names of its contributors may be used to endorse or promote products
1815
# derived from this software without specific prior written permission.
1916
#

git_hooks/pre-commit/bsd

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,7 @@
1010
# 2. Redistributions in binary form must reproduce the above copyright
1111
# notice, this list of conditions and the following disclaimer in the
1212
# documentation and/or other materials provided with the distribution.
13-
# 3. All advertising materials mentioning features or use of this software
14-
# must display the following acknowledgement:
15-
# This product includes software developed by Benjamin C. Meyer.
16-
# 4. Neither the name of the project nor the
13+
# 3. Neither the name of the project nor the
1714
# names of its contributors may be used to endorse or promote products
1815
# derived from this software without specific prior written permission.
1916
#
@@ -34,10 +31,9 @@ function test_file {
3431
if grep 'Copyright (c)' "${file}" | grep -v 'grep' >/dev/null 2>&1 ; then
3532
set -e
3633
grep "Redistribution and use in source and binary forms, with or without" "${file}" >/dev/null
37-
grep "1. Redistributions of source code must retain the above copyright" "${file}" >/dev/null
38-
grep "2. Redistributions in binary form must reproduce the above copyright" "${file}" >/dev/null
39-
grep "3. All advertising materials mentioning features or use of this software" "${file}" >/dev/null
40-
grep "4. Neither the name of the project nor the" "${file}" >/dev/null
34+
grep "Redistributions of source code must retain the above copyright" "${file}" >/dev/null
35+
grep "Redistributions in binary form must reproduce the above copyright" "${file}" >/dev/null
36+
grep "Neither the name of the project nor the" "${file}" >/dev/null
4137
set +e
4238
fi
4339
}

0 commit comments

Comments
 (0)