Xen project Mailing List

[Xen-changelog] [xen stable-4.5] libxenvchan: Change license of header from Lesser GPL v2.1 to BSD

Date: Wed, 17 Aug 2016 00:33:22 +0000

Delivery-date: Wed, 17 Aug 2016 00:33:26 +0000

List-id: "Change log for Mercurial \(receive only\)" <xen-changelog.lists.xen.org>

commit 8ca7cf8926939e7356ab90ca99c6a5fb70e31ca6 Author: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx> AuthorDate: Mon Jun 13 05:28:57 2016 -0400 Commit: Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx> CommitDate: Mon Aug 15 11:52:17 2016 +0100 libxenvchan: Change license of header from Lesser GPL v2.1 to BSD As the xen/COPYING file says: "A few files are licensed under both GPL and a weaker BSD-style license. This includes all files within the subdirectory include/public, as described in include/public/COPYING. All such files include the non-GPL license text as a source-code comment. Although the license text refers generically to "the software", the non-GPL license applies *only* to those source files that explicitly include the non-GPL license text." The libxenvchan.h is under xen/include/public/io directory and the xen/include/public/COPYING says: "XEN NOTICE ========== This copyright applies to all files within this subdirectory and its subdirectories: include/public/*.h include/public/hvm/*.h include/public/io/*.h The intention is that these files can be freely copied into the source tree of an operating system when porting that OS to run on Xen. Doing so does *not* cause the OS to become subject to the terms of the GPL. All other files in the Xen source distribution are covered by version 2 of the GNU General Public License except where explicitly stated otherwise within individual source files. " Having the libxenvchan.h as Lesser GPL v2.1 where the COPYING file says otherwise is confusing to say at least. Upon consulting with the authors of libxenvchan they said: "FWIW Neither I, nor ITL staff (as author of original libvchan library) have anything against converting it to the BSD-style licence." (Marek Marczykowski-GÃ³recki, http://lists.xen.org/archives/html/xen-devel/2016-06/msg00995.html) so as such lets change it. Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx> Acked-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx> Acked-by: Anil Madhavapeddy <anil@xxxxxxxxxx> Acked-by: Daniel De Graaf <dgdegra@xxxxxxxxxxxxx> Acked-by: George Dunlap <George.Dunlap@xxxxxxxxxxxxx> Acked-by: Jan Beulich <JBeulich@xxxxxxxx> Acked-by: Jason Andryuk <andryuk@xxxxxxxx> Acked-by: Marek Marczykowski-GÃ³recki <marmarek@xxxxxxxxxxxxxxxxxxxxxx> Acked-by: Matthew Daley <mattjd@xxxxxxxxx> Acked-by: Olaf Hering <olaf@xxxxxxxxx> Acked-by: Roger Pau Monne <roger.pau@xxxxxxxxxxxxx> Acked-by: Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx> ["I have spoken to my line manager. I can confirm that Citrix is happy with this proposed change. So: Acked-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx> This view from Citrix covers all contributions made to these files in the course of Citrix's employees' employment, which I think is: > Cc: Andrew Cooper <andrew.cooper3@xxxxxxxxxx> > cc: George Dunlap <George.Dunlap@xxxxxxxxxxxxx> > Cc: Ian Campbell <ian.campbell@xxxxxxxxxx> > Cc: Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx> > Cc: Roger Pau Monne <roger.pau@xxxxxxxxxxxxx> > Cc: Stefano Stabellini <sstabellini@xxxxxxxxxx> > Cc: Tim Deegan <tim@xxxxxxx> > Cc: Wei Liu <wei.liu2@xxxxxxxxxx> .. [in subsequent email]: Wei points out that this ought also to include Keir Fraser's contribution, which was (only) in 2012. " (from Ian's email) In a subsequent mail, Wei also points out that David Scott's contribution is covered by Ian's ack. ] master commit: 937324f032f4f77866e80e39de0d697fa5131df1 (cherry picked from commit b5e124661c175c88512c81acdeb06992259361b7) (cherry picked from commit 29e5892cbfd01b65db013a9bda99fa52781eed67) Conflicts: xen/include/public/io/libxenvchan.h The conflict was due to to the FSF address still being in this version. Signed-off-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx> --- xen/include/public/io/libxenvchan.h | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/xen/include/public/io/libxenvchan.h b/xen/include/public/io/libxenvchan.h index 5c3d3d4..44284f4 100644 --- a/xen/include/public/io/libxenvchan.h +++ b/xen/include/public/io/libxenvchan.h @@ -10,19 +10,23 @@ * * @section LICENSE * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. * - * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. * * @section DESCRIPTION * -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5

_______________________________________________ Xen-changelog mailing list Xen-changelog@xxxxxxxxxxxxx https://lists.xenproject.org/xen-changelog

©2013 Xen Project, A Linux Foundation Collaborative Project. All Rights Reserved.
Linux Foundation is a registered trademark of The Linux Foundation.
Xen Project is a trademark of The Linux Foundation.