automatic import of zabbix

1 files changed, 84 insertions, 90 deletions

diff --git a/zabbix.spec b/zabbix.spec
index 0ad15df..1ce1bf7 100644
--- a/zabbix.spec
+++ b/zabbix.spec
@@ -5,11 +5,10 @@
 #TODO: systemctl reload seems to be necessary after switching with Alternatives
 #TODO: If the DB path for a Sqlite proxy is configured wrong, it requires systemctl restart. Start doesn't work.
 
-%global srcname zabbix
 %global with_selinux 1
 %global selinuxtype targeted
 # go is needed for agent2, but there are missing deps
-%bcond_with go
+%bcond_without go
 # Missing dependencies for the java connector
 %bcond_with java
 #%%global prerelease rc2
@@ -21,34 +20,34 @@ Summary:        Open-source monitoring solution for your IT infrastructure
 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
-Source1:        %{srcname}-web.conf
-Source2:        %{srcname}-php-fpm.conf
-Source5:        %{srcname}-logrotate.in
-Source9:        %{srcname}-tmpfiles-zabbix.conf
+Source1:        %{name}-web.conf
+Source2:        %{name}-php-fpm.conf
+Source5:        %{name}-logrotate.in
+Source9:        %{name}-tmpfiles-zabbix.conf
 # systemd units -- Alternatives switches between them (they state their dependencies)
 # https://support.zabbix.com/browse/ZBXNEXT-1593
-Source10:       %{srcname}-agent.service
-Source11:       %{srcname}-proxy-mysql.service
-Source12:       %{srcname}-proxy-pgsql.service
-Source13:       %{srcname}-proxy-sqlite3.service
-Source14:       %{srcname}-server-mysql.service
-Source15:       %{srcname}-server-pgsql.service
-Source17:       %{srcname}-tmpfiles-zabbixsrv.conf
-Source18:       %{srcname}.te
-Source19:       %{srcname}.if
-Source20:       %{srcname}.fc
+Source10:       %{name}-agent.service
+Source11:       %{name}-proxy-mysql.service
+Source12:       %{name}-proxy-pgsql.service
+Source13:       %{name}-proxy-sqlite3.service
+Source14:       %{name}-server-mysql.service
+Source15:       %{name}-server-pgsql.service
+Source17:       %{name}-tmpfiles-zabbixsrv.conf
+Source18:       %{name}.te
+Source19:       %{name}.if
+Source20:       %{name}.fc
 
 # This is not a symlink, because we don't want the webserver to possibly ever serve it.
 # local rules for config files
-Patch0:         %{srcname}-config.patch
+Patch0:         %{name}-config.patch
 # Allow out-of-tree builds
 # https://support.zabbix.com/browse/ZBXNEXT-6077
-Patch1:         %{srcname}-out-of-tree.patch
+Patch1:         %{name}-out-of-tree.patch
 # Enforce Fedora Crypto Policy
-Patch2:         %{srcname}-crypto-policy.patch
+Patch2:         %{name}-crypto-policy.patch
 # Add <stdio> to sscanf check
 # https://support.zabbix.com/browse/ZBX-21946
-Patch3:         %{srcname}-configure-sscanf.patch
+Patch3:         %{name}-configure-sscanf.patch
 
 # Patch1 patches automake files so we need to autoreconf
 BuildRequires:   libtool
@@ -95,15 +94,10 @@ Requires:        logrotate
 %if 0%{?with_selinux}
 # This ensures that the *-selinux package and all it’s dependencies are not pulled
 # into containers and other systems that do not use SELinux
-Requires:        (%{srcname}-selinux if selinux-policy-%{selinuxtype})
+Requires:        (%{name}-selinux if selinux-policy-%{selinuxtype})
 %endif
 
 Provides:        bundled(md5-deutsch)
-# Could alternatively be conditional on Fedora/EL
-%if "x%{?srcname}" != "x%{name}"
-Provides:        %{srcname} = %{version}-%{release}
-Conflicts:       %{srcname} < 6.0
-%endif
 
 %description
 Zabbix is software that monitors numerous parameters of a network and the
