Change license of all code from the 4 clause license to the 3 clause license

Signed-off-by: Benjamin C Meyer <ben@meyerhome.net>

diff --git a/contrib/commit-msg/duplicate-signedoffby b/contrib/commit-msg/duplicate-signedoffby
index d4271b1002e3657487532d7c59124b358717b477..34b9985570b6aee2b2d7deabefbc1a3cb6923e96 100755 (executable)
--- a/contrib/commit-msg/duplicate-signedoffby
+++ b/contrib/commit-msg/duplicate-signedoffby
@@ -10,10 +10,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.
-# 3. All advertising materials mentioning features or use of this software
-#    must display the following acknowledgement:
-#    This product includes software developed by Benjamin C. Meyer.
-# 4. Neither the name of the project nor the
+# 3. Neither the name of the project nor the
 #    names of its contributors may be used to endorse or promote products
 #    derived from this software without specific prior written permission.
 #

diff --git a/contrib/commit-msg/spellcheck b/contrib/commit-msg/spellcheck
index 0167d692bc1151d5478501461c7a8b2512c61718..de4147cd4b7fc5fd78d191e4235442ea3544428f 100755 (executable)
--- a/contrib/commit-msg/spellcheck
+++ b/contrib/commit-msg/spellcheck
@@ -10,10 +10,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.
-# 3. All advertising materials mentioning features or use of this software
-#    must display the following acknowledgement:
-#    This product includes software developed by Benjamin C. Meyer.
-# 4. Neither the name of the project nor the
+# 3. Neither the name of the project nor the
 #    names of its contributors may be used to endorse or promote products
 #    derived from this software without specific prior written permission.
 #

diff --git a/contrib/pre-commit/bash_syntax b/contrib/pre-commit/bash_syntax
index 714e298a15e148f205dc98fc17a8d060952f82b0..5fecbfe722ca2d42f4d2e8267611c22e571c2c27 100755 (executable)
--- a/contrib/pre-commit/bash_syntax
+++ b/contrib/pre-commit/bash_syntax
@@ -10,10 +10,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.
-# 3. All advertising materials mentioning features or use of this software
-#    must display the following acknowledgement:
-#    This product includes software developed by Benjamin C. Meyer.
-# 4. Neither the name of the project nor the
+# 3. Neither the name of the project nor the
 #    names of its contributors may be used to endorse or promote products
 #    derived from this software without specific prior written permission.
 #

diff --git a/contrib/pre-commit/copyright_year b/contrib/pre-commit/copyright_year
index e879381e29f7305de97aa7ddb07dd13c2261b56b..cea0fe647535b594bcec6f4e67d6ce2f08769ca6 100755 (executable)
--- a/contrib/pre-commit/copyright_year
+++ b/contrib/pre-commit/copyright_year
@@ -10,10 +10,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.
-# 3. All advertising materials mentioning features or use of this software
-#    must display the following acknowledgement:
-#    This product includes software developed by Benjamin C. Meyer.
-# 4. Neither the name of the project nor the
+# 3. Neither the name of the project nor the
 #    names of its contributors may be used to endorse or promote products
 #    derived from this software without specific prior written permission.
 #

diff --git a/contrib/pre-commit/whitespace b/contrib/pre-commit/whitespace
index f5bbee3a8689b0dd6d474913711eb7f102217506..d2b4a6ef0312ba11e1dea910ba646feb620df4e0 100755 (executable)
--- a/contrib/pre-commit/whitespace
+++ b/contrib/pre-commit/whitespace
@@ -10,10 +10,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.
-# 3. All advertising materials mentioning features or use of this software
-#    must display the following acknowledgement:
-#    This product includes software developed by Benjamin C. Meyer.
-# 4. Neither the name of the project nor the
+# 3. Neither the name of the project nor the
 #    names of its contributors may be used to endorse or promote products
 #    derived from this software without specific prior written permission.
 #

diff --git a/contrib/pre-receive/freespace b/contrib/pre-receive/freespace
index d4eae85e86078e627a3efa4fe3f2c776d5bb8406..acf3c028b83c471ffc24464392f3917a2a86bb17 100755 (executable)
--- a/contrib/pre-receive/freespace
+++ b/contrib/pre-receive/freespace
@@ -10,10 +10,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.
-# 3. All advertising materials mentioning features or use of this software
-#    must display the following acknowledgement:
-#    This product includes software developed by Benjamin C. Meyer.
-# 4. Neither the name of the project nor the
+# 3. Neither the name of the project nor the
 #    names of its contributors may be used to endorse or promote products
 #    derived from this software without specific prior written permission.
 #

diff --git a/git-hooks b/git-hooks
index 6b17d3cf89a71fb0d99a50c9afd743b109a4fb14..39bb0d18b8c12877230ad4337ed557288478febc 100755 (executable)
--- a/git-hooks
+++ b/git-hooks
@@ -10,10 +10,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.
-# 3. All advertising materials mentioning features or use of this software
-#    must display the following acknowledgement:
-#    This product includes software developed by Benjamin C. Meyer.
-# 4. Neither the name of the project nor the
+# 3. Neither the name of the project nor the
 #    names of its contributors may be used to endorse or promote products
 #    derived from this software without specific prior written permission.
 #

diff --git a/git_hooks/commit-msg/signed-off-by b/git_hooks/commit-msg/signed-off-by
index 9fddff7e5eeb1060379e1606becf273b1da9cf0e..5dbafb4d18bd624e2d690d262e6876234c9e7c04 100755 (executable)
--- a/git_hooks/commit-msg/signed-off-by
+++ b/git_hooks/commit-msg/signed-off-by
@@ -10,10 +10,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.
-# 3. All advertising materials mentioning features or use of this software
-#    must display the following acknowledgement:
-#    This product includes software developed by Benjamin C. Meyer.
-# 4. Neither the name of the project nor the
+# 3. Neither the name of the project nor the
 #    names of its contributors may be used to endorse or promote products
 #    derived from this software without specific prior written permission.
 #

diff --git a/git_hooks/pre-commit/bsd b/git_hooks/pre-commit/bsd
index 3080cef460169d0c4eb089cba787f823a779ee5e..339334891bcf7d9d0141dd88c913c7c6a6e60515 100755 (executable)
--- a/git_hooks/pre-commit/bsd
+++ b/git_hooks/pre-commit/bsd
@@ -10,10 +10,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.
-# 3. All advertising materials mentioning features or use of this software
-#    must display the following acknowledgement:
-#    This product includes software developed by Benjamin C. Meyer.
-# 4. Neither the name of the project nor the
+# 3. Neither the name of the project nor the
 #    names of its contributors may be used to endorse or promote products
 #    derived from this software without specific prior written permission.
 #
@@ -34,10 +31,9 @@ function test_file {
     if grep 'Copyright (c)' "${file}" | grep -v 'grep' >/dev/null 2>&1 ; then
         set -e
         grep "Redistribution and use in source and binary forms, with or without" "${file}" >/dev/null
-        grep "1. Redistributions of source code must retain the above copyright" "${file}" >/dev/null
-        grep "2. Redistributions in binary form must reproduce the above copyright" "${file}" >/dev/null
-        grep "3. All advertising materials mentioning features or use of this software" "${file}" >/dev/null
-        grep "4. Neither the name of the project nor the" "${file}" >/dev/null
+        grep "Redistributions of source code must retain the above copyright" "${file}" >/dev/null
+        grep "Redistributions in binary form must reproduce the above copyright" "${file}" >/dev/null
+        grep "Neither the name of the project nor the" "${file}" >/dev/null
         set +e
     fi
 }