From 02d6064689382d02ee0502d6b4c8b1d768a06fb9 Mon Sep 17 00:00:00 2001 From: Fabian Arrotin Date: Mar 13 2025 07:54:43 +0000 Subject: Import upstream zabbix 6.0.39 Signed-off-by: Fabian Arrotin --- diff --git a/.zabbix.metadata b/.zabbix.metadata index b1f79e9..b538549 100644 --- a/.zabbix.metadata +++ b/.zabbix.metadata @@ -1 +1 @@ -018d3896942dcf127005d7b1bd7399c1bc43c1b6 SOURCES/zabbix-6.0.34.tar.gz +e187d5ac7bad36d4a34f67373adcb363acabba0f SOURCES/zabbix-6.0.39.tar.gz diff --git a/SOURCES/java-gateway-amazon.patch b/SOURCES/java-gateway-amazon.patch new file mode 100644 index 0000000..2c9c207 --- /dev/null +++ b/SOURCES/java-gateway-amazon.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/java-gateway.patch b/SOURCES/java-gateway.patch index d4ed997..2716e05 100644 --- a/SOURCES/java-gateway.patch +++ b/SOURCES/java-gateway.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/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 922db13..10b870d 100644 --- a/SPECS/zabbix.spec +++ b/SPECS/zabbix.spec @@ -1,6 +1,6 @@ Name: zabbix -Version: 6.0.34 -Release: %{?alphatag:%{?alphatag}.}2%{?dist} +Version: 6.0.39 +Release: %{?alphatag:%{?alphatag}.}release1%{?dist} Summary: The Enterprise-class open source monitoring solution Group: Applications/Internet License: GPLv2+ @@ -27,6 +27,9 @@ 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 @@ -36,27 +39,31 @@ Patch5: rhel6-go11.6.patch Patch6: conf.var.run.patch Patch7: agent2.conf.var.run.patch Patch8: agent2.conf.socket.patch +Patch9: java-gateway-amazon.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 aarch64 -%if 0%{?rhel} >= 6 -%{!?build_agent2: %global build_agent2 0} +%if 0%{?rhel} >= 6 || %{amzn} >= 2023 +%{!?build_agent2: %global build_agent2 1} %endif -%if 0%{?rhel} >= 8 +%if 0%{?rhel} >= 8 || %{amzn} >= 2023 %{!?build_web_service: %global build_web_service 1} %endif %endif -%if 0%{?rhel} >= 7 +%if 0%{?rhel} >= 7 || %{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 || %{amzn} >= 2023 %{!?build_server: %global build_server 1} %{!?build_frontend: %global build_frontend 1} %endif @@ -74,7 +81,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 @@ -84,41 +91,41 @@ 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 -BuildRequires: golang golang-bin +%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 +%if 0%{?rhel} >= 9 || %{amzn} >= 2023 BuildRequires: selinux-policy-devel %endif %endif @@ -134,7 +141,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 @@ -163,7 +170,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 @@ -387,11 +394,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} == 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} == 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 @@ -445,7 +486,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} @@ -470,6 +510,9 @@ mv database/sqlite3/schema.sql database/sqlite3/proxy.sql %if 0%{?build_java_gateway} %patch2 -p1 +%if 0%{?amzn} >= 2023 +%patch9 -p1 +%endif %endif # update config files @@ -507,21 +550,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 " @@ -671,7 +716,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 @@ -691,7 +736,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 @@ -726,24 +771,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} @@ -808,6 +855,15 @@ mv zabbix_policy.pp $RPM_BUILD_ROOT%{_datadir}/selinux/packages/zabbix %endif +%if 0%{?build_java_gateway} +%if 0%{?rhel} == 8 +install -Dm 0755 -p %{SOURCE25} $RPM_BUILD_ROOT%{_sysconfdir}/zabbix/zabbix_java_gateway_openjdk11.env +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 + + %clean rm -rf $RPM_BUILD_ROOT @@ -829,7 +885,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 @@ -857,7 +913,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 || : @@ -865,7 +921,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 @@ -875,7 +931,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 @@ -913,7 +969,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 @@ -929,7 +985,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) @@ -939,7 +995,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 : @@ -1277,7 +1333,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 \ @@ -1285,7 +1341,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 @@ -1313,7 +1369,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 @@ -1366,6 +1422,20 @@ fi %postun java-gateway %systemd_postun_with_restart zabbix-java-gateway.service : + +%if 0%{?rhel} == 8 +%files java-gateway-openjdk11 +%defattr(-,root,root,-) +%{_sysconfdir}/zabbix/zabbix_java_gateway_openjdk11.env + +%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 @@ -1387,11 +1457,47 @@ if [ $1 = 0 ] && semodule -l | grep -q zabbix_policy; then semodule -r zabbix_po %changelog -* Thu Oct 03 2024 Fabian Arrotin - 6.0.34-2 -- Disabled agent2 build (missing go rpm pkgs) -- Rebuilt for infra needs and covering x86_64, aarch64, ppc64le and s390x builds +* 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 -* Thu Sep 26 2024 Zabbix Packager - 6.0.34-release2 +* Fri Sep 27 2024 Zabbix Packager - 6.0.34-release2 - added OpenSSL compilation flags * Thu Sep 26 2024 Zabbix Packager - 6.0.34-release1