Hello community,
here is the log from the commit of package slirp4netns for openSUSE:Factory checked in at 2019-04-02 09:17:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/slirp4netns (Old)
and /work/SRC/openSUSE:Factory/.slirp4netns.new.25356 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "slirp4netns"
Tue Apr 2 09:17:56 2019 rev:3 rq:689750 version:0.3.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/slirp4netns/slirp4netns.changes 2019-03-24 14:57:07.687201259 +0100
+++ /work/SRC/openSUSE:Factory/.slirp4netns.new.25356/slirp4netns.changes 2019-04-02 09:17:59.112512049 +0200
@@ -1,0 +2,6 @@
+Fri Mar 29 07:29:04 UTC 2019 - Sascha Grunert
+
+- Update to 0.3.0
+ * QMP-like JSON API for exposing node ports (--api-socket)
+
+-------------------------------------------------------------------
Old:
----
slirp4netns-0.3.0~beta1.tar.xz
New:
----
slirp4netns-0.3.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ slirp4netns.spec ++++++
--- /var/tmp/diff_new_pack.kcGUYv/_old 2019-04-02 09:17:59.580512479 +0200
+++ /var/tmp/diff_new_pack.kcGUYv/_new 2019-04-02 09:17:59.600512497 +0200
@@ -17,7 +17,7 @@
Name: slirp4netns
-Version: 0.3.0~beta1
+Version: 0.3.0
Release: 0
Summary: User-mode networking for unprivileged network namespaces
License: GPL-2.0-only
++++++ _service ++++++
--- /var/tmp/diff_new_pack.kcGUYv/_old 2019-04-02 09:17:59.652512545 +0200
+++ /var/tmp/diff_new_pack.kcGUYv/_new 2019-04-02 09:17:59.652512545 +0200
@@ -4,8 +4,8 @@
<param name="url">https://github.com/rootless-containers/slirp4netns.git</param>
<param name="scm">git</param>
<param name="filename">slirp4netns</param>
-<param name="versionformat">0.3.0~beta1</param>
-<param name="revision">v0.3.0-beta.1</param>
+<param name="versionformat">0.3.0</param>
+<param name="revision">v0.3.0</param>
</service>
<service name="recompress" mode="disabled">
++++++ slirp4netns-0.3.0~beta1.tar.xz -> slirp4netns-0.3.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slirp4netns-0.3.0~beta1/.gitignore new/slirp4netns-0.3.0/.gitignore
--- old/slirp4netns-0.3.0~beta1/.gitignore 1970-01-01 01:00:00.000000000 +0100
+++ new/slirp4netns-0.3.0/.gitignore 2019-03-28 12:45:09.000000000 +0100
@@ -0,0 +1,60 @@
+slirp4netns
+a.out
+.deps
+*~
+*.log
+*.o
+*.a
+*.trs
+config.h
+config.status
+INSTALL
+
+################################################################################
+# https://github.com/github/gitignore/blob/c24cdc2175d7514d504d7f060a5d69675c8...
+################################################################################
+
+# http://www.gnu.org/software/automake
+
+Makefile
+Makefile.in
+/ar-lib
+/mdate-sh
+/py-compile
+/test-driver
+/ylwrap
+*.dirstamp
+*tar.*
+
+# http://www.gnu.org/software/autoconf
+
+autom4te.cache
+/autoscan.log
+/autoscan-*.log
+/aclocal.m4
+/compile
+/config.guess
+/config.h.in
+/config.sub
+/configure
+/configure.scan
+/depcomp
+/install-sh
+/missing
+/stamp-h1
+
+# https://www.gnu.org/software/libtool/
+
+/ltmain.sh
+
+# http://www.gnu.org/software/texinfo
+
+/texinfo.tex
+
+# http://www.gnu.org/software/m4/
+
+m4/libtool.m4
+m4/ltoptions.m4
+m4/ltsugar.m4
+m4/ltversion.m4
+m4/lt~obsolete.m4
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slirp4netns-0.3.0~beta1/.travis.yml new/slirp4netns-0.3.0/.travis.yml
--- old/slirp4netns-0.3.0~beta1/.travis.yml 2019-03-13 16:57:09.000000000 +0100
+++ new/slirp4netns-0.3.0/.travis.yml 2019-03-28 12:45:09.000000000 +0100
@@ -7,3 +7,4 @@
script:
- docker build -t slirp4netns-tests -f Dockerfile.tests .
- docker run --security-opt seccomp="unconfined" -ti --rm -v /dev:/dev slirp4netns-tests
+ - docker build -q -f Dockerfile.buildtests .
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slirp4netns-0.3.0~beta1/Dockerfile.buildtests new/slirp4netns-0.3.0/Dockerfile.buildtests
--- old/slirp4netns-0.3.0~beta1/Dockerfile.buildtests 1970-01-01 01:00:00.000000000 +0100
+++ new/slirp4netns-0.3.0/Dockerfile.buildtests 2019-03-28 12:45:09.000000000 +0100
@@ -0,0 +1,22 @@
+FROM alpine:3.8 AS buildtest-alpine38-static
+RUN apk add --no-cache git build-base autoconf automake libtool linux-headers glib-dev glib-static
+COPY . /src
+WORKDIR /src
+RUN ./autogen.sh && ./configure LDFLAGS="-static" && make && cp -f slirp4netns /
+
+FROM ubuntu:18.04 AS buildtest-ubuntu1804-common
+RUN apt update && apt install -y automake autotools-dev make gcc libglib2.0-dev
+COPY . /src
+WORKDIR /src
+RUN ./autogen.sh
+
+FROM buildtest-ubuntu1804-common AS buildtest-ubuntu1804-dynamic
+RUN ./configure && make && cp -f slirp4netns /
+
+FROM buildtest-ubuntu1804-common AS buildtest-ubuntu1804-static
+RUN ./configure LDFLAGS="-static" && make && cp -f slirp4netns /
+
+FROM scratch AS buildtest-final-stage
+COPY --from=buildtest-alpine38-static /slirp4netns /buildtest-alpine38-static
+COPY --from=buildtest-ubuntu1804-dynamic /slirp4netns /buildtest-ubuntu1804-dynamic
+COPY --from=buildtest-ubuntu1804-static /slirp4netns /buildtest-ubuntu1804-static
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slirp4netns-0.3.0~beta1/Makefile.am new/slirp4netns-0.3.0/Makefile.am
--- old/slirp4netns-0.3.0~beta1/Makefile.am 2019-03-13 16:57:09.000000000 +0100
+++ new/slirp4netns-0.3.0/Makefile.am 2019-03-28 12:45:09.000000000 +0100
@@ -31,7 +31,6 @@
qemu/slirp/src/sbuf.h \
qemu/slirp/src/slirp.h \
qemu/slirp/src/socket.h \
- qemu/slirp/src/state.h \
qemu/slirp/src/stream.h \
qemu/slirp/src/tftp.h \
qemu/slirp/src/tcp.h \
@@ -76,7 +75,7 @@
qemu/slirp/src/vmstate.c
# define specific commit if git available or it was replaced during git-archive creation
-COMMIT := $(shell V=$Format:%H$ ; \
+COMMIT := $(shell V=4992082b2af77c09bca6bd8504e2ebfa5e118c18 ; \
expr match "$$V" ormat: >/dev/null \
&& (cd "$$abs_srcdir" && [ -d .git ] && git describe --always --abbrev=0 --dirty --exclude=\* || echo unknown) \
|| echo "$$V" )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slirp4netns-0.3.0~beta1/README.md new/slirp4netns-0.3.0/README.md
--- old/slirp4netns-0.3.0~beta1/README.md 2019-03-13 16:57:09.000000000 +0100
+++ new/slirp4netns-0.3.0/README.md 2019-03-28 12:45:09.000000000 +0100
@@ -2,7 +2,7 @@
slirp4netns provides user-mode networking ("slirp") for unprivileged network namespaces.
-Latest stable release: [v0.2.X](https://github.com/rootless-containers/slirp4netns/releases)
+Latest stable release: [v0.3.X](https://github.com/rootless-containers/slirp4netns/releases)
## Motivation
@@ -131,7 +131,7 @@
Terminal 2: Start slirp4netns
```console
-$ slirp4netns --configure --mtu=65520 $(cat /tmp/pid) tap0
+$ slirp4netns --configure --mtu=65520 --disable-host-loopback $(cat /tmp/pid) tap0
starting slirp, MTU=65520
...
```
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slirp4netns-0.3.0~beta1/configure.ac new/slirp4netns-0.3.0/configure.ac
--- old/slirp4netns-0.3.0~beta1/configure.ac 2019-03-13 16:57:09.000000000 +0100
+++ new/slirp4netns-0.3.0/configure.ac 2019-03-28 12:45:09.000000000 +0100
@@ -1,5 +1,5 @@
AC_PREREQ([2.69])
-AC_INIT([slirp4netns], [0.3.0-beta.1], [https://github.com/rootless-containers/slirp4netns/issues])
+AC_INIT([slirp4netns], [0.3.0], [https://github.com/rootless-containers/slirp4netns/issues])
AC_CONFIG_SRCDIR([main.c])
AC_CONFIG_HEADERS([config.h])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slirp4netns-0.3.0~beta1/main.c new/slirp4netns-0.3.0/main.c
--- old/slirp4netns-0.3.0~beta1/main.c 2019-03-13 16:57:09.000000000 +0100
+++ new/slirp4netns-0.3.0/main.c 2019-03-28 12:45:09.000000000 +0100
@@ -269,7 +269,7 @@
printf("-m, --mtu=MTU specify MTU (default=%d, max=65521)\n", DEFAULT_MTU);
printf("--cidr=CIDR specify network address CIDR (default=%s)\n", DEFAULT_CIDR);
printf("--disable-host-loopback prohibit connecting to 127.0.0.1:* on the host namespace\n");
- printf("-a, --api-socket=PATH specify API socket path (experimental)\n");
+ printf("-a, --api-socket=PATH specify API socket path\n");
printf("-6, --enable-ipv6 enable IPv6 (experimental)\n");
printf("-h, --help show this help and exit\n");
printf("-v, --version show version and exit\n");
@@ -391,7 +391,6 @@
break;
case 'a':
options->api_socket = strdup(optarg);
- printf("WARNING: Support for API socket is experimental\n");
break;
case '6':
options->enable_ipv6 = true;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slirp4netns-0.3.0~beta1/qemu/README.md new/slirp4netns-0.3.0/qemu/README.md
--- old/slirp4netns-0.3.0~beta1/qemu/README.md 2019-03-13 16:57:09.000000000 +0100
+++ new/slirp4netns-0.3.0/qemu/README.md 2019-03-28 12:45:09.000000000 +0100
@@ -1,6 +1,6 @@
# DO NOT EDIT MANUALLY
-This directory was synced from QEMU `4c76137484878f42a2ce1ae1b888b6a7f66b4053` (`https://github.com/qemu/qemu.git`),
+This directory was synced from QEMU `49fc899f8d673dd9e73f3db0d9e9ea60b77c331b` (`https://github.com/qemu/qemu.git`),
with the following patches (sha256sum):
```
6bed7e4f10c4d462a84656b08441a740fb86c31a0b5394e4c89c06f6a8f44827 0001-slirp-add-slirp_initx-SlirpConfig-SlirpCb-void.patch
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slirp4netns-0.3.0~beta1/qemu/slirp/COPYRIGHT new/slirp4netns-0.3.0/qemu/slirp/COPYRIGHT
--- old/slirp4netns-0.3.0~beta1/qemu/slirp/COPYRIGHT 2019-03-13 16:57:09.000000000 +0100
+++ new/slirp4netns-0.3.0/qemu/slirp/COPYRIGHT 2019-03-28 12:45:09.000000000 +0100
@@ -1,8 +1,6 @@
Slirp was written by Danny Gasparovski.
Copyright (c), 1995,1996 All Rights Reserved.
-Slirp is maintained by Kelly Price
-
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 @@
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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slirp4netns-0.3.0~beta1/qemu/slirp/src/arp_table.c new/slirp4netns-0.3.0/qemu/slirp/src/arp_table.c
--- old/slirp4netns-0.3.0~beta1/qemu/slirp/src/arp_table.c 2019-03-13 16:57:09.000000000 +0100
+++ new/slirp4netns-0.3.0/qemu/slirp/src/arp_table.c 2019-03-28 12:45:09.000000000 +0100
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: MIT */
/*
* ARP table
*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slirp4netns-0.3.0~beta1/qemu/slirp/src/bootp.c new/slirp4netns-0.3.0/qemu/slirp/src/bootp.c
--- old/slirp4netns-0.3.0~beta1/qemu/slirp/src/bootp.c 2019-03-13 16:57:09.000000000 +0100
+++ new/slirp4netns-0.3.0/qemu/slirp/src/bootp.c 2019-03-28 12:45:09.000000000 +0100
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: MIT */
/*
* QEMU BOOTP/DHCP server
*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slirp4netns-0.3.0~beta1/qemu/slirp/src/bootp.h new/slirp4netns-0.3.0/qemu/slirp/src/bootp.h
--- old/slirp4netns-0.3.0~beta1/qemu/slirp/src/bootp.h 2019-03-13 16:57:09.000000000 +0100
+++ new/slirp4netns-0.3.0/qemu/slirp/src/bootp.h 2019-03-28 12:45:09.000000000 +0100
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
/* bootp/dhcp defines */
#ifndef SLIRP_BOOTP_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slirp4netns-0.3.0~beta1/qemu/slirp/src/cksum.c new/slirp4netns-0.3.0/qemu/slirp/src/cksum.c
--- old/slirp4netns-0.3.0~beta1/qemu/slirp/src/cksum.c 2019-03-13 16:57:09.000000000 +0100
+++ new/slirp4netns-0.3.0/qemu/slirp/src/cksum.c 2019-03-28 12:45:09.000000000 +0100
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
/*
* Copyright (c) 1988, 1992, 1993
* The Regents of the University of California. All rights reserved.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slirp4netns-0.3.0~beta1/qemu/slirp/src/debug.h new/slirp4netns-0.3.0/qemu/slirp/src/debug.h
--- old/slirp4netns-0.3.0~beta1/qemu/slirp/src/debug.h 2019-03-13 16:57:09.000000000 +0100
+++ new/slirp4netns-0.3.0/qemu/slirp/src/debug.h 2019-03-28 12:45:09.000000000 +0100
@@ -1,8 +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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slirp4netns-0.3.0~beta1/qemu/slirp/src/dhcpv6.c new/slirp4netns-0.3.0/qemu/slirp/src/dhcpv6.c
--- old/slirp4netns-0.3.0~beta1/qemu/slirp/src/dhcpv6.c 2019-03-13 16:57:09.000000000 +0100
+++ new/slirp4netns-0.3.0/qemu/slirp/src/dhcpv6.c 2019-03-28 12:45:09.000000000 +0100
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
/*
* SLIRP stateless DHCPv6
*
@@ -6,18 +7,35 @@
*
* Copyright 2016 Thomas Huth, Red Hat Inc.
*
- * This program 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 of the License,
- * or (at your option) any later version.
- *
- * This program 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.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see http://www.gnu.org/licenses/.
+ * 1. Redistributions of source code must retain the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer.
+ *
+ * 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 BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "slirp.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slirp4netns-0.3.0~beta1/qemu/slirp/src/dhcpv6.h new/slirp4netns-0.3.0/qemu/slirp/src/dhcpv6.h
--- old/slirp4netns-0.3.0~beta1/qemu/slirp/src/dhcpv6.h 2019-03-13 16:57:09.000000000 +0100
+++ new/slirp4netns-0.3.0/qemu/slirp/src/dhcpv6.h 2019-03-28 12:45:09.000000000 +0100
@@ -1,10 +1,38 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
/*
* Definitions and prototypes for SLIRP stateless DHCPv6
*
* Copyright 2016 Thomas Huth, Red Hat Inc.
*
- * This work is licensed under the terms of the GNU GPL, version 2
- * or later. See the COPYING file in the top-level directory.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer.
+ *
+ * 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 BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef SLIRP_DHCPV6_H
#define SLIRP_DHCPV6_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slirp4netns-0.3.0~beta1/qemu/slirp/src/dnssearch.c new/slirp4netns-0.3.0/qemu/slirp/src/dnssearch.c
--- old/slirp4netns-0.3.0~beta1/qemu/slirp/src/dnssearch.c 2019-03-13 16:57:09.000000000 +0100
+++ new/slirp4netns-0.3.0/qemu/slirp/src/dnssearch.c 2019-03-28 12:45:09.000000000 +0100
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: MIT */
/*
* Domain search option for DHCP (RFC 3397)
*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slirp4netns-0.3.0~beta1/qemu/slirp/src/if.c new/slirp4netns-0.3.0/qemu/slirp/src/if.c
--- old/slirp4netns-0.3.0~beta1/qemu/slirp/src/if.c 2019-03-13 16:57:09.000000000 +0100
+++ new/slirp4netns-0.3.0/qemu/slirp/src/if.c 2019-03-28 12:45:09.000000000 +0100
@@ -1,8 +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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slirp4netns-0.3.0~beta1/qemu/slirp/src/if.h new/slirp4netns-0.3.0/qemu/slirp/src/if.h
--- old/slirp4netns-0.3.0~beta1/qemu/slirp/src/if.h 2019-03-13 16:57:09.000000000 +0100
+++ new/slirp4netns-0.3.0/qemu/slirp/src/if.h 2019-03-28 12:45:09.000000000 +0100
@@ -1,8 +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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slirp4netns-0.3.0~beta1/qemu/slirp/src/ip.h new/slirp4netns-0.3.0/qemu/slirp/src/ip.h
--- old/slirp4netns-0.3.0~beta1/qemu/slirp/src/ip.h 2019-03-13 16:57:09.000000000 +0100
+++ new/slirp4netns-0.3.0/qemu/slirp/src/ip.h 2019-03-28 12:45:09.000000000 +0100
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
/*
* Copyright (c) 1982, 1986, 1993
* The Regents of the University of California. All rights reserved.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slirp4netns-0.3.0~beta1/qemu/slirp/src/ip6.h new/slirp4netns-0.3.0/qemu/slirp/src/ip6.h
--- old/slirp4netns-0.3.0~beta1/qemu/slirp/src/ip6.h 2019-03-13 16:57:09.000000000 +0100
+++ new/slirp4netns-0.3.0/qemu/slirp/src/ip6.h 2019-03-28 12:45:09.000000000 +0100
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
/*
* Copyright (c) 2013
* Guillaume Subiron, Yann Bordenave, Serigne Modou Wagne.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slirp4netns-0.3.0~beta1/qemu/slirp/src/ip6_icmp.c new/slirp4netns-0.3.0/qemu/slirp/src/ip6_icmp.c
--- old/slirp4netns-0.3.0~beta1/qemu/slirp/src/ip6_icmp.c 2019-03-13 16:57:09.000000000 +0100
+++ new/slirp4netns-0.3.0/qemu/slirp/src/ip6_icmp.c 2019-03-28 12:45:09.000000000 +0100
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
/*
* Copyright (c) 2013
* Guillaume Subiron, Yann Bordenave, Serigne Modou Wagne.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slirp4netns-0.3.0~beta1/qemu/slirp/src/ip6_icmp.h new/slirp4netns-0.3.0/qemu/slirp/src/ip6_icmp.h
--- old/slirp4netns-0.3.0~beta1/qemu/slirp/src/ip6_icmp.h 2019-03-13 16:57:09.000000000 +0100
+++ new/slirp4netns-0.3.0/qemu/slirp/src/ip6_icmp.h 2019-03-28 12:45:09.000000000 +0100
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
/*
* Copyright (c) 2013
* Guillaume Subiron, Yann Bordenave, Serigne Modou Wagne.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slirp4netns-0.3.0~beta1/qemu/slirp/src/ip6_input.c new/slirp4netns-0.3.0/qemu/slirp/src/ip6_input.c
--- old/slirp4netns-0.3.0~beta1/qemu/slirp/src/ip6_input.c 2019-03-13 16:57:09.000000000 +0100
+++ new/slirp4netns-0.3.0/qemu/slirp/src/ip6_input.c 2019-03-28 12:45:09.000000000 +0100
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
/*
* Copyright (c) 2013
* Guillaume Subiron, Yann Bordenave, Serigne Modou Wagne.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slirp4netns-0.3.0~beta1/qemu/slirp/src/ip6_output.c new/slirp4netns-0.3.0/qemu/slirp/src/ip6_output.c
--- old/slirp4netns-0.3.0~beta1/qemu/slirp/src/ip6_output.c 2019-03-13 16:57:09.000000000 +0100
+++ new/slirp4netns-0.3.0/qemu/slirp/src/ip6_output.c 2019-03-28 12:45:09.000000000 +0100
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
/*
* Copyright (c) 2013
* Guillaume Subiron, Yann Bordenave, Serigne Modou Wagne.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slirp4netns-0.3.0~beta1/qemu/slirp/src/ip_icmp.c new/slirp4netns-0.3.0/qemu/slirp/src/ip_icmp.c
--- old/slirp4netns-0.3.0~beta1/qemu/slirp/src/ip_icmp.c 2019-03-13 16:57:09.000000000 +0100
+++ new/slirp4netns-0.3.0/qemu/slirp/src/ip_icmp.c 2019-03-28 12:45:09.000000000 +0100
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
/*
* Copyright (c) 1982, 1986, 1988, 1993
* The Regents of the University of California. All rights reserved.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slirp4netns-0.3.0~beta1/qemu/slirp/src/ip_icmp.h new/slirp4netns-0.3.0/qemu/slirp/src/ip_icmp.h
--- old/slirp4netns-0.3.0~beta1/qemu/slirp/src/ip_icmp.h 2019-03-13 16:57:09.000000000 +0100
+++ new/slirp4netns-0.3.0/qemu/slirp/src/ip_icmp.h 2019-03-28 12:45:09.000000000 +0100
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
/*
* Copyright (c) 1982, 1986, 1993
* The Regents of the University of California. All rights reserved.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slirp4netns-0.3.0~beta1/qemu/slirp/src/ip_input.c new/slirp4netns-0.3.0/qemu/slirp/src/ip_input.c
--- old/slirp4netns-0.3.0~beta1/qemu/slirp/src/ip_input.c 2019-03-13 16:57:09.000000000 +0100
+++ new/slirp4netns-0.3.0/qemu/slirp/src/ip_input.c 2019-03-28 12:45:09.000000000 +0100
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
/*
* Copyright (c) 1982, 1986, 1988, 1993
* The Regents of the University of California. All rights reserved.
@@ -33,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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slirp4netns-0.3.0~beta1/qemu/slirp/src/ip_output.c new/slirp4netns-0.3.0/qemu/slirp/src/ip_output.c
--- old/slirp4netns-0.3.0~beta1/qemu/slirp/src/ip_output.c 2019-03-13 16:57:09.000000000 +0100
+++ new/slirp4netns-0.3.0/qemu/slirp/src/ip_output.c 2019-03-28 12:45:09.000000000 +0100
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
/*
* Copyright (c) 1982, 1986, 1988, 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -33,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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slirp4netns-0.3.0~beta1/qemu/slirp/src/libslirp.h new/slirp4netns-0.3.0/qemu/slirp/src/libslirp.h
--- old/slirp4netns-0.3.0~beta1/qemu/slirp/src/libslirp.h 2019-03-13 16:57:09.000000000 +0100
+++ new/slirp4netns-0.3.0/qemu/slirp/src/libslirp.h 2019-03-28 12:45:09.000000000 +0100
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
#ifndef LIBSLIRP_H
#define LIBSLIRP_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slirp4netns-0.3.0~beta1/qemu/slirp/src/main.h new/slirp4netns-0.3.0/qemu/slirp/src/main.h
--- old/slirp4netns-0.3.0~beta1/qemu/slirp/src/main.h 2019-03-13 16:57:09.000000000 +0100
+++ new/slirp4netns-0.3.0/qemu/slirp/src/main.h 2019-03-28 12:45:09.000000000 +0100
@@ -1,8 +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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slirp4netns-0.3.0~beta1/qemu/slirp/src/mbuf.c new/slirp4netns-0.3.0/qemu/slirp/src/mbuf.c
--- old/slirp4netns-0.3.0~beta1/qemu/slirp/src/mbuf.c 2019-03-13 16:57:09.000000000 +0100
+++ new/slirp4netns-0.3.0/qemu/slirp/src/mbuf.c 2019-03-28 12:45:09.000000000 +0100
@@ -1,8 +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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slirp4netns-0.3.0~beta1/qemu/slirp/src/mbuf.h new/slirp4netns-0.3.0/qemu/slirp/src/mbuf.h
--- old/slirp4netns-0.3.0~beta1/qemu/slirp/src/mbuf.h 2019-03-13 16:57:09.000000000 +0100
+++ new/slirp4netns-0.3.0/qemu/slirp/src/mbuf.h 2019-03-28 12:45:09.000000000 +0100
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
/*
* Copyright (c) 1982, 1986, 1988, 1993
* The Regents of the University of California. All rights reserved.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slirp4netns-0.3.0~beta1/qemu/slirp/src/misc.c new/slirp4netns-0.3.0/qemu/slirp/src/misc.c
--- old/slirp4netns-0.3.0~beta1/qemu/slirp/src/misc.c 2019-03-13 16:57:09.000000000 +0100
+++ new/slirp4netns-0.3.0/qemu/slirp/src/misc.c 2019-03-28 12:45:09.000000000 +0100
@@ -1,8 +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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slirp4netns-0.3.0~beta1/qemu/slirp/src/misc.h new/slirp4netns-0.3.0/qemu/slirp/src/misc.h
--- old/slirp4netns-0.3.0~beta1/qemu/slirp/src/misc.h 2019-03-13 16:57:09.000000000 +0100
+++ new/slirp4netns-0.3.0/qemu/slirp/src/misc.h 2019-03-28 12:45:09.000000000 +0100
@@ -1,8 +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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slirp4netns-0.3.0~beta1/qemu/slirp/src/ncsi-pkt.h new/slirp4netns-0.3.0/qemu/slirp/src/ncsi-pkt.h
--- old/slirp4netns-0.3.0~beta1/qemu/slirp/src/ncsi-pkt.h 2019-03-13 16:57:09.000000000 +0100
+++ new/slirp4netns-0.3.0/qemu/slirp/src/ncsi-pkt.h 2019-03-28 12:45:09.000000000 +0100
@@ -1,10 +1,36 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
/*
* Copyright Gavin Shan, IBM Corporation 2016.
*
- * This program 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 of the License, or
- * (at your option) any later version.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer.
+ *
+ * 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 BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef NCSI_PKT_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slirp4netns-0.3.0~beta1/qemu/slirp/src/ncsi.c new/slirp4netns-0.3.0/qemu/slirp/src/ncsi.c
--- old/slirp4netns-0.3.0~beta1/qemu/slirp/src/ncsi.c 2019-03-13 16:57:09.000000000 +0100
+++ new/slirp4netns-0.3.0/qemu/slirp/src/ncsi.c 2019-03-28 12:45:09.000000000 +0100
@@ -1,10 +1,38 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
/*
* NC-SI (Network Controller Sideband Interface) "echo" model
*
* Copyright (C) 2016-2018 IBM Corp.
*
- * This code is licensed under the GPL version 2 or later. See the
- * COPYING file in the top-level directory.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer.
+ *
+ * 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 BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "slirp.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slirp4netns-0.3.0~beta1/qemu/slirp/src/ndp_table.c new/slirp4netns-0.3.0/qemu/slirp/src/ndp_table.c
--- old/slirp4netns-0.3.0~beta1/qemu/slirp/src/ndp_table.c 2019-03-13 16:57:09.000000000 +0100
+++ new/slirp4netns-0.3.0/qemu/slirp/src/ndp_table.c 2019-03-28 12:45:09.000000000 +0100
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
/*
* Copyright (c) 2013
* Guillaume Subiron, Yann Bordenave, Serigne Modou Wagne.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slirp4netns-0.3.0~beta1/qemu/slirp/src/qtailq.h new/slirp4netns-0.3.0/qemu/slirp/src/qtailq.h
--- old/slirp4netns-0.3.0~beta1/qemu/slirp/src/qtailq.h 2019-03-13 16:57:09.000000000 +0100
+++ new/slirp4netns-0.3.0/qemu/slirp/src/qtailq.h 2019-03-28 12:45:09.000000000 +0100
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
/* $NetBSD: queue.h,v 1.52 2009/04/20 09:56:08 mschuett Exp $ */
/*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slirp4netns-0.3.0~beta1/qemu/slirp/src/sbuf.c new/slirp4netns-0.3.0/qemu/slirp/src/sbuf.c
--- old/slirp4netns-0.3.0~beta1/qemu/slirp/src/sbuf.c 2019-03-13 16:57:09.000000000 +0100
+++ new/slirp4netns-0.3.0/qemu/slirp/src/sbuf.c 2019-03-28 12:45:09.000000000 +0100
@@ -1,8 +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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slirp4netns-0.3.0~beta1/qemu/slirp/src/sbuf.h new/slirp4netns-0.3.0/qemu/slirp/src/sbuf.h
--- old/slirp4netns-0.3.0~beta1/qemu/slirp/src/sbuf.h 2019-03-13 16:57:09.000000000 +0100
+++ new/slirp4netns-0.3.0/qemu/slirp/src/sbuf.h 2019-03-28 12:45:09.000000000 +0100
@@ -1,8 +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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slirp4netns-0.3.0~beta1/qemu/slirp/src/slirp.c new/slirp4netns-0.3.0/qemu/slirp/src/slirp.c
--- old/slirp4netns-0.3.0~beta1/qemu/slirp/src/slirp.c 2019-03-13 16:57:09.000000000 +0100
+++ new/slirp4netns-0.3.0/qemu/slirp/src/slirp.c 2019-03-28 12:45:09.000000000 +0100
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: MIT */
/*
* libslirp glue
*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slirp4netns-0.3.0~beta1/qemu/slirp/src/slirp.h new/slirp4netns-0.3.0/qemu/slirp/src/slirp.h
--- old/slirp4netns-0.3.0~beta1/qemu/slirp/src/slirp.h 2019-03-13 16:57:09.000000000 +0100
+++ new/slirp4netns-0.3.0/qemu/slirp/src/slirp.h 2019-03-28 12:45:09.000000000 +0100
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
#ifndef SLIRP_H
#define SLIRP_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slirp4netns-0.3.0~beta1/qemu/slirp/src/socket.c new/slirp4netns-0.3.0/qemu/slirp/src/socket.c
--- old/slirp4netns-0.3.0~beta1/qemu/slirp/src/socket.c 2019-03-13 16:57:09.000000000 +0100
+++ new/slirp4netns-0.3.0/qemu/slirp/src/socket.c 2019-03-28 12:45:09.000000000 +0100
@@ -1,8 +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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slirp4netns-0.3.0~beta1/qemu/slirp/src/socket.h new/slirp4netns-0.3.0/qemu/slirp/src/socket.h
--- old/slirp4netns-0.3.0~beta1/qemu/slirp/src/socket.h 2019-03-13 16:57:09.000000000 +0100
+++ new/slirp4netns-0.3.0/qemu/slirp/src/socket.h 2019-03-28 12:45:09.000000000 +0100
@@ -1,8 +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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slirp4netns-0.3.0~beta1/qemu/slirp/src/state.c new/slirp4netns-0.3.0/qemu/slirp/src/state.c
--- old/slirp4netns-0.3.0~beta1/qemu/slirp/src/state.c 2019-03-13 16:57:09.000000000 +0100
+++ new/slirp4netns-0.3.0/qemu/slirp/src/state.c 2019-03-28 12:45:09.000000000 +0100
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: MIT */
/*
* libslirp
*
@@ -23,7 +24,6 @@
*/
#include "slirp.h"
#include "vmstate.h"
-#include "state.h"
#include "stream.h"
static int slirp_tcp_post_load(void *opaque, int version)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slirp4netns-0.3.0~beta1/qemu/slirp/src/stream.c new/slirp4netns-0.3.0/qemu/slirp/src/stream.c
--- old/slirp4netns-0.3.0~beta1/qemu/slirp/src/stream.c 2019-03-13 16:57:09.000000000 +0100
+++ new/slirp4netns-0.3.0/qemu/slirp/src/stream.c 2019-03-28 12:45:09.000000000 +0100
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: MIT */
/*
* libslirp io streams
*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slirp4netns-0.3.0~beta1/qemu/slirp/src/stream.h new/slirp4netns-0.3.0/qemu/slirp/src/stream.h
--- old/slirp4netns-0.3.0~beta1/qemu/slirp/src/stream.h 2019-03-13 16:57:09.000000000 +0100
+++ new/slirp4netns-0.3.0/qemu/slirp/src/stream.h 2019-03-28 12:45:09.000000000 +0100
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
#ifndef STREAM_H_
#define STREAM_H_
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slirp4netns-0.3.0~beta1/qemu/slirp/src/tcp.h new/slirp4netns-0.3.0/qemu/slirp/src/tcp.h
--- old/slirp4netns-0.3.0~beta1/qemu/slirp/src/tcp.h 2019-03-13 16:57:09.000000000 +0100
+++ new/slirp4netns-0.3.0/qemu/slirp/src/tcp.h 2019-03-28 12:45:09.000000000 +0100
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
/*
* Copyright (c) 1982, 1986, 1993
* The Regents of the University of California. All rights reserved.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slirp4netns-0.3.0~beta1/qemu/slirp/src/tcp_input.c new/slirp4netns-0.3.0/qemu/slirp/src/tcp_input.c
--- old/slirp4netns-0.3.0~beta1/qemu/slirp/src/tcp_input.c 2019-03-13 16:57:09.000000000 +0100
+++ new/slirp4netns-0.3.0/qemu/slirp/src/tcp_input.c 2019-03-28 12:45:09.000000000 +0100
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
/*
* Copyright (c) 1982, 1986, 1988, 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.
@@ -33,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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slirp4netns-0.3.0~beta1/qemu/slirp/src/tcp_output.c new/slirp4netns-0.3.0/qemu/slirp/src/tcp_output.c
--- old/slirp4netns-0.3.0~beta1/qemu/slirp/src/tcp_output.c 2019-03-13 16:57:09.000000000 +0100
+++ new/slirp4netns-0.3.0/qemu/slirp/src/tcp_output.c 2019-03-28 12:45:09.000000000 +0100
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
/*
* Copyright (c) 1982, 1986, 1988, 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -33,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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slirp4netns-0.3.0~beta1/qemu/slirp/src/tcp_subr.c new/slirp4netns-0.3.0/qemu/slirp/src/tcp_subr.c
--- old/slirp4netns-0.3.0~beta1/qemu/slirp/src/tcp_subr.c 2019-03-13 16:57:09.000000000 +0100
+++ new/slirp4netns-0.3.0/qemu/slirp/src/tcp_subr.c 2019-03-28 12:45:09.000000000 +0100
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
/*
* Copyright (c) 1982, 1986, 1988, 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -33,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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slirp4netns-0.3.0~beta1/qemu/slirp/src/tcp_timer.c new/slirp4netns-0.3.0/qemu/slirp/src/tcp_timer.c
--- old/slirp4netns-0.3.0~beta1/qemu/slirp/src/tcp_timer.c 2019-03-13 16:57:09.000000000 +0100
+++ new/slirp4netns-0.3.0/qemu/slirp/src/tcp_timer.c 2019-03-28 12:45:09.000000000 +0100
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
/*
* Copyright (c) 1982, 1986, 1988, 1990, 1993
* The Regents of the University of California. All rights reserved.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slirp4netns-0.3.0~beta1/qemu/slirp/src/tcp_timer.h new/slirp4netns-0.3.0/qemu/slirp/src/tcp_timer.h
--- old/slirp4netns-0.3.0~beta1/qemu/slirp/src/tcp_timer.h 2019-03-13 16:57:09.000000000 +0100
+++ new/slirp4netns-0.3.0/qemu/slirp/src/tcp_timer.h 2019-03-28 12:45:09.000000000 +0100
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
/*
* Copyright (c) 1982, 1986, 1993
* The Regents of the University of California. All rights reserved.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slirp4netns-0.3.0~beta1/qemu/slirp/src/tcp_var.h new/slirp4netns-0.3.0/qemu/slirp/src/tcp_var.h
--- old/slirp4netns-0.3.0~beta1/qemu/slirp/src/tcp_var.h 2019-03-13 16:57:09.000000000 +0100
+++ new/slirp4netns-0.3.0/qemu/slirp/src/tcp_var.h 2019-03-28 12:45:09.000000000 +0100
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
/*
* Copyright (c) 1982, 1986, 1993, 1994
* The Regents of the University of California. All rights reserved.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slirp4netns-0.3.0~beta1/qemu/slirp/src/tcpip.h new/slirp4netns-0.3.0/qemu/slirp/src/tcpip.h
--- old/slirp4netns-0.3.0~beta1/qemu/slirp/src/tcpip.h 2019-03-13 16:57:09.000000000 +0100
+++ new/slirp4netns-0.3.0/qemu/slirp/src/tcpip.h 2019-03-28 12:45:09.000000000 +0100
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
/*
* Copyright (c) 1982, 1986, 1993
* The Regents of the University of California. All rights reserved.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slirp4netns-0.3.0~beta1/qemu/slirp/src/tftp.c new/slirp4netns-0.3.0/qemu/slirp/src/tftp.c
--- old/slirp4netns-0.3.0~beta1/qemu/slirp/src/tftp.c 2019-03-13 16:57:09.000000000 +0100
+++ new/slirp4netns-0.3.0/qemu/slirp/src/tftp.c 2019-03-28 12:45:09.000000000 +0100
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: MIT */
/*
* tftp.c - a simple, read-only tftp server for qemu
*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slirp4netns-0.3.0~beta1/qemu/slirp/src/tftp.h new/slirp4netns-0.3.0/qemu/slirp/src/tftp.h
--- old/slirp4netns-0.3.0~beta1/qemu/slirp/src/tftp.h 2019-03-13 16:57:09.000000000 +0100
+++ new/slirp4netns-0.3.0/qemu/slirp/src/tftp.h 2019-03-28 12:45:09.000000000 +0100
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
/* tftp defines */
#ifndef SLIRP_TFTP_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slirp4netns-0.3.0~beta1/qemu/slirp/src/udp.c new/slirp4netns-0.3.0/qemu/slirp/src/udp.c
--- old/slirp4netns-0.3.0~beta1/qemu/slirp/src/udp.c 2019-03-13 16:57:09.000000000 +0100
+++ new/slirp4netns-0.3.0/qemu/slirp/src/udp.c 2019-03-28 12:45:09.000000000 +0100
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
/*
* Copyright (c) 1982, 1986, 1988, 1990, 1993
* The Regents of the University of California. All rights reserved.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slirp4netns-0.3.0~beta1/qemu/slirp/src/udp.h new/slirp4netns-0.3.0/qemu/slirp/src/udp.h
--- old/slirp4netns-0.3.0~beta1/qemu/slirp/src/udp.h 2019-03-13 16:57:09.000000000 +0100
+++ new/slirp4netns-0.3.0/qemu/slirp/src/udp.h 2019-03-28 12:45:09.000000000 +0100
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
/*
* Copyright (c) 1982, 1986, 1993
* The Regents of the University of California. All rights reserved.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slirp4netns-0.3.0~beta1/qemu/slirp/src/udp6.c new/slirp4netns-0.3.0/qemu/slirp/src/udp6.c
--- old/slirp4netns-0.3.0~beta1/qemu/slirp/src/udp6.c 2019-03-13 16:57:09.000000000 +0100
+++ new/slirp4netns-0.3.0/qemu/slirp/src/udp6.c 2019-03-28 12:45:09.000000000 +0100
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
/*
* Copyright (c) 2013
* Guillaume Subiron
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slirp4netns-0.3.0~beta1/qemu/slirp/src/util.c new/slirp4netns-0.3.0/qemu/slirp/src/util.c
--- old/slirp4netns-0.3.0~beta1/qemu/slirp/src/util.c 2019-03-13 16:57:09.000000000 +0100
+++ new/slirp4netns-0.3.0/qemu/slirp/src/util.c 2019-03-28 12:45:09.000000000 +0100
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: MIT */
/*
* util.c (mostly based on QEMU os-win32.c)
*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slirp4netns-0.3.0~beta1/qemu/slirp/src/util.h new/slirp4netns-0.3.0/qemu/slirp/src/util.h
--- old/slirp4netns-0.3.0~beta1/qemu/slirp/src/util.h 2019-03-13 16:57:09.000000000 +0100
+++ new/slirp4netns-0.3.0/qemu/slirp/src/util.h 2019-03-28 12:45:09.000000000 +0100
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: MIT */
/*
* Copyright (c) 2003-2008 Fabrice Bellard
* Copyright (c) 2010-2019 Red Hat, Inc.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slirp4netns-0.3.0~beta1/qemu/slirp/src/vmstate.c new/slirp4netns-0.3.0/qemu/slirp/src/vmstate.c
--- old/slirp4netns-0.3.0~beta1/qemu/slirp/src/vmstate.c 2019-03-13 16:57:09.000000000 +0100
+++ new/slirp4netns-0.3.0/qemu/slirp/src/vmstate.c 2019-03-28 12:45:09.000000000 +0100
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
/*
* VMState interpreter
*
@@ -6,8 +7,35 @@
* Authors:
* Juan Quintela
*
- * This work is licensed under the terms of the GNU GPL, version 2 or later.
- * See the COPYING file in the top-level directory.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer.
+ *
+ * 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 BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include
#include
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slirp4netns-0.3.0~beta1/qemu/slirp/src/vmstate.h new/slirp4netns-0.3.0/qemu/slirp/src/vmstate.h
--- old/slirp4netns-0.3.0~beta1/qemu/slirp/src/vmstate.h 2019-03-13 16:57:09.000000000 +0100
+++ new/slirp4netns-0.3.0/qemu/slirp/src/vmstate.h 2019-03-28 12:45:09.000000000 +0100
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
/*
* QEMU migration/snapshot declarations
*
@@ -5,23 +6,35 @@
*
* Original author: Juan Quintela
*
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * 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.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer.
+ *
+ * 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 BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef VMSTATE_H_
#define VMSTATE_H_
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slirp4netns-0.3.0~beta1/qemu_patches/sync.sh new/slirp4netns-0.3.0/qemu_patches/sync.sh
--- old/slirp4netns-0.3.0~beta1/qemu_patches/sync.sh 2019-03-13 16:57:09.000000000 +0100
+++ new/slirp4netns-0.3.0/qemu_patches/sync.sh 2019-03-28 12:45:09.000000000 +0100
@@ -1,8 +1,8 @@
#!/bin/bash
set -eux -o pipefail
QEMU_REPO=https://github.com/qemu/qemu.git
-# March 2019
-QEMU_COMMIT=4c76137484878f42a2ce1ae1b888b6a7f66b4053
+# v4.0.0-rc1 (March 2019)
+QEMU_COMMIT=49fc899f8d673dd9e73f3db0d9e9ea60b77c331b
cd $(dirname $0)/..
slirp4netns_dir=$(pwd)
slirp4netns_qemu_dir=$slirp4netns_dir/qemu
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slirp4netns-0.3.0~beta1/slirp4netns.1 new/slirp4netns-0.3.0/slirp4netns.1
--- old/slirp4netns-0.3.0~beta1/slirp4netns.1 2019-03-13 16:57:09.000000000 +0100
+++ new/slirp4netns-0.3.0/slirp4netns.1 2019-03-28 12:45:09.000000000 +0100
@@ -67,7 +67,7 @@
.PP
\fB\-a\fP, \fB\-\-api\-socket\fP (since v0.3.0)
-API socket path (experimental).
+API socket path
.PP
\fB\-6\fP, \fB\-\-enable\-ipv6\fP
@@ -202,7 +202,7 @@
.RE
-.SH API SOCKET (EXPERIMENTAL)
+.SH API SOCKET
.PP
slirp4netns can provide QMP\-like API server over an UNIX socket file:
@@ -230,6 +230,12 @@
.RE
.PP
+If \fBhost\_addr\fP is not specified, then it defaults to "0.0.0.0".
+
+.PP
+If \fBguest\_addr\fP is not specified, then it will be set to the default address that corresponds to \-\-configure.
+
+.PP
\fBlist\_hostfwd\fP: List exposed ports
.PP
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slirp4netns-0.3.0~beta1/slirp4netns.1.md new/slirp4netns-0.3.0/slirp4netns.1.md
--- old/slirp4netns-0.3.0~beta1/slirp4netns.1.md 2019-03-13 16:57:09.000000000 +0100
+++ new/slirp4netns-0.3.0/slirp4netns.1.md 2019-03-28 12:45:09.000000000 +0100
@@ -46,7 +46,7 @@
prohibit connecting to 127.0.0.1:\* on the host namespace
**-a**, **--api-socket** (since v0.3.0)
-API socket path (experimental).
+API socket path
**-6**, **--enable-ipv6**
enable IPv6 (experimental).
@@ -134,7 +134,7 @@
unshared$ iptables -A OUTPUT -d 10.0.2.3 -j DROP
```
-# API SOCKET (EXPERIMENTAL)
+# API SOCKET
slirp4netns can provide QMP-like API server over an UNIX socket file:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slirp4netns-0.3.0~beta1/slirp4netns.c new/slirp4netns-0.3.0/slirp4netns.c
--- old/slirp4netns-0.3.0~beta1/slirp4netns.c 2019-03-13 16:57:09.000000000 +0100
+++ new/slirp4netns-0.3.0/slirp4netns.c 2019-03-28 12:45:09.000000000 +0100
@@ -270,7 +270,6 @@
int do_slirp(int tapfd, int exitfd, const char *api_socket, struct slirp4netns_config *cfg)
{
- /* WIP BROKEN */
int ret = -1;
Slirp *slirp = NULL;
uint8_t *buf = NULL;
