maint: avoid regression on copyright listings

Commit f9ce7dad6 tried to kill uses of a raw street address, but
missed a few instances.  Automate things so we don't introduce
new problems in the future.

* cfg.mk (sc_copyright_address): New rule.
(exclude_file_name_regexp--sc_copyright_address): Add exemption.
* bootstrap.conf: Adjust offenders.
* build-aux/augeas-gentest.pl: Likewise.
* examples/systemtap/events.stp: Likewise.
* examples/systemtap/qemu-monitor.stp: Likewise.
* examples/systemtap/rpc-monitor.stp: Likewise.
* src/dtrace2systemtap.pl: Likewise.
* src/esx/esx_vi_generator.py: Likewise.
* src/hyperv/hyperv_wmi_generator.py: Likewise.
* src/remote/qemu_protocol.x: Likewise.
* src/remote/remote_protocol.x: Likewise.
* src/rpc/gensystemtap.pl: Likewise.
* src/rpc/virnetprotocol.x: Likewise.
* tests/object-locking.ml: Likewise.
* tools/virt-xml-validate.in: Likewise.

diff --git a/bootstrap b/bootstrap
index e3e270b007f658edd2ca3ec6aa590ecf14f29c27..35a87eddc37ec5a382c6520ccc39b9374df70b0c 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -17,7 +17,8 @@ scriptversion=2012-07-19.14; # UTC
 # 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, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see
+# <http://www.gnu.org/licenses/>.
 
 # Originally written by Paul Eggert.  The canonical version of this
 # script is maintained as build-aux/bootstrap in gnulib, however, to

diff --git a/bootstrap.conf b/bootstrap.conf
index 3ac84f46eb6197b092586fa9a88d70a23f07f5fc..66a88cda7b0240d2596335677d890ed848299672 100644 (file)
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -13,9 +13,8 @@
 # GNU 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
-
+# License along with this library; if not, see
+# <http://www.gnu.org/licenses/>.
 
 # gnulib modules used by this package.
 gnulib_modules='

diff --git a/build-aux/augeas-gentest.pl b/build-aux/augeas-gentest.pl
index a5f9fd3881f4e72974bd7253393164e602acd2b9..8b68357017c393f6e38b27e770e573d04815f674 100755 (executable)
--- a/build-aux/augeas-gentest.pl
+++ b/build-aux/augeas-gentest.pl
@@ -14,8 +14,8 @@
 # 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
+# License along with this library; if not, see
+# <http://www.gnu.org/licenses/>.
 #
 # Authors:
 #     Daniel P. Berrange <berrange@redhat.com>

diff --git a/cfg.mk b/cfg.mk
index 68f3a91617965609173fbb76061f2651912770a5..f5c19a2dec70b7f05499a1506a60d272a8067cba 100644 (file)
--- a/cfg.mk
+++ b/cfg.mk
@@ -13,7 +13,8 @@
 # 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, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see
+# <http://www.gnu.org/licenses/>.
 
 # Use alpha.gnu.org for alpha and beta releases.
 # Use ftp.gnu.org for major releases.
@@ -622,6 +623,13 @@ sc_copyright_format:
        halt='spell Red Hat as two words'                               \
          $(_sc_search_regexp)
 
+# Prefer the new URL listing over the old street address listing when
+# calling out where to get a copy of the [L]GPL.
+sc_copyright_address:
+       @prohibit=Boston,' MA'                                          \
+       halt='Point to <http://www.gnu.org/licenses/>, not an address'  \
+         $(_sc_search_regexp)
+
 # Some functions/macros produce messages intended solely for developers
 # and maintainers.  Do not mark them for translation.
 sc_prohibit_gettext_markup:
@@ -736,6 +744,9 @@ exclude_file_name_regexp--sc_avoid_write = \
 
 exclude_file_name_regexp--sc_bindtextdomain = ^(tests|examples)/
 
+exclude_file_name_regexp--sc_copyright_address = \
+  ^COPYING\.LIB$$
+
 exclude_file_name_regexp--sc_flags_usage = ^(docs/|src/util/virnetdevtap\.c$$)
 
 exclude_file_name_regexp--sc_libvirt_unmarked_diagnostics = \

