automatic import of zabbix

1 files changed, 72 insertions, 85 deletions

diff --git a/zabbix.spec b/zabbix.spec
index 25f400f..0ad15df 100644
--- a/zabbix.spec
+++ b/zabbix.spec
@@ -18,28 +18,6 @@ Name:           zabbix
 Version:        7.0.5
 Release:        1
 Summary:        Open-source monitoring solution for your IT infrastructure
-
-# TODO - Note additional licenses in src/go when we start building with go
-# src/libs/zbxembed/duktape.c: MIT License
-# src/libs/zbxembed/duktape.h: MIT License
-# src/libs/zbxgetopt/getopt.c: GNU General Public License v2.0 or later
-# src/libs/zbxhash/md5.c: zlib License
-# ui/vendor/composer/LICENSE: MIT License
-# ui/js/vendors/D3/LICENSE: ISC License
-# ui/js/vendors/Leaflet/LICENSE: BSD 2-Clause License
-# ui/js/vendors/Leaflet.markercluster/LICENSE: MIT License
-# ui/js/vendors/jQueryUI/LICENSE: MIT License
-# ui/js/vendors/qrcode/LICENSE: MIT License
-# ui/vendor/duosecurity/duo_universal_php/LICENSE: BSD 3-Clause License
-# ui/vendor/firebase/php-jwt/LICENSE: BSD 3-Clause License
-# ui/vendor/onelogin/php-saml/LICENSE: MIT License
-# ui/vendor/paragonie/constant_time_encoding/LICENSE.txt: MIT License
-# ui/vendor/pragmarx/google2fa/LICENSE.md: MIT License
-# ui/vendor/symfony/deprecation-contracts/LICENSE: MIT License
-# ui/vendor/symfony/polyfill-ctype/LICENSE: MIT License
-# ui/vendor/symfony/yaml/LICENSE: MIT License
-# ui/assets/styles/vendors/Leaflet/LICENSE: BSD 2-Clause License
-# ui/vendor/paragonie/constant_time_encoding/src/*.php: MIT License
 License:        AGPL-3.0-only AND MIT AND GPL-2.0-or-later AND Zlib AND BSD-3-Clause AND BSD-2-Clause AND ISC
 URL:            https://www.zabbix.com
 Source0:        https://cdn.zabbix.com/zabbix/sources/stable/7.0/zabbix-%{version}.tar.gz
@@ -175,9 +153,7 @@ Requires:            %{name}-server-implementation = %{version}-%{release}
 Requires:            fping
 Requires:            traceroute
 Requires(pre):       shadow-utils
-Requires(post):      systemd
-Requires(preun):     systemd
-Requires(postun):    systemd
+%{?systemd_requires}
 
 %description server
 Zabbix server common files
@@ -210,9 +186,7 @@ Zabbix server compiled to use PostgreSQL
 Summary:             Zabbix agent
 Requires:            %{name} = %{version}-%{release}
 Requires(pre):       shadow-utils
-Requires(post):      systemd
-Requires(preun):     systemd
-Requires(postun):    systemd
+%{?systemd_requires}
 
 %description agent
 Zabbix agent, to be installed on monitored systems
@@ -223,9 +197,7 @@ BuildArch:           noarch
 Requires:            %{name} = %{version}-%{release}
 Requires:            %{name}-proxy-implementation = %{version}-%{release}
 Requires(pre):       shadow-utils
-Requires(post):      systemd
-Requires(preun):     systemd
-Requires(postun):    systemd
+%{?systemd_requires}
 Requires:            fping
 
 %description proxy
@@ -437,9 +409,9 @@ cd -
 # SELinux policy (originally from selinux-policy-contrib)
 # this policy module will override the production module
 mkdir selinux
-cp -p %{SOURCE18} selinux/
-cp -p %{SOURCE19} selinux/
-cp -p %{SOURCE20} selinux/
+cp -p %{S:18} selinux/
+cp -p %{S:19} selinux/
+cp -p %{S:20} selinux/
 
 make -f %{_datadir}/selinux/devel/Makefile %{srcname}.pp
 bzip2 -9 %{srcname}.pp
@@ -449,97 +421,97 @@ bzip2 -9 %{srcname}.pp
 %install
 # Install binaries
 %make_install -C build-frontend
-mv $RPM_BUILD_ROOT%{_sbindir}/zabbix_proxy{,_sqlite3}
+mv %{buildroot}%{_sbindir}/zabbix_proxy{,_sqlite3}
 %make_install -C build-server-mysql
-mv $RPM_BUILD_ROOT%{_sbindir}/zabbix_proxy{,_mysql}
-mv $RPM_BUILD_ROOT%{_sbindir}/zabbix_server{,_mysql}
+mv %{buildroot}%{_sbindir}/zabbix_proxy{,_mysql}
+mv %{buildroot}%{_sbindir}/zabbix_server{,_mysql}
 %make_install -C build-server-postgresql
-mv $RPM_BUILD_ROOT%{_sbindir}/zabbix_proxy{,_pgsql}
-mv $RPM_BUILD_ROOT%{_sbindir}/zabbix_server{,_pgsql}
+mv %{buildroot}%{_sbindir}/zabbix_proxy{,_pgsql}
+mv %{buildroot}%{_sbindir}/zabbix_server{,_pgsql}
 
 # Ghosted alternatives
-touch $RPM_BUILD_ROOT%{_sbindir}/zabbix_{proxy,server}
+touch %{buildroot}%{_sbindir}/zabbix_{proxy,server}
 
 # Home directory for the agent;
 # The other home directory is created during installation
-mkdir -p $RPM_BUILD_ROOT%{_sharedstatedir}/zabbix
+mkdir -p %{buildroot}%{_sharedstatedir}/zabbix
 
 # Log directories
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/zabbix
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/zabbixsrv
+mkdir -p %{buildroot}%{_localstatedir}/log/zabbix
+mkdir -p %{buildroot}%{_localstatedir}/log/zabbixsrv
 
 # systemd tmpfiles
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/tmpfiles.d
-install -m 0644 -p %{SOURCE9} $RPM_BUILD_ROOT%{_prefix}/lib/tmpfiles.d/zabbix.conf
-install -m 0644 -p %{SOURCE17} $RPM_BUILD_ROOT%{_prefix}/lib/tmpfiles.d/zabbixsrv.conf
-mkdir -p $RPM_BUILD_ROOT%{_rundir}
-install -d -m 0755 $RPM_BUILD_ROOT%{_rundir}/zabbix/
-install -d -m 0755 $RPM_BUILD_ROOT%{_rundir}/zabbixsrv/
+mkdir -p %{buildroot}%{_prefix}/lib/tmpfiles.d
+install -m 0644 -p %{S:9} %{buildroot}%{_prefix}/lib/tmpfiles.d/zabbix.conf
+install -m 0644 -p %{S:17} %{buildroot}%{_prefix}/lib/tmpfiles.d/zabbixsrv.conf
+mkdir -p %{buildroot}%{_rundir}
+install -d -m 0755 %{buildroot}%{_rundir}/zabbix/
+install -d -m 0755 %{buildroot}%{_rundir}/zabbixsrv/
 
 # Install the frontend after removing backup files from patching
 find ui -name '*.orig' -delete
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{srcname}
-cp -a ui/* $RPM_BUILD_ROOT%{_datadir}/%{srcname}/
+mkdir -p %{buildroot}%{_datadir}/%{srcname}
+cp -a ui/* %{buildroot}%{_datadir}/%{srcname}/
 
 # Prepare ghosted config file
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{srcname}/web
-touch $RPM_BUILD_ROOT%{_sysconfdir}/%{srcname}/web/zabbix.conf.php
+mkdir -p %{buildroot}%{_sysconfdir}/%{srcname}/web
+touch %{buildroot}%{_sysconfdir}/%{srcname}/web/zabbix.conf.php
 
 # Replace bundled font
 [ -d %{_fontbasedir}/dejavu ] &&
-  ln -sf ../../../fonts/dejavu/DejaVuSans.ttf $RPM_BUILD_ROOT%{_datadir}/%{srcname}/assets/fonts/
+  ln -sf ../../../fonts/dejavu/DejaVuSans.ttf %{buildroot}%{_datadir}/%{srcname}/assets/fonts/
 [ -d %{_fontbasedir}/dejavu-sans-fonts ] &&
-  ln -sf ../../../fonts/dejavu-sans-fonts/DejaVuSans.ttf $RPM_BUILD_ROOT%{_datadir}/%{srcname}/assets/fonts/
+  ln -sf ../../../fonts/dejavu-sans-fonts/DejaVuSans.ttf %{buildroot}%{_datadir}/%{srcname}/assets/fonts/
 
 # Replace JS libraries
 # There is no jquery-ui package yet
-ln -sf ../../../javascript/jquery/3/jquery.min.js $RPM_BUILD_ROOT%{_datadir}/%{srcname}/js/vendors/jquery.js
-#ln -sf ../../../javascript/jquery-ui/1/jquery-ui.min.js $RPM_BUILD_ROOT%{_datadir}/%{srcname}/js/vendors/jquery-ui.js
+ln -sf ../../../javascript/jquery/3/jquery.min.js %{buildroot}%{_datadir}/%{srcname}/js/vendors/jquery.js
+#ln -sf ../../../javascript/jquery-ui/1/jquery-ui.min.js %{buildroot}%{_datadir}/%{srcname}/js/vendors/jquery-ui.js
 
 # This file is used to switch the frontend to maintenance mode
-mv $RPM_BUILD_ROOT%{_datadir}/%{srcname}/conf/maintenance.inc.php $RPM_BUILD_ROOT%{_sysconfdir}/%{srcname}/web/maintenance.inc.php || :
+mv %{buildroot}%{_datadir}/%{srcname}/conf/maintenance.inc.php %{buildroot}%{_sysconfdir}/%{srcname}/web/maintenance.inc.php || :
 
 # Drop Apache config file in place
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d
-install -m 0644 -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/%{srcname}.conf
+mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d
+install -m 0644 -p %{S:1} %{buildroot}%{_sysconfdir}/httpd/conf.d/%{srcname}.conf
 
 # Drop php-fpm config file in place
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/php-fpm.d
-install -m 0644 -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/php-fpm.d/%{srcname}.conf
+mkdir -p %{buildroot}%{_sysconfdir}/php-fpm.d
+install -m 0644 -p %{S:2} %{buildroot}%{_sysconfdir}/php-fpm.d/%{srcname}.conf
 
 # Install log rotation
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
-sed -e 's|COMPONENT|agentd|g; s|USER|zabbix|g' %{SOURCE5} > \
-     $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/zabbix-agent
-sed -e 's|COMPONENT|server|g; s|USER|zabbixsrv|g' %{SOURCE5} > \
-     $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/zabbix-server
-sed -e 's|COMPONENT|proxy|g; s|USER|zabbixsrv|g' %{SOURCE5} > \
-     $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/zabbix-proxy
+mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
+sed -e 's|COMPONENT|agentd|g; s|USER|zabbix|g' %{S:5} > \
+     %{buildroot}%{_sysconfdir}/logrotate.d/zabbix-agent
+sed -e 's|COMPONENT|server|g; s|USER|zabbixsrv|g' %{S:5} > \
+     %{buildroot}%{_sysconfdir}/logrotate.d/zabbix-server
+sed -e 's|COMPONENT|proxy|g; s|USER|zabbixsrv|g' %{S:5} > \
+     %{buildroot}%{_sysconfdir}/logrotate.d/zabbix-proxy
 
 # Install different systemd units because of the requirements for DBMS daemons
-mkdir -p $RPM_BUILD_ROOT%{_unitdir}
-install -m 0644 -p %{SOURCE10} $RPM_BUILD_ROOT%{_unitdir}/zabbix-agent.service
-install -m 0644 -p %{SOURCE11} $RPM_BUILD_ROOT%{_unitdir}/zabbix-proxy-mysql.service
-install -m 0644 -p %{SOURCE12} $RPM_BUILD_ROOT%{_unitdir}/zabbix-proxy-pgsql.service
-install -m 0644 -p %{SOURCE13} $RPM_BUILD_ROOT%{_unitdir}/zabbix-proxy-sqlite3.service
-install -m 0644 -p %{SOURCE14} $RPM_BUILD_ROOT%{_unitdir}/zabbix-server-mysql.service
-install -m 0644 -p %{SOURCE15} $RPM_BUILD_ROOT%{_unitdir}/zabbix-server-pgsql.service
+mkdir -p %{buildroot}%{_unitdir}
+install -m 0644 -p %{S:10} %{buildroot}%{_unitdir}/zabbix-agent.service
+install -m 0644 -p %{S:11} %{buildroot}%{_unitdir}/zabbix-proxy-mysql.service
+install -m 0644 -p %{S:12} %{buildroot}%{_unitdir}/zabbix-proxy-pgsql.service
+install -m 0644 -p %{S:13} %{buildroot}%{_unitdir}/zabbix-proxy-sqlite3.service
+install -m 0644 -p %{S:14} %{buildroot}%{_unitdir}/zabbix-server-mysql.service
+install -m 0644 -p %{S:15} %{buildroot}%{_unitdir}/zabbix-server-pgsql.service
 
 # Ghosted alternatives 
-touch $RPM_BUILD_ROOT%{_unitdir}/zabbix-server.service
-touch $RPM_BUILD_ROOT%{_unitdir}/zabbix-proxy.service
+touch %{buildroot}%{_unitdir}/zabbix-server.service
+touch %{buildroot}%{_unitdir}/zabbix-proxy.service
 
 # Directory for fping spooling files 
-mkdir -p $RPM_BUILD_ROOT%{_sharedstatedir}/zabbixsrv/tmp
+mkdir -p %{buildroot}%{_sharedstatedir}/zabbixsrv/tmp
 
 # Install sql files
 for db in postgresql mysql; do
-    mkdir $RPM_BUILD_ROOT%{_datadir}/%{srcname}-$db
-    cp -p database/$db/*.sql $RPM_BUILD_ROOT%{_datadir}/%{srcname}-$db
+    mkdir %{buildroot}%{_datadir}/%{srcname}-$db
+    cp -p database/$db/*.sql %{buildroot}%{_datadir}/%{srcname}-$db
 done
 
-install -dm 755 $RPM_BUILD_ROOT%{_datadir}/%{srcname}-sqlite3
-cp -p database/sqlite3/schema.sql $RPM_BUILD_ROOT%{_datadir}/%{srcname}-sqlite3
+install -dm 755 %{buildroot}%{_datadir}/%{srcname}-sqlite3
+cp -p database/sqlite3/schema.sql %{buildroot}%{_datadir}/%{srcname}-sqlite3
 
 %if 0%{?with_selinux}
 install -D -m 0644 %{name}.pp.bz2 %{buildroot}%{_datadir}/selinux/packages/%{selinuxtype}/%{name}.pp.bz2
@@ -832,5 +804,20 @@ fi
 %files web-pgsql
 
 %changelog
-* Wed Oct 23 2024 Funda Wang <fundawang@yeah.net> - 7.0.5-1
-- about to 7.x
+* Thu Oct 24 2024 Funda Wang <fundawang@yeah.net> - 7.0.5-1
+- update to 7.0.5
+
+* Sat Oct 28 2023 beta <beta@yfqm.date> - 5.2.6-5
+- solve installation conflicts between zabbix-proxy-sqlite3 and zabbix-proxy-mysql
+
+* Mon Aug 15 2022 Zhang Jun <zhangjun@kylinos.cn> - 5.2.6-4
+- update BuildRequire mysql-devel to mysql5-devel
+
+* Fri Oct 29 2021 Wang Jiangyong <wangjy41@chinatelecom.cn> - 5.2.6-3
+- solve the problem x86 build failed on offline environment
+
+* Fri May 14 2021 duyiwei <duyiwei@kylinos.cn> - 5.2.6-2
+- solve the problem that missing or redundant if/endif
+
+* Fri Apr 16 2021 duyiwei <duyiwei@kylinos.cn> - 5.2.6-1
+- init