update proxmox-mini-journalreader to 1.5

Signed-off-by: Wolfgang <github@linux-dude.de>

build.sh

@@ -406,8 +406,8 @@ else
 	echo "pve-xtermjs up-to-date"
 fi
 
-PROXMOX_JOURNALREADER_VER="1.4.0"
+PROXMOX_JOURNALREADER_VER="1.5"
-PROXMOX_JOURNALREADER_GIT="66c4d47b853fbeddf1ddb725ac8e3908452554cb"
+PROXMOX_JOURNALREADER_GIT="a3afed6c1a743525b00d514ffc066e523784dcf3"
 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
@@ -418,7 +418,7 @@ if [ ! -e "${PACKAGES}/proxmox-mini-journalreader_${PROXMOX_JOURNALREADER_VER}_$
 	set_package_info
 	${SUDO} apt -y -a${PACKAGE_ARCH} build-dep .
 	make deb
-	mv -f proxmox-mini-journalreader{,-dbgsym}_${PROXMOX_JOURNALREADER_VER}_${PACKAGE_ARCH}.* "${PACKAGES}"
+	mv -f proxmox-mini-journalreader{,-dbgsym}_${PROXMOX_JOURNALREADER_VER}_${PACKAGE_ARCH}.deb "${PACKAGES}"
 	cd ..
 else
 	echo "proxmox-mini-journalreader up-to-date"

patches/proxmox-mini-journalreader-cross.patch

@@ -1,30 +1,39 @@
 diff --git a/Makefile b/Makefile
-index 1a32c86..b1a4e0a 100644
+index 615c077..50a72ac 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -7,7 +7,7 @@ GITVERSION:=$(shell git rev-parse HEAD)
+@@ -7,8 +7,8 @@ GITVERSION:=$(shell git rev-parse HEAD)
  
  BUILDDIR ?= $(PACKAGE)-$(DEB_VERSION_UPSTREAM)
  
 -DEB=$(PACKAGE)_$(DEB_VERSION_UPSTREAM_REVISION)_$(DEB_BUILD_ARCH).deb
+-DBGDEB=$(PACKAGE)-dbgsym_$(DEB_VERSION_UPSTREAM_REVISION)_$(DEB_BUILD_ARCH).deb
 +DEB=$(PACKAGE)_$(DEB_VERSION_UPSTREAM_REVISION)_$(DEB_HOST_ARCH).deb
- DBGDEB=$(PACKAGE)-dbgsym_$(DEB_VERSION_UPSTREAM_REVISION)_$(DEB_BUILD_ARCH).deb
++DBGDEB=$(PACKAGE)-dbgsym_$(DEB_VERSION_UPSTREAM_REVISION)_$(DEB_HOST_ARCH).deb
  DEBS=$(DEB) $(DBGDEB)
  
-@@ -24,7 +24,7 @@ $(BUILDDIR): src debian
+ DSC=$(PACKAGE)_$(DEB_VERSION_UPSTREAM_REVISION).dsc
- deb: $(DEBS)
+@@ -24,13 +24,13 @@ $(BUILDDIR): src debian
- $(DEBS): $(DEB)
+ deb: $(DEB)
+ $(DBGDEB): $(DEB)
  $(DEB): $(BUILDDIR)
 -	cd $(BUILDDIR); dpkg-buildpackage -b -us -uc
 +	cd $(BUILDDIR); dpkg-buildpackage -aarm64 -b -us -uc
- 	lintian $(DEB)
+ 	lintian $(DEBS)
  
  .PHONY: dsc
+ dsc: $(DSC)
+ $(DSC): $(BUILDDIR)
+-	cd $(BUILDDIR); dpkg-buildpackage -S -us -uc -d
++	cd $(BUILDDIR); dpkg-buildpackage -aarm64 -S -us -uc -d
+ 	lintian $(DSC)
+ 
+ sbuild: $(DSC)
 diff --git a/src/Makefile b/src/Makefile
-index 449004f..f437733 100644
+index 6807b67..3f31c07 100644
 --- a/src/Makefile
 +++ b/src/Makefile
-@@ -13,7 +13,7 @@ LDFLAGS += $(shell pkg-config --libs $(LIBS))
+@@ -14,7 +14,7 @@ LDFLAGS += $(shell pkg-config --libs $(LIBS))
  all: $(PROGRAM)
  
  $(PROGRAM): $(SOURCES)
@@ -32,4 +41,4 @@ index 449004f..f437733 100644
 +	${CC} $< -o $@ $(CFLAGS) $(LDFLAGS)
  
  .PHONY: install
- install: $(PROGRAM) mini-journalreader.1
+ install: $(PROGRAM) $(MANPAGE)

patches/proxmox-mini-journalreader.patch

@@ -1,17 +1,26 @@
 diff --git a/src/mini-journalreader.c b/src/mini-journalreader.c
-index 98bcaac..4fc5415 100644
+index 0489d4a..8fccb99 100644
 --- a/src/mini-journalreader.c
 +++ b/src/mini-journalreader.c
-@@ -169,7 +169,7 @@ static bool print_field(sd_journal *j, const char *field) {
+@@ -64,7 +64,7 @@ static void print_error_and_exit(const char *fmt, ...) {
+         fprintf(stdout, "], \"error\":\"");
+         for (int i = 0; i < message_len; i++) {
+             char c = message[i];
+-            if (c == '"' || c == '\\' || (c >= 0 && c <= 0x1F)) {
++            if (c == '"' || c == '\\' || c <= 0x1F) {
+                 fprintf(stdout, "\\u%04X", c);
+             } else {
+                 fprintf(stdout, "%c", c);
+@@ -216,7 +216,7 @@ static bool print_field(sd_journal *j, const char *field) {
      if (json) {
          char tmp[7];
-         for (size_t i = 0; i < l;i++) {
+         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) {
++            if (d[i] == '"' || d[i] == '\\' || d[i] <= 0x1F) {
                  sprintf(tmp, "\\u%04X", d[i]);
                  print_to_buf(tmp, 6);
              } else {
-@@ -257,10 +257,12 @@ int main(int argc, char *argv[]) {
+@@ -305,10 +305,12 @@ int main(int argc, char *argv[]) {
      uint64_t begin = 0;
      uint64_t end = 0;
      char c;
@@ -19,9 +28,9 @@ index 98bcaac..4fc5415 100644
  
      progname = argv[0];
  
--    while ((c = (char)getopt (argc, argv, "b:e:d:n:f:t:jh")) != -1) {
+-    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) {
++    while ((getopt(argc, argv, "b:e:d:n:f:t:jh")) != -1) {
-+        c = (char) opt;
++	c = (char) opt;
          switch (c) {
-             case 'b':
+         case 'b':
-                 begin = arg_to_uint64(optarg);
+             begin = arg_to_uint64(optarg);