Zabbix 7.x releas. Nginx updated

fedora/SPECS/nginx.spec

@@ -21,7 +21,7 @@
 
 Name:              nginx
 Epoch:             1
-Version:           1.26.0
+Version:           1.26.1
 Release:           100%{?dist}
 
 Summary:           A high performance web server and reverse proxy server
@@ -636,6 +636,9 @@ fi
 [ "%{_builddir}" != "/" ] && [ -d "%{_builddir}" ] && rm -rf %{_builddir}/*
 
 %changelog
+* Sat Jun 15 2024 Daniel Steiner <daniel.steiner@dsteiner.ch>
+- Update to 1.26.1 version.
+
 * Sun May 12 2024 Daniel Steiner <daniel.steiner@dsteiner.ch>
 - Update to 1.26 version.
 

fedora/SPECS/zabbix-raidstat.spec

@@ -74,6 +74,9 @@ fi
 
 
 %changelog
+* Thu May 11 2023 Daniel Steiner <daniel.steiner@dsteiner.ch>
+- First build on Fedora 38.
+
 * Sun Mar 5 2023 Daniel Steiner <daniel.steiner@dsteiner.ch>
 - First build on Fedora 37.
 

fedora/SPECS/zabbix.spec

@@ -1,5 +1,5 @@
 Name:		zabbix
-Version:	6.4.15
+Version:	7.0.0
 Release:	%{?alphatag:%{?alphatag}.}release1%{?dist}
 Summary:	The Enterprise-class open source monitoring solution
 Group:		Applications/Internet
@@ -30,11 +30,7 @@ Source24:	zabbix_policy.te
 Patch0:		frontend.patch
 Patch1:		fping3-sourceip-option.patch
 Patch2:		java-gateway.patch
-Patch3:		conf.patch
-Patch4:		agent2.conf.patch
 Patch5:		rhel6-go11.6.patch
-Patch6:		conf.var.run.patch
-Patch7:		agent2.conf.var.run.patch
 Patch9:		agent2.conf.socket.patch
 
 
@@ -471,23 +467,6 @@ mv database/sqlite3/schema.sql database/sqlite3/proxy.sql
 %patch -P 2 -p1
 %endif
 
-# update config files
-%patch -P 3 -p1
-
-%if 0%{?build_agent2}
-%patch -P 4 -p1
-%if 0%{?rhel} == 6
-%patch -P 5 -p1
-%endif
-%endif
-
-%if 0%{?rhel} <= 6
-%patch -P 6 -p1
-%if 0%{?build_agent2}
-%patch -P 7 -p1
-%endif
-%endif
-
 %if 0%{?build_agent2}
 %patch -P 9 -p1
 %endif
@@ -705,8 +684,7 @@ 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/option-patches/double.sql $RPM_BUILD_ROOT%{_datadir}/zabbix-sql-scripts/mysql
+cp database/mysql/option-patches/history_upgrade_prepare.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
 
@@ -718,8 +696,7 @@ cp database/postgresql/proxy.sql $RPM_BUILD_ROOT%{_datadir}/zabbix-sql-scripts/p
 %if 0%{?build_server}
 cp database/postgresql/server.sql.gz $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_upgrade_prepare.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/timescaledb/option-patches/without-compression $RPM_BUILD_ROOT%{_datadir}/zabbix-sql-scripts/postgresql/tsdb_history_pk_upgrade_no_compression
 cp -R database/postgresql/timescaledb/option-patches/with-compression $RPM_BUILD_ROOT%{_datadir}/zabbix-sql-scripts/postgresql/tsdb_history_pk_upgrade_with_compression
@@ -961,32 +938,19 @@ getent passwd zabbix > /dev/null || \
 %doc AUTHORS ChangeLog COPYING NEWS README
 %if 0%{?build_server}
 %{_datadir}/zabbix-sql-scripts/mysql/server.sql.gz
-%{_datadir}/zabbix-sql-scripts/mysql/double.sql
+%{_datadir}/zabbix-sql-scripts/mysql/history_upgrade_prepare.sql
-%{_datadir}/zabbix-sql-scripts/mysql/history_pk_prepare.sql
 %{_datadir}/zabbix-sql-scripts/postgresql/server.sql.gz
 %{_datadir}/zabbix-sql-scripts/postgresql/timescaledb.sql
-%{_datadir}/zabbix-sql-scripts/postgresql/double.sql
+%{_datadir}/zabbix-sql-scripts/postgresql/history_upgrade_prepare.sql
-%{_datadir}/zabbix-sql-scripts/postgresql/history_pk_prepare.sql
+%{_datadir}/zabbix-sql-scripts/postgresql/tsdb_history_pk_upgrade_no_compression/*.sql
+%{_datadir}/zabbix-sql-scripts/postgresql/tsdb_history_pk_upgrade_with_compression/*.sql
 %endif
 %if 0%{?build_proxy}
 %{_datadir}/zabbix-sql-scripts/mysql/proxy.sql
 %{_datadir}/zabbix-sql-scripts/postgresql/proxy.sql
 %{_datadir}/zabbix-sql-scripts/sqlite3/proxy.sql
 %endif
-%if 0%{?build_server} || 0%{?build_proxy}
-%{_datadir}/zabbix-sql-scripts/postgresql/tsdb_history_pk_upgrade_no_compression/history_pk_log.sql
-%{_datadir}/zabbix-sql-scripts/postgresql/tsdb_history_pk_upgrade_no_compression/history_pk.sql
-%{_datadir}/zabbix-sql-scripts/postgresql/tsdb_history_pk_upgrade_no_compression/history_pk_str.sql
-%{_datadir}/zabbix-sql-scripts/postgresql/tsdb_history_pk_upgrade_no_compression/history_pk_text.sql
-%{_datadir}/zabbix-sql-scripts/postgresql/tsdb_history_pk_upgrade_no_compression/history_pk_uint.sql
-%{_datadir}/zabbix-sql-scripts/postgresql/tsdb_history_pk_upgrade_with_compression/history_pk_log.sql
-%{_datadir}/zabbix-sql-scripts/postgresql/tsdb_history_pk_upgrade_with_compression/history_pk.sql
-%{_datadir}/zabbix-sql-scripts/postgresql/tsdb_history_pk_upgrade_with_compression/history_pk_str.sql
-%{_datadir}/zabbix-sql-scripts/postgresql/tsdb_history_pk_upgrade_with_compression/history_pk_text.sql
-%{_datadir}/zabbix-sql-scripts/postgresql/tsdb_history_pk_upgrade_with_compression/history_pk_uint.sql
 %endif
-%endif
-
 
 %if 0%{?build_proxy}
 %if 0%{?build_with_mysql}
@@ -1360,6 +1324,12 @@ if [ $1 = 0 ] && semodule -l | grep -q zabbix_policy; then semodule -r zabbix_po
 #
 
 %changelog
+* Wed Jun 19 2024 Zabbix Packager <daniel.steiner@dsteiner.ch>
+- Version update to 7.0.0
+
+* Wed Jun 19 2024 Zabbix Packager <daniel.steiner@dsteiner.ch>
+- Version update to 6.4.16
+
 * Fri May 31 2024 Zabbix Packager <daniel.steiner@dsteiner.ch>
 - Version update to 6.4.15