* Re: Licensing on lib/bsearch.c?
2009-11-19 8:33 Licensing on lib/bsearch.c? Rusty Russell
@ 2009-11-19 15:39 ` André Goddard Rosa
2009-11-21 21:15 ` Tim Abbott
1 sibling, 0 replies; 3+ messages in thread
From: André Goddard Rosa @ 2009-11-19 15:39 UTC (permalink / raw)
To: Rusty Russell, Tim Abbott; +Cc: linux-kernel
On Thu, Nov 19, 2009 at 6:33 AM, Rusty Russell <rusty@rustcorp.com.au> wrote:
> Hi Tim, Andre,
>
> I note that the license header on lib/bsearch.c is GPLv2. I wanted to
> steal it for SAMBA, which is GPLv3. This is one reason all my kernel code is
> v2 or later.
>
> If you don't have strong objections, could you send something like the
> following so I don't have to reimplement and re-test?
>
> Thanks,
> Rusty.
>
> Subject: bsearch: extend license to GPL 2+
>
> Rusty asked nicely.
>
> diff --git a/lib/bsearch.c b/lib/bsearch.c
> --- a/lib/bsearch.c
> +++ b/lib/bsearch.c
> @@ -6,7 +6,8 @@
> *
> * This program is free software; you can redistribute it and/or
> * modify it under the terms of the GNU General Public License as
> - * published by the Free Software Foundation; version 2.
> + * published by the Free Software Foundation; either version 2 of
> + * the License, or (at your option) any later version.
> */
>
> #include <linux/module.h>
>
Hi, Rusty!
It's surely fine by me:
Acked-by: André Goddard Rosa <andre.goddard@gmail.com>
Tim?
Thank you,
André
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: Licensing on lib/bsearch.c?
2009-11-19 8:33 Licensing on lib/bsearch.c? Rusty Russell
2009-11-19 15:39 ` André Goddard Rosa
@ 2009-11-21 21:15 ` Tim Abbott
1 sibling, 0 replies; 3+ messages in thread
From: Tim Abbott @ 2009-11-21 21:15 UTC (permalink / raw)
To: Rusty Russell; +Cc: André Goddard Rosa, linux-kernel
On Thu, 19 Nov 2009, Rusty Russell wrote:
> Hi Tim, Andre,
>
> I note that the license header on lib/bsearch.c is GPLv2. I wanted to
> steal it for SAMBA, which is GPLv3. This is one reason all my kernel code is
> v2 or later.
>
> If you don't have strong objections, could you send something like the
> following so I don't have to reimplement and re-test?
Rusty,
I'd be happy to release it under a more permissive license.
-Tim Abbott
bsearch: relicense under MIT/X11 license.
Rusty asked nicely.
Signed-off-by: Tim Abbott <tabbott@ksplice.com>
---
lib/bsearch.c | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/lib/bsearch.c b/lib/bsearch.c
index 4297c98..5555bb2 100644
--- a/lib/bsearch.c
+++ b/lib/bsearch.c
@@ -4,9 +4,25 @@
* Copyright (C) 2008-2009 Ksplice, Inc.
* Author: Tim Abbott <tabbott@ksplice.com>
*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2.
+ * 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:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * 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.
*/
#include <linux/module.h>
--
1.6.5.2
^ permalink raw reply related [flat|nested] 3+ messages in thread