From: Eric Blake Date: Thu, 26 Jul 2012 22:58:02 +0000 (-0600) Subject: maint: avoid regression on copyright listings X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=3ad13c92a73ed6afaeeab76d5dd598912ef8f72d;p=libvirt.git 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 e3e270b007..35a87eddc3 100755 --- 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 . +# along with this program. If not, see +# . # 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 3ac84f46eb..66a88cda7b 100644 --- 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 +# . # gnulib modules used by this package. gnulib_modules=' diff --git a/build-aux/augeas-gentest.pl b/build-aux/augeas-gentest.pl index a5f9fd3881..8b68357017 100755 --- 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 +# . # # Authors: # Daniel P. Berrange diff --git a/cfg.mk b/cfg.mk index 68f3a91617..f5c19a2dec 100644 --- 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 . +# along with this program. If not, see +# . # 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 , 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 7184000ca4..0a7cf8486f 100644 --- 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 +# . # # Author: Daniel P. Berrange # diff --git a/examples/systemtap/qemu-monitor.stp b/examples/systemtap/qemu-monitor.stp index b9d9b253d1..fd6e7de96e 100644 --- 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 +# . # # Author: Daniel P. Berrange # diff --git a/examples/systemtap/rpc-monitor.stp b/examples/systemtap/rpc-monitor.stp index 69d7593a3c..47b44d023b 100644 --- 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 +# . # # Author: Daniel P. Berrange # diff --git a/src/dtrace2systemtap.pl b/src/dtrace2systemtap.pl index 4c6c249b18..d52626f2fe 100755 --- 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 +# . # # Author: Daniel P. Berrange # diff --git a/src/esx/esx_vi_generator.py b/src/esx/esx_vi_generator.py index 97b8e15f36..910478cdaf 100755 --- 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 +# . # import sys diff --git a/src/hyperv/hyperv_wmi_generator.py b/src/hyperv/hyperv_wmi_generator.py index 93f5ac2a66..fb8c0d6a99 100755 --- 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 +# . # import sys diff --git a/src/remote/qemu_protocol.x b/src/remote/qemu_protocol.x index 5afe680ac5..c06339c8ec 100644 --- 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 + * . * * Author: Chris Lalancette */ diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x index dd460d4b8d..200fe75f99 100644 --- 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 + * . * * Author: Richard Jones */ diff --git a/src/rpc/gensystemtap.pl b/src/rpc/gensystemtap.pl index 1cf9c0fb10..7c1e734373 100755 --- 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 +# . # # Author: Daniel P. Berrange # diff --git a/src/rpc/virnetprotocol.x b/src/rpc/virnetprotocol.x index 9663ddbf6a..d1a82cc77c 100644 --- 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 + * . * * Author: Richard Jones */ diff --git a/tests/cpuset b/tests/cpuset index d638ad6cda..4618a54e0c 100755 --- 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 . +# along with this program. If not, see +# . 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 68c414e206..48f84af52e 100644 --- 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 + * . * * Author: Daniel P. Berrange *) diff --git a/tests/read-bufsiz b/tests/read-bufsiz index a4c6007653..23c3b531d9 100755 --- 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 . +# along with this program. If not, see +# . 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 d5ae027f0b..46e2831eb9 100755 --- 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 . +# along with this program. If not, see +# . test -z "$srcdir" && srcdir=`pwd` test -z "$abs_top_srcdir" && abs_top_srcdir=`pwd`/.. diff --git a/tests/start b/tests/start index 524b12787e..5d4c0a73c7 100755 --- 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 . +# along with this program. If not, see +# . test -z "$srcdir" && srcdir=$(pwd) test -z "$abs_top_srcdir" && abs_top_srcdir=$(pwd)/.. diff --git a/tests/undefine b/tests/undefine index 22d6c1491c..f7ba495933 100755 --- 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 . +# along with this program. If not, see +# . test -z "$srcdir" && srcdir=$(pwd) test -z "$abs_top_srcdir" && abs_top_srcdir=$(pwd)/.. diff --git a/tests/vcpupin b/tests/vcpupin index 59528622dc..f1fb038295 100755 --- 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 . +# along with this program. If not, see +# . 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 8d60ac31f6..2650b86c58 100755 --- 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 . +# along with this program. If not, see +# . test -z "$srcdir" && srcdir=$(pwd) diff --git a/tests/virsh-optparse b/tests/virsh-optparse index fc2279f938..4ddc31a563 100755 --- 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 . +# along with this program. If not, see +# . : ${srcdir=$(pwd)} : ${abs_top_srcdir=$(pwd)/..} diff --git a/tests/virsh-schedinfo b/tests/virsh-schedinfo index 8ea4ce47d4..4f462f87a0 100755 --- 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 . +# along with this program. If not, see +# . : ${srcdir=$(pwd)} : ${abs_top_srcdir=$(pwd)/..} diff --git a/tests/virsh-synopsis b/tests/virsh-synopsis index 59960fce8b..cacdee4876 100755 --- 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 . +# along with this program. If not, see +# . 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 9ba3a0abc6..419879e614 100644 --- 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 +# . set -e