diff --git a/examples/systemtap/events.stp b/examples/systemtap/events.stp
index 7184000ca44d1e5063db3bf48572e2112e04f738..0a7cf8486fcb932e91ad77c3e20b935e7824bddb 100644 (file)
--- a/examples/systemtap/events.stp
+++ b/examples/systemtap/events.stp
@@ -13,8 +13,8 @@
 # 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
+# License along with this library; if not, see
+# <http://www.gnu.org/licenses/>.
 #
 # Author: Daniel P. Berrange <berrange@redhat.com>
 #

diff --git a/examples/systemtap/qemu-monitor.stp b/examples/systemtap/qemu-monitor.stp
index b9d9b253d1144f12ca60421f3989ab4c71ba467d..fd6e7de96eb031ea7f190039eb376d2d2ced6ced 100644 (file)
--- a/examples/systemtap/qemu-monitor.stp
+++ b/examples/systemtap/qemu-monitor.stp
@@ -13,8 +13,8 @@
 # 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
+# License along with this library; if not, see
+# <http://www.gnu.org/licenses/>.
 #
 # Author: Daniel P. Berrange <berrange@redhat.com>
 #

diff --git a/examples/systemtap/rpc-monitor.stp b/examples/systemtap/rpc-monitor.stp
index 69d7593a3ca41e4d1345b32c4b4ab0262b30e500..47b44d023b9f2f2886dadf57ae47a03114306836 100644 (file)
--- a/examples/systemtap/rpc-monitor.stp
+++ b/examples/systemtap/rpc-monitor.stp
@@ -13,8 +13,8 @@
 # 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
+# License along with this library; if not, see
+# <http://www.gnu.org/licenses/>.
 #
 # Author: Daniel P. Berrange <berrange@redhat.com>
 #

diff --git a/src/dtrace2systemtap.pl b/src/dtrace2systemtap.pl
index 4c6c249b18751ad8bbabd60c82c94f9b8ec21470..d52626f2fe585d308e835cd18299f1ac48cca635 100755 (executable)
--- a/src/dtrace2systemtap.pl
+++ b/src/dtrace2systemtap.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# Copyright (C) 2011 Red Hat, Inc.
+# Copyright (C) 2011-2012 Red Hat, Inc.
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -13,8 +13,8 @@
 # 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
+# License along with this library; if not, see
+# <http://www.gnu.org/licenses/>.
 #
 # Author: Daniel P. Berrange <berrange@redhat.com>
 #

diff --git a/src/esx/esx_vi_generator.py b/src/esx/esx_vi_generator.py
index 97b8e15f36dca1247bb2f426d237fbfc459e08e8..910478cdaf567df3d66830fa23364124c63b5a6b 100755 (executable)
--- a/src/esx/esx_vi_generator.py
+++ b/src/esx/esx_vi_generator.py
@@ -16,8 +16,8 @@
 # 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
+# License along with this library; if not, see
+# <http://www.gnu.org/licenses/>.
 #
 
 import sys

diff --git a/src/hyperv/hyperv_wmi_generator.py b/src/hyperv/hyperv_wmi_generator.py
index 93f5ac2a6654f556ac7bb7d0727745a717d3932e..fb8c0d6a99c139f4aa7352b22070183c25168dc1 100755 (executable)
--- a/src/hyperv/hyperv_wmi_generator.py
+++ b/src/hyperv/hyperv_wmi_generator.py
@@ -16,8 +16,8 @@
 # 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
+# License along with this library; if not, see
+# <http://www.gnu.org/licenses/>.
 #
 
 import sys

diff --git a/src/remote/qemu_protocol.x b/src/remote/qemu_protocol.x
index 5afe680ac5bf065b53978c0bdb5629ee0be367c4..c06339c8ecdbfcad5782de33a234d3f1061fcb63 100644 (file)
--- a/src/remote/qemu_protocol.x
+++ b/src/remote/qemu_protocol.x
@@ -16,8 +16,8 @@
  * 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
+ * License along with this library; if not, see
+ * <http://www.gnu.org/licenses/>.
  *
  * Author: Chris Lalancette <clalance@redhat.com>
  */

diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x
index dd460d4b8d09278c01f8035bba0498a3cb2ad570..200fe75f99163959e4ac21120ecfc2d47cb5c7d9 100644 (file)
--- a/src/remote/remote_protocol.x
+++ b/src/remote/remote_protocol.x
@@ -16,8 +16,8 @@
  * 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
