[libvirt] [PATCH] 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. --- Not that I'm trying to demean Boston, but right now, the only mention of it in our source code happens to come from stale LGPL reference source boilerplate. bootstrap.conf | 4 +--- build-aux/augeas-gentest.pl | 3 +-- cfg.mk | 10 ++++++++++ examples/systemtap/events.stp | 3 +-- examples/systemtap/qemu-monitor.stp | 3 +-- examples/systemtap/rpc-monitor.stp | 3 +-- src/dtrace2systemtap.pl | 5 ++--- src/esx/esx_vi_generator.py | 3 +-- src/hyperv/hyperv_wmi_generator.py | 3 +-- src/remote/qemu_protocol.x | 3 +-- src/remote/remote_protocol.x | 3 +-- src/rpc/gensystemtap.pl | 5 ++--- src/rpc/virnetprotocol.x | 5 ++--- tests/object-locking.ml | 5 ++--- tools/virt-xml-validate.in | 5 ++--- 15 files changed, 29 insertions(+), 34 deletions(-) diff --git a/bootstrap.conf b/bootstrap.conf index 3ac84f4..84e37e7 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -13,9 +13,7 @@ # 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 a5f9fd3..9cdc400 100755 --- a/build-aux/augeas-gentest.pl +++ b/build-aux/augeas-gentest.pl @@ -14,8 +14,7 @@ # 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 68f3a91..88131cb 100644 --- a/cfg.mk +++ b/cfg.mk @@ -622,6 +622,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 +743,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 7184000..3703be5 100644 --- a/examples/systemtap/events.stp +++ b/examples/systemtap/events.stp @@ -13,8 +13,7 @@ # 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 b9d9b25..50f706f 100644 --- a/examples/systemtap/qemu-monitor.stp +++ b/examples/systemtap/qemu-monitor.stp @@ -13,8 +13,7 @@ # 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 69d7593..8b9dc1e 100644 --- a/examples/systemtap/rpc-monitor.stp +++ b/examples/systemtap/rpc-monitor.stp @@ -13,8 +13,7 @@ # 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 4c6c249..91c9452 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,7 @@ # 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 97b8e15..2a344cc 100755 --- a/src/esx/esx_vi_generator.py +++ b/src/esx/esx_vi_generator.py @@ -16,8 +16,7 @@ # 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 93f5ac2..d2d44d2 100755 --- a/src/hyperv/hyperv_wmi_generator.py +++ b/src/hyperv/hyperv_wmi_generator.py @@ -16,8 +16,7 @@ # 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 5afe680..3536319 100644 --- a/src/remote/qemu_protocol.x +++ b/src/remote/qemu_protocol.x @@ -16,8 +16,7 @@ * 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 dd460d4..bdfa8ff 100644 --- a/src/remote/remote_protocol.x +++ b/src/remote/remote_protocol.x @@ -16,8 +16,7 @@ * 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 1cf9c0f..0adf900 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,7 @@ # 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 9663ddb..f81a059 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,7 @@ * 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/object-locking.ml b/tests/object-locking.ml index 68c414e..e952fe7 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,7 @@ * 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/tools/virt-xml-validate.in b/tools/virt-xml-validate.in index 9ba3a0a..ce13aff 100644 --- a/tools/virt-xml-validate.in +++ b/tools/virt-xml-validate.in @@ -10,9 +10,8 @@ # 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 -- 1.7.11.2
On 2012年07月27日 07:14, Eric Blake wrote:
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. ---
Not that I'm trying to demean Boston, but right now, the only mention of it in our source code happens to come from stale LGPL reference source boilerplate.
bootstrap.conf | 4 +--- build-aux/augeas-gentest.pl | 3 +-- cfg.mk | 10 ++++++++++ examples/systemtap/events.stp | 3 +-- examples/systemtap/qemu-monitor.stp | 3 +-- examples/systemtap/rpc-monitor.stp | 3 +-- src/dtrace2systemtap.pl | 5 ++--- src/esx/esx_vi_generator.py | 3 +-- src/hyperv/hyperv_wmi_generator.py | 3 +-- src/remote/qemu_protocol.x | 3 +-- src/remote/remote_protocol.x | 3 +-- src/rpc/gensystemtap.pl | 5 ++--- src/rpc/virnetprotocol.x | 5 ++--- tests/object-locking.ml | 5 ++--- tools/virt-xml-validate.in | 5 ++--- 15 files changed, 29 insertions(+), 34 deletions(-)
diff --git a/bootstrap.conf b/bootstrap.conf index 3ac84f4..84e37e7 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -13,9 +13,7 @@ # 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/>.
To be consistent. It should be: # License along with this library; If not, see # <http://www.gnu.org/licenses/>. ACK with that change. Regards, Osier
On 07/27/2012 03:21 AM, Osier Yang wrote:
On 2012年07月27日 07:14, Eric Blake wrote:
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.
# 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/>.
To be consistent. It should be:
# License along with this library; If not, see # <http://www.gnu.org/licenses/>.
ACK with that change.
Actually, I prefer the two-line version - we already had it in-tree in files such as tests/start. But three-line dominates the code base, and switching between two and three lines is cosmetic; I did it via: $ sed -i -e 's/^\([^a-zA-Z]*\)\(.*\)see <http/\1\2see\n\1<http/' $(git grep -l 'see <http') and pushed the results. -- Eric Blake eblake@redhat.com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
Commit 3ad13c92a7 blindly touched all files to have a 3-line hint for getting LGPL, but bootstrap is synced from gnulib where it has a 2-line hint. * bootstrap: Resync from gnulib. --- Pushing under the trivial rule. bootstrap | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/bootstrap b/bootstrap index 35a87ed..e3e270b 100755 --- a/bootstrap +++ b/bootstrap @@ -17,8 +17,7 @@ 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 -- 1.7.11.2
participants (2)
-
Eric Blake -
Osier Yang