summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCoprDistGit <infra@openeuler.org>2025-01-28 18:09:45 +0000
committerCoprDistGit <infra@openeuler.org>2025-01-28 18:09:46 +0000
commit234c16f1fc1ee7bec43aad07359694c7e3d90a37 (patch)
treedca029a0bd81a570401d0f44782275e1e64f9b09
parenta8a67d4e7d4634ed79e41e046b78243959579aba (diff)
automatic import of zabbixopeneuler22.03_LTS
-rw-r--r--zabbix-out-of-tree.patch7
1 files changed, 4 insertions, 3 deletions
diff --git a/zabbix-out-of-tree.patch b/zabbix-out-of-tree.patch
index 59d3e6d..b35dae3 100644
--- a/zabbix-out-of-tree.patch
+++ b/zabbix-out-of-tree.patch
@@ -667,13 +667,14 @@ diff -up zabbix-6.0.25/src/zabbix_get/Makefile.am zabbix-6.0.25/src/zabbix_get/M
diff -up zabbix-6.0.25/src/zabbix_java/Makefile.am zabbix-6.0.25/src/zabbix_java/Makefile.am
--- zabbix-6.0.25/src/zabbix_java/Makefile.am 2024-01-27 12:18:09.889569717 +0800
+++ zabbix-6.0.25/src/zabbix_java/Makefile.am 2024-01-27 12:26:48.421352435 +0800
-@@ -9,22 +9,22 @@
+@@ -9,23 +9,23 @@
startup.sh
ZJG = bin/zabbix-java-gateway-$(VERSION).jar
--LIB = lib/android-json-4.3_r3.1.jar:lib/logback-core-1.2.9.jar:lib/logback-classic-1.2.9.jar:lib/slf4j-api-1.7.32.jar
+-LIB = lib/android-json-4.3_r3.1.jar:lib/logback-core-1.5.16.jar:lib/logback-classic-1.5.16.jar:lib/slf4j-api-2.0.16.jar
++LIB = $(srcdir)/lib/android-json-4.3_r3.1.jar:$(srcdir)/lib/logback-core-1.5.16.jar:$(srcdir)/lib/logback-classic-1.5.16.jar:$(srcdir)/lib/slf4j-api-2.0.16.jar
+
-JUNIT = tests/junit-4.8.2.jar
-+LIB = $(srcdir)/lib/android-json-4.3_r3.1.jar:$(srcdir)/lib/logback-core-1.2.3.jar:$(srcdir)/lib/logback-classic-1.2.3.jar:$(srcdir)/lib/slf4j-api-1.7.30.jar
+JUNIT = $(srcdir)/tests/junit-4.8.2.jar
ZJG_DEST = $(DESTDIR)$(sbindir)/zabbix_java