This is the mail archive of the
ecos-patches@sources.redhat.com
mailing list for the eCos project.
Correct licence in some net/common/current/src/ files
- From: Jonathan Larmour <jifl at eCosCentric dot com>
- To: eCos Patches List <ecos-patches at sources dot redhat dot com>
- Date: Sun, 12 Jan 2003 04:53:04 +0000
- Subject: Correct licence in some net/common/current/src/ files
When we switched to the modified GPL (while I and the rest of the eCos
team was still at Red Hat), the BSD code in the net stack that included
the advertising clause could not be licensed that way as it conflicts with
the GPL. I removed the RHEPL and replaced it with either a public domain
clause, or just left the warning that it may be BSD derived.
I have now learnt authoratitively that for some files, they were written
completely from scratch, and thus since there is no BSD code involved, the
GPL should have been applied after all - that was the intention. I have
applied the Red Hat copyright of course, as it was us at Red Hat that
wrote it.
Patch attached and checked in.
Jifl
--
eCosCentric http://www.eCosCentric.com/ <info@eCosCentric.com>
--[ "You can complain because roses have thorns, or you ]--
--[ can rejoice because thorns have roses." -Lincoln ]-- Opinions==mine
Index: ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos-opt/net/net/common/current/ChangeLog,v
retrieving revision 1.14
diff -u -5 -p -r1.14 ChangeLog
--- ChangeLog 4 Jan 2003 18:46:39 -0000 1.14
+++ ChangeLog 12 Jan 2003 04:47:51 -0000
@@ -1,5 +1,16 @@
+2003-01-12 Jonathan Larmour <jifl@eCosCentric.com>
+
+ * src/bootp_support.c: Fix licence which should always have been
+ GPL since no BSD licensed code was in fact involved.
+ * src/dhcp_prot.c: Ditto.
+ * src/dhcp_support.c: Ditto.
+ * src/network_support.c: Ditto.
+ * src/tftp_client.c: Ditto.
+ * src/tftp_dummy_file.c: Ditto.
+ * src/tftp_server.c: Ditto.
+
2003-01-04 Jonathan Larmour <jifl@eCosCentric.com>
* doc/tcpip.sgml: Use new entity name for tcpip manpages.
2002-10-06 Andrew Lunn <andrew.lunn@ascom.ch>
Index: src/bootp_support.c
===================================================================
RCS file: /cvs/ecos/ecos-opt/net/net/common/current/src/bootp_support.c,v
retrieving revision 1.2
diff -u -5 -p -r1.2 bootp_support.c
--- src/bootp_support.c 10 Jul 2002 15:26:28 -0000 1.2
+++ src/bootp_support.c 12 Jan 2003 04:47:51 -0000
@@ -3,20 +3,42 @@
// lib/bootp_support.c
//
// Minimal BOOTP functions
//
//==========================================================================
-//####BSDCOPYRIGHTBEGIN####
-//
+//####ECOSGPLCOPYRIGHTBEGIN####
// -------------------------------------------
+// This file is part of eCos, the Embedded Configurable Operating System.
+// Copyright (C) 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
//
-// Portions of this software may have been derived from OpenBSD or other sources,
-// and are covered by the appropriate copyright disclaimers included herein.
+// eCos 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 2 or (at your option) any later version.
//
-// -------------------------------------------
+// eCos 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 eCos; if not, write to the Free Software Foundation, Inc.,
+// 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+//
+// As a special exception, if other files instantiate templates or use macros
+// or inline functions from this file, or you compile this file and link it
+// with other works to produce a work based on this file, this file does not
+// by itself cause the resulting work to be covered by the GNU General Public
+// License. However the source code for this file must still be made available
+// in accordance with section (3) of the GNU General Public License.
//
-//####BSDCOPYRIGHTEND####
+// This exception does not invalidate any other reasons why a work based on
+// this file might be covered by the GNU General Public License.
+//
+// Alternative licenses for eCos may be arranged by contacting Red Hat, Inc.
+// at http://sources.redhat.com/ecos/ecos-license/
+// -------------------------------------------
+//####ECOSGPLCOPYRIGHTEND####
//==========================================================================
//#####DESCRIPTIONBEGIN####
//
// Author(s): gthomas
// Contributors: gthomas
@@ -552,5 +574,7 @@ init_net_IPv6(const char *intf, struct b
}
close(s);
return true;
}
#endif
+
+// EOF bootp_support.c
Index: src/dhcp_prot.c
===================================================================
RCS file: /cvs/ecos/ecos-opt/net/net/common/current/src/dhcp_prot.c,v
retrieving revision 1.6
diff -u -5 -p -r1.6 dhcp_prot.c
--- src/dhcp_prot.c 26 Jul 2002 15:06:39 -0000 1.6
+++ src/dhcp_prot.c 12 Jan 2003 04:47:52 -0000
@@ -3,19 +3,42 @@
// dhcp_prot.c
//
// DHCP protocol implementation for DHCP client
//
//==========================================================================
-//####ECOSPDCOPYRIGHTBEGIN####
+//####ECOSGPLCOPYRIGHTBEGIN####
+// -------------------------------------------
+// This file is part of eCos, the Embedded Configurable Operating System.
+// Copyright (C) 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
//
-// Copyright (C) 2000, 2001, 2002 Red Hat, Inc.
-// All Rights Reserved.
+// eCos 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 2 or (at your option) any later version.
//
-// Permission is granted to use, copy, modify and redistribute this
-// file.
+// eCos 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.
//
-//####ECOSPDCOPYRIGHTEND####
+// You should have received a copy of the GNU General Public License along
+// with eCos; if not, write to the Free Software Foundation, Inc.,
+// 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+//
+// As a special exception, if other files instantiate templates or use macros
+// or inline functions from this file, or you compile this file and link it
+// with other works to produce a work based on this file, this file does not
+// by itself cause the resulting work to be covered by the GNU General Public
+// License. However the source code for this file must still be made available
+// in accordance with section (3) of the GNU General Public License.
+//
+// This exception does not invalidate any other reasons why a work based on
+// this file might be covered by the GNU General Public License.
+//
+// Alternative licenses for eCos may be arranged by contacting Red Hat, Inc.
+// at http://sources.redhat.com/ecos/ecos-license/
+// -------------------------------------------
+//####ECOSGPLCOPYRIGHTEND####
//==========================================================================
//#####DESCRIPTIONBEGIN####
//
// Author(s): hmt
// Contributors: gthomas
Index: src/dhcp_support.c
===================================================================
RCS file: /cvs/ecos/ecos-opt/net/net/common/current/src/dhcp_support.c,v
retrieving revision 1.1
diff -u -5 -p -r1.1 dhcp_support.c
--- src/dhcp_support.c 20 May 2002 22:25:05 -0000 1.1
+++ src/dhcp_support.c 12 Jan 2003 04:47:52 -0000
@@ -3,19 +3,42 @@
// dhcp_support.c
//
// Support code == friendly API for DHCP client
//
//==========================================================================
-//####ECOSPDCOPYRIGHTBEGIN####
+//####ECOSGPLCOPYRIGHTBEGIN####
+// -------------------------------------------
+// This file is part of eCos, the Embedded Configurable Operating System.
+// Copyright (C) 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
//
-// Copyright (C) 2000, 2001, 2002 Red Hat, Inc.
-// All Rights Reserved.
+// eCos 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 2 or (at your option) any later version.
//
-// Permission is granted to use, copy, modify and redistribute this
-// file.
+// eCos 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.
//
-//####ECOSPDCOPYRIGHTEND####
+// You should have received a copy of the GNU General Public License along
+// with eCos; if not, write to the Free Software Foundation, Inc.,
+// 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+//
+// As a special exception, if other files instantiate templates or use macros
+// or inline functions from this file, or you compile this file and link it
+// with other works to produce a work based on this file, this file does not
+// by itself cause the resulting work to be covered by the GNU General Public
+// License. However the source code for this file must still be made available
+// in accordance with section (3) of the GNU General Public License.
+//
+// This exception does not invalidate any other reasons why a work based on
+// this file might be covered by the GNU General Public License.
+//
+// Alternative licenses for eCos may be arranged by contacting Red Hat, Inc.
+// at http://sources.redhat.com/ecos/ecos-license/
+// -------------------------------------------
+//####ECOSGPLCOPYRIGHTEND####
//==========================================================================
//#####DESCRIPTIONBEGIN####
//
// Author(s): hmt
// Contributors: gthomas
Index: src/network_support.c
===================================================================
RCS file: /cvs/ecos/ecos-opt/net/net/common/current/src/network_support.c,v
retrieving revision 1.1
diff -u -5 -p -r1.1 network_support.c
--- src/network_support.c 20 May 2002 22:25:05 -0000 1.1
+++ src/network_support.c 12 Jan 2003 04:47:52 -0000
@@ -3,20 +3,42 @@
// network_support.c
//
// Misc network support functions
//
//==========================================================================
-//####BSDCOPYRIGHTBEGIN####
-//
+//####ECOSGPLCOPYRIGHTBEGIN####
// -------------------------------------------
+// This file is part of eCos, the Embedded Configurable Operating System.
+// Copyright (C) 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
//
-// Portions of this software may have been derived from OpenBSD or other sources,
-// and are covered by the appropriate copyright disclaimers included herein.
+// eCos 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 2 or (at your option) any later version.
//
-// -------------------------------------------
+// eCos 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 eCos; if not, write to the Free Software Foundation, Inc.,
+// 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
//
-//####BSDCOPYRIGHTEND####
+// As a special exception, if other files instantiate templates or use macros
+// or inline functions from this file, or you compile this file and link it
+// with other works to produce a work based on this file, this file does not
+// by itself cause the resulting work to be covered by the GNU General Public
+// License. However the source code for this file must still be made available
+// in accordance with section (3) of the GNU General Public License.
+//
+// This exception does not invalidate any other reasons why a work based on
+// this file might be covered by the GNU General Public License.
+//
+// Alternative licenses for eCos may be arranged by contacting Red Hat, Inc.
+// at http://sources.redhat.com/ecos/ecos-license/
+// -------------------------------------------
+//####ECOSGPLCOPYRIGHTEND####
//==========================================================================
//#####DESCRIPTIONBEGIN####
//
// Author(s): gthomas
// Contributors: gthomas, sorin@netappi.com ("Sorin Babeanu"), hmt
Index: src/tftp_client.c
===================================================================
RCS file: /cvs/ecos/ecos-opt/net/net/common/current/src/tftp_client.c,v
retrieving revision 1.2
diff -u -5 -p -r1.2 tftp_client.c
--- src/tftp_client.c 7 Aug 2002 14:42:35 -0000 1.2
+++ src/tftp_client.c 12 Jan 2003 04:47:52 -0000
@@ -3,20 +3,42 @@
// lib/tftp_client.c
//
// TFTP client support
//
//==========================================================================
-//####BSDCOPYRIGHTBEGIN####
-//
+//####ECOSGPLCOPYRIGHTBEGIN####
// -------------------------------------------
+// This file is part of eCos, the Embedded Configurable Operating System.
+// Copyright (C) 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
//
-// Portions of this software may have been derived from OpenBSD or other sources,
-// and are covered by the appropriate copyright disclaimers included herein.
+// eCos 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 2 or (at your option) any later version.
+//
+// eCos 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 eCos; if not, write to the Free Software Foundation, Inc.,
+// 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+//
+// As a special exception, if other files instantiate templates or use macros
+// or inline functions from this file, or you compile this file and link it
+// with other works to produce a work based on this file, this file does not
+// by itself cause the resulting work to be covered by the GNU General Public
+// License. However the source code for this file must still be made available
+// in accordance with section (3) of the GNU General Public License.
//
-// -------------------------------------------
+// This exception does not invalidate any other reasons why a work based on
+// this file might be covered by the GNU General Public License.
//
-//####BSDCOPYRIGHTEND####
+// Alternative licenses for eCos may be arranged by contacting Red Hat, Inc.
+// at http://sources.redhat.com/ecos/ecos-license/
+// -------------------------------------------
+//####ECOSGPLCOPYRIGHTEND####
//==========================================================================
//#####DESCRIPTIONBEGIN####
//
// Author(s): gthomas
// Contributors: gthomas
@@ -398,5 +420,6 @@ tftp_put(char *filename,
}
close(s);
return res;
}
+// EOF tftp_client.c
Index: src/tftp_dummy_file.c
===================================================================
RCS file: /cvs/ecos/ecos-opt/net/net/common/current/src/tftp_dummy_file.c,v
retrieving revision 1.1
diff -u -5 -p -r1.1 tftp_dummy_file.c
--- src/tftp_dummy_file.c 20 May 2002 22:25:05 -0000 1.1
+++ src/tftp_dummy_file.c 12 Jan 2003 04:47:52 -0000
@@ -3,20 +3,42 @@
// lib/tftp_dummy_file.c
//
// Dummy [in memory] file I/O functions
//
//==========================================================================
-//####BSDCOPYRIGHTBEGIN####
-//
+//####ECOSGPLCOPYRIGHTBEGIN####
// -------------------------------------------
+// This file is part of eCos, the Embedded Configurable Operating System.
+// Copyright (C) 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
//
-// Portions of this software may have been derived from OpenBSD or other sources,
-// and are covered by the appropriate copyright disclaimers included herein.
+// eCos 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 2 or (at your option) any later version.
//
-// -------------------------------------------
+// eCos 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 eCos; if not, write to the Free Software Foundation, Inc.,
+// 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
//
-//####BSDCOPYRIGHTEND####
+// As a special exception, if other files instantiate templates or use macros
+// or inline functions from this file, or you compile this file and link it
+// with other works to produce a work based on this file, this file does not
+// by itself cause the resulting work to be covered by the GNU General Public
+// License. However the source code for this file must still be made available
+// in accordance with section (3) of the GNU General Public License.
+//
+// This exception does not invalidate any other reasons why a work based on
+// this file might be covered by the GNU General Public License.
+//
+// Alternative licenses for eCos may be arranged by contacting Red Hat, Inc.
+// at http://sources.redhat.com/ecos/ecos-license/
+// -------------------------------------------
+//####ECOSGPLCOPYRIGHTEND####
//==========================================================================
//#####DESCRIPTIONBEGIN####
//
// Author(s): gthomas
// Contributors: gthomas
Index: src/tftp_server.c
===================================================================
RCS file: /cvs/ecos/ecos-opt/net/net/common/current/src/tftp_server.c,v
retrieving revision 1.2
diff -u -5 -p -r1.2 tftp_server.c
--- src/tftp_server.c 7 Aug 2002 14:42:35 -0000 1.2
+++ src/tftp_server.c 12 Jan 2003 04:47:53 -0000
@@ -3,20 +3,42 @@
// lib/tftp_server.c
//
// TFTP server support
//
//==========================================================================
-//####BSDCOPYRIGHTBEGIN####
-//
+//####ECOSGPLCOPYRIGHTBEGIN####
// -------------------------------------------
+// This file is part of eCos, the Embedded Configurable Operating System.
+// Copyright (C) 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
//
-// Portions of this software may have been derived from OpenBSD or other sources,
-// and are covered by the appropriate copyright disclaimers included herein.
+// eCos 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 2 or (at your option) any later version.
//
-// -------------------------------------------
+// eCos 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 eCos; if not, write to the Free Software Foundation, Inc.,
+// 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
//
-//####BSDCOPYRIGHTEND####
+// As a special exception, if other files instantiate templates or use macros
+// or inline functions from this file, or you compile this file and link it
+// with other works to produce a work based on this file, this file does not
+// by itself cause the resulting work to be covered by the GNU General Public
+// License. However the source code for this file must still be made available
+// in accordance with section (3) of the GNU General Public License.
+//
+// This exception does not invalidate any other reasons why a work based on
+// this file might be covered by the GNU General Public License.
+//
+// Alternative licenses for eCos may be arranged by contacting Red Hat, Inc.
+// at http://sources.redhat.com/ecos/ecos-license/
+// -------------------------------------------
+//####ECOSGPLCOPYRIGHTEND####
//==========================================================================
//#####DESCRIPTIONBEGIN####
//
// Author(s): gthomas
// Contributors: gthomas, hmt, andrew.lunn@ascom.ch (Andrew Lunn)