+ * License along with this library; if not, see
+ * <http://www.gnu.org/licenses/>.
  *
  * Author: Richard Jones <rjones@redhat.com>
  */

diff --git a/src/rpc/gensystemtap.pl b/src/rpc/gensystemtap.pl
index 1cf9c0fb10e1d0316a23f5f1b6237f744eb61741..7c1e734373a27cc14d749c889a19f715d8af1041 100755 (executable)
--- a/src/rpc/gensystemtap.pl
+++ b/src/rpc/gensystemtap.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# Copyright (C) 2011 Red Hat, Inc.
+# Copyright (C) 2011-2012 Red Hat, Inc.
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -13,8 +13,8 @@
 # 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
+# License along with this library; if not, see
+# <http://www.gnu.org/licenses/>.
 #
 # Author: Daniel P. Berrange <berrange@redhat.com>
 #

diff --git a/src/rpc/virnetprotocol.x b/src/rpc/virnetprotocol.x
index 9663ddbf6a0eabca29cfbc07d7afe66d0ef62a2c..d1a82cc77c452e6c497bbcfebeb8273c29b0437e 100644 (file)
--- a/src/rpc/virnetprotocol.x
+++ b/src/rpc/virnetprotocol.x
@@ -1,7 +1,7 @@
 /* -*- c -*-
  * virnetprotocol.x: basic protocol for all RPC services.
  *
- * Copyright (C) 2006-2011 Red Hat, Inc.
+ * Copyright (C) 2006-2012 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -14,8 +14,8 @@
  * 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
+ * License along with this library; if not, see
+ * <http://www.gnu.org/licenses/>.
  *
  * Author: Richard Jones <rjones@redhat.com>
  */

diff --git a/tests/cpuset b/tests/cpuset
index d638ad6cda9b1732df849dc0581c76020bbf1b7b..4618a54e0c486adcca832d22e46f1cf39f90c72d 100755 (executable)
--- a/tests/cpuset
+++ b/tests/cpuset
@@ -14,7 +14,8 @@
 # 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, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see
+# <http://www.gnu.org/licenses/>.
 
 test -z "$srcdir" && srcdir=$(pwd)
 test -z "$abs_top_srcdir" && abs_top_srcdir=$(pwd)/..

diff --git a/tests/object-locking.ml b/tests/object-locking.ml
index 68c414e20625ff579f4ea11e8369d1e91e9f7971..48f84af52edc148448e1cc643bb8c59d9dc5ba06 100644 (file)
--- a/tests/object-locking.ml
+++ b/tests/object-locking.ml
@@ -1,7 +1,7 @@
 (*
  * Analyse libvirt driver API methods for mutex locking mistakes
  *
- * Copyright (C) 2008-2010 Red Hat, Inc.
+ * Copyright (C) 2008-2010, 2012 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -14,8 +14,8 @@
  * 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
+ * License along with this library; if not, see
+ * <http://www.gnu.org/licenses/>.
  *
  * Author: Daniel P. Berrange <berrange@redhat.com>
  *)

diff --git a/tests/read-bufsiz b/tests/read-bufsiz
index a4c6007653e7fc7fd997e56a2d73625d572aeb2b..23c3b531d9ae0bc03dec2b8cb9492103e53662c9 100755 (executable)
--- a/tests/read-bufsiz
+++ b/tests/read-bufsiz
@@ -14,7 +14,8 @@
 # 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, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see
+# <http://www.gnu.org/licenses/>.
 
 test -z "$srcdir" && srcdir=`pwd`
 test -z "$abs_top_srcdir" && abs_top_srcdir=`pwd`/..

diff --git a/tests/read-non-seekable b/tests/read-non-seekable
index d5ae027f0b4cf5e25c567c8f96cd28c0b3afa70e..46e2831eb9c50a3cc11ade8b359da509ace81f96 100755 (executable)
--- a/tests/read-non-seekable
+++ b/tests/read-non-seekable
@@ -14,7 +14,8 @@
 # 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, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see
+# <http://www.gnu.org/licenses/>.
 
 test -z "$srcdir" && srcdir=`pwd`
 test -z "$abs_top_srcdir" && abs_top_srcdir=`pwd`/..

