diff --git a/build.sh b/build.sh index 6189759..fab6ebe 100755 --- a/build.sh +++ b/build.sh @@ -162,8 +162,8 @@ else echo "pve-xtermjs up-to-date" fi -PROXMOX_JOURNALREADER_VER="1.2-1" -PROXMOX_JOURNALREADER_GIT="5ce05d16f63b5bddc0ffffa7070c490763eeda22" +PROXMOX_JOURNALREADER_VER="1.3-1" +PROXMOX_JOURNALREADER_GIT="09cd4c8e692c5d357fa360e600a34dc3036cda59" if [ ! -e "${PACKAGES}/proxmox-mini-journalreader_${PROXMOX_JOURNALREADER_VER}_arm64.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 68aaf28..09c3e63 100644 --- a/patches/proxmox-mini-journalreader.patch +++ b/patches/proxmox-mini-journalreader.patch @@ -1,8 +1,17 @@ diff --git a/src/mini-journalreader.c b/src/mini-journalreader.c -index 92176ac..2e0cfa9 100644 +index 7ce7857..520fb1e 100644 --- a/src/mini-journalreader.c +++ b/src/mini-journalreader.c -@@ -214,10 +214,12 @@ int main(int argc, char *argv[]) { +@@ -174,7 +174,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)) { ++ 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[]) { uint64_t begin = 0; uint64_t end = 0; char c; @@ -10,9 +19,9 @@ index 92176ac..2e0cfa9 100644 progname = argv[0]; -- while ((c = (char)getopt (argc, argv, "b:e:d:n:f:t:h")) != -1) { -+ while ((opt = getopt (argc, argv, "b:e:d:n:f:t:h")) != -1) { -+ c = (char) opt; +- while ((c = (char)getopt (argc, argv, "b:e:d:n:f:t:jh")) != -1) { ++ while ((opt = getopt (argc, argv, "b:e:d:n:f:t:jh")) != -1) { ++ c = (char) opt; switch (c) { case 'b': begin = arg_to_uint64(optarg);