Attachment 8940 Details for Bug 8997 – Patch for 3.6 and 4.0 branches, same as is in master

[patch] Patch for 3.6 and 4.0 branches, same as is in master

0001-Bug-8997-change-libreplace-GPL-source-to-LGPL.patch (text/plain), 6.28 KB, created by David Disseldorp on 2013-06-04 13:41:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Disseldorp

Created: 2013-06-04 13:41:03 UTC

Size: 6.28 KB

patch

obsolete

>From 391328c1713aba27631e602581f8cae31c4c4706 Mon Sep 17 00:00:00 2001
>From: David Disseldorp <ddiss@samba.org>
>Date: Mon, 3 Jun 2013 13:00:31 +0200
>Subject: [PATCH] Bug 8997: change libreplace GPL source to LGPL
>
>libreplace currently includes socket.c and getifaddrs.c both of which
>are GPL licensed.
>Although not required, talloc and tdb build alongside this source,
>leading to some ambiguity regarding their LGPL licences.
>
>The following copyright holders have agreed to the GPL->LGPL change:
>lib/replace/getifaddrs.c
>   Copyright (C) Andrew Tridgell 1998
>   Copyright (C) Jeremy Allison 2007
>   Copyright (C) Jelmer Vernooij <jelmer@samba.org> 2007
>
>lib/replace/test/getifaddrs.c
>lib/replace/socket.c
> * Copyright (C) Michael Adam <obnox@samba.org> 2008
>
>Signed-off-by: David Disseldorp <ddiss@samba.org>
>
>Reviewed-by: Andrew Bartlett <abartlet@samba.org>
>
>(cherry picked from commit 8a6743e4edcdff1c7860d150720483f19f3b33bb)
>---
> lib/replace/getifaddrs.c      | 28 ++++++++++++++++------------
> lib/replace/socket.c          | 22 +++++++++++++---------
> lib/replace/test/getifaddrs.c | 24 ++++++++++++++----------
> 3 files changed, 43 insertions(+), 31 deletions(-)
>
>diff --git a/lib/replace/getifaddrs.c b/lib/replace/getifaddrs.c
>index 84d7906..8da022f 100644
>--- a/lib/replace/getifaddrs.c
>+++ b/lib/replace/getifaddrs.c
>@@ -4,19 +4,23 @@
>    Copyright (C) Andrew Tridgell 1998
>    Copyright (C) Jeremy Allison 2007
>    Copyright (C) Jelmer Vernooij <jelmer@samba.org> 2007
>-   
>-   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 replace
>+     ** 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
>+   Library 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/>.
> */
> 
> #define SOCKET_WRAPPER_NOT_REPLACE
>diff --git a/lib/replace/socket.c b/lib/replace/socket.c
>index 35e975f..4cd9d2e 100644
>--- a/lib/replace/socket.c
>+++ b/lib/replace/socket.c
>@@ -5,18 +5,22 @@
>  *
>  * Copyright (C) Michael Adam <obnox@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.
>+ *   ** NOTE! The following LGPL license applies to the replace
>+ *   ** 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
>+ * Library 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 "replace.h"
>diff --git a/lib/replace/test/getifaddrs.c b/lib/replace/test/getifaddrs.c
>index d325d8b..8d575af 100644
>--- a/lib/replace/test/getifaddrs.c
>+++ b/lib/replace/test/getifaddrs.c
>@@ -5,18 +5,22 @@
>  *
>  * Copyright (C) Michael Adam <obnox@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.
>+ *   ** NOTE! The following LGPL license applies to the replace
>+ *   ** 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,
>- *  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.
>+ * 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.
>  *
>- *  You should have received a copy of the GNU General Public License
>- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
>+ * 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
>+ * Library 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 AUTOCONF_TEST
>-- 
>1.8.1.4
>

Flags:

asn: review+
jra: review+

Actions: View

Attachments on bug 8997: 8940