Commit c442b7b4 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/elmarco/tags/slirp-pull-request' into staging 



slirp: clarify license of slirp as BSD-3

# gpg: Signature made Fri 22 Mar 2019 19:16:50 GMT
# gpg:                using RSA key DAE8E10975969CE5
# gpg: Good signature from "Marc-André Lureau <marcandre.lureau@redhat.com>" [full]
# gpg:                 aka "Marc-André Lureau <marcandre.lureau@gmail.com>" [full]
# Primary key fingerprint: 87A9 BD93 3F87 C606 D276  F62D DAE8 E109 7596 9CE5

* remotes/elmarco/tags/slirp-pull-request:
  slirp: is not maintained by Kelly Price for a long time
  slirp: remove reference to COPYRIGHT file
  slirp: clarify license of slirp files using SPDX: implicit via unstated
  slirp: clarify license of slirp files using SPDX: implicit via COPYRIGHT
  slirp: clarify license of slirp files using SPDX: explicit MIT
  slirp: clarify license of slirp files using SPDX: explicit BSD
  slirp: relicense GPL files to BSD-3
  slirp: update COPYRIGHT to use full 3-Clause BSD License

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents d97a39d9 7849f0c2

slirp/COPYRIGHT

+3 −2
Original line number Diff line number Diff line 
Slirp was written by Danny Gasparovski.

Copyright (c), 1995,1996 All Rights Reserved.



Slirp is maintained by Kelly Price <tygris+slirp@erols.com>



Slirp is free software; "free" as in you don't have to pay for it, and you

are free to do whatever you want with it.  I do not accept any donations,

monetary or otherwise, for Slirp.  Instead, I would ask you to pass this
@@ -25,6 +23,9 @@ The copyright terms and conditions: 
 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 copyright holder 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 ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,

 INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY

slirp/src/arp_table.c

+1 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: MIT */

/*

 * ARP table

 *

slirp/src/bootp.c

+1 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: MIT */

/*

 * QEMU BOOTP/DHCP server

 *

slirp/src/bootp.h

+1 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: BSD-3-Clause */

/* bootp/dhcp defines */



#ifndef SLIRP_BOOTP_H

slirp/src/cksum.c

+1 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: BSD-3-Clause */

/*

 * Copyright (c) 1988, 1992, 1993

 *	The Regents of the University of California.  All rights reserved.