On 05/16/2013 12:50 AM, Martin Kletzander wrote:
> On 05/16/2013 02:23 AM, Eric Blake wrote:
>> Now that COPYING no longer contains the text of the LGPL,
>> modify the LGPLv2-only files from vbox to call out the
>> correct file.
>>
>> * src/vbox/vbox_CAPI_v2_2.h: Refer to correct file.
>> * src/vbox/vbox_CAPI_v3_0.h: Likewise.
>> * src/vbox/vbox_CAPI_v3_1.h: Likewise.
>> * src/vbox/vbox_CAPI_v3_2.h: Likewise.
>> * src/vbox/vbox_CAPI_v4_0.h: Likewise.
>> * src/vbox/vbox_CAPI_v4_1.h: Likewise.
>> * src/vbox/vbox_V2_2.c: Likewise.
>> * src/vbox/vbox_V3_0.c: Likewise.
>> * src/vbox/vbox_V3_1.c: Likewise.
>> * src/vbox/vbox_XPCOMCGlue.c: Likewise.
>> * src/vbox/vbox_XPCOMCGlue.h: Likewise.
>> * src/vbox/vbox_driver.c: Likewise.
>> * src/vbox/vbox_driver.h: Likewise.
>> * src/vbox/vbox_tmpl.c: Likewise.
>>
>> Signed-off-by: Eric Blake <eblake@xxxxxxxxxx>
>> ---
>
> ACK,
As mentioned in the review of 1/4, a few files in this directory lacked
copyright claims. I'm squashing this in before pushing (justification
on the README file: FSF states that top-level files with no code content
can be distributed under a generic as-is disclaimer, rather than needing
to be LGPL):
diff --git i/src/vbox/README w/src/vbox/README
index 22db911..6e88ae6 100644
--- i/src/vbox/README
+++ w/src/vbox/README
@@ -1,3 +1,15 @@
+ Licensing
+
+Note that much of the vbox in this directory is LGPLv2-only. Thus, it
+cannot be linked into any software that also wants to use GPLv3+ code.
+This readme file is:
+
+Copyright (C) 2009, 2013 Red Hat, Inc.
+
+Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved. This file is offered as-is,
+without warranty of any kind.
Explanation about the how multi-version support
for VirtualBox libvirt driver is implemented.
diff --git i/src/vbox/vbox_V3_2.c w/src/vbox/vbox_V3_2.c
index a67302c..1ef3303 100644
--- i/src/vbox/vbox_V3_2.c
+++ w/src/vbox/vbox_V3_2.c
@@ -3,6 +3,30 @@
* at runtime.
*/
+/*
+ * Copyright (C) 2008-2009 Sun Microsystems, Inc.
+ *
+ * This file is part of a free software library; you can redistribute
+ * it and/or modify it under the terms of the GNU Lesser General
+ * Public License version 2.1 as published by the Free Software
+ * Foundation and shipped in the "COPYING.LESSER" file with this library.
+ * The library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY of any kind.
+ *
+ * Sun LGPL Disclaimer: For the avoidance of doubt, except that if
+ * any license choice other than GPL or LGPL is available it will
+ * apply instead, Sun elects to use only the Lesser General Public
+ * License version 2.1 (LGPLv2) at this time for any software where
+ * a choice of LGPL license versions is made available with the
+ * language indicating that LGPLv2 or any later version may be used,
+ * or where a choice of which version of the LGPL is applied is
+ * otherwise unspecified.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa
+ * Clara, CA 95054 USA or visit http://www.sun.com if you need
+ * additional information or have any questions.
+ */
+
#include <config.h>
/** The API Version */
diff --git i/src/vbox/vbox_V4_0.c w/src/vbox/vbox_V4_0.c
index f976a1a..0c13c6a 100644
--- i/src/vbox/vbox_V4_0.c
+++ w/src/vbox/vbox_V4_0.c
@@ -3,6 +3,30 @@
* at runtime.
*/
+/*
+ * Copyright (C) 2008-2009 Sun Microsystems, Inc.
+ *
+ * This file is part of a free software library; you can redistribute
+ * it and/or modify it under the terms of the GNU Lesser General
+ * Public License version 2.1 as published by the Free Software
+ * Foundation and shipped in the "COPYING.LESSER" file with this library.
+ * The library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY of any kind.
+ *
+ * Sun LGPL Disclaimer: For the avoidance of doubt, except that if
+ * any license choice other than GPL or LGPL is available it will
+ * apply instead, Sun elects to use only the Lesser General Public
+ * License version 2.1 (LGPLv2) at this time for any software where
+ * a choice of LGPL license versions is made available with the
+ * language indicating that LGPLv2 or any later version may be used,
+ * or where a choice of which version of the LGPL is applied is
+ * otherwise unspecified.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa
+ * Clara, CA 95054 USA or visit http://www.sun.com if you need
+ * additional information or have any questions.
+ */
+
#include <config.h>
/** The API Version */
diff --git i/src/vbox/vbox_V4_1.c w/src/vbox/vbox_V4_1.c
index 00fab09..b6d06f1 100644
--- i/src/vbox/vbox_V4_1.c
+++ w/src/vbox/vbox_V4_1.c
@@ -3,6 +3,30 @@
* at runtime.
*/
+/*
+ * Copyright (C) 2008-2009 Sun Microsystems, Inc.
+ *
+ * This file is part of a free software library; you can redistribute
+ * it and/or modify it under the terms of the GNU Lesser General
+ * Public License version 2.1 as published by the Free Software
+ * Foundation and shipped in the "COPYING.LESSER" file with this library.
+ * The library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY of any kind.
+ *
+ * Sun LGPL Disclaimer: For the avoidance of doubt, except that if
+ * any license choice other than GPL or LGPL is available it will
+ * apply instead, Sun elects to use only the Lesser General Public
+ * License version 2.1 (LGPLv2) at this time for any software where
+ * a choice of LGPL license versions is made available with the
+ * language indicating that LGPLv2 or any later version may be used,
+ * or where a choice of which version of the LGPL is applied is
+ * otherwise unspecified.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa
+ * Clara, CA 95054 USA or visit http://www.sun.com if you need
+ * additional information or have any questions.
+ */
+
#include <config.h>
/** The API Version */
--
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library http://libvirt.org
Attachment:
signature.asc
Description: OpenPGP digital signature
-- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list