diff options
| author | Marc-André Lureau <marcandre.lureau@gmail.com> | 2020-03-17 10:07:35 +0000 |
|---|---|---|
| committer | Marc-André Lureau <marcandre.lureau@gmail.com> | 2020-03-17 10:07:35 +0000 |
| commit | daba14c3416fa9641ab4453a9a11e7f8bde08875 (patch) | |
| tree | 19ff82d642da6a815b24f520e219e2a08bac92d5 | |
| parent | fb73a40e11664437d3a90bb8d8aa3457ae773813 (diff) | |
| parent | 9562615265c57ef7ee7382ceebe25f4481616b94 (diff) | |
| download | slirp-daba14c3416fa9641ab4453a9a11e7f8bde08875.zip slirp-daba14c3416fa9641ab4453a9a11e7f8bde08875.tar.gz slirp-daba14c3416fa9641ab4453a9a11e7f8bde08875.tar.bz2 | |
Merge branch 'release-v4.2.0' into 'master'v4.2.0
Release v4.2.0
Closes #15
See merge request slirp/libslirp!33
| -rw-r--r-- | CHANGELOG.md | 10 | ||||
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | meson.build | 6 |
3 files changed, 12 insertions, 6 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 5cf94a8..af836bb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,22 +5,27 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [Unreleased] +## [v4.2.0] - 2020-03-17 ### Added - New API function `slirp_add_unix`: add a forward rule to a Unix socket. - New API function `slirp_remove_guestfwd`: remove a forward rule previously added by `slirp_add_exec`, `slirp_add_unix` or `slirp_add_guestfwd` + - New SlirpConfig.outbound_addr{,6} fields to bind output socket to a + specific address ### Changed -### Deprecated + - socket: do not fallback on host loopback if get_dns_addr() failed + or the address is in slirp network ### Fixed - ncsi: fix checksum OOB memory access - `tcp_emu()`: fix OOB accesses + - tftp: restrict relative path access + - state: fix loading of guestfwd state ## [4.1.0] - 2019-12-02 @@ -68,5 +73,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - License clarifications. [unreleased]: https://gitlab.freedesktop.org/slirp/libslirp/compare/v4.1.0...master +[4.2.0]: https://gitlab.freedesktop.org/slirp/libslirp/compare/v4.1.0...v4.2.0 [4.1.0]: https://gitlab.freedesktop.org/slirp/libslirp/compare/v4.0.0...v4.1.0 [4.0.0]: https://gitlab.freedesktop.org/slirp/libslirp/commits/v4.0.0 @@ -3,7 +3,7 @@ BUILD_DIR ?= . LIBSLIRP = $(BUILD_DIR)/libslirp.a SLIRP_MAJOR_VERSION = 4 -SLIRP_MINOR_VERSION = 1 +SLIRP_MINOR_VERSION = 2 SLIRP_MICRO_VERSION = 0 all: $(LIBSLIRP) diff --git a/meson.build b/meson.build index 401b736..df0d26f 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project('libslirp', 'c', - version : '4.1.0', + version : '4.2.0', license : 'BSD-3-Clause', default_options : ['warning_level=1', 'c_std=gnu99'] ) @@ -32,9 +32,9 @@ conf.set('SLIRP_MICRO_VERSION', micro_version) # - If the interface is the same as the previous version, but bugs are # fixed, change: # REVISION += 1 -lt_current = 1 +lt_current = 2 lt_revision = 0 -lt_age = 1 +lt_age = 2 lt_version = '@0@.@1@.@2@'.format(lt_current - lt_age, lt_age, lt_revision) host_system = host_machine.system() |