summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Aehlig <klaus.aehlig@huawei.com>2023-06-09 12:37:38 +0200
committerKlaus Aehlig <klaus.aehlig@huawei.com>2023-06-09 12:37:38 +0200
commit67b486e2ce6ab657a98b2212a9b6f68935d07a29 (patch)
tree3f453102166e2806e65a6238c848509dcf8ff77f
parent1e604a7aa352f89d2f5af5af978826cd7146abb6 (diff)
downloadjustbuild-67b486e2ce6ab657a98b2212a9b6f68935d07a29.tar.gz
Release 1.1.2v1.1.2
-rw-r--r--CHANGELOG.md9
-rw-r--r--src/buildtool/main/version.cpp2
2 files changed, 9 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 308ad62b..f2925ddb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,14 @@
-## Release `1.1.2` (UNRELEASED)
+## Release `1.1.2` (2023-06-09)
Bug fixes on top of release `1.1.1`.
+### Fixes
+
+- Removed another potential uses of `malloc` between `fork` and
+ `exec`. This removes the risk of deadlocks on certain combinations
+ of `C++` standard library and `libc`.
+- Fix bundled build of `ssl` on `i686`.
+
## Release `1.1.1` (2023-06-02)
Bug fixes on top of release `1.1.0`.
diff --git a/src/buildtool/main/version.cpp b/src/buildtool/main/version.cpp
index 8801ca01..4df9e11c 100644
--- a/src/buildtool/main/version.cpp
+++ b/src/buildtool/main/version.cpp
@@ -21,7 +21,7 @@ auto version() -> std::string {
std::size_t major = 1;
std::size_t minor = 1;
std::size_t revision = 2;
- std::string suffix = "~beta";
+ std::string suffix = std::string{};
#ifdef VERSION_EXTRA_SUFFIX
suffix += VERSION_EXTRA_SUFFIX;
#endif