diff --git a/tests/start b/tests/start
index 524b12787e6f90ca89023faecf7e6c3ead45d0b6..5d4c0a73c76d04e8811311473f7b91297598c555 100755 (executable)
--- a/tests/start
+++ b/tests/start
@@ -14,7 +14,8 @@
 # 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, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see
+# <http://www.gnu.org/licenses/>.
 
 test -z "$srcdir" && srcdir=$(pwd)
 test -z "$abs_top_srcdir" && abs_top_srcdir=$(pwd)/..

diff --git a/tests/undefine b/tests/undefine
index 22d6c1491c7a88e0e2053b97c3510a45dfd1fe30..f7ba49593373850b596b348bad22b2188a7961bc 100755 (executable)
--- a/tests/undefine
+++ b/tests/undefine
@@ -14,7 +14,8 @@
 # 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, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see
+# <http://www.gnu.org/licenses/>.
 
 test -z "$srcdir" && srcdir=$(pwd)
 test -z "$abs_top_srcdir" && abs_top_srcdir=$(pwd)/..

diff --git a/tests/vcpupin b/tests/vcpupin
index 59528622dc4fa7c922bec0d55b5d197e8537eac4..f1fb0382959518cfc67e779b55dc3dd2dbdba990 100755 (executable)
--- a/tests/vcpupin
+++ b/tests/vcpupin
@@ -14,7 +14,8 @@
 # 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, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see
+# <http://www.gnu.org/licenses/>.
 
 test -z "$srcdir" && srcdir=$(pwd)
 test -z "$abs_top_srcdir" && abs_top_srcdir=$(pwd)/..

diff --git a/tests/virsh-all b/tests/virsh-all
index 8d60ac31f6a890382bcb6cf2bb4b15be687a055e..2650b86c5839eb9926c3c9e5a687d1803d76664e 100755 (executable)
--- a/tests/virsh-all
+++ b/tests/virsh-all
@@ -14,7 +14,8 @@
 # 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, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see
+# <http://www.gnu.org/licenses/>.
 
 test -z "$srcdir" && srcdir=$(pwd)
 

diff --git a/tests/virsh-optparse b/tests/virsh-optparse
index fc2279f9383896a63b8b52e1475ce170e4776719..4ddc31a563a0a7cec6e69058376a1b32c0884bd2 100755 (executable)
--- a/tests/virsh-optparse
+++ b/tests/virsh-optparse
@@ -14,7 +14,8 @@
 # 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, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see
+# <http://www.gnu.org/licenses/>.
 
 : ${srcdir=$(pwd)}
 : ${abs_top_srcdir=$(pwd)/..}

diff --git a/tests/virsh-schedinfo b/tests/virsh-schedinfo
index 8ea4ce47d413e6256b7126640fd835bf704d5af6..4f462f87a0f945f2f89943ad3fe7ec27768cdd30 100755 (executable)
--- a/tests/virsh-schedinfo
+++ b/tests/virsh-schedinfo
@@ -14,7 +14,8 @@
 # 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, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see
+# <http://www.gnu.org/licenses/>.
 
 : ${srcdir=$(pwd)}
 : ${abs_top_srcdir=$(pwd)/..}

diff --git a/tests/virsh-synopsis b/tests/virsh-synopsis
index 59960fce8bb76279db93878b59426b86bcd60f96..cacdee487669cda994956776dc4a0ed1cdf2964d 100755 (executable)
--- a/tests/virsh-synopsis
+++ b/tests/virsh-synopsis
@@ -14,7 +14,8 @@
 # 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, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see
+# <http://www.gnu.org/licenses/>.
 
 test -z "$srcdir" && srcdir=$(pwd)
 test -z "$abs_top_srcdir" && abs_top_srcdir=$(pwd)/..

diff --git a/tools/virt-xml-validate.in b/tools/virt-xml-validate.in
index 9ba3a0abc6ccb55f05dbfddbba85a105fe82bddd..419879e614faaa9a73238d3bdfae8098b8f3f0fb 100644 (file)
--- a/tools/virt-xml-validate.in
+++ b/tools/virt-xml-validate.in
@@ -10,9 +10,9 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, see
+# <http://www.gnu.org/licenses/>.
 
 
 set -e