Attachment 16321 Details for Bug 9931 – patch v2 with signed-off-by, BUG:, etc

[patch] patch v2 with signed-off-by, BUG:, etc

0001-Bug-9931-change-pytalloc-source-to-LGPL.patch (text/plain), 6.15 KB, created by Douglas Bagnall on 2020-11-02 19:17:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Douglas Bagnall

Created: 2020-11-02 19:17:50 UTC

Size: 6.15 KB

patch

obsolete

>From 3ead6a1ce1412fd38f3f5fedb2a418613dfe1bf6 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
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>pytalloc is currently GPL, while the rest of talloc is LGPL.
>
>This situation arose because pytalloc was originally developed under
>source4/scripting/python/, and moved into talloc proper with commit
>0f043c197c473c801fc32c727194b5a2d6ae232f ("Move pytalloc to talloc
>directory.", October 2008).
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=9931
>
>Signed-off-by: David Disseldorp <ddiss@samba.org>
>Reviewed-by: Stefan Metzmacher <metze@samba.org>
>Reviewed-by: Jelmer Vernooij <jelmer@samba.org>
>Reviewed-by: BjÃ¶rn Jacke <bjacke@samba.org>
>Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
>---
> 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 cc5a6a812ea..15e4232f0c8 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 8ab1e16fe47..a105170bfc7 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 c580d46f858..1b7cfdda6e7 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>
>-- 
>2.17.1
>

Flags:

ddiss: review+

Actions: View

Attachments on bug 9931: 8945 | 16321