aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc-André Lureau <marcandre.lureau@gmail.com>2020-07-08 11:48:02 +0000
committerMarc-André Lureau <marcandre.lureau@gmail.com>2020-07-08 11:48:02 +0000
commita62d36734ffe9828d0f70df1b3898a3b4fbda755 (patch)
tree85c83892f076b8291b2b140283e07097073e50d2
parent53a3a938618f97c0439abd313a74791e13b313d6 (diff)
parent376187c4b14c795763d472214812826eebe7e9c2 (diff)
downloadslirp-4.3.1.zip
slirp-4.3.1.tar.gz
slirp-4.3.1.tar.bz2
Merge branch 'release-v4.3.1' into 'master'v4.3.1
Release v4.3.1 See merge request slirp/libslirp!46
-rw-r--r--CHANGELOG.md15
-rw-r--r--Makefile2
-rw-r--r--meson.build2
3 files changed, 12 insertions, 7 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 01649e2..5f83e27 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,16 +5,21 @@ 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]
-
-### Added
+## [4.3.1] - 2020-07-08
### Changed
-### Deprecated
+ - A silent truncation could occur in `slirp_fmt()`, which will now print a
+ critical message. See also #22.
### Fixed
+ - CVE-2020-10756 - Drop bogus IPv6 messages that could lead to data leakage.
+ See !44 and !42.
+ - Fix win32 builds by using the SLIRP_PACKED definition.
+ - Various coverity scan errors fixed. !41
+ - Fix new GCC warnings. !43
+
## [4.3.0] - 2020-04-22
### Added
@@ -99,7 +104,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Standalone project, removing any QEMU dependency.
- License clarifications.
-[unreleased]: https://gitlab.freedesktop.org/slirp/libslirp/compare/v4.3.0...master
+[4.3.1]: https://gitlab.freedesktop.org/slirp/libslirp/compare/v4.3.0...v4.3.1
[4.3.0]: https://gitlab.freedesktop.org/slirp/libslirp/compare/v4.2.0...v4.3.0
[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
diff --git a/Makefile b/Makefile
index c34cffe..1e48f35 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ BUILD_DIR ?= .
LIBSLIRP = $(BUILD_DIR)/libslirp.a
SLIRP_MAJOR_VERSION = 4
SLIRP_MINOR_VERSION = 3
-SLIRP_MICRO_VERSION = 0
+SLIRP_MICRO_VERSION = 1
SLIRP_VERSION_STRING = "$(SLIRP_MAJOR_VERSION).$(SLIRP_MINOR_VERSION).$(SLIRP_MICRO_VERSION)-git"
all: $(LIBSLIRP)
diff --git a/meson.build b/meson.build
index 2e48fd8..922d602 100644
--- a/meson.build
+++ b/meson.build
@@ -37,7 +37,7 @@ conf.set_quoted('SLIRP_VERSION_STRING', version)
# fixed, change:
# REVISION += 1
lt_current = 2
-lt_revision = 1
+lt_revision = 2
lt_age = 2
lt_version = '@0@.@1@.@2@'.format(lt_current - lt_age, lt_age, lt_revision)