@@ -280,7 +274,7 @@ Provides:        %{name}-web-database = %{version}-%{release}
 Zabbix web frontend for PostgreSQL
 
 %if %{with java}
-%package -n java-%{srcname}
+%package -n java-%{name}
 Summary:         Zabbix Java connector
 BuildArch:       noarch
 BuildRequires:   java-devel
@@ -288,7 +282,7 @@ BuildRequires:   osgi(org.junit)
 BuildRequires:   osgi(slf4j.api)
 BuildRequires:   osgi(logback)
 
-%description -n java-%{srcname}
+%description -n java-%{name}
 Zabbix Java connector.
 %endif
 
@@ -413,8 +407,8 @@ 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
+make -f %{_datadir}/selinux/devel/Makefile %{name}.pp
+bzip2 -9 %{name}.pp
 %endif
 
 
@@ -450,34 +444,34 @@ install -d -m 0755 %{buildroot}%{_rundir}/zabbixsrv/
 
 # Install the frontend after removing backup files from patching
 find ui -name '*.orig' -delete
-mkdir -p %{buildroot}%{_datadir}/%{srcname}
-cp -a ui/* %{buildroot}%{_datadir}/%{srcname}/
+mkdir -p %{buildroot}%{_datadir}/%{name}
+cp -a ui/* %{buildroot}%{_datadir}/%{name}/
 
 # Prepare ghosted config file
-mkdir -p %{buildroot}%{_sysconfdir}/%{srcname}/web
-touch %{buildroot}%{_sysconfdir}/%{srcname}/web/zabbix.conf.php
+mkdir -p %{buildroot}%{_sysconfdir}/%{name}/web
+touch %{buildroot}%{_sysconfdir}/%{name}/web/zabbix.conf.php
 
 # Replace bundled font
 [ -d %{_fontbasedir}/dejavu ] &&
-  ln -sf ../../../fonts/dejavu/DejaVuSans.ttf %{buildroot}%{_datadir}/%{srcname}/assets/fonts/
+  ln -sf ../../../fonts/dejavu/DejaVuSans.ttf %{buildroot}%{_datadir}/%{name}/assets/fonts/
 [ -d %{_fontbasedir}/dejavu-sans-fonts ] &&
-  ln -sf ../../../fonts/dejavu-sans-fonts/DejaVuSans.ttf %{buildroot}%{_datadir}/%{srcname}/assets/fonts/
+  ln -sf ../../../fonts/dejavu-sans-fonts/DejaVuSans.ttf %{buildroot}%{_datadir}/%{name}/assets/fonts/
 
 # Replace JS libraries
 # There is no jquery-ui package yet
-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
+ln -sf ../../../javascript/jquery/3/jquery.min.js %{buildroot}%{_datadir}/%{name}/js/vendors/jquery.js
+#ln -sf ../../../javascript/jquery-ui/1/jquery-ui.min.js %{buildroot}%{_datadir}/%{name}/js/vendors/jquery-ui.js
 
 # This file is used to switch the frontend to maintenance mode
-mv %{buildroot}%{_datadir}/%{srcname}/conf/maintenance.inc.php %{buildroot}%{_sysconfdir}/%{srcname}/web/maintenance.inc.php || :
+mv %{buildroot}%{_datadir}/%{name}/conf/maintenance.inc.php %{buildroot}%{_sysconfdir}/%{name}/web/maintenance.inc.php || :
 
 # Drop Apache config file in place
 mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d
-install -m 0644 -p %{S:1} %{buildroot}%{_sysconfdir}/httpd/conf.d/%{srcname}.conf
+install -m 0644 -p %{S:1} %{buildroot}%{_sysconfdir}/httpd/conf.d/%{name}.conf
 
 # Drop php-fpm config file in place
 mkdir -p %{buildroot}%{_sysconfdir}/php-fpm.d
-install -m 0644 -p %{S:2} %{buildroot}%{_sysconfdir}/php-fpm.d/%{srcname}.conf
+install -m 0644 -p %{S:2} %{buildroot}%{_sysconfdir}/php-fpm.d/%{name}.conf
 
 # Install log rotation
 mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
@@ -506,12 +500,12 @@ mkdir -p %{buildroot}%{_sharedstatedir}/zabbixsrv/tmp
 
 # Install sql files
 for db in postgresql mysql; do
-    mkdir %{buildroot}%{_datadir}/%{srcname}-$db
-    cp -p database/$db/*.sql %{buildroot}%{_datadir}/%{srcname}-$db
+    mkdir %{buildroot}%{_datadir}/%{name}-$db
+    cp -p database/$db/*.sql %{buildroot}%{_datadir}/%{name}-$db
 done
 
-install -dm 755 %{buildroot}%{_datadir}/%{srcname}-sqlite3
-cp -p database/sqlite3/schema.sql %{buildroot}%{_datadir}/%{srcname}-sqlite3
+install -dm 755 %{buildroot}%{_datadir}/%{name}-sqlite3
+cp -p database/sqlite3/schema.sql %{buildroot}%{_datadir}/%{name}-sqlite3
 
 %if 0%{?with_selinux}
 install -D -m 0644 %{name}.pp.bz2 %{buildroot}%{_datadir}/selinux/packages/%{selinuxtype}/%{name}.pp.bz2
@@ -530,27 +524,27 @@ fi
 :
 
 %post server-mysql
-%{_sbindir}/update-alternatives --install %{_sbindir}/%{srcname}_server \
-    %{srcname}-server %{_sbindir}/%{srcname}_server_mysql 10 \
-        --slave %{_unitdir}/zabbix-server.service %{srcname}-server.service \
+%{_sbindir}/update-alternatives --install %{_sbindir}/%{name}_server \
+    %{name}-server %{_sbindir}/%{name}_server_mysql 10 \
+        --slave %{_unitdir}/zabbix-server.service %{name}-server.service \
             %{_unitdir}/zabbix-server-mysql.service
 # This needs to be run twice to rename from old slave name in zabbix < 6.0.33-2
-# due to a bug in alternatives. Remove in F45
-%{_sbindir}/update-alternatives --install %{_sbindir}/%{srcname}_server \
-    %{srcname}-server %{_sbindir}/%{srcname}_server_mysql 10 \
-        --slave %{_unitdir}/zabbix-server.service %{srcname}-server.service \
+# due to a bug in alternatives.
+%{_sbindir}/update-alternatives --install %{_sbindir}/%{name}_server \
+    %{name}-server %{_sbindir}/%{name}_server_mysql 10 \
+        --slave %{_unitdir}/zabbix-server.service %{name}-server.service \
             %{_unitdir}/zabbix-server-mysql.service
 
 %post server-pgsql
-%{_sbindir}/update-alternatives --install %{_sbindir}/%{srcname}_server \
-    %{srcname}-server %{_sbindir}/%{srcname}_server_pgsql 10 \
-        --slave %{_unitdir}/zabbix-server.service %{srcname}-server.service \
+%{_sbindir}/update-alternatives --install %{_sbindir}/%{name}_server \
+    %{name}-server %{_sbindir}/%{name}_server_pgsql 10 \
+        --slave %{_unitdir}/zabbix-server.service %{name}-server.service \
             %{_unitdir}/zabbix-server-pgsql.service
 # This needs to be run twice to rename from old slave name in zabbix < 6.0.33-2
-# due to a bug in alternatives. Remove in F45
-%{_sbindir}/update-alternatives --install %{_sbindir}/%{srcname}_server \
-    %{srcname}-server %{_sbindir}/%{srcname}_server_pgsql 10 \
-        --slave %{_unitdir}/zabbix-server.service %{srcname}-server.service \
+# due to a bug in alternatives.
+%{_sbindir}/update-alternatives --install %{_sbindir}/%{name}_server \
+    %{name}-server %{_sbindir}/%{name}_server_pgsql 10 \
+        --slave %{_unitdir}/zabbix-server.service %{name}-server.service \
             %{_unitdir}/zabbix-server-pgsql.service
 
 %post proxy
@@ -564,39 +558,39 @@ fi
 :
 
 %post proxy-mysql
-%{_sbindir}/update-alternatives --install %{_sbindir}/%{srcname}_proxy \
-    %{srcname}-proxy %{_sbindir}/%{srcname}_proxy_mysql 10 \
-        --slave %{_unitdir}/zabbix-proxy.service %{srcname}-proxy.service \
+%{_sbindir}/update-alternatives --install %{_sbindir}/%{name}_proxy \
+    %{name}-proxy %{_sbindir}/%{name}_proxy_mysql 10 \
+        --slave %{_unitdir}/zabbix-proxy.service %{name}-proxy.service \
             %{_unitdir}/zabbix-proxy-mysql.service
 # This needs to be run twice to rename from old slave name in zabbix < 6.0.33-2
 # due to a bug in alternatives. Remove in F45
-%{_sbindir}/update-alternatives --install %{_sbindir}/%{srcname}_proxy \
-    %{srcname}-proxy %{_sbindir}/%{srcname}_proxy_mysql 10 \
-        --slave %{_unitdir}/zabbix-proxy.service %{srcname}-proxy.service \
+%{_sbindir}/update-alternatives --install %{_sbindir}/%{name}_proxy \
+    %{name}-proxy %{_sbindir}/%{name}_proxy_mysql 10 \
+        --slave %{_unitdir}/zabbix-proxy.service %{name}-proxy.service \
             %{_unitdir}/zabbix-proxy-mysql.service
 
 %post proxy-pgsql
-%{_sbindir}/update-alternatives --install %{_sbindir}/%{srcname}_proxy \
-    %{srcname}-proxy %{_sbindir}/%{srcname}_proxy_pgsql 10 \
-        --slave %{_unitdir}/zabbix-proxy.service %{srcname}-proxy.service \
+%{_sbindir}/update-alternatives --install %{_sbindir}/%{name}_proxy \
+    %{name}-proxy %{_sbindir}/%{name}_proxy_pgsql 10 \
+        --slave %{_unitdir}/zabbix-proxy.service %{name}-proxy.service \
             %{_unitdir}/zabbix-proxy-pgsql.service
 # This needs to be run twice to rename from old slave name in zabbix < 6.0.33-2
 # due to a bug in alternatives. Remove in F45
-%{_sbindir}/update-alternatives --install %{_sbindir}/%{srcname}_proxy \
-    %{srcname}-proxy %{_sbindir}/%{srcname}_proxy_pgsql 10 \
-        --slave %{_unitdir}/zabbix-proxy.service %{srcname}-proxy.service \
+%{_sbindir}/update-alternatives --install %{_sbindir}/%{name}_proxy \
+    %{name}-proxy %{_sbindir}/%{name}_proxy_pgsql 10 \
+        --slave %{_unitdir}/zabbix-proxy.service %{name}-proxy.service \
             %{_unitdir}/zabbix-proxy-pgsql.service
 
 %post proxy-sqlite3
-%{_sbindir}/update-alternatives --install %{_sbindir}/%{srcname}_proxy \
-    %{srcname}-proxy %{_sbindir}/%{srcname}_proxy_sqlite3 10 \
-        --slave %{_unitdir}/zabbix-proxy.service %{srcname}-proxy.service \
+%{_sbindir}/update-alternatives --install %{_sbindir}/%{name}_proxy \
+    %{name}-proxy %{_sbindir}/%{name}_proxy_sqlite3 10 \
+        --slave %{_unitdir}/zabbix-proxy.service %{name}-proxy.service \
             %{_unitdir}/zabbix-proxy-sqlite3.service
 # This needs to be run twice to rename from old slave name in zabbix < 6.0.33-2
 # due to a bug in alternatives. Remove in F45
-%{_sbindir}/update-alternatives --install %{_sbindir}/%{srcname}_proxy \
-    %{srcname}-proxy %{_sbindir}/%{srcname}_proxy_sqlite3 10 \
-        --slave %{_unitdir}/zabbix-proxy.service %{srcname}-proxy.service \
+%{_sbindir}/update-alternatives --install %{_sbindir}/%{name}_proxy \
+    %{name}-proxy %{_sbindir}/%{name}_proxy_sqlite3 10 \
+        --slave %{_unitdir}/zabbix-proxy.service %{name}-proxy.service \
             %{_unitdir}/zabbix-proxy-sqlite3.service
 
 %if 0%{?with_selinux}
@@ -669,12 +663,12 @@ fi
 
 %postun server-mysql
 if [ $1 -eq 0 ] ; then
-    %{_sbindir}/update-alternatives --remove %{srcname}-server %{_sbindir}/%{srcname}_server_mysql
+    %{_sbindir}/update-alternatives --remove %{name}-server %{_sbindir}/%{name}_server_mysql
 fi
 
 %postun server-pgsql
 if [ $1 -eq 0 ] ; then
-    %{_sbindir}/update-alternatives --remove %{srcname}-server %{_sbindir}/%{srcname}_server_pgsql
+    %{_sbindir}/update-alternatives --remove %{name}-server %{_sbindir}/%{name}_server_pgsql
 fi
 
 %postun proxy
@@ -682,17 +676,17 @@ fi
 
 %postun proxy-mysql
 if [ $1 -eq 0 ] ; then
-    %{_sbindir}/update-alternatives --remove %{srcname}-proxy %{_sbindir}/%{srcname}_proxy_mysql
+    %{_sbindir}/update-alternatives --remove %{name}-proxy %{_sbindir}/%{name}_proxy_mysql
 fi
 
 %postun proxy-pgsql
 if [ $1 -eq 0 ] ; then
-    %{_sbindir}/update-alternatives --remove %{srcname}-proxy %{_sbindir}/%{srcname}_proxy_pgsql
+    %{_sbindir}/update-alternatives --remove %{name}-proxy %{_sbindir}/%{name}_proxy_pgsql
 fi
 
 %postun proxy-sqlite3
 if [ $1 -eq 0 ] ; then
-    %{_sbindir}/update-alternatives --remove %{srcname}-proxy %{_sbindir}/%{srcname}_proxy_sqlite3
+    %{_sbindir}/update-alternatives --remove %{name}-proxy %{_sbindir}/%{name}_proxy_sqlite3
 fi
 
 %postun agent
@@ -702,7 +696,7 @@ fi
 %files
 %license COPYING
 %doc AUTHORS ChangeLog NEWS README
-%dir %{_sysconfdir}/%{srcname}
+%dir %{_sysconfdir}/%{name}
 %config(noreplace) %{_sysconfdir}/zabbix_agentd.conf
 %{_bindir}/zabbix_get
 %{_bindir}/zabbix_js
@@ -712,15 +706,15 @@ fi
 
 %files dbfiles-mysql
 %license COPYING
-%{_datadir}/%{srcname}-mysql/
+%{_datadir}/%{name}-mysql/
 
 %files dbfiles-pgsql
 %license COPYING
-%{_datadir}/%{srcname}-postgresql/
+%{_datadir}/%{name}-postgresql/
 
 %files dbfiles-sqlite3
 %license COPYING
-%{_datadir}/%{srcname}-sqlite3/
+%{_datadir}/%{name}-sqlite3/
 
 %files server
 %doc misc/snmptrap/zabbix_trap_receiver.pl
@@ -792,12 +786,12 @@ fi
 %{_unitdir}/zabbix-proxy-sqlite3.service
 
 %files web
-%dir %attr(0750,apache,apache) %{_sysconfdir}/%{srcname}/web
-%ghost %attr(0644,apache,apache) %config(noreplace) %{_sysconfdir}/%{srcname}/web/zabbix.conf.php
-%attr(0644,apache,apache) %config(noreplace) %{_sysconfdir}/%{srcname}/web/maintenance.inc.php
+%dir %attr(0750,apache,apache) %{_sysconfdir}/%{name}/web
+%ghost %attr(0644,apache,apache) %config(noreplace) %{_sysconfdir}/%{name}/web/zabbix.conf.php
+%attr(0644,apache,apache) %config(noreplace) %{_sysconfdir}/%{name}/web/maintenance.inc.php
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/zabbix.conf
 %config(noreplace) %{_sysconfdir}/php-fpm.d/zabbix.conf
-%{_datadir}/%{srcname}/
+%{_datadir}/%{name}/
 
 %files web-mysql