Compare commits
9 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
9fc67a1c4d | ||
|
|
589e3abddf | ||
|
|
e519ea660d | ||
|
|
2be2e7b694 | ||
|
|
60dcdb24f6 | ||
|
|
27eebef3e9 | ||
|
|
6533d82c20 | ||
|
|
c4c6622648 | ||
|
53b0d7113f |
4 changed files with 60 additions and 24 deletions
8
.gitignore
vendored
8
.gitignore
vendored
|
|
@ -106,3 +106,11 @@ zabbix-1.8.2.tar.gz
|
|||
/zabbix-7.0.4.tar.gz
|
||||
/zabbix-7.0.5.tar.gz
|
||||
/zabbix-7.0.6.tar.gz
|
||||
/zabbix-7.0.11.tar.gz
|
||||
/zabbix-7.0.15.tar.gz
|
||||
/zabbix-7.0.16.tar.gz
|
||||
/zabbix-7.0.17.tar.gz
|
||||
/zabbix-7.0.18.tar.gz
|
||||
/zabbix-7.0.19.tar.gz
|
||||
/zabbix-7.0.20.tar.gz
|
||||
/zabbix-7.0.21.tar.gz
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (zabbix-7.0.6.tar.gz) = ea74e1b45487333579cfe3c421d9467895efc3ce511fc4795b6e18950128ee9ead6599934b7dcb3aa393f32fd81847b48c61924196d111e99f26f65b620d83aa
|
||||
SHA512 (zabbix-7.0.21.tar.gz) = 0c3d1972082695e6c82df07ab41df6c1d82f4c80978a56c32bc27b6a8d5cc3793185910a34c5c068b8c2322b63d05b254fde4f2afa0fbed8311140f71a6dc77c
|
||||
|
|
|
|||
|
|
@ -1,5 +1,18 @@
|
|||
diff --git a/configure.ac b/configure.ac
|
||||
index 3bf77ab..aa050ef 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -24,7 +24,7 @@ AC_PROG_MAKE_SET
|
||||
|
||||
AC_CONFIG_HEADERS(include/common/config.h)
|
||||
|
||||
-AC_SUBST(DEFAULT_INCLUDES, ['-I$(top_srcdir)/include/common -I$(top_srcdir)/include'])
|
||||
+AC_SUBST(DEFAULT_INCLUDES, ['-I$(top_builddir)/include/common -I$(top_srcdir)/include/common -I$(top_srcdir)/include'])
|
||||
|
||||
AC_CANONICAL_HOST
|
||||
|
||||
diff --git a/src/go/Makefile.am b/src/go/Makefile.am
|
||||
index 3e24aa0..308e34b 100644
|
||||
index 3e24aa0..e1fac61 100644
|
||||
--- a/src/go/Makefile.am
|
||||
+++ b/src/go/Makefile.am
|
||||
@@ -67,6 +67,7 @@ clean: clean-go-build clean-sbom
|
||||
|
|
@ -23,7 +36,7 @@ index 3e24aa0..308e34b 100644
|
|||
$(INSTALL_DATA) $${_f} "$(DESTDIR)$(AGENT2_PLUGIN_CONFIG_DIR)"; \
|
||||
done)
|
||||
diff --git a/src/zabbix_agent/Makefile.am b/src/zabbix_agent/Makefile.am
|
||||
index b217fb5..945a673 100644
|
||||
index b217fb5..1afa36b 100644
|
||||
--- a/src/zabbix_agent/Makefile.am
|
||||
+++ b/src/zabbix_agent/Makefile.am
|
||||
@@ -69,4 +69,4 @@ zabbix_agentd_CFLAGS = \
|
||||
|
|
@ -33,16 +46,17 @@ index b217fb5..945a673 100644
|
|||
- test -f "$(DESTDIR)$(AGENT_CONFIG_FILE)" || cp "../../conf/zabbix_agentd.conf" "$(DESTDIR)$(AGENT_CONFIG_FILE)"
|
||||
+ test -f "$(DESTDIR)$(AGENT_CONFIG_FILE)" || cp "$(top_srcdir)/conf/zabbix_agentd.conf" "$(DESTDIR)$(AGENT_CONFIG_FILE)"
|
||||
diff --git a/src/zabbix_java/Makefile.am b/src/zabbix_java/Makefile.am
|
||||
index 43f8f19..48214c9 100644
|
||||
index 7b410ed..b3bb5b9 100644
|
||||
--- a/src/zabbix_java/Makefile.am
|
||||
+++ b/src/zabbix_java/Makefile.am
|
||||
@@ -9,22 +9,22 @@ EXTRA_DIST = \
|
||||
@@ -9,23 +9,23 @@ EXTRA_DIST = \
|
||||
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
|
||||
|
|
@ -60,16 +74,16 @@ index 43f8f19..48214c9 100644
|
|||
chmod 600 tests/com/zabbix/gateway/jmx_test_beans/jmxremote.password
|
||||
- $(JAVAC) tests/com/zabbix/gateway/jmx_test_beans/*.java
|
||||
- $(JAVAC) -d class/tests -classpath class/src:$(JUNIT) tests/com/zabbix/gateway/*.java
|
||||
+ $(JAVAC) tests/com/zabbix/gateway/jmx_$(srcdir)/test_beans/*.java
|
||||
+ $(JAVAC) $(srcdir)/tests/com/zabbix/gateway/jmx_test_beans/*.java
|
||||
+ $(JAVAC) -d class/tests -classpath class/src:$(JUNIT) $(srcdir)/tests/com/zabbix/gateway/*.java
|
||||
java -classpath class/tests:$(LIB):$(ZJG):$(JUNIT) com.zabbix.gateway.AllTestRunner
|
||||
|
||||
class:
|
||||
diff --git a/src/zabbix_js/Makefile.am b/src/zabbix_js/Makefile.am
|
||||
index 1e4fd93..2110656 100644
|
||||
index 1e4fd93..534db83 100644
|
||||
--- a/src/zabbix_js/Makefile.am
|
||||
+++ b/src/zabbix_js/Makefile.am
|
||||
@@ -5,30 +5,30 @@
|
||||
@@ -5,30 +5,30 @@ bin_PROGRAMS = zabbix_js
|
||||
zabbix_js_SOURCES = zabbix_js.c
|
||||
|
||||
zabbix_js_LDADD = \
|
||||
|
|
@ -125,7 +139,7 @@ index 1e4fd93..2110656 100644
|
|||
zabbix_js_LDADD += @ZBXJS_LIBS@ $(LIBXML2_LIBS)
|
||||
|
||||
diff --git a/src/zabbix_proxy/Makefile.am b/src/zabbix_proxy/Makefile.am
|
||||
index b56f8a8..44800a0 100644
|
||||
index b56f8a8..4c7dcf6 100644
|
||||
--- a/src/zabbix_proxy/Makefile.am
|
||||
+++ b/src/zabbix_proxy/Makefile.am
|
||||
@@ -151,4 +151,4 @@ install-data-hook:
|
||||
|
|
@ -135,7 +149,7 @@ index b56f8a8..44800a0 100644
|
|||
- test -f "$(DESTDIR)$(PROXY_CONFIG_FILE)" || cp "../../conf/zabbix_proxy.conf" "$(DESTDIR)$(PROXY_CONFIG_FILE)"
|
||||
+ test -f "$(DESTDIR)$(PROXY_CONFIG_FILE)" || cp "$(top_srcdir)/conf/zabbix_proxy.conf" "$(DESTDIR)$(PROXY_CONFIG_FILE)"
|
||||
diff --git a/src/zabbix_server/Makefile.am b/src/zabbix_server/Makefile.am
|
||||
index 0a55934..a7f6a28 100644
|
||||
index 0a55934..61ce877 100644
|
||||
--- a/src/zabbix_server/Makefile.am
|
||||
+++ b/src/zabbix_server/Makefile.am
|
||||
@@ -186,4 +186,4 @@ install-data-hook:
|
||||
|
|
@ -144,14 +158,3 @@ index 0a55934..a7f6a28 100644
|
|||
$(MKDIR_P) "$(DESTDIR)$(LOAD_MODULE_PATH)"
|
||||
- test -f "$(DESTDIR)$(SERVER_CONFIG_FILE)" || cp "../../conf/zabbix_server.conf" "$(DESTDIR)$(SERVER_CONFIG_FILE)"
|
||||
+ test -f "$(DESTDIR)$(SERVER_CONFIG_FILE)" || cp "$(top_srcdir)/conf/zabbix_server.conf" "$(DESTDIR)$(SERVER_CONFIG_FILE)"
|
||||
--- zabbix-7.0.3/configure.ac.out-of-tree 2024-08-19 14:38:13.426482392 -0600
|
||||
+++ zabbix-7.0.3/configure.ac 2024-08-19 14:40:30.842129965 -0600
|
||||
@@ -24,7 +24,7 @@
|
||||
|
||||
AC_CONFIG_HEADERS(include/common/config.h)
|
||||
|
||||
-AC_SUBST(DEFAULT_INCLUDES, ['-I$(top_srcdir)/include/common -I$(top_srcdir)/include'])
|
||||
+AC_SUBST(DEFAULT_INCLUDES, ['-I$(top_builddir)/include/common -I$(top_srcdir)/include/common -I$(top_srcdir)/include'])
|
||||
|
||||
AC_CANONICAL_HOST
|
||||
|
||||
|
|
|
|||
27
zabbix.spec
27
zabbix.spec
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
Name: zabbix
|
||||
Epoch: 1
|
||||
Version: 7.0.6
|
||||
Version: 7.0.21
|
||||
Release: 1%{?dist}
|
||||
Summary: Open-source monitoring solution for your IT infrastructure
|
||||
|
||||
|
|
@ -838,6 +838,31 @@ fi
|
|||
%files web-pgsql
|
||||
|
||||
%changelog
|
||||
* Mon Nov 03 2025 Gwyn Ciesla <gwync@protonmail.com> - 1:7.0.21-1
|
||||
- 7.0.21
|
||||
|
||||
* Wed Oct 29 2025 Gwyn Ciesla <gwync@protonmail.com> - 1:7.0.20-1
|
||||
- 7.0.20
|
||||
|
||||
* Tue Sep 30 2025 Gwyn Ciesla <gwync@protonmail.com> - 1:7.0.19-1
|
||||
- 7.0.19
|
||||
|
||||
* Mon Aug 25 2025 Gwyn Ciesla <gwync@protonmail.com> - 1:7.0.18-1
|
||||
- 7.0.18
|
||||
|
||||
* Wed Jul 23 2025 Gwyn Ciesla <gwync@protonmail.com> - 1:7.0.17-1
|
||||
- 7.0.17
|
||||
|
||||
* Fri Jun 27 2025 Gwyn Ciesla <gwync@protonmail.com> - 1:7.0.16-1
|
||||
- 7.0.16
|
||||
|
||||
* Fri Jun 20 2025 Gwyn Ciesla <gwync@protonmail.com> - 1:7.0.15-1
|
||||
- 7.0.15
|
||||
|
||||
* Wed Apr 02 2025 Orion Poplawski <orion@nwra.com> - 1:7.0.11-1
|
||||
- Update to 7.0.11 (CVE-2024-36465, CVE-2024-36469, CVE-2024-42325,
|
||||
CVE-2024-45699, CVE-2024-45700)
|
||||
|
||||
* Sat Nov 30 2024 Orion Poplawski <orion@nwra.com> - 1:7.0.6-1
|
||||
- Update to 7.0.6
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue