Attachment 8945 Details for Bug 9931 – proposed patch

[patch] proposed patch

0001-Bug-9931-change-pytalloc-source-to-LGPL.patch (text/plain), 5.51 KB, created by David Disseldorp on 2013-06-05 14:00:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Disseldorp

Created: 2013-06-05 14:00:19 UTC

Size: 5.51 KB

patch

obsolete

>From 9813328ad0177ebd6a1b087eec4250461d49b9e1 Mon Sep 17 00:00:00 2001
>From: David Disseldorp <ddiss@samba.org>
>Date: Wed, 5 Jun 2013 15:48:24 +0200
>Subject: [PATCH] Bug 9931: change pytalloc source to LGPL
>
>pytalloc is currently GPL, while the rest of talloc is LGPL.
>---
> lib/talloc/pytalloc.c      | 22 +++++++++++++---------
> lib/talloc/pytalloc.h      | 26 +++++++++++++++-----------
> lib/talloc/pytalloc_util.c | 26 +++++++++++++++-----------
> 3 files changed, 43 insertions(+), 31 deletions(-)
>
>diff --git a/lib/talloc/pytalloc.c b/lib/talloc/pytalloc.c
>index 80196c6..abb777c 100644
>--- a/lib/talloc/pytalloc.c
>+++ b/lib/talloc/pytalloc.c
>@@ -3,18 +3,22 @@
>    Python Talloc Module
>    Copyright (C) Jelmer Vernooij <jelmer@samba.org> 2010-2011
> 
>-   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; either version 3 of the License, or
>-   (at your option) any later version.
>+     ** NOTE! The following LGPL license applies to the talloc
>+     ** library. This does NOT imply that all of Samba is released
>+     ** under the LGPL
> 
>-   This program is distributed in the hope that it will be useful,
>+   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 3 of the License, or (at your option) any later version.
>+
>+   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 General Public License for more details.
>+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
>+   Lesser 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/>.
>+   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/>.
> */
> 
> #include <Python.h>
>diff --git a/lib/talloc/pytalloc.h b/lib/talloc/pytalloc.h
>index 2d2c57b..799c914 100644
>--- a/lib/talloc/pytalloc.h
>+++ b/lib/talloc/pytalloc.h
>@@ -3,18 +3,22 @@
>    Samba utility functions
>    Copyright (C) Jelmer Vernooij <jelmer@samba.org> 2008
>    
>-   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; either version 3 of the License, or
>-   (at your option) any later version.
>-   
>-   This program is distributed in the hope that it will be useful,
>+     ** NOTE! The following LGPL license applies to the talloc
>+     ** library. This does NOT imply that all of Samba is released
>+     ** under the LGPL
>+
>+   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 3 of the License, or (at your option) any later version.
>+
>+   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 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/>.
>+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
>+   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, see <http://www.gnu.org/licenses/>.
> */
> 
> #ifndef _PYTALLOC_H_
>diff --git a/lib/talloc/pytalloc_util.c b/lib/talloc/pytalloc_util.c
>index 89a093b..fb393f1 100644
>--- a/lib/talloc/pytalloc_util.c
>+++ b/lib/talloc/pytalloc_util.c
>@@ -3,18 +3,22 @@
>    Python/Talloc glue
>    Copyright (C) Jelmer Vernooij <jelmer@samba.org> 2008
>    
>-   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; either version 3 of the License, or
>-   (at your option) any later version.
>-   
>-   This program is distributed in the hope that it will be useful,
>+     ** NOTE! The following LGPL license applies to the talloc
>+     ** library. This does NOT imply that all of Samba is released
>+     ** under the LGPL
>+
>+   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 3 of the License, or (at your option) any later version.
>+
>+   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 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/>.
>+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
>+   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, see <http://www.gnu.org/licenses/>.
> */
> 
> #include <Python.h>
>-- 
>1.8.1.4
>

Flags:

jelmer: review+
bjacke: review+
dbagnall: review+
metze: review+

Actions: View

Attachments on bug 9931: 8945 | 16321