From 9cb8b7fa76b5d76dcacf4c93b139129e2e7d0ce6 Mon Sep 17 00:00:00 2001 From: Wolfgang Date: Thu, 18 May 2023 19:54:39 +0000 Subject: [PATCH] update promox-mini-journalreader to 1.4.0 --- build.sh | 4 ++-- patches/proxmox-mini-journalreader.patch | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/build.sh b/build.sh index 38ef2e4..08f0da8 100755 --- a/build.sh +++ b/build.sh @@ -248,8 +248,8 @@ else echo "pve-xtermjs up-to-date" fi -PROXMOX_JOURNALREADER_VER="1.3-1" -PROXMOX_JOURNALREADER_GIT="09cd4c8e692c5d357fa360e600a34dc3036cda59" +PROXMOX_JOURNALREADER_VER="1.4.0" +PROXMOX_JOURNALREADER_GIT="66c4d47b853fbeddf1ddb725ac8e3908452554cb" if [ ! -e "${PACKAGES}/proxmox-mini-journalreader_${PROXMOX_JOURNALREADER_VER}_${PACKAGE_ARCH}.deb" ]; then git_clone_or_fetch https://git.proxmox.com/git/proxmox-mini-journalreader.git git_clean_and_checkout ${PROXMOX_JOURNALREADER_GIT} proxmox-mini-journalreader diff --git a/patches/proxmox-mini-journalreader.patch b/patches/proxmox-mini-journalreader.patch index 09c3e63..3e6dad4 100644 --- a/patches/proxmox-mini-journalreader.patch +++ b/patches/proxmox-mini-journalreader.patch @@ -1,17 +1,17 @@ diff --git a/src/mini-journalreader.c b/src/mini-journalreader.c -index 7ce7857..520fb1e 100644 +index 98bcaac..4fc5415 100644 --- a/src/mini-journalreader.c +++ b/src/mini-journalreader.c -@@ -174,7 +174,7 @@ static bool print_field(sd_journal *j, const char *field) { +@@ -169,7 +169,7 @@ static bool print_field(sd_journal *j, const char *field) { if (json) { - char tmp[7]; - for (size_t i = 0; i < l;i++) { -- if (d[i] == '"' || d[i] == '\\' || (d[i] >= 0 && d[i] <= 0x1F)) { + char tmp[7]; + for (size_t i = 0; i < l;i++) { +- if (d[i] == '"' || d[i] == '\\' || (d[i] >= 0 && d[i] <= 0x1F)) { + if (d[i] == '"' || d[i] == '\\' || d[i] <= 0x1F) { - sprintf(tmp, "\\u%04X", d[i]); - print_to_buf(tmp, 6); - } else { -@@ -263,10 +263,12 @@ int main(int argc, char *argv[]) { + sprintf(tmp, "\\u%04X", d[i]); + print_to_buf(tmp, 6); + } else { +@@ -257,10 +257,12 @@ int main(int argc, char *argv[]) { uint64_t begin = 0; uint64_t end = 0; char c;