| Message ID | 20190314131049.23175-8-marcandre.lureau@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | slirp: clarify license of slirp as BSD-3 | expand |
On 3/14/19 8:10 AM, Marc-André Lureau wrote: > The slirp COPYRIGHT file is a BSD-3 license. Instead of referring to > another project file, the SPDX license notice present in all source > files states that unequivocally. > > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> > --- Perhaps parts could be squashed in with 5/8? Hmm, comparing the file list between 5/8 and this one: > slirp/src/debug.h | 3 --- > slirp/src/if.h | 3 --- > slirp/src/main.h | 3 --- > slirp/src/misc.h | 3 --- > slirp/src/sbuf.h | 3 --- > slirp/src/socket.h | 3 --- > slirp/src/if.c | 3 --- these match, > slirp/src/ip_input.c | 3 --- > slirp/src/ip_output.c | 3 --- these two were in 3/8 instead? Oh, I see - the files in 5/8 mention ONLY the COPYRIGHT file, while the files touched here and in 3/8 mention BOTH an explicit BSD and the COPYRIGHT file. Okay, I'm sold, don't squash this one in to either 3/8 or 5/8. > slirp/src/mbuf.c | 3 --- > slirp/src/misc.c | 3 --- > slirp/src/sbuf.c | 3 --- > slirp/src/socket.c | 3 --- more from 5/8 > slirp/src/tcp_input.c | 3 --- > slirp/src/tcp_output.c | 3 --- > slirp/src/tcp_subr.c | 3 --- more from 3/8 > +++ b/slirp/src/tcp_input.c > @@ -34,9 +34,6 @@ > /* > * Changes and additions relating to SLiRP Side question - what is the history behind this choice of capitalization? Should we pick a more consistent spelling and stick to it, whether 'slirp', 'SLiRP', or 'SLIRP'? But not for this series. Reviewed-by: Eric Blake <eblake@redhat.com>
diff --git a/slirp/src/debug.h b/slirp/src/debug.h index 2e503ad7fa..c95fd8ffd2 100644 --- a/slirp/src/debug.h +++ b/slirp/src/debug.h @@ -1,9 +1,6 @@ /* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1995 Danny Gasparovski. - * - * Please read the file COPYRIGHT for the - * terms and conditions of the copyright. */ #ifndef DEBUG_H_ diff --git a/slirp/src/if.h b/slirp/src/if.h index 8a60c4e052..b71c37d6ea 100644 --- a/slirp/src/if.h +++ b/slirp/src/if.h @@ -1,9 +1,6 @@ /* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1995 Danny Gasparovski. - * - * Please read the file COPYRIGHT for the - * terms and conditions of the copyright. */ #ifndef IF_H diff --git a/slirp/src/main.h b/slirp/src/main.h index a88774215f..3b3f883703 100644 --- a/slirp/src/main.h +++ b/slirp/src/main.h @@ -1,9 +1,6 @@ /* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1995 Danny Gasparovski. - * - * Please read the file COPYRIGHT for the - * terms and conditions of the copyright. */ #ifndef SLIRP_MAIN_H diff --git a/slirp/src/misc.h b/slirp/src/misc.h index 4eaa2466d7..23b7490448 100644 --- a/slirp/src/misc.h +++ b/slirp/src/misc.h @@ -1,9 +1,6 @@ /* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1995 Danny Gasparovski. - * - * Please read the file COPYRIGHT for the - * terms and conditions of the copyright. */ #ifndef MISC_H diff --git a/slirp/src/sbuf.h b/slirp/src/sbuf.h index ece616e317..337af1bbde 100644 --- a/slirp/src/sbuf.h +++ b/slirp/src/sbuf.h @@ -1,9 +1,6 @@ /* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1995 Danny Gasparovski. - * - * Please read the file COPYRIGHT for the - * terms and conditions of the copyright. */ #ifndef SBUF_H diff --git a/slirp/src/socket.h b/slirp/src/socket.h index 10a0c78a26..25403898cd 100644 --- a/slirp/src/socket.h +++ b/slirp/src/socket.h @@ -1,9 +1,6 @@ /* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1995 Danny Gasparovski. - * - * Please read the file COPYRIGHT for the - * terms and conditions of the copyright. */ #ifndef SLIRP_SOCKET_H diff --git a/slirp/src/if.c b/slirp/src/if.c index b8cddebf66..6eaac7292a 100644 --- a/slirp/src/if.c +++ b/slirp/src/if.c @@ -1,9 +1,6 @@ /* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1995 Danny Gasparovski. - * - * Please read the file COPYRIGHT for the - * terms and conditions of the copyright. */ #include "slirp.h" diff --git a/slirp/src/ip_input.c b/slirp/src/ip_input.c index 6ad6765938..a714fecd58 100644 --- a/slirp/src/ip_input.c +++ b/slirp/src/ip_input.c @@ -34,9 +34,6 @@ /* * Changes and additions relating to SLiRP are * Copyright (c) 1995 Danny Gasparovski. - * - * Please read the file COPYRIGHT for the - * terms and conditions of the copyright. */ #include "slirp.h" diff --git a/slirp/src/ip_output.c b/slirp/src/ip_output.c index 9299997efb..8560197cf6 100644 --- a/slirp/src/ip_output.c +++ b/slirp/src/ip_output.c @@ -34,9 +34,6 @@ /* * Changes and additions relating to SLiRP are * Copyright (c) 1995 Danny Gasparovski. - * - * Please read the file COPYRIGHT for the - * terms and conditions of the copyright. */ #include "slirp.h" diff --git a/slirp/src/mbuf.c b/slirp/src/mbuf.c index f079a86d78..800406ca9e 100644 --- a/slirp/src/mbuf.c +++ b/slirp/src/mbuf.c @@ -1,9 +1,6 @@ /* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1995 Danny Gasparovski - * - * Please read the file COPYRIGHT for the - * terms and conditions of the copyright. */ /* diff --git a/slirp/src/misc.c b/slirp/src/misc.c index da41f3bb5f..7c5db0e0aa 100644 --- a/slirp/src/misc.c +++ b/slirp/src/misc.c @@ -1,9 +1,6 @@ /* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1995 Danny Gasparovski. - * - * Please read the file COPYRIGHT for the - * terms and conditions of the copyright. */ #include "slirp.h" diff --git a/slirp/src/sbuf.c b/slirp/src/sbuf.c index 815823ffbe..9c0b31b513 100644 --- a/slirp/src/sbuf.c +++ b/slirp/src/sbuf.c @@ -1,9 +1,6 @@ /* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1995 Danny Gasparovski. - * - * Please read the file COPYRIGHT for the - * terms and conditions of the copyright. */ #include "slirp.h" diff --git a/slirp/src/socket.c b/slirp/src/socket.c index ad58262a06..4a3c935e25 100644 --- a/slirp/src/socket.c +++ b/slirp/src/socket.c @@ -1,9 +1,6 @@ /* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1995 Danny Gasparovski. - * - * Please read the file COPYRIGHT for the - * terms and conditions of the copyright. */ #include "slirp.h" diff --git a/slirp/src/tcp_input.c b/slirp/src/tcp_input.c index cf54eeee92..50a1145ec9 100644 --- a/slirp/src/tcp_input.c +++ b/slirp/src/tcp_input.c @@ -34,9 +34,6 @@ /* * Changes and additions relating to SLiRP * Copyright (c) 1995 Danny Gasparovski. - * - * Please read the file COPYRIGHT for the - * terms and conditions of the copyright. */ #include "slirp.h" diff --git a/slirp/src/tcp_output.c b/slirp/src/tcp_output.c index 272c261d07..6bbaf6ca6f 100644 --- a/slirp/src/tcp_output.c +++ b/slirp/src/tcp_output.c @@ -34,9 +34,6 @@ /* * Changes and additions relating to SLiRP * Copyright (c) 1995 Danny Gasparovski. - * - * Please read the file COPYRIGHT for the - * terms and conditions of the copyright. */ #include "slirp.h" diff --git a/slirp/src/tcp_subr.c b/slirp/src/tcp_subr.c index 086e4e98e2..fde9207b0c 100644 --- a/slirp/src/tcp_subr.c +++ b/slirp/src/tcp_subr.c @@ -34,9 +34,6 @@ /* * Changes and additions relating to SLiRP * Copyright (c) 1995 Danny Gasparovski. - * - * Please read the file COPYRIGHT for the - * terms and conditions of the copyright. */ #include "slirp.h"
The slirp COPYRIGHT file is a BSD-3 license. Instead of referring to another project file, the SPDX license notice present in all source files states that unequivocally. Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> --- slirp/src/debug.h | 3 --- slirp/src/if.h | 3 --- slirp/src/main.h | 3 --- slirp/src/misc.h | 3 --- slirp/src/sbuf.h | 3 --- slirp/src/socket.h | 3 --- slirp/src/if.c | 3 --- slirp/src/ip_input.c | 3 --- slirp/src/ip_output.c | 3 --- slirp/src/mbuf.c | 3 --- slirp/src/misc.c | 3 --- slirp/src/sbuf.c | 3 --- slirp/src/socket.c | 3 --- slirp/src/tcp_input.c | 3 --- slirp/src/tcp_output.c | 3 --- slirp/src/tcp_subr.c | 3 --- 16 files changed, 48 deletions(-)