Bug#630893: [PATCH] Relicense listen/ripdump.c to permit commercial use and distribution
Hi Ralf et al,
How about this patch? Patch is against ax25-apps from cvs.linux-ax25.org.
-- >8 --
On Mon, Mar 19, 2012 at 02:28:50PM -0500, Jeff White wrote:
> On Mon, Mar 19, 2012 at 1:53 PM, Sam Geeraerts <samgee@elmundolibre.be>wrote:
>> Jeff White wrote:
>>> I release all of my code from the rip-2 project (including ripdump.c) under
>>> the BSD license.
>>>
>>
>> Hi Jeff,
>>
>> Thanks for relicensing. Just to be clear: by "the BSD license" do you mean
>> the (GPL compatible) 3-clause BSD license [1] or the (GPL incompatible)
>> 4-clause BSD license [2]? Both packages that use your code are under the
>> GPL license, so the 3-clause license is needed.
>>
>> [1] http://www.gnu.org/licenses/**license-list.html#ModifiedBSD<http://www.gnu.org/licenses/license-list.html#ModifiedBSD>
>> [2] http://www.gnu.org/licenses/**license-list.html#OriginalBSD<http://www.gnu.org/licenses/license-list.html#OriginalBSD>
>>
>> Regards,
>> Sam Geeraerts
>>
[...]
> GPL compatible 3-clause BSD license.
---
Thanks,
Jonathan
ChangeLog | 1 +
listen/ripdump.c | 26 ++++++++++++++++++++++++--
2 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 6ca7471f..b7c445e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,7 @@ ax25-apps (0.0.8)
* Support for UNIX98 pseudo terminals.
* New option -S to silence call for use in shell scripts.
* Add support for building rpm packages.
+ * Relicense listen/ripdump.c to permit commercial use and distribution.
ax25-apps (0.0.7)
* Added opentrac to listen, Thanks to Scott Miller
diff --git a/listen/ripdump.c b/listen/ripdump.c
index 8a3f966e..2524ae16 100644
--- a/listen/ripdump.c
+++ b/listen/ripdump.c
@@ -2,8 +2,30 @@
* Copyright 1991 Phil Karn, KA9Q
*
* Changes Copyright (c) 1993 Jeff White - N0POY, All Rights Reserved.
- * Permission granted for non-commercial copying and use, provided
- * this notice is retained.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* Rehack for RIP-2 (RFC1388) by N0POY 4/1993
*
--
1.7.10
Reply to: