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.
2025-01-21 12:05:17 +00:00 · 2012-07-26 16:58:02 -06:00 · 2012-07-26 16:58:02 -06:00 · 3ad13c92a7
commit 3ad13c92a7
parent a4bcefbcff
26 changed files with 67 additions and 46 deletions
--- a/3
+++ b/3
@ -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
--- 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='
--- 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>
--- 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 = \
--- 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>
 #
--- 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>
 #
--- 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>
 #
--- 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>
 #
--- 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
--- 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
--- 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>
 */
--- 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>
 */
--- 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>
 #
--- 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>
 */
--- 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)/..
--- 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>
 *)
--- 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`/..
--- 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`/..
--- 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)/..
--- 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)/..
--- 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)/..
--- 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)

--- 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)/..}
--- 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)/..}
--- 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)/..
--- 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