From 38d98f6a116356749f31aadab0d948bab902e27c Mon Sep 17 00:00:00 2001 From: Reinhard Tartler Date: Tue, 2 Apr 2019 07:48:58 -0400 Subject: debian/copyright: Various updates Prompted by a friendly notice from upstream (cf. https://github.com/rootless-containers/slirp4netns/issues/81#issuecomment-478448319). The new upstream release cleaned up the qemu imports. Only the slirp related parts are included, and some file got relicensed from GPL to BSD-3-Clause. --- debian/copyright | 82 ++++++++++++++++++++++++++++++-------------------------- 1 file changed, 44 insertions(+), 38 deletions(-) diff --git a/debian/copyright b/debian/copyright index 449e482..7f36512 100644 --- a/debian/copyright +++ b/debian/copyright @@ -17,68 +17,75 @@ License: MIT Files: qemu/* Copyright: 1982, 1986, 1988, 1990-1994, The Regents of the University of California. + 2016, Thomas Huth, Red Hat Inc. License: BSD-3-clause -Files: qemu/slirp/COPYRIGHT -Copyright: 1995, 1996 -License: BSD-2-clause - Please fill license BSD-2-clause from header of qemu/slirp/COPYRIGHT - -Files: qemu/slirp/arp_table.c +Files: qemu/slirp/src/arp_table.c Copyright: 2011, AdaCore License: Expat -Files: qemu/slirp/bootp.c +Files: qemu/slirp/src/bootp.c qemu/slirp/slirp.c Copyright: 2004-2008, Fabrice Bellard License: Expat -Files: qemu/slirp/debug.h - qemu/slirp/if.c - qemu/slirp/if.h - qemu/slirp/main.h - qemu/slirp/misc.c - qemu/slirp/misc.h - qemu/slirp/sbuf.c - qemu/slirp/sbuf.h - qemu/slirp/socket.c - qemu/slirp/socket.h +Files: qemu/slirp/src/debug.h + qemu/slirp/src/if.c + qemu/slirp/src/if.h + qemu/slirp/src/main.h + qemu/slirp/src/misc.c + qemu/slirp/src/misc.h + qemu/slirp/src/sbuf.c + qemu/slirp/src/sbuf.h + qemu/slirp/src/socket.c + qemu/slirp/src/socket.h Copyright: 1995, Danny Gasparovski. License: Danny-SLIRP -Files: qemu/slirp/dhcpv6.c -Copyright: 2016, Thomas Huth, Red Hat Inc. -License: GPL-2+ +Files: qemu/slirp/src/slirp.c + qemu/slirp/src/state.c +Copyright: 2004-2008 Fabrice Bellard +License: MIT -Files: qemu/slirp/dhcpv6.h -Copyright: 2016, Thomas Huth, Red Hat Inc. -License: GPL-2+ +Files: qemu/slirp/src/arp_table.c +Copyright: 2011 AdaCore +License: MIT -Files: qemu/slirp/dnssearch.c +Files: qemu/slirp/src/dnssearch.c Copyright: 2012, Klaus Stengel -License: Expat +License: MIT -Files: qemu/slirp/ip6.h - qemu/slirp/ip6_icmp.c - qemu/slirp/ip6_icmp.h - qemu/slirp/ip6_input.c - qemu/slirp/ip6_output.c - qemu/slirp/ndp_table.c +Files: qemu/slirp/src/stream.c +Copyright: 2018 Red Hat, Inc. +License: MIT + +Files: qemu/slirp/src/tftp.c +Copyright: 2004 Magnus Damm +License: MIT + +Files: qemu/slirp/src/util.c + qemu/slirp/src/util.h +Copyright: 2003-2008 Fabrice Bellard + 2010-2016 Red Hat, Inc. +License: MIT + +Files: qemu/slirp/src/ip6.h + qemu/slirp/src/ip6_icmp.c + qemu/slirp/src/ip6_icmp.h + qemu/slirp/src/ip6_input.c + qemu/slirp/src/ip6_output.c + qemu/slirp/src/ndp_table.c Copyright: 2013, Guillaume Subiron, Yann Bordenave, Serigne Modou Wagne. License: Danny-SLIRP -Files: qemu/slirp/mbuf.c +Files: qemu/slirp/src/mbuf.c Copyright: 1995, Danny Gasparovski License: Danny-SLIRP -Files: qemu/slirp/udp6.c +Files: qemu/slirp/src/udp6.c Copyright: 2013, Guillaume Subiron License: Danny-SLIRP -Files: rd235_libslirp/src/* -Copyright: 2016, Renzo Davoli VirtualSquare -License: LGPL-2.1+ - License: BSD-3-clause Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions @@ -211,4 +218,3 @@ License: MIT LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - \ No newline at end of file -- cgit v1.2.3