LICENSE - Fixed old addresses, updated tools/check_license.sh to correct detect all licenses

7 files changed, 48 insertions, 47 deletions

diff --git a/includes/blowfish.h b/includes/blowfish.h
index 3f33e945..2d0dae1a 100644
--- a/includes/blowfish.h
+++ b/includes/blowfish.h
@@ -1,20 +1,18 @@
 /*

-blowfish.h:  Header file for blowfish.c

-

-Copyright (C) 1997 by Paul Kocher

-

-This library is free software; you can redistribute it and/or

-modify it under the terms of the GNU Lesser General Public

-License as published by the Free Software Foundation; either

-version 2.1 of the License, or (at your option) any later version.

-This library is distributed in the hope that it will be useful,

-but WITHOUT ANY WARRANTY; without even the implied warranty of

-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

-Lesser General Public License for more details.

-You should have received a copy of the GNU Lesser General Public

-License along with this library; if not, write to the Free Software

-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

-

+ * blowfish.h:  Header file for blowfish.c

+ * Copyright (C) 1997 by Paul Kocher

+ *

+ * This library is free software; you can redistribute it and/or

+ * modify it under the terms of the GNU Lesser General Public

+ * License as published by the Free Software Foundation; either

+ * version 2.1 of the License, or (at your option) any later version.

+ * This library is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

+ * Lesser General Public License for more details.

+ *

+ * You should have received a copy of the GNU General Public License

+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.

 

 See blowfish.c for more information about this file.

 */

diff --git a/includes/loadgraph.h b/includes/loadgraph.h
index d176e816..16181cd9 100644
--- a/includes/loadgraph.h
+++ b/includes/loadgraph.h
@@ -11,10 +11,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public
- * License along with the Simple Load Graph; if not, write to the Free
- * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 
diff --git a/modules/benchmark/blowfish.c b/modules/benchmark/blowfish.c
index f8d2e14a..9cfacc81 100644
--- a/modules/benchmark/blowfish.c
+++ b/modules/benchmark/blowfish.c
@@ -1,23 +1,21 @@
 /*
-blowfish.c:  C implementation of the Blowfish algorithm.
-
-Copyright (C) 1997 by Paul Kocher
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Lesser General Public License for more details.
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
+ * blowfish.c:  C implementation of the Blowfish algorithm.
+ * Copyright (C) 1997 by Paul Kocher
 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
 
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 
+/*
 COMMENTS ON USING THIS CODE:
 
 Normal usage is as follows:
diff --git a/modules/devices/spd-decode.c b/modules/devices/spd-decode.c
index cf4c89d7..7cfc688c 100644
--- a/modules/devices/spd-decode.c
+++ b/modules/devices/spd-decode.c
@@ -20,8 +20,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <ctype.h>
diff --git a/modules/devices/spd-vendors.c b/modules/devices/spd-vendors.c
index 80b2a6a4..7a646758 100644
--- a/modules/devices/spd-vendors.c
+++ b/modules/devices/spd-vendors.c
@@ -20,8 +20,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /* from decode-dimms, in the i2c-tools package:
diff --git a/shell/loadgraph.c b/shell/loadgraph.c
index 0290d1f1..a84f6d33 100644
--- a/shell/loadgraph.c
+++ b/shell/loadgraph.c
@@ -17,10 +17,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public
- * License along with the Simple Load Graph; if not, write to the Free
- * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "loadgraph.h"
diff --git a/tools/check_license.sh b/tools/check_license.sh
index 1a754ce8..794fd7bb 100755
--- a/tools/check_license.sh
+++ b/tools/check_license.sh
@@ -7,8 +7,16 @@ cd build
 
 licensecheck -r .. | grep '\.c: \|\.h: ' >licenses_all.txt
 
+echo "LGPL2.0+ & GPL2+:"
+cat licenses_all.txt| grep 'hardinfo2/util.c'
+echo ""
+
+echo "LGPL2.0+:"
+cat licenses_all.txt| grep 'hardinfo2/gg_strescape.c\|deps/uber-graph/uber-frame-source.\|deps/update-graph/uber-timeout-interval'
+echo ""
+
 echo "GPL2.0+:"
-cat licenses_all.txt| grep 'General Public License v2.0 or later\|GNU Library General Public License v2 or later'
+cat licenses_all.txt| grep -v 'hardinfo2/gg_strescape.c\|hardinfo2/util.c\|deps/uber-graph/uber-frame-source.\|deps/update-graph/uber-timeout-interval' | grep 'General Public License v2.0 or later\|GNU Library General Public License v2 or later'
 echo ""
 									 
 echo "LGPL2.1+:"
@@ -29,8 +37,11 @@ echo ""
 
 #remaining licenses
 echo "Others:"
-cat licenses_all.txt|grep -v 'General Public License v2.0 or later\|GNU Library General Public License v2 or later' \
-    | grep -v 'GNU Lesser General Public License v2.1 or later'| grep -v 'GNU Lesser General Public License, Version 2.1' \
+cat licenses_all.txt| grep 'Lesser General Public License v2.0 or later' \
+    | grep -v 'hardinfo2/gg_strescape.c\|hardinfo2/util.c\|deps/uber-graph/uber-frame-source.\|deps/update-graph/uber-timeout-interval' \
+    | grep -v 'General Public License v2.0 or later\|GNU Library General Public License v2 or later' \
+    | grep -v 'GNU Lesser General Public License v2.1 or later' \
+    | grep -v 'GNU Lesser General Public License, Version 2.1' \
     | grep -v 'General Public License v3.0 or later' \
     | grep -v '*No copyright*'