From 960ea6fb384f905ae3aece34850b1a64c8191e80 Mon Sep 17 00:00:00 2001
From: Tom Cort
Date: Tue, 11 Dec 2007 21:00:03 -0500
Subject: [PATCH] Clarify License => GNU General Public License version 2.
---
CMakeLists.txt | 5 ++---
COPYING | 6 ++++++
contrib/ubuntu-gutsy/etc_init.d_inoclam | 5 ++---
contrib/ubuntu-gutsy/etc_inoclam.conf | 5 ++---
format.sh | 7 +++----
man/CMakeLists.txt | 5 ++---
man/inoclam.8 | 10 ++++------
man/inoclam.conf.5 | 10 ++++------
src/CMakeLists.txt | 5 ++---
src/clam.cxx | 5 ++---
src/clam.hxx | 5 ++---
src/config.cxx | 5 ++---
src/config.hxx | 5 ++---
src/inoclam.cxx | 5 ++---
src/inoclam.hxx | 5 ++---
src/inotify.cxx | 5 ++---
src/inotify.hxx | 5 ++---
src/monitor.cxx | 5 ++---
src/monitor.hxx | 5 ++---
src/signal.cxx | 5 ++---
src/signal.hxx | 5 ++---
src/smtp.cxx | 5 ++---
src/smtp.hxx | 5 ++---
www/index.html | 22 ++++++++++------------
www/style.css | 5 ++---
25 files changed, 67 insertions(+), 88 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4c3b26a..cb3bb65 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,9 +2,8 @@
# Copyright (C) 2007 Vermont Department of Taxes
#
# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/COPYING b/COPYING
index 45645b4..09ccce8 100644
--- a/COPYING
+++ b/COPYING
@@ -1,3 +1,9 @@
+ Note that the only valid version of the GPL as far as inoclam
+ is concerned is _this_ particular version of the license (ie v2, not
+ v2.2 or v3.x or whatever), unless explicitly otherwise stated.
+
+----------------------------------------
+
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
diff --git a/contrib/ubuntu-gutsy/etc_init.d_inoclam b/contrib/ubuntu-gutsy/etc_init.d_inoclam
index 3a834bf..6389f56 100644
--- a/contrib/ubuntu-gutsy/etc_init.d_inoclam
+++ b/contrib/ubuntu-gutsy/etc_init.d_inoclam
@@ -3,9 +3,8 @@
# Copyright (C) 2007 Vermont Department of Taxes
#
# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/contrib/ubuntu-gutsy/etc_inoclam.conf b/contrib/ubuntu-gutsy/etc_inoclam.conf
index cf26ff1..8fd19f2 100644
--- a/contrib/ubuntu-gutsy/etc_inoclam.conf
+++ b/contrib/ubuntu-gutsy/etc_inoclam.conf
@@ -2,9 +2,8 @@
# Copyright (C) 2007 Vermont Department of Taxes
#
# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/format.sh b/format.sh
index 9155e9b..cb559d2 100644
--- a/format.sh
+++ b/format.sh
@@ -2,10 +2,9 @@
# gatewayav - an anti-virus web service
# Copyright (C) 2007 Vermont Department of Taxes
#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/man/CMakeLists.txt b/man/CMakeLists.txt
index 4b9cf6f..93fa4a8 100644
--- a/man/CMakeLists.txt
+++ b/man/CMakeLists.txt
@@ -2,9 +2,8 @@
# Copyright (C) 2007 Vermont Department of Taxes
#
# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/man/inoclam.8 b/man/inoclam.8
index c11e9ee..ca46df8 100644
--- a/man/inoclam.8
+++ b/man/inoclam.8
@@ -2,9 +2,8 @@
.\" Copyright (C) 2007 Vermont Department of Taxes
.\"
.\" This program is free software; you can redistribute it and/or modify
-.\" it under the terms of the GNU General Public License as published by
-.\" the Free Software Foundation; either version 2 of the License, or
-.\" (at your option) any later version.
+.\" it under the terms of the GNU General Public License version 2 as
+.\" published by the Free Software Foundation.
.\"
.\" This program is distributed in the hope that it will be useful,
.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -72,9 +71,8 @@ Matt Gagne
Copyright \(co 2007 Vermont Department of Taxes
This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+it under the terms of the GNU General Public License version 2 as
+published by the Free Software Foundation.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/man/inoclam.conf.5 b/man/inoclam.conf.5
index 1e8ac6b..6afb154 100644
--- a/man/inoclam.conf.5
+++ b/man/inoclam.conf.5
@@ -2,9 +2,8 @@
.\" Copyright (C) 2007 Vermont Department of Taxes
.\"
.\" This program is free software; you can redistribute it and/or modify
-.\" it under the terms of the GNU General Public License as published by
-.\" the Free Software Foundation; either version 2 of the License, or
-.\" (at your option) any later version.
+.\" it under the terms of the GNU General Public License version 2 as
+.\" published by the Free Software Foundation.
.\"
.\" This program is distributed in the hope that it will be useful,
.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -47,9 +46,8 @@ Matt Gagne
Copyright \(co 2007 Vermont Department of Taxes
This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+it under the terms of the GNU General Public License version 2 as
+published by the Free Software Foundation.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ab51e85..2e32047 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -2,9 +2,8 @@
# Copyright (C) 2007 Vermont Department of Taxes
#
# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/clam.cxx b/src/clam.cxx
index e9929e8..0fdd1d2 100644
--- a/src/clam.cxx
+++ b/src/clam.cxx
@@ -3,9 +3,8 @@
* Copyright (C) 2007 Vermont Department of Taxes
*
* This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/clam.hxx b/src/clam.hxx
index ea41873..f27084a 100644
--- a/src/clam.hxx
+++ b/src/clam.hxx
@@ -3,9 +3,8 @@
* Copyright (C) 2007 Vermont Department of Taxes
*
* This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/config.cxx b/src/config.cxx
index a568572..482c7ce 100644
--- a/src/config.cxx
+++ b/src/config.cxx
@@ -3,9 +3,8 @@
* Copyright (C) 2007 Vermont Department of Taxes
*
* This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/config.hxx b/src/config.hxx
index cd2f7a4..6d56229 100644
--- a/src/config.hxx
+++ b/src/config.hxx
@@ -3,9 +3,8 @@
* Copyright (C) 2007 Vermont Department of Taxes
*
* This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/inoclam.cxx b/src/inoclam.cxx
index ab15664..a5e2c94 100644
--- a/src/inoclam.cxx
+++ b/src/inoclam.cxx
@@ -3,9 +3,8 @@
* Copyright (C) 2007 Vermont Department of Taxes
*
* This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/inoclam.hxx b/src/inoclam.hxx
index d485650..aedc314 100644
--- a/src/inoclam.hxx
+++ b/src/inoclam.hxx
@@ -3,9 +3,8 @@
* Copyright (C) 2007 Vermont Department of Taxes
*
* This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/inotify.cxx b/src/inotify.cxx
index 9ba0a80..68fff1d 100644
--- a/src/inotify.cxx
+++ b/src/inotify.cxx
@@ -3,9 +3,8 @@
* Copyright (C) 2007 Vermont Department of Taxes
*
* This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/inotify.hxx b/src/inotify.hxx
index 46c3b0f..df0b651 100644
--- a/src/inotify.hxx
+++ b/src/inotify.hxx
@@ -3,9 +3,8 @@
* Copyright (C) 2007 Vermont Department of Taxes
*
* This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/monitor.cxx b/src/monitor.cxx
index 25ee83e..936fec2 100644
--- a/src/monitor.cxx
+++ b/src/monitor.cxx
@@ -3,9 +3,8 @@
* Copyright (C) 2007 Vermont Department of Taxes
*
* This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/monitor.hxx b/src/monitor.hxx
index 227dfb0..5e418be 100644
--- a/src/monitor.hxx
+++ b/src/monitor.hxx
@@ -3,9 +3,8 @@
* Copyright (C) 2007 Vermont Department of Taxes
*
* This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/signal.cxx b/src/signal.cxx
index cb5863c..5355d55 100644
--- a/src/signal.cxx
+++ b/src/signal.cxx
@@ -3,9 +3,8 @@
* Copyright (C) 2007 Vermont Department of Taxes
*
* This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/signal.hxx b/src/signal.hxx
index 5b5399d..c0523ef 100644
--- a/src/signal.hxx
+++ b/src/signal.hxx
@@ -3,9 +3,8 @@
* Copyright (C) 2007 Vermont Department of Taxes
*
* This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/smtp.cxx b/src/smtp.cxx
index 365065a..7deae29 100644
--- a/src/smtp.cxx
+++ b/src/smtp.cxx
@@ -3,9 +3,8 @@
* Copyright (C) 2007 Vermont Department of Taxes
*
* This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/smtp.hxx b/src/smtp.hxx
index 51036b3..962134c 100644
--- a/src/smtp.hxx
+++ b/src/smtp.hxx
@@ -3,9 +3,8 @@
* Copyright (C) 2007 Vermont Department of Taxes
*
* This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/www/index.html b/www/index.html
index 4cd17aa..5605bbf 100644
--- a/www/index.html
+++ b/www/index.html
@@ -7,9 +7,8 @@
* Copyright (C) 2007 Vermont Department of Taxes
*
* This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -47,9 +46,8 @@
This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
+ it under the terms of the GNU General Public License version 2 as
+ published by the Free Software Foundation.
This program is distributed in the hope that it will be useful,
@@ -65,12 +63,12 @@
diff --git a/www/style.css b/www/style.css
index d7193b6..44fb50d 100644
--- a/www/style.css
+++ b/www/style.css
@@ -3,9 +3,8 @@
* Copyright (C) 2007 Vermont Department of Taxes
*
* This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
--
2.11.4.GIT