From 5d76fcd4475ee81f79b68533ab79ef9a188def94 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Wed, 10 Sep 2025 15:38:30 +0300 Subject: [PATCH] Update to 6.0.41.release1 --- .gitignore | 2 +- .zabbix.metadata | 2 +- SOURCES/el6.conf.patch | 21 ++ SOURCES/fping3-sourceip-option.patch | 10 +- ...a-gateway.patch => java-gateway-el8.patch} | 33 +- SOURCES/java-gateway-el9.patch | 15 + SOURCES/zabbix-proxy.service | 7 + SOURCES/zabbix-server.service | 7 + SOURCES/zabbix_java_gateway_openjdk11.env | 6 + SOURCES/zabbix_java_gateway_openjdk17.env | 6 + SOURCES/zabbix_java_gateway_openjdk21.env | 6 + SPECS/zabbix.spec | 347 +++++++++++++++--- 12 files changed, 395 insertions(+), 67 deletions(-) create mode 100644 SOURCES/el6.conf.patch rename SOURCES/{java-gateway.patch => java-gateway-el8.patch} (58%) create mode 100644 SOURCES/java-gateway-el9.patch create mode 100755 SOURCES/zabbix_java_gateway_openjdk11.env create mode 100755 SOURCES/zabbix_java_gateway_openjdk17.env create mode 100755 SOURCES/zabbix_java_gateway_openjdk21.env diff --git a/.gitignore b/.gitignore index b1e82b9..3065f29 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/zabbix-6.0.17.tar.gz +SOURCES/zabbix-6.0.41.tar.gz diff --git a/.zabbix.metadata b/.zabbix.metadata index 7335cda..72ea4d5 100644 --- a/.zabbix.metadata +++ b/.zabbix.metadata @@ -1 +1 @@ -0a1665c7179e889de1a96fdbcd2fcc6134425d15 SOURCES/zabbix-6.0.17.tar.gz +415272daba1171021d6f51f4414b12942b5dccab SOURCES/zabbix-6.0.41.tar.gz diff --git a/SOURCES/el6.conf.patch b/SOURCES/el6.conf.patch new file mode 100644 index 0000000..4ff4664 --- /dev/null +++ b/SOURCES/el6.conf.patch @@ -0,0 +1,21 @@ +diff -urN zabbix-7.0.11.orig/src/go/conf/zabbix_agent2.conf zabbix-7.0.11/src/go/conf/zabbix_agent2.conf +--- zabbix-7.0.11.orig/src/go/conf/zabbix_agent2.conf 2025-04-03 14:18:59.882000816 +0000 ++++ zabbix-7.0.11/src/go/conf/zabbix_agent2.conf 2025-04-03 14:20:30.646802177 +0000 +@@ -311,7 +311,7 @@ + # Default:/tmp/agent.plugin.sock + # PluginSocket= + +-PluginSocket=/run/zabbix/agent.plugin.sock ++PluginSocket=/var/run/zabbix/agent.plugin.sock + + ####### USER-DEFINED MONITORED PARAMETERS ####### + +@@ -354,7 +354,7 @@ + # Default: + # ControlSocket= + +-ControlSocket=/run/zabbix/agent.sock ++ControlSocket=/var/run/zabbix/agent.sock + + ####### TLS-RELATED PARAMETERS ####### + diff --git a/SOURCES/fping3-sourceip-option.patch b/SOURCES/fping3-sourceip-option.patch index f1a21e5..d6ecf7f 100644 --- a/SOURCES/fping3-sourceip-option.patch +++ b/SOURCES/fping3-sourceip-option.patch @@ -1,7 +1,7 @@ -diff -urN zabbix-5.0.14.orig/src/libs/zbxicmpping/icmpping.c zabbix-5.0.14/src/libs/zbxicmpping/icmpping.c ---- zabbix-5.0.14.orig/src/libs/zbxicmpping/icmpping.c 2021-07-16 18:09:40.807727222 +0300 -+++ zabbix-5.0.14/src/libs/zbxicmpping/icmpping.c 2021-07-16 18:11:43.121350484 +0300 -@@ -53,34 +53,7 @@ +diff -urN zabbix-7.0.0alpha7.orig/src/libs/zbxicmpping/icmpping.c zabbix-7.0.0alpha7/src/libs/zbxicmpping/icmpping.c +--- zabbix-7.0.0alpha7.orig/src/libs/zbxicmpping/icmpping.c 2023-10-20 15:58:34.762406039 +0300 ++++ zabbix-7.0.0alpha7/src/libs/zbxicmpping/icmpping.c 2023-10-20 15:59:03.290569616 +0300 +@@ -75,36 +75,7 @@ static void get_source_ip_option(const char *fping, const char **option, unsigned char *checked) { @@ -10,6 +10,8 @@ diff -urN zabbix-5.0.14.orig/src/libs/zbxicmpping/icmpping.c zabbix-5.0.14/src/l - - zbx_snprintf(tmp, sizeof(tmp), "%s -h 2>&1", fping); - +- zabbix_log(LOG_LEVEL_DEBUG, "executing %s", tmp); +- - if (NULL == (f = popen(tmp, "r"))) - return; - diff --git a/SOURCES/java-gateway.patch b/SOURCES/java-gateway-el8.patch similarity index 58% rename from SOURCES/java-gateway.patch rename to SOURCES/java-gateway-el8.patch index d4ed997..2716e05 100644 --- a/SOURCES/java-gateway.patch +++ b/SOURCES/java-gateway-el8.patch @@ -1,6 +1,6 @@ -diff -urN 5.4.orig/src/zabbix_java/lib/logback.xml 5.4/src/zabbix_java/lib/logback.xml ---- 5.4.orig/src/zabbix_java/lib/logback.xml 2021-02-03 14:46:36.510530149 +0200 -+++ 5.4/src/zabbix_java/lib/logback.xml 2021-02-03 16:08:48.139648517 +0200 +diff -urN zabbix-6.0.38.orig/src/zabbix_java/lib/logback.xml zabbix-6.0.38/src/zabbix_java/lib/logback.xml +--- zabbix-6.0.38.orig/src/zabbix_java/lib/logback.xml 2025-02-06 10:05:14.762067735 +0200 ++++ zabbix-6.0.38/src/zabbix_java/lib/logback.xml 2025-02-06 10:05:35.122061249 +0200 @@ -2,10 +2,10 @@ @@ -14,9 +14,9 @@ diff -urN 5.4.orig/src/zabbix_java/lib/logback.xml 5.4/src/zabbix_java/lib/logba 1 3 -diff -urN 5.4.orig/src/zabbix_java/settings.sh 5.4/src/zabbix_java/settings.sh ---- 5.4.orig/src/zabbix_java/settings.sh 2021-02-03 14:46:36.510530149 +0200 -+++ 5.4/src/zabbix_java/settings.sh 2021-02-03 17:30:37.637881653 +0200 +diff -urN zabbix-6.0.38.orig/src/zabbix_java/settings.sh zabbix-6.0.38/src/zabbix_java/settings.sh +--- zabbix-6.0.38.orig/src/zabbix_java/settings.sh 2025-02-06 10:05:14.762067735 +0200 ++++ zabbix-6.0.38/src/zabbix_java/settings.sh 2025-02-06 10:05:35.122061249 +0200 @@ -24,7 +24,7 @@ # Default: # PID_FILE= @@ -26,9 +26,9 @@ diff -urN 5.4.orig/src/zabbix_java/settings.sh 5.4/src/zabbix_java/settings.sh ### Option: zabbix.startPollers # Number of worker threads to start. -diff -urN 5.4.orig/src/zabbix_java/shutdown.sh 5.4/src/zabbix_java/shutdown.sh ---- 5.4.orig/src/zabbix_java/shutdown.sh 2021-02-03 14:46:36.510530149 +0200 -+++ 5.4/src/zabbix_java/shutdown.sh 2021-02-03 14:54:19.090352858 +0200 +diff -urN zabbix-6.0.38.orig/src/zabbix_java/shutdown.sh zabbix-6.0.38/src/zabbix_java/shutdown.sh +--- zabbix-6.0.38.orig/src/zabbix_java/shutdown.sh 2025-02-06 10:05:14.762067735 +0200 ++++ zabbix-6.0.38/src/zabbix_java/shutdown.sh 2025-02-06 10:05:35.122061249 +0200 @@ -1,7 +1,14 @@ #!/bin/sh @@ -46,10 +46,10 @@ diff -urN 5.4.orig/src/zabbix_java/shutdown.sh 5.4/src/zabbix_java/shutdown.sh if [ -n "$PID_FILE" ]; then if [ -f "$PID_FILE" ]; then -diff -urN 5.4.orig/src/zabbix_java/startup.sh 5.4/src/zabbix_java/startup.sh ---- 5.4.orig/src/zabbix_java/startup.sh 2021-02-03 14:46:36.510530149 +0200 -+++ 5.4/src/zabbix_java/startup.sh 2021-02-03 15:51:17.466224873 +0200 -@@ -1,7 +1,12 @@ +diff -urN zabbix-6.0.38.orig/src/zabbix_java/startup.sh zabbix-6.0.38/src/zabbix_java/startup.sh +--- zabbix-6.0.38.orig/src/zabbix_java/startup.sh 2025-02-06 10:05:14.762067735 +0200 ++++ zabbix-6.0.38/src/zabbix_java/startup.sh 2025-02-06 10:06:26.222043946 +0200 +@@ -1,7 +1,17 @@ #!/bin/sh -cd `dirname $0` @@ -61,10 +61,15 @@ diff -urN 5.4.orig/src/zabbix_java/startup.sh 5.4/src/zabbix_java/startup.sh +if [ -z $GATEWAY_HOME ]; then + GATEWAY_HOME="/usr/share/zabbix-java-gateway" +fi ++ ++for f in /etc/zabbix/zabbix_java_gateway*.env; do ++ . $f ++ break ++done if [ -n "$PID_FILE" -a -f "$PID_FILE" ]; then PID=`cat "$PID_FILE"` -@@ -15,9 +20,9 @@ +@@ -15,9 +25,9 @@ JAVA=${JAVA:-java} JAVA_OPTIONS="$JAVA_OPTIONS -server" diff --git a/SOURCES/java-gateway-el9.patch b/SOURCES/java-gateway-el9.patch new file mode 100644 index 0000000..2c9c207 --- /dev/null +++ b/SOURCES/java-gateway-el9.patch @@ -0,0 +1,15 @@ +diff -urN zabbix-6.0.38.orig/src/zabbix_java/startup.sh zabbix-6.0.38/src/zabbix_java/startup.sh +--- zabbix-6.0.38.orig/src/zabbix_java/startup.sh 2025-02-06 10:09:30.471978625 +0200 ++++ zabbix-6.0.38/src/zabbix_java/startup.sh 2025-02-06 10:10:00.541967696 +0200 +@@ -8,11 +8,6 @@ + GATEWAY_HOME="/usr/share/zabbix-java-gateway" + fi + +-for f in /etc/zabbix/zabbix_java_gateway*.env; do +- . $f +- break +-done +- + if [ -n "$PID_FILE" -a -f "$PID_FILE" ]; then + PID=`cat "$PID_FILE"` + if ps -p "$PID" > /dev/null 2>&1; then diff --git a/SOURCES/zabbix-proxy.service b/SOURCES/zabbix-proxy.service index 8e44e7a..9e42fe2 100644 --- a/SOURCES/zabbix-proxy.service +++ b/SOURCES/zabbix-proxy.service @@ -15,6 +15,13 @@ After=postgresql-11.service After=postgresql-12.service After=postgresql-13.service After=postgresql-14.service +After=postgresql-15.service +After=postgresql-16.service +After=postgresql-17.service +After=postgresql-18.service +After=postgresql-19.service +After=postgresql-20.service +After=postgresql-21.service [Service] Environment="CONFFILE=/etc/zabbix/zabbix_proxy.conf" diff --git a/SOURCES/zabbix-server.service b/SOURCES/zabbix-server.service index e06e0d2..659ec26 100644 --- a/SOURCES/zabbix-server.service +++ b/SOURCES/zabbix-server.service @@ -15,6 +15,13 @@ After=postgresql-11.service After=postgresql-12.service After=postgresql-13.service After=postgresql-14.service +After=postgresql-15.service +After=postgresql-16.service +After=postgresql-17.service +After=postgresql-18.service +After=postgresql-19.service +After=postgresql-20.service +After=postgresql-21.service [Service] Environment="CONFFILE=/etc/zabbix/zabbix_server.conf" diff --git a/SOURCES/zabbix_java_gateway_openjdk11.env b/SOURCES/zabbix_java_gateway_openjdk11.env new file mode 100755 index 0000000..dba25fe --- /dev/null +++ b/SOURCES/zabbix_java_gateway_openjdk11.env @@ -0,0 +1,6 @@ +# Sourced by java-gateway /usr/sbin/zabbix_java_gateway_startup script. + +# Do not edit this file! It will be overwritten during an update. +# Create /etc/zabbix/zabbix_java_gateway.env instead. + +PATH=/usr/lib/jvm/jre-11-openjdk/bin:$PATH diff --git a/SOURCES/zabbix_java_gateway_openjdk17.env b/SOURCES/zabbix_java_gateway_openjdk17.env new file mode 100755 index 0000000..c691b6f --- /dev/null +++ b/SOURCES/zabbix_java_gateway_openjdk17.env @@ -0,0 +1,6 @@ +# Sourced by java-gateway /usr/sbin/zabbix_java_gateway_startup script. + +# Do not edit this file! It will be overwritten during an update. +# Create /etc/zabbix/zabbix_java_gateway.env instead. + +PATH=/usr/lib/jvm/jre-17-openjdk/bin:$PATH diff --git a/SOURCES/zabbix_java_gateway_openjdk21.env b/SOURCES/zabbix_java_gateway_openjdk21.env new file mode 100755 index 0000000..09f4fe9 --- /dev/null +++ b/SOURCES/zabbix_java_gateway_openjdk21.env @@ -0,0 +1,6 @@ +# Sourced by java-gateway /usr/sbin/zabbix_java_gateway_startup script. + +# Do not edit this file! It will be overwritten during an update. +# Create /etc/zabbix/zabbix_java_gateway.env instead. + +PATH=/usr/lib/jvm/jre-21-openjdk/bin:$PATH diff --git a/SPECS/zabbix.spec b/SPECS/zabbix.spec index bc74cfa..53743ea 100644 --- a/SPECS/zabbix.spec +++ b/SPECS/zabbix.spec @@ -1,5 +1,5 @@ Name: zabbix -Version: 6.0.17 +Version: 6.0.41 Release: %{?alphatag:%{?alphatag}.}release1%{?dist} Summary: The Enterprise-class open source monitoring solution Group: Applications/Internet @@ -27,37 +27,44 @@ Source21: zabbix-agent2.init Source22: zabbix-agent2.sysconfig Source23: zabbix-web-service.service Source24: zabbix_policy.te +Source25: zabbix_java_gateway_openjdk11.env +Source26: zabbix_java_gateway_openjdk17.env +Source27: zabbix_java_gateway_openjdk21.env Patch0: frontend.patch Patch1: fping3-sourceip-option.patch -Patch2: java-gateway.patch +Patch2: java-gateway-el8.patch Patch3: conf.patch Patch4: agent2.conf.patch Patch5: rhel6-go11.6.patch Patch6: conf.var.run.patch Patch7: agent2.conf.var.run.patch Patch8: agent2.conf.socket.patch +Patch9: java-gateway-el9.patch +Patch10: el6.conf.patch Buildroot: %{_tmppath}/zabbix-%{version}-%{release}-root-%(%{__id_u} -n) +%{!?rhel: %global rhel 0} +%{!?amzn: %global amzn 0} + %{!?build_agent: %global build_agent 1} - -%ifarch x86_64 -%if 0%{?rhel} >= 6 +%ifarch x86_64 aarch64 +%if 0%{?rhel} >= 7 || %{amzn} >= 2023 %{!?build_agent2: %global build_agent2 1} %endif -%if 0%{?rhel} >= 8 +%if (0%{?rhel} >= 8 && 0%{?rhel} <= 9) || %{amzn} >= 2023 %{!?build_web_service: %global build_web_service 1} %endif %endif -%if 0%{?rhel} >= 7 +%if (0%{?rhel} >= 7 && 0%{?rhel} <= 9) || %{amzn} >= 2023 %{!?build_proxy: %global build_proxy 1} %{!?build_java_gateway: %global build_java_gateway 1} %endif -%if 0%{?rhel} >= 8 +%if (0%{?rhel} >= 8 && 0%{?rhel} <= 9) || %{amzn} >= 2023 %{!?build_server: %global build_server 1} %{!?build_frontend: %global build_frontend 1} %endif @@ -75,7 +82,7 @@ Buildroot: %{_tmppath}/zabbix-%{version}-%{release}-root-%(%{__id_u} -n) %endif %endif -%if 0%{?rhel} >= 7 +%if 0%{?rhel} >= 7 || %{amzn} >= 2023 %{!?build_selinux_policy: %global build_selinux_policy 1} %endif @@ -85,39 +92,43 @@ Buildroot: %{_tmppath}/zabbix-%{version}-%{release}-root-%(%{__id_u} -n) %endif # Enable hardening -%if 0%{?rhel} >= 8 +%if 0%{?rhel} >= 8 || %{amzn} >= 2023 %global _hardened_build 1 %endif BuildRequires: make -%if 0%{?rhel} >= 8 +%if 0%{?rhel} >= 8 || %{amzn} >= 2023 BuildRequires: mariadb-connector-c-devel BuildRequires: postgresql-devel >= 12.0 BuildRequires: sqlite-devel BuildRequires: net-snmp-devel BuildRequires: openldap-devel -BuildRequires: gnutls-devel BuildRequires: unixODBC-devel BuildRequires: curl-devel >= 7.13.1 +%if %{amzn} == 0 BuildRequires: OpenIPMI-devel >= 2 +%endif BuildRequires: libssh-devel >= 0.9.0 BuildRequires: java-devel >= 1.6.0 BuildRequires: libxml2-devel BuildRequires: libevent-devel %endif -%if 0%{?rhel} >= 7 +%if 0%{?rhel} >= 7 || %{amzn} >= 2023 BuildRequires: pcre2-devel %else BuildRequires: pcre-devel %endif -%if 0%{?rhel} >= 6 +%if 0%{?rhel} >= 6 || %{amzn} >= 2023 BuildRequires: openssl-devel >= 1.0.1 %endif -%if 0%{?rhel} >= 7 +%if 0%{?rhel} >= 7 || %{amzn} >= 2023 BuildRequires: systemd %endif %if 0%{?build_selinux_policy} BuildRequires: policycoreutils-devel +%if 0%{?rhel} >= 9 || %{amzn} >= 2023 +BuildRequires: selinux-policy-devel +%endif %endif %description @@ -131,7 +142,7 @@ Summary: Zabbix agent Group: Applications/Internet Requires: logrotate Requires(pre): /usr/sbin/useradd -%if 0%{?rhel} >= 7 +%if 0%{?rhel} >= 7 || %{amzn} >= 2023 Requires(post): systemd Requires(preun): systemd Requires(preun): systemd @@ -160,7 +171,7 @@ To be installed on monitored systems. Summary: Zabbix agent 2 Group: Applications/Internet Requires: logrotate -%if 0%{?rhel} >= 7 +%if 0%{?rhel} >= 7 || %{amzn} >= 2023 Requires(post): systemd Requires(preun): systemd Requires(preun): systemd @@ -384,11 +395,45 @@ Japanese font configuration for Zabbix web frontend %package java-gateway Summary: Zabbix java gateway Group: Applications/Internet -Requires: java-headless >= 1.6.0 +%if 0%{?rhel} == 7 || 0%{?rhel} == 8 +Requires: zabbix-java-gateway-openjdk +%else +Requires: java-headless >= 1.8.0 +%endif Requires(post): systemd Requires(preun): systemd Requires(postun): systemd +%if 0%{?rhel} == 7 || 0%{?rhel} == 8 +%package java-gateway-openjdk11 +Summary: Dependency metapackage for zabbix-java-gateway +Group: Applications/Internet +Requires: java-11-openjdk-headless +Provides: zabbix-java-gateway-openjdk + +%description java-gateway-openjdk11 +Dependency metapackage for zabbix-java-gateway + +%package java-gateway-openjdk17 +Summary: Dependency metapackage for zabbix-java-gateway +Group: Applications/Internet +Requires: java-17-openjdk-headless +Provides: zabbix-java-gateway-openjdk + +%description java-gateway-openjdk17 +Dependency metapackage for zabbix-java-gateway + +%package java-gateway-openjdk21 +Summary: Dependency metapackage for zabbix-java-gateway +Group: Applications/Internet +Requires: java-21-openjdk-headless +Provides: zabbix-java-gateway-openjdk + +%description java-gateway-openjdk21 +Dependency metapackage for zabbix-java-gateway +%endif + + %description java-gateway Zabbix java gateway %endif @@ -442,7 +487,6 @@ find ui/locale -name '*.sh' | xargs rm -f # traceroute command path for global script sed -i -e 's|/usr/bin/traceroute|/bin/traceroute|' database/mysql/data.sql sed -i -e 's|/usr/bin/traceroute|/bin/traceroute|' database/postgresql/data.sql -sed -i -e 's|/usr/bin/traceroute|/bin/traceroute|' database/sqlite3/data.sql %endif %if 0%{?build_server} @@ -467,6 +511,9 @@ mv database/sqlite3/schema.sql database/sqlite3/proxy.sql %if 0%{?build_java_gateway} %patch2 -p1 +%if 0%{?amzn} >= 2023 || 0%{?rhel} >= 9 +%patch9 -p1 +%endif %endif # update config files @@ -490,6 +537,12 @@ mv database/sqlite3/schema.sql database/sqlite3/proxy.sql %patch8 -p1 %endif +%if 0%{?rhel} <= 6 +%if 0%{?build_agent2} +%patch10 -p1 +%endif +%endif + %build # Build consists of 1-3 configure/make passes, one for each database. # pass 1: is sqlite proxy, may be omitted. @@ -504,21 +557,23 @@ build_conf_common=" --with-net-snmp --with-ldap --with-libcurl +%if %{amzn} == 0 --with-openipmi +%endif --with-unixodbc -%if 0%{?rhel} >= 8 +%if 0%{?rhel} >= 8 || %{amzn} >= 2023 --with-ssh %else --with-ssh2 %endif --with-libxml2 --with-libevent -%if 0%{?rhel} >= 7 +%if 0%{?rhel} >= 7 || %{amzn} >= 2023 --with-libpcre2 %else --with-libpcre %endif -%if 0%{?rhel} >= 6 +%if 0%{?rhel} >= 6 || %{amzn} >= 2023 --with-openssl %endif " @@ -600,7 +655,7 @@ make_flags="$make_flags ALERT_SCRIPTS_PATH=/usr/lib/zabbix/alertscripts" # pass 1 if [ -n "$build_conf_1" ]; then %configure $build_conf_common $build_conf_1 - make $make_flags + make -j16 $make_flags mv src/zabbix_proxy/zabbix_proxy src/zabbix_proxy/zabbix_proxy_sqlite3 fi @@ -608,7 +663,7 @@ fi # pass 2 if [ -n "$build_conf_2" ]; then %configure $build_conf_common $build_conf_2 - make $make_flags + make -j16 $make_flags %if 0%{?build_server} mv src/zabbix_server/zabbix_server src/zabbix_server/zabbix_server_pgsql %endif @@ -621,7 +676,7 @@ fi # pass 3 if [ -n "$build_conf_3" ]; then %configure $build_conf_common $build_conf_3 - make $make_flags + make -j16 $make_flags %if 0%{?build_server} mv src/zabbix_server/zabbix_server "src/zabbix_server/zabbix_server_$build_db_3" %endif @@ -668,7 +723,7 @@ install -dm 755 $RPM_BUILD_ROOT%{_docdir}/zabbix-agent-%{version} cat %{SOURCE3} | sed \ -e 's|COMPONENT|agentd|g' \ > $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/zabbix-agent -%if 0%{?rhel} >= 7 +%if 0%{?rhel} >= 7 || %{amzn} >= 2023 install -Dm 0644 -p %{SOURCE10} $RPM_BUILD_ROOT%{_unitdir}/zabbix-agent.service install -Dm 0644 -p %{SOURCE15} $RPM_BUILD_ROOT%{_tmpfilesdir}/zabbix-agent.conf %else @@ -688,7 +743,7 @@ cat %{SOURCE3} | sed \ -e 's|COMPONENT|agent2|g' \ > $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/zabbix-agent2 cp man/zabbix_agent2.man $RPM_BUILD_ROOT%{_mandir}/man8/zabbix_agent2.8 -%if 0%{?rhel} >= 7 +%if 0%{?rhel} >= 7 || %{amzn} >= 2023 install -Dm 0644 -p %{SOURCE19} $RPM_BUILD_ROOT%{_unitdir}/zabbix-agent2.service install -Dm 0644 -p %{SOURCE15} $RPM_BUILD_ROOT%{_tmpfilesdir}/zabbix_agent2.conf %else @@ -700,7 +755,7 @@ install -Dm 0644 -p %{SOURCE22} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/zabbix-a %if 0%{?build_web_service} cat %{SOURCE3} | sed \ - -e 's|COMPONENT|web-service|g' \ + -e 's|COMPONENT|web_service|g' \ > $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/zabbix-web-service cp man/zabbix_web_service.man $RPM_BUILD_ROOT%{_mandir}/man8/zabbix_web_service.8 install -Dm 0644 -p %{SOURCE23} $RPM_BUILD_ROOT%{_unitdir}/zabbix-web-service.service @@ -723,24 +778,26 @@ cp database/mysql/proxy.sql $RPM_BUILD_ROOT%{_datadir}/zabbix-sql-scripts/mysql %endif %if 0%{?build_server} cp database/mysql/server.sql.gz $RPM_BUILD_ROOT%{_datadir}/zabbix-sql-scripts/mysql -cp database/mysql/double.sql $RPM_BUILD_ROOT%{_datadir}/zabbix-sql-scripts/mysql -cp database/mysql/history_pk_prepare.sql $RPM_BUILD_ROOT%{_datadir}/zabbix-sql-scripts/mysql +cp database/mysql/option-patches/double.sql $RPM_BUILD_ROOT%{_datadir}/zabbix-sql-scripts/mysql +cp database/mysql/option-patches/history_pk_prepare.sql $RPM_BUILD_ROOT%{_datadir}/zabbix-sql-scripts/mysql %endif %endif %if 0%{?build_with_pgsql} mkdir -p $RPM_BUILD_ROOT%{_datadir}/zabbix-sql-scripts/postgresql +mkdir $RPM_BUILD_ROOT%{_datadir}/zabbix-sql-scripts/postgresql/tsdb_history_pk_upgrade_no_compression +mkdir $RPM_BUILD_ROOT%{_datadir}/zabbix-sql-scripts/postgresql/tsdb_history_pk_upgrade_with_compression %if 0%{?build_proxy} cp database/postgresql/proxy.sql $RPM_BUILD_ROOT%{_datadir}/zabbix-sql-scripts/postgresql %endif %if 0%{?build_server} cp database/postgresql/server.sql.gz $RPM_BUILD_ROOT%{_datadir}/zabbix-sql-scripts/postgresql -cp database/postgresql/timescaledb.sql $RPM_BUILD_ROOT%{_datadir}/zabbix-sql-scripts/postgresql -cp database/postgresql/double.sql $RPM_BUILD_ROOT%{_datadir}/zabbix-sql-scripts/postgresql -cp database/postgresql/history_pk_prepare.sql $RPM_BUILD_ROOT%{_datadir}/zabbix-sql-scripts/postgresql +cp database/postgresql/timescaledb/schema.sql $RPM_BUILD_ROOT%{_datadir}/zabbix-sql-scripts/postgresql/timescaledb.sql +cp database/postgresql/option-patches/double.sql $RPM_BUILD_ROOT%{_datadir}/zabbix-sql-scripts/postgresql +cp database/postgresql/option-patches/history_pk_prepare.sql $RPM_BUILD_ROOT%{_datadir}/zabbix-sql-scripts/postgresql %endif -cp -R database/postgresql/tsdb_history_pk_upgrade_no_compression $RPM_BUILD_ROOT%{_datadir}/zabbix-sql-scripts/postgresql -cp -R database/postgresql/tsdb_history_pk_upgrade_with_compression $RPM_BUILD_ROOT%{_datadir}/zabbix-sql-scripts/postgresql +cp -R database/postgresql/timescaledb/option-patches/without-compression/*.sql $RPM_BUILD_ROOT%{_datadir}/zabbix-sql-scripts/postgresql/tsdb_history_pk_upgrade_no_compression +cp -R database/postgresql/timescaledb/option-patches/with-compression/*.sql $RPM_BUILD_ROOT%{_datadir}/zabbix-sql-scripts/postgresql/tsdb_history_pk_upgrade_with_compression %endif %if 0%{?build_with_sqlite} && 0%{?build_proxy} @@ -796,6 +853,13 @@ rm $RPM_BUILD_ROOT%{_sbindir}/zabbix_java/lib/logback-console.xml mv $RPM_BUILD_ROOT%{_sbindir}/zabbix_java $RPM_BUILD_ROOT%{_datadir}/zabbix-java-gateway install -Dm 0644 -p %{SOURCE13} $RPM_BUILD_ROOT%{_unitdir}/zabbix-java-gateway.service install -Dm 0644 -p %{SOURCE15} $RPM_BUILD_ROOT%{_tmpfilesdir}/zabbix-java-gateway.conf +%if 0%{?rhel} >= 7 && 0%{?rhel} <= 8 +install -Dm 0755 -p %{SOURCE25} $RPM_BUILD_ROOT%{_sysconfdir}/zabbix/zabbix_java_gateway_openjdk11.env +%if 0%{?rhel} == 8 +install -Dm 0755 -p %{SOURCE26} $RPM_BUILD_ROOT%{_sysconfdir}/zabbix/zabbix_java_gateway_openjdk17.env +install -Dm 0755 -p %{SOURCE27} $RPM_BUILD_ROOT%{_sysconfdir}/zabbix/zabbix_java_gateway_openjdk21.env +%endif +%endif %endif @@ -804,7 +868,6 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/selinux/packages/zabbix mv zabbix_policy.pp $RPM_BUILD_ROOT%{_datadir}/selinux/packages/zabbix %endif - %clean rm -rf $RPM_BUILD_ROOT @@ -826,7 +889,7 @@ rm -rf $RPM_BUILD_ROOT %attr(0755,zabbix,zabbix) %dir %{_localstatedir}/run/zabbix %{_sbindir}/zabbix_agentd %{_mandir}/man8/zabbix_agentd.8* -%if 0%{?rhel} >= 7 +%if 0%{?rhel} >= 7 || %{amzn} >= 2023 %{_unitdir}/zabbix-agent.service %{_tmpfilesdir}/zabbix-agent.conf %else @@ -854,7 +917,7 @@ getent passwd zabbix > /dev/null || \ : %post agent -%if 0%{?rhel} >= 7 +%if 0%{?rhel} >= 7 || %{amzn} >= 2023 %systemd_post zabbix-agent.service %else /sbin/chkconfig --add zabbix-agent || : @@ -862,7 +925,7 @@ getent passwd zabbix > /dev/null || \ %preun agent if [ "$1" = 0 ]; then -%if 0%{?rhel} >= 7 +%if 0%{?rhel} >= 7 || %{amzn} >= 2023 %systemd_preun zabbix-agent.service %else /sbin/service zabbix-agent stop >/dev/null 2>&1 @@ -872,7 +935,7 @@ fi : %postun agent -%if 0%{?rhel} >= 7 +%if 0%{?rhel} >= 7 || %{amzn} >= 2023 %systemd_postun_with_restart zabbix-agent.service %else if [ $1 -ge 1 ]; then @@ -910,7 +973,7 @@ fi %attr(0755,zabbix,zabbix) %dir %{_localstatedir}/run/zabbix %{_sbindir}/zabbix_agent2 %{_mandir}/man8/zabbix_agent2.8* -%if 0%{?rhel} >= 7 +%if 0%{?rhel} >= 7 || %{amzn} >= 2023 %{_unitdir}/zabbix-agent2.service %{_tmpfilesdir}/zabbix_agent2.conf %else @@ -926,7 +989,7 @@ getent passwd zabbix > /dev/null || \ : %post agent2 -%if 0%{?rhel} >= 7 +%if 0%{?rhel} >= 7 || %{amzn} >= 2023 %systemd_post zabbix-agent2.service %endif # make sure that agent2 log file is create with proper attributes (ZBX-18243) @@ -936,7 +999,7 @@ if [ $1 == 1 ] && [ ! -f %{_localstatedir}/log/zabbix/zabbix_agent2.log ]; then fi : -%if 0%{?rhel} >= 7 +%if 0%{?rhel} >= 7 || %{amzn} >= 2023 %preun agent2 %systemd_preun zabbix-agent2.service : @@ -1274,7 +1337,7 @@ then rm %{_datadir}/zabbix/fonts/graphfont.ttf fi fi -%if 0%{?rhel} >= 9 +%if 0%{?rhel} >= 9 || %{amzn} >= 2023 # remove bad link to fonts/dejavu/DejaVuSans.ttf during upgrade on rhel 9 if [ "$1" = 2 ]; then /usr/sbin/update-alternatives --remove zabbix-web-font \ @@ -1282,7 +1345,7 @@ if [ "$1" = 2 ]; then fi %endif /usr/sbin/update-alternatives --install %{_datadir}/zabbix/assets/fonts/graphfont.ttf \ -%if 0%{?rhel} >= 9 +%if 0%{?rhel} >= 9 || %{amzn} >= 2023 zabbix-web-font %{_datadir}/fonts/dejavu-sans-fonts/DejaVuSans.ttf 10 %else zabbix-web-font %{_datadir}/fonts/dejavu/DejaVuSans.ttf 10 @@ -1310,7 +1373,7 @@ fi %preun web if [ "$1" = 0 ]; then -%if 0%{?rhel} >= 9 +%if 0%{?rhel} >= 9 || %{amzn} >= 2023 /usr/sbin/update-alternatives --remove zabbix-web-font \ %{_datadir}/fonts/dejavu-sans-fonts/DejaVuSans.ttf %else @@ -1363,8 +1426,23 @@ fi %postun java-gateway %systemd_postun_with_restart zabbix-java-gateway.service : -%endif +%if 0%{?rhel} == 7 || 0%{?rhel} == 8 +%files java-gateway-openjdk11 +%defattr(-,root,root,-) +%{_sysconfdir}/zabbix/zabbix_java_gateway_openjdk11.env + +%if 0%{?rhel} == 8 +%files java-gateway-openjdk17 +%defattr(-,root,root,-) +%{_sysconfdir}/zabbix/zabbix_java_gateway_openjdk17.env + +%files java-gateway-openjdk21 +%defattr(-,root,root,-) +%{_sysconfdir}/zabbix/zabbix_java_gateway_openjdk21.env +%endif +%endif +%endif %if 0%{?build_selinux_policy} %files selinux-policy @@ -1384,6 +1462,181 @@ if [ $1 = 0 ] && semodule -l | grep -q zabbix_policy; then semodule -r zabbix_po %changelog +* Tue Aug 19 2025 Zabbix Packager - 6.0.41-release1 +- update to 6.0.41 + +* Tue Aug 12 2025 Zabbix Packager - 6.0.41-rc1.release1 +- update to 6.0.41rc1 +- removed agent2 on el6, does not compile anymore + +* Tue Apr 22 2025 Zabbix Packager - 6.0.40-release1 +- update to 6.0.40 + +* Mon Apr 14 2025 Zabbix Packager - 6.0.40-rc1.release1 +- update to 6.0.40rc1 + +* Mon Mar 17 2025 Zabbix Packager - 6.0.39-release3 +- added el6.conf.patch (ZBX-26267) + +* Mon Mar 17 2025 Zabbix Packager - 6.0.39-release2 +- fixed zabbix_java_gateway*.env not found error (ZBX-26119) + +* Mon Feb 24 2025 Zabbix Packager - 6.0.39-release1 +- update to 6.0.39 + +* Mon Feb 17 2025 Zabbix Packager - 6.0.39-rc1.release1 +- update to 6.0.39rc1 + +* Thu Feb 06 2025 Zabbix Packager - 6.0.38-release3 +- added java-gateway patch for amnz2023 +- added java-gateway-openjdk* packages on el8 (ZBX-25947) +- replaced java-gateway dependency with java-11-openjdk on el8 + +* Fri Jan 31 2025 Zabbix Packager - 6.0.38-release2 +- fixed IPMI pollers + +* Mon Jan 27 2025 Zabbix Packager - 6.0.38-release1 +- update to 6.0.38 + +* Mon Jan 20 2025 Zabbix Packager - 6.0.38-rc1.release1 +- update to 6.0.38rc1 +- fixed path to optional database patches + +* Tue Dec 17 2024 Zabbix Packager - 6.0.37-release1 +- update to 6.0.37 +- added support for amazon linux 2023 + +* Wed Dec 11 2024 Zabbix Packager - 6.0.37-rc1.release1 +- update to 6.0.37rc1 + +* Tue Nov 19 2024 Zabbix Packager - 6.0.36-release1 +- update to 6.0.36 + +* Tue Nov 12 2024 Zabbix Packager - 6.0.36-rc1.release1 +- update to 6.0.36rc1 + +* Mon Oct 21 2024 Zabbix Packager - 6.0.35-release1 +- update to 6.0.35 + +* Mon Oct 14 2024 Zabbix Packager - 6.0.35-rc1.release1 +- update to 6.0.35rc1 + +* Fri Sep 27 2024 Zabbix Packager - 6.0.34-release2 +- added OpenSSL compilation flags + +* Thu Sep 26 2024 Zabbix Packager - 6.0.34-release1 +- update to 6.0.34 + +* Tue Sep 24 2024 Zabbix Packager - 6.0.34-rc2.release1 +- update to 6.0.34rc2 + +* Mon Sep 16 2024 Zabbix Packager - 6.0.34-rc1.release1 +- update to 6.0.34rc1 + +* Tue Aug 13 2024 Zabbix Packager - 6.0.33-release2 +- update to 6.0.33 + +* Tue Aug 06 2024 Zabbix Packager - 6.0.33-rc1.release2 +- second release of 6.0.33rc1 + +* Tue Aug 06 2024 Zabbix Packager - 6.0.33-rc1.release1 +- update to 6.0.33rc1 + +* Mon Jul 15 2024 Zabbix Packager - 6.0.32-release1 +- update to 6.0.32 + +* Tue Jul 09 2024 Zabbix Packager - 6.0.32-rc1.release1 +- update to 6.0.32rc1 + +* Mon Jun 17 2024 Zabbix Packager - 6.0.31-release1 +- update to 6.0.31 + +* Mon Jun 10 2024 Zabbix Packager - 6.0.31-rc1.release1 +- update to 6.0.31rc1 + +* Tue May 21 2024 Zabbix Packager - 6.0.30-release1 +- update to 6.0.30 + +* Wed May 15 2024 Zabbix Packager - 6.0.30-rc1.release1 +- update to 6.0.30rc1 + +* Mon Apr 22 2024 Zabbix Packager - 6.0.29-release1 +- update to 6.0.29 + +* Mon Apr 15 2024 Zabbix Packager - 6.0.29-rc1.release1 +- update to 6.0.29rc1 + +* Mon Mar 25 2024 Zabbix Packager - 6.0.28-release1 +- update to 6.0.28 + +* Mon Mar 18 2024 Zabbix Packager - 6.0.28-rc1.release1 +- update to 6.0.28rc1 + +* Mon Feb 26 2024 Zabbix Packager - 6.0.27-release1 +- update to 6.0.27 + +* Mon Feb 19 2024 Zabbix Packager - 6.0.27-rc1.release1 +- update to 6.0.27rc1 + +* Mon Jan 29 2024 Zabbix Packager - 6.0.26-release1 +- update to 6.0.26 + +* Mon Jan 22 2024 Zabbix Packager - 6.0.26-rc1.release1 +- update to 6.0.26rc1 + +* Wed Dec 13 2023 Zabbix Packager - 6.0.25-release1 +- update to 6.0.25 + +* Thu Dec 07 2023 Zabbix Packager - 6.0.25-rc1.release1 +- update to 6.0.25rc1 + +* Thu Nov 30 2023 Zabbix Packager - 6.0.24-release1 +- update to 6.0.24 + +* Thu Nov 23 2023 Zabbix Packager - 6.0.24-rc1.release1 +- update to 6.0.24rc1 +- added After statements for postgresql 15 and 16 to server and proxy systemd unit files + +* Tue Oct 31 2023 Zabbix Packager - 6.0.23-release1 +- update to 6.0.23 + +* Mon Oct 23 2023 Zabbix Packager - 6.0.23-rc1.release1 +- update to 6.0.23rc1 + +* Mon Sep 25 2023 Zabbix Packager - 6.0.22-release1 +- update to 6.0.22 + +* Tue Sep 19 2023 Zabbix Packager - 6.0.22-rc1.release1 +- update to 6.0.22rc1 + +* Wed Sep 06 2023 Zabbix Packager - 6.0.21-release2 +- added support for aarch64 + +* Tue Aug 22 2023 Zabbix Packager - 6.0.21-release1 +- update to 6.0.21 + +* Tue Aug 15 2023 Zabbix Packager - 6.0.21-rc1.release1 +- update to 6.0.21rc1 +- fixed web_service logrotate configuration file (ZBX-23169) + +* Mon Jul 31 2023 Zabbix Packager - 6.0.20-release1 +- update to 6.0.20 + +* Mon Jul 24 2023 Zabbix Packager - 6.0.20-rc1.release1 +- update to 6.0.20rc1 + +* Tue Jun 27 2023 Zabbix Packager - 6.0.19-release1 +- update to 6.0.19 + +* Mon Jun 19 2023 Zabbix Packager - 6.0.19-rc1.release1 +- update to 6.0.19rc1 + +* Tue May 30 2023 Zabbix Packager - 6.0.18-release1 +- update to 6.0.18 + +* Mon May 22 2023 Zabbix Packager - 6.0.18-rc1.release1 +- update to 6.0.18rc1 + * Mon Apr 24 2023 Zabbix Packager - 6.0.17-release1 - update to 6.0.17