public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/zabbix] f44: 7.4.12
@ 2026-07-09 16:52 Gwyn Ciesla
0 siblings, 0 replies; only message in thread
From: Gwyn Ciesla @ 2026-07-09 16:52 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/zabbix
Branch : f44
Commit : 58378901e3da0d99bef1a66fe341dc80f4f86d33
Author : Gwyn Ciesla <gwync@protonmail.com>
Date : 2026-07-09T11:51:13-05:00
Stats : +63/-63 in 4 file(s)
URL : https://src.fedoraproject.org/rpms/zabbix/c/58378901e3da0d99bef1a66fe341dc80f4f86d33?branch=f44
Log:
7.4.12
---
diff --git a/.gitignore b/.gitignore
index bbc1a7b..5d9666f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -121,3 +121,4 @@ zabbix-1.8.2.tar.gz
/zabbix-7.4.7.tar.gz
/zabbix-7.4.8.tar.gz
/zabbix-7.4.9.tar.gz
+/zabbix-7.4.12.tar.gz
diff --git a/sources b/sources
index e2da8ea..ff25d9e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (zabbix-7.4.9.tar.gz) = 981d12923e8343f8cf189a7aa8bda88912c240e31a73eeb61517c8d7fd1db27b29e8189f7478e9bc89c550f0968a070fe6f8573abbd3f58b319b4b1779517eb0
+SHA512 (zabbix-7.4.12.tar.gz) = 1b1711a8a03e1bf0e62397a6b97981793d241461ae72b4d866a5263017fe4f715c2a670c57fe0e219f44ee56729bd660577348c3c32be93259940d27d08e319d
diff --git a/zabbix-out-of-tree.patch b/zabbix-out-of-tree.patch
index 29f7da3..b584193 100644
--- a/zabbix-out-of-tree.patch
+++ b/zabbix-out-of-tree.patch
@@ -24,19 +24,59 @@ index b217fb5..945a673 100644
$(MKDIR_P) "$(DESTDIR)$(LOAD_MODULE_PATH)"
- 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
---- a/src/zabbix_java/Makefile.am
-+++ b/src/zabbix_java/Makefile.am
-@@ -9,23 +9,23 @@ EXTRA_DIST = \
+diff --git a/src/zabbix_proxy/Makefile.am b/src/zabbix_proxy/Makefile.am
+index b56f8a8..44800a0 100644
+--- a/src/zabbix_proxy/Makefile.am
++++ b/src/zabbix_proxy/Makefile.am
+@@ -151,4 +151,4 @@ install-data-hook:
+ $(MKDIR_P) "$(DESTDIR)$(PROXY_CONFIG_FILE).d"
+ $(MKDIR_P) "$(DESTDIR)$(EXTERNAL_SCRIPTS_PATH)"
+ $(MKDIR_P) "$(DESTDIR)$(LOAD_MODULE_PATH)"
+- 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
+--- a/src/zabbix_server/Makefile.am
++++ b/src/zabbix_server/Makefile.am
+@@ -186,4 +186,4 @@ install-data-hook:
+ $(MKDIR_P) "$(DESTDIR)$(EXTERNAL_SCRIPTS_PATH)"
+ $(MKDIR_P) "$(DESTDIR)$(ALERT_SCRIPTS_PATH)"
+ $(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)"
+diff -up zabbix-7.2.0/configure.ac.out-of-tree zabbix-7.2.0/configure.ac
+--- zabbix-7.2.0/configure.ac.out-of-tree 2024-12-09 04:53:54.274588489 -0700
++++ zabbix-7.2.0/configure.ac 2024-12-11 20:31:44.684746169 -0700
+@@ -22,7 +22,7 @@ AC_CONFIG_MACRO_DIR([m4])
+ AC_CONFIG_SRCDIR([src/zabbix_server/server.c])
+ 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_BUILD
+ AC_CANONICAL_HOST
+--- zabbix-7.4.3/src/go/Makefile.am~ 2025-10-01 09:49:27.351910250 -0500
++++ zabbix-7.4.3/src/go/Makefile.am 2025-10-01 10:33:26.662210424 -0500
+@@ -64,6 +64,7 @@
+ clean-go-build:
+ -$(GO) clean ./...
+ -$(GO) clean -cache
++ -$(GO) clean $(srcdir)/...
+ -rm -f bin/mock_server
+ -rm -f bin/zabbix_agent2
+ -rm -f bin/zabbix_web_service
+--- a/src/zabbix_java/Makefile.am~ 2026-07-07 09:04:30.341683492 -0500
++++ b/src/zabbix_java/Makefile.am 2026-07-09 10:47:55.481651595 -0500
+@@ -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.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
-
+-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/dnsjava-3.6.4.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:$(srcdir)lib/dnsjava-3.6.4.jar
+
-JUNIT = tests/junit-4.8.2.jar
-+JUNIT = $(srcdir)/tests/junit-4.8.2.jar
++JUNIT = $(srcdir)tests/junit-4.8.2.jar
ZJG_DEST = $(DESTDIR)$(sbindir)/zabbix_java
@@ -44,8 +84,8 @@ index 43f8f19..48214c9 100644
-$(ZJG): class src/com/zabbix/gateway/*.java
- $(JAVAC) -d class/src -classpath $(LIB) src/com/zabbix/gateway/*.java
-+$(ZJG): class $(srcdir)/src/com/zabbix/gateway/*.java
-+ $(JAVAC) -d class/src -classpath $(LIB) $(srcdir)/src/com/zabbix/gateway/*.java
++$(ZJG): class $(srcdir)src/com/zabbix/gateway/*.java
++ $(JAVAC) -d class/src -classpath $(LIB) $(srcdir)src/com/zabbix/gateway/*.java
$(JAR) cf $(ZJG) -C class/src .
test: class
@@ -54,14 +94,12 @@ index 43f8f19..48214c9 100644
- $(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) -d class/tests -classpath class/src:$(JUNIT) $(srcdir)/tests/com/zabbix/gateway/*.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
---- a/src/zabbix_js/Makefile.am
-+++ b/src/zabbix_js/Makefile.am
+--- a/src/zabbix_js/Makefile.am.orig 2026-07-09 10:49:49.036634968 -0500
++++ b/src/zabbix_js/Makefile.am 2026-07-09 10:50:03.475753570 -0500
@@ -5,30 +5,30 @@
zabbix_js_SOURCES = zabbix_js.c
@@ -70,7 +108,6 @@ index 1e4fd93..2110656 100644
- $(top_srcdir)/src/libs/zbxembed/libzbxembed.a \
- $(top_srcdir)/src/libs/zbxjson/libzbxjson.a \
- $(top_srcdir)/src/libs/zbxregexp/libzbxregexp.a \
-- $(top_srcdir)/src/libs/zbxalgo/libzbxalgo.a \
- $(top_srcdir)/src/libs/zbxthreads/libzbxthreads.a \
- $(top_srcdir)/src/libs/zbxmutexs/libzbxmutexs.a \
- $(top_srcdir)/src/libs/zbxprof/libzbxprof.a \
@@ -84,6 +121,7 @@ index 1e4fd93..2110656 100644
- $(top_srcdir)/src/libs/zbxhttp/libzbxhttp.a \
- $(top_srcdir)/src/libs/zbxvariant/libzbxvariant.a \
- $(top_srcdir)/src/libs/zbxxml/libzbxxml.a \
+- $(top_srcdir)/src/libs/zbxalgo/libzbxalgo.a \
- $(top_srcdir)/src/libs/zbxstr/libzbxstr.a \
- $(top_srcdir)/src/libs/zbxnum/libzbxnum.a \
- $(top_srcdir)/src/libs/zbxtime/libzbxtime.a \
@@ -94,7 +132,6 @@ index 1e4fd93..2110656 100644
+ $(top_builddir)/src/libs/zbxembed/libzbxembed.a \
+ $(top_builddir)/src/libs/zbxjson/libzbxjson.a \
+ $(top_builddir)/src/libs/zbxregexp/libzbxregexp.a \
-+ $(top_builddir)/src/libs/zbxalgo/libzbxalgo.a \
+ $(top_builddir)/src/libs/zbxthreads/libzbxthreads.a \
+ $(top_builddir)/src/libs/zbxmutexs/libzbxmutexs.a \
+ $(top_builddir)/src/libs/zbxprof/libzbxprof.a \
@@ -108,6 +145,7 @@ index 1e4fd93..2110656 100644
+ $(top_builddir)/src/libs/zbxhttp/libzbxhttp.a \
+ $(top_builddir)/src/libs/zbxvariant/libzbxvariant.a \
+ $(top_builddir)/src/libs/zbxxml/libzbxxml.a \
++ $(top_builddir)/src/libs/zbxalgo/libzbxalgo.a \
+ $(top_builddir)/src/libs/zbxstr/libzbxstr.a \
+ $(top_builddir)/src/libs/zbxnum/libzbxnum.a \
+ $(top_builddir)/src/libs/zbxtime/libzbxtime.a \
@@ -117,45 +155,3 @@ 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
---- a/src/zabbix_proxy/Makefile.am
-+++ b/src/zabbix_proxy/Makefile.am
-@@ -151,4 +151,4 @@ install-data-hook:
- $(MKDIR_P) "$(DESTDIR)$(PROXY_CONFIG_FILE).d"
- $(MKDIR_P) "$(DESTDIR)$(EXTERNAL_SCRIPTS_PATH)"
- $(MKDIR_P) "$(DESTDIR)$(LOAD_MODULE_PATH)"
-- 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
---- a/src/zabbix_server/Makefile.am
-+++ b/src/zabbix_server/Makefile.am
-@@ -186,4 +186,4 @@ install-data-hook:
- $(MKDIR_P) "$(DESTDIR)$(EXTERNAL_SCRIPTS_PATH)"
- $(MKDIR_P) "$(DESTDIR)$(ALERT_SCRIPTS_PATH)"
- $(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)"
-diff -up zabbix-7.2.0/configure.ac.out-of-tree zabbix-7.2.0/configure.ac
---- zabbix-7.2.0/configure.ac.out-of-tree 2024-12-09 04:53:54.274588489 -0700
-+++ zabbix-7.2.0/configure.ac 2024-12-11 20:31:44.684746169 -0700
-@@ -22,7 +22,7 @@ AC_CONFIG_MACRO_DIR([m4])
- AC_CONFIG_SRCDIR([src/zabbix_server/server.c])
- 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_BUILD
- AC_CANONICAL_HOST
---- zabbix-7.4.3/src/go/Makefile.am~ 2025-10-01 09:49:27.351910250 -0500
-+++ zabbix-7.4.3/src/go/Makefile.am 2025-10-01 10:33:26.662210424 -0500
-@@ -64,6 +64,7 @@
- clean-go-build:
- -$(GO) clean ./...
- -$(GO) clean -cache
-+ -$(GO) clean $(srcdir)/...
- -rm -f bin/mock_server
- -rm -f bin/zabbix_agent2
- -rm -f bin/zabbix_web_service
diff --git a/zabbix.spec b/zabbix.spec
index 6d87dd5..5b40b6c 100644
--- a/zabbix.spec
+++ b/zabbix.spec
@@ -16,8 +16,8 @@
Name: zabbix
Epoch: 1
-Version: 7.4.9
-Release: 3%{?dist}
+Version: 7.4.12
+Release: 1%{?dist}
Summary: Open-source monitoring solution for your IT infrastructure
# TODO - Note additional licenses in src/go when we start building with go
@@ -839,6 +839,9 @@ fi
%files web-pgsql
%changelog
+* Thu Jul 09 2026 Gwyn Ciesla <gwync@protonmail.com> - 1:7.4.12-1
+- 7.4.12
+
* Sat Jun 13 2026 Yaakov Selkowitz <yselkowi@redhat.com> - 1:7.4.9-3
- Rebuilt for openssl 4.0
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-07-09 16:52 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-07-09 16:52 [rpms/zabbix] f44: 7.4.12 Gwyn Ciesla
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox