public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Gwyn Ciesla <gwync@protonmail.com>
To: git-commits@fedoraproject.org
Subject: [rpms/zabbix] rawhide: 7.4.15
Date: Wed, 23 Sep 2026 18:44:25 GMT [thread overview]
Message-ID: <179018906577.1.15501059143487040832.rpms-zabbix-8be5ef49f711@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/zabbix
Branch : rawhide
Commit : 8be5ef49f711acab38578c88040df9c96b4a6030
Author : Gwyn Ciesla <gwync@protonmail.com>
Date : 2026-09-23T13:42:59-05:00
Stats : +39/-35 in 4 file(s)
URL : https://src.fedoraproject.org/rpms/zabbix/c/8be5ef49f711acab38578c88040df9c96b4a6030?branch=rawhide
Log:
7.4.15
---
diff --git a/.gitignore b/.gitignore
index cf2dbe2..d129587 100644
--- a/.gitignore
+++ b/.gitignore
@@ -124,3 +124,4 @@ zabbix-1.8.2.tar.gz
/zabbix-7.4.12.tar.gz
/zabbix-7.4.13.tar.gz
/zabbix-7.4.14.tar.gz
+/zabbix-7.4.15.tar.gz
diff --git a/sources b/sources
index 5e8c08d..bc4ede4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (zabbix-7.4.14.tar.gz) = 98b26bfcd3b1803b23d85af70094fe875d138263cabbc4f6fa5c63ea9b07c4bedaa86eeed79ede74919f55515d6c17408391ea999ed204948320dc8ec29bbdc6
+SHA512 (zabbix-7.4.15.tar.gz) = 71b2ec636fcbaa0e229046a4eab7eb1c3c323cd95e8993728fdf4e6675a775abd33d775e4dcee4d87288cc63f764e5bb2112ed134726f6192e79a697cb19e203
diff --git a/zabbix-out-of-tree.patch b/zabbix-out-of-tree.patch
index b584193..c9a1164 100644
--- a/zabbix-out-of-tree.patch
+++ b/zabbix-out-of-tree.patch
@@ -66,38 +66,6 @@ diff -up zabbix-7.2.0/configure.ac.out-of-tree zabbix-7.2.0/configure.ac
-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/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
-
- ZJG_DEST = $(DESTDIR)$(sbindir)/zabbix_java
-
- all: $(ZJG)
-
--$(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
- $(JAR) cf $(ZJG) -C class/src .
-
- test: class
- echo "badger useruser" > tests/com/zabbix/gateway/jmx_test_beans/jmxremote.password
- 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) -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:
--- 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 @@
@@ -155,3 +123,35 @@ diff -up zabbix-7.2.0/configure.ac.out-of-tree zabbix-7.2.0/configure.ac
zabbix_js_LDADD += @ZBXJS_LIBS@ $(LIBXML2_LIBS)
+--- a/src/zabbix_java/Makefile.am~ 2026-09-16 01:04:26.892321976 -0500
++++ b/src/zabbix_java/Makefile.am 2026-09-23 13:12:10.223763816 -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.25.jar:lib/logback-classic-1.5.25.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.25.jar:$(srcdir)lib/logback-classic-1.5.25.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
+
+ ZJG_DEST = $(DESTDIR)$(sbindir)/zabbix_java
+
+ all: $(ZJG)
+
+-$(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
+ $(JAR) cf $(ZJG) -C class/src .
+
+ test: $(ZJG)
+ echo "badger useruser" > tests/com/zabbix/gateway/jmx_test_beans/jmxremote.password
+ 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) -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/zabbix.spec b/zabbix.spec
index ca67aed..e5dac21 100644
--- a/zabbix.spec
+++ b/zabbix.spec
@@ -16,8 +16,8 @@
Name: zabbix
Epoch: 1
-Version: 7.4.14
-Release: 2%{?dist}
+Version: 7.4.15
+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
+* Wed Sep 23 2026 Gwyn Ciesla <gwync@protonmail.com> - 1:7.4.15-1
+- 7.4.15
+
* Fri Sep 11 2026 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1:7.4.14-2
- Rebuilt for libxml-2.5.4
reply other threads:[~2026-09-23 18:44 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=179018906577.1.15501059143487040832.rpms-zabbix-8be5ef49f711@fedoraproject.org \
--to=gwync@protonmail.com \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox