diff --git a/fedora/SPECS/zabbix.spec b/fedora/SPECS/zabbix.spec index c55a654..963c52d 100644 --- a/fedora/SPECS/zabbix.spec +++ b/fedora/SPECS/zabbix.spec @@ -1,11 +1,27 @@ +# overwrites: +%global build_frontend 1 +%global build_agent2 1 +%global build_agent 1 +%global build_web_service 1 +%global build_java_gateway 1 +%global build_with_mysql 1 +%global build_with_pgsql 1 +%global build_with_sqlite 1 +%global build_server 1 +%global build_proxy 1 +%global build_selinux_policy 1 +BuildRequires: mysql-connector-odbc postgresql-odbc unixODBC unixODBC-devel +BuildRequires: libssh2-devel net-snmp-devel postgresql-server-devel gnutls-devel +# end owerwrite + Name: zabbix -Version: 6.4.2 -Release: %{?alphatag:%{?alphatag}.}release2%{?dist} +Version: 6.4.3 +Release: %{?alphatag:%{?alphatag}.}release1%{?dist} Summary: The Enterprise-class open source monitoring solution Group: Applications/Internet License: GPLv2+ URL: http://www.zabbix.com/ -Source0: https://cdn.zabbix.com/zabbix/sources/development/6.2/%{name}-%{version}%{?alphatag}.tar.gz +Source0: https://cdn.zabbix.com/zabbix/sources/development/6.3/%{name}-%{version}%{?alphatag}.tar.gz Source1: zabbix-web22.conf Source2: zabbix-web24.conf Source3: zabbix-logrotate.in @@ -27,6 +43,7 @@ Source21: zabbix-agent2.init Source22: zabbix-agent2.sysconfig Source23: zabbix-web-service.service Source24: zabbix_policy.te +Patch0: frontend.patch Patch1: fping3-sourceip-option.patch Patch2: java-gateway.patch Patch3: conf.patch @@ -34,7 +51,7 @@ Patch4: agent2.conf.patch Patch5: rhel6-go11.6.patch Patch6: conf.var.run.patch Patch7: agent2.conf.var.run.patch -Patch8: zabbix-godbus.patch +Patch9: agent2.conf.socket.patch Buildroot: %{_tmppath}/zabbix-%{version}-%{release}-root-%(%{__id_u} -n) @@ -77,22 +94,6 @@ Buildroot: %{_tmppath}/zabbix-%{version}-%{release}-root-%(%{__id_u} -n) %{!?build_selinux_policy: %global build_selinux_policy 1} %endif -# overwrites: -%global build_frontend 1 -%global build_agent2 1 -%global build_agent 1 -%global build_web_service 1 -%global build_java_gateway 1 -%global build_with_mysql 1 -%global build_with_pgsql 1 -%global build_with_sqlite 1 -%global build_server 1 -%global build_proxy 1 -%global build_selinux_policy 1 -BuildRequires: mysql-connector-odbc postgresql-odbc unixODBC unixODBC-devel -BuildRequires: libssh2-devel net-snmp-devel postgresql-server-devel gnutls-devel -# end owerwrite - # FIXME: Building debuginfo is broken on RHEL 5 & 8. Disabled for now. %if 0%{?rhel} <= 5 || 0%{?rhel} >= 8 %define debug_package %{nil} @@ -134,14 +135,6 @@ BuildRequires: systemd BuildRequires: policycoreutils-devel %endif -%if 0%{?fedora} >= 37 -BuildRequires: libssh2-devel -BuildRequires: libssh-devel -BuildRequires: OpenIPMI-devel -BuildRequires: libevent-devel -BuildRequires: java-latest-openjdk-devel -%endif - %description Zabbix is the ultimate enterprise-level software designed for real-time monitoring of millions of metrics collected from tens of @@ -432,9 +425,9 @@ Zabbix SELinux policy %prep %setup0 -q -n %{name}-%{version}%{?alphatag} -%patch 8 %if 0%{?build_frontend} +%patch0 -p1 ## remove font file rm -f ui/assets/fonts/DejaVuSans.ttf @@ -455,7 +448,7 @@ find ui/locale -name '*.sh' | xargs rm -f %endif %if 0%{?build_server} || 0%{?build_proxy} || 0%{?build_agent} || 0%{?build_agent2} -%patch 1 -p1 +%patch1 -p1 %endif %if 0%{?build_server} || 0%{?build_proxy} @@ -486,26 +479,29 @@ mv database/sqlite3/schema.sql database/sqlite3/proxy.sql %endif %if 0%{?build_java_gateway} -%patch 2 -p1 +%patch2 -p1 %endif # update config files -%patch 3 -p1 +%patch3 -p1 %if 0%{?build_agent2} -%patch 4 -p1 +%patch4 -p1 %if 0%{?rhel} == 6 -%patch 5 -p1 +%patch5 -p1 %endif %endif %if 0%{?rhel} <= 6 -%patch 6 -p1 +%patch6 -p1 %if 0%{?build_agent2} -%patch 7 -p1 +%patch7 -p1 %endif %endif +%if 0%{?build_agent2} +%patch9 -p1 +%endif %build # Build consists of 1-3 configure/make passes, one for each database. @@ -523,11 +519,21 @@ build_conf_common=" --with-libcurl --with-openipmi --with-unixodbc - --with-openssl +%if 0%{?rhel} >= 8 --with-ssh +%else + --with-ssh2 +%endif --with-libxml2 --with-libevent +%if 0%{?rhel} >= 7 --with-libpcre2 +%else + --with-libpcre +%endif +%if 0%{?rhel} >= 6 + --with-openssl +%endif " # setup pass 3 @@ -675,9 +681,14 @@ 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 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 +install -Dm 0755 -p %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/init.d/zabbix-agent +install -Dm 0644 -p %{SOURCE20} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/zabbix-agent +%endif +%else %if 0%{?build_agent2} rm $RPM_BUILD_ROOT%{_sbindir}/zabbix_agentd rm $RPM_BUILD_ROOT%{_sysconfdir}/zabbix/zabbix_agentd.conf @@ -690,8 +701,13 @@ 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 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 +install -Dm 0755 -p %{SOURCE21} $RPM_BUILD_ROOT%{_sysconfdir}/init.d/zabbix-agent2 +install -Dm 0644 -p %{SOURCE22} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/zabbix-agent2 +%endif %endif @@ -823,8 +839,13 @@ 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 %{_unitdir}/zabbix-agent.service %{_tmpfilesdir}/zabbix-agent.conf +%else +%{_sysconfdir}/init.d/zabbix-agent +%config(noreplace) %{_sysconfdir}/sysconfig/zabbix-agent +%endif %files get %defattr(-,root,root,-) @@ -902,8 +923,13 @@ fi %attr(0755,zabbix,zabbix) %dir %{_localstatedir}/run/zabbix %{_sbindir}/zabbix_agent2 %{_mandir}/man8/zabbix_agent2.8* +%if 0%{?rhel} >= 7 %{_unitdir}/zabbix-agent2.service %{_tmpfilesdir}/zabbix_agent2.conf +%else +%{_sysconfdir}/init.d/zabbix-agent2 +%config(noreplace) %{_sysconfdir}/sysconfig/zabbix-agent2 +%endif %pre agent2 getent group zabbix > /dev/null || groupadd -r zabbix @@ -913,7 +939,9 @@ getent passwd zabbix > /dev/null || \ : %post agent2 +%if 0%{?rhel} >= 7 %systemd_post zabbix-agent2.service +%endif # make sure that agent2 log file is create with proper attributes (ZBX-18243) if [ $1 == 1 ] && [ ! -f %{_localstatedir}/log/zabbix/zabbix_agent2.log ]; then touch %{_localstatedir}/log/zabbix/zabbix_agent2.log @@ -921,10 +949,14 @@ if [ $1 == 1 ] && [ ! -f %{_localstatedir}/log/zabbix/zabbix_agent2.log ]; then fi : +%if 0%{?rhel} >= 7 %preun agent2 %systemd_preun zabbix-agent2.service : +%postun agent2 +%systemd_postun_with_restart zabbix-agent2.service +%endif %endif @@ -1240,6 +1272,16 @@ fi %config(noreplace) %{_sysconfdir}/nginx/conf.d/zabbix.conf %post web +%if 0%{?rhel} >= 9 +if [ "$1" = 2 ] && update-alternatives --display zabbix-web-font | grep -q %{_datadir}/fonts/dejavu/DejaVuSans.ttf; then + # remove borked web font alternative symlink + /usr/sbin/update-alternatives --remove zabbix-web-font \ + %{_datadir}/fonts/dejavu/DejaVuSans.ttf +fi +/usr/sbin/update-alternatives --install %{_datadir}/zabbix/assets/fonts/graphfont.ttf \ + zabbix-web-font %{_datadir}/fonts/dejavu-sans-fonts/DejaVuSans.ttf 10 +: +%else # The fonts directory was moved into assets subdirectory at one point. # # This broke invocation of update-alternatives command below, because the target link for zabbix-web-font changed @@ -1255,20 +1297,10 @@ then rm %{_datadir}/zabbix/fonts/graphfont.ttf fi fi -%if 0%{?rhel} >= 9 -# 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 \ - %{_datadir}/fonts/dejavu/DejaVuSans.ttf -fi -%endif /usr/sbin/update-alternatives --install %{_datadir}/zabbix/assets/fonts/graphfont.ttf \ -%if 0%{?rhel} >= 9 - zabbix-web-font %{_datadir}/fonts/dejavu-sans-fonts/DejaVuSans.ttf 10 -%else zabbix-web-font %{_datadir}/fonts/dejavu/DejaVuSans.ttf 10 -%endif : +%endif %post web-japanese /usr/sbin/update-alternatives --install %{_datadir}/zabbix/assets/fonts/graphfont.ttf zabbix-web-font \ @@ -1290,15 +1322,17 @@ fi : %preun web -if [ "$1" = 0 ]; then %if 0%{?rhel} >= 9 +if [ "$1" = 0 ]; then /usr/sbin/update-alternatives --remove zabbix-web-font \ %{_datadir}/fonts/dejavu-sans-fonts/DejaVuSans.ttf +fi %else +if [ "$1" = 0 ]; then /usr/sbin/update-alternatives --remove zabbix-web-font \ %{_datadir}/fonts/dejavu/DejaVuSans.ttf -%endif fi +%endif : %preun web-japanese @@ -1369,64 +1403,82 @@ if [ $1 = 0 ] && semodule -l | grep -q zabbix_policy; then semodule -r zabbix_po # %changelog -* Tue May 16 2023 Daniel Steiner -- Patch for recent godbus version. +* Fri May 26 2023 Zabbix Packager - 6.4.3-release1 +- update to 6.4.3 -* Thu May 11 2023 Daniel Steiner -- first build on Fedora 38. +* Tue May 23 2023 Zabbix Packager - 6.4.3-rc1.release1 +- update to 6.4.3rc1 -* Fri May 5 2023 Daniel Steiner +* Mon May 15 2023 Zabbix Packager - 6.4.2-release3 +- third release of 6.4.2 +- restored support for agent2 on rhel-6 + +* Wed Apr 26 2023 Zabbix Packager - 6.4.2-release2 +- second release of 6.4.2 +- fixed zabbix-web-font on rhel-9 (ZBX-22599) + +* Tue Apr 25 2023 Zabbix Packager - 6.4.2-release1 - update to 6.4.2 -* Fri Apr 7 2023 Daniel Steiner +* Wed Apr 19 2023 Zabbix Packager - 6.4.2-rc2.release1 +- update to 6.4.2rc2 + +* Tue Apr 18 2023 Zabbix Packager - 6.4.2-rc1.release1 +- update to 6.4.2rc1 + +* Mon Apr 03 2023 Zabbix Packager - 6.4.1-release1 - update to 6.4.1 -* Sat Mar 11 2023 Daniel Steiner +* Wed Mar 29 2023 Zabbix Packager - 6.4.1-rc2.release1 +- update to 6.4.1rc2 + +* Wed Mar 22 2023 Zabbix Packager - 6.4.1-rc1.release1 +- update to 6.4.1rc1 + +* Tue Mar 07 2023 Zabbix Packager - 6.4.0-release1 - update to 6.4.0 -* Sun Feb 5 2023 Daniel Steiner -- update to 6.2.7 +* Thu Mar 02 2023 Zabbix Packager - 6.4.0-rc4.release1 +- update to 6.4.0rc4 -* Mon Dec 05 2022 Zabbix Packager - 6.2.6-release1 -- update to 6.2.6 +* Tue Feb 28 2023 Zabbix Packager - 6.4.0-rc3.release1 +- update to 6.4.0rc3 -* Fri Dec 02 2022 Zabbix Packager - 6.2.6-rc2.release1 -- update to 6.2.6rc2 +* Tue Feb 21 2023 Zabbix Packager - 6.4.0-rc2.release1 +- update to 6.4.0rc2 +- removed c99.patch; use -std=gnu99 compiler flag instead -* Thu Dec 01 2022 Zabbix Packager - 6.2.6-rc1.release1 -- update to 6.2.6rc1 +* Wed Feb 08 2023 Zabbix Packager - 6.4.0-rc1.release1 +- update to 6.4.0rc1 +- updated c99.patch -* Mon Nov 28 2022 Zabbix Packager - 6.2.5-release1 -- update to 6.2.5 +* Wed Jan 25 2023 Zabbix Packager - 6.4.0-beta6.release1 +- update to 6.4.0beta6 +- added LimitNOFILE=8192 to agent2 systemd service file (ZBX-22061) +- added agent2.conf.socket.patch (ZBX-22061) -* Mon Nov 21 2022 Zabbix Packager - 6.2.5-rc1.release1 -- update to 6.2.5rc1 +* Tue Dec 20 2022 Zabbix Packager - 6.4.0-beta5.release1 +- update to 6.4.0beta5 -* Wed Nov 02 2022 Zabbix Packager - 6.2.4-release1 -- update to 6.2.4 +* Tue Nov 29 2022 Zabbix Packager - 6.4.0-beta4.release1 +- update to 6.4.0beta4 -* Wed Oct 26 2022 Zabbix Packager - 6.2.4-rc1.release1 -- update to 6.2.4rc1 -- removed agent2 builtin postgres.conf file; to be replaced with a plugin +* Tue Nov 08 2022 Zabbix Packager - 6.4.0-beta3.release1 +- update to 6.4.0beta3 -* Wed Sep 21 2022 Zabbix Packager - 6.2.3-release1 -- update to 6.2.3 +* Thu Oct 27 2022 Zabbix Packager - 6.4.0-beta2.release1 +- update to 6.4.0beta2 +- removed agent2 for rhel-6 -* Mon Sep 19 2022 Zabbix Packager - 6.2.3-rc2.release1 -- update to 6.2.3rc2 +* Thu Sep 29 2022 Zabbix Packager - 6.4.0-beta1.release1 +- update to 6.4.0beta1 +- removed postgres.conf from agent2 package -* Wed Sep 14 2022 Zabbix Packager - 6.2.3-rc1.release1 -- update to 6.2.3rc1 -- moved zabbix-sql-scripts contents out of system documentation and into data directory -- added new postgresql files to sql-scripts package - -* Tue Aug 30 2022 Zabbix Packager - 6.2.2-release2 -- second release of 6.2.2 for rhel-9 -- fixed path to DejaVuSans font - -* Mon Aug 29 2022 Zabbix Packager - 6.2.2-release1 -- update to 6.2.2 +* Wed Sep 14 2022 Zabbix Packager - 6.4.0-alpha1.release1 +- update to 6.4.0alpha1 - added "release" prefix to package version +- added new postgresql files to sql-scripts package +- moved zabbix-sql-scripts contents out of system documentation and into data directory * Thu Jul 14 2022 Zabbix Packager - 6.2.1-1 - update to 6.2.1