From bd5a5f63d72f8210d8cee76195eb9f0749e5bd70 Mon Sep 17 00:00:00 2001
From: Lucas Ramage <lucas.ramage@infinite-omicron.com>
Date: Sat, 13 May 2023 01:45:30 -0500
Subject: [PATCH] Prepare for PRoot release v5.4.0

Prepare for CARE release v2.3.0
---
 CHANGELOG.rst         | 25 ++++++++++++++++++++++++-
 doc/care/manual.rst   |  4 ++--
 doc/howto-release.rst |  4 ++--
 doc/proot/manual.rst  |  4 ++--
 src/cli/care.h        |  2 +-
 src/cli/proot.h       |  2 +-
 6 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 6b15b975..8c8e15f9 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -11,6 +11,29 @@ Unreleased
 
 Please see `Unreleased Changes`_ for more information.
 
+5.4.0 - 2023-05-13
+------------------
+
+Added
+~~~~~
+
+- faccessat2 syscall
+- Enable SonarCloud for GitHub Actions
+- Include uthash v2.3.0 as submodule
+- Disable mixed execution with new --mixed-mode option
+
+Changed
+~~~~~~~
+
+- Rename test-0cf405b0.c to fix_memory_corruption_execve_proc_self_exe.c
+
+Fixed
+~~~~~
+
+- Android compatibility with cwd
+- Running test-0cf405b0 for newer versions of glibc
+- Running test-25069c12 and test-25069c13 on newer kernels
+
 5.3.1 - 2022-04-24
 ------------------
 
@@ -221,6 +244,6 @@ Fixed
 
 -  Non-executable stack for binaries.
 
-.. _Unreleased Changes: https://github.com/proot-me/proot/compare/v5.3.1...master
+.. _Unreleased Changes: https://github.com/proot-me/proot/compare/v5.4.0...master
 .. _Keep a Changelog: https://keepachangelog.com/en/1.0.0
 .. _Semantic Versioning: https://semver.org/spec/v2.0.0.html
diff --git a/doc/care/manual.rst b/doc/care/manual.rst
index 831fbe7e..1c19a078 100644
--- a/doc/care/manual.rst
+++ b/doc/care/manual.rst
@@ -6,8 +6,8 @@
 Comprehensive Archiver for Reproducible Execution
 -------------------------------------------------
 
-:Date: 2014-09-15
-:Version: 2.2
+:Date: 2023-05-13
+:Version: 2.3.0
 :Manual section: 1
 
 
diff --git a/doc/howto-release.rst b/doc/howto-release.rst
index c41dfc5f..6f624e13 100644
--- a/doc/howto-release.rst
+++ b/doc/howto-release.rst
@@ -41,8 +41,8 @@ Static Binaries
 The following commands will generate statically-linked binaries
 which can be optionally distributed for each release::
 
-    make -C src loader.elf loader-m32.elf build.h
-    LDFLAGS="${LDFLAGS} -static" make -C src proot
+    make -C src clean loader.elf loader-m32.elf build.h
+    LDFLAGS="${LDFLAGS} -static" make -C src proot care
 
 Documentation Update
 --------------------
diff --git a/doc/proot/manual.rst b/doc/proot/manual.rst
index a6603786..65dd4085 100644
--- a/doc/proot/manual.rst
+++ b/doc/proot/manual.rst
@@ -6,8 +6,8 @@
 ``chroot``, ``mount --bind``, and ``binfmt_misc`` without privilege/setup
 -------------------------------------------------------------------------
 
-:Date: 2022-01-04
-:Version: 5.3.0
+:Date: 2023-05-13
+:Version: 5.4.0
 :Manual section: 1
 
 
diff --git a/src/cli/care.h b/src/cli/care.h
index 69f3645a..4cbf69f2 100644
--- a/src/cli/care.h
+++ b/src/cli/care.h
@@ -6,7 +6,7 @@
 #include "cli/cli.h"
 
 #ifndef VERSION
-#define VERSION "2.2"
+#define VERSION "2.3.0"
 #endif
 
 #define CARE_MAX_SIZE 1024
diff --git a/src/cli/proot.h b/src/cli/proot.h
index d363d8de..85366b6f 100644
--- a/src/cli/proot.h
+++ b/src/cli/proot.h
@@ -6,7 +6,7 @@
 #include "cli/cli.h"
 
 #ifndef VERSION
-#define VERSION "5.3.0"
+#define VERSION "5.4.0"
 #endif
 
 static const char *recommended_bindings[] = {