svn 14760 (new diff applet)

Rob Landley rob at landley.net
Thu Apr 6 18:05:46 UTC 2006


On Thursday 06 April 2006 1:58 pm, Rob Landley wrote:
> Anybody want to opine on this?  I'm cc'ing the original author: can we just
> GPL this and drop the BSD boilerplate?  (Obviously, your name goes in the
> copyright holder's list in the boilerplate at the top...)
>
> Rob

Clarifying: the proposed patch is:

Index: coreutils/diff.c
===================================================================
--- coreutils/diff.c	(revision 14764)
+++ coreutils/diff.c	(working copy)
@@ -3,29 +3,13 @@
  * Mini diff implementation for busybox, adapted from OpenBSD diff.
  *
  * Copyright (C) 2006 by Robert Sullivan <cogito.ergo.cogito at hotmail.com>
- *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
- */
-
-/*
  * Copyright (c) 2003 Todd C. Miller <Todd.Miller at courtesan.com>
  *
- * Permission to
- * use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
  * Sponsored in part by the Defense Advanced Research Projects
  * Agency (DARPA) and Air Force Research Laboratory, Air Force
  * Materiel Command, USAF, under agreement number F39502-99-1-0512.
+ * 
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
 #include <time.h>

The body of the GPL already includes extensive warantee disclaimers, and
BusyBox's membership in the SFLC consortium means if anybody does sue
busybox developers for the code in busybox, the SFLC is a party and can
defend us.

Rob
-- 
Never bet against the cheap plastic solution.



More information about the busybox mailing list