[packages/zabbix] - up to 5.2.3; some place to package zabbix_js needed

[arekm]

commit 710f2b0f13a2649cc609eeafdcf1df0ec53838e8
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Thu Jan 21 22:46:15 2021 +0100

    - up to 5.2.3; some place to package zabbix_js needed

 config.patch         | 22 +++++++++++-----------
 sqlite3_dbname.patch |  9 +++++----
 zabbix.spec          | 17 ++++++++++-------
 3 files changed, 26 insertions(+), 22 deletions(-)
---
diff --git a/zabbix.spec b/zabbix.spec
index 3b93e1d..0320e0c 100644
--- a/zabbix.spec
+++ b/zabbix.spec
@@ -10,16 +10,16 @@
 %define databases %{?with_sqlite3:sqlite3} %{?with_pgsql:postgresql} %{?with_mysql:mysql}
 %define any_database %{with pgsql}%{with mysql}%{with sqlite3}
 
-%define		php_min_version 5.4.0
+%define		php_min_version 7.2.5
 Summary:	Zabbix - network monitoring software
 Summary(pl.UTF-8):	Zabbix - oprogramowanie do monitorowania sieci
 Name:		zabbix
-Version:	4.2.0
-Release:	4
+Version:	5.2.3
+Release:	0.1
 License:	GPL v2+
 Group:		Networking/Utilities
-Source0:	http://downloads.sourceforge.net/zabbix/%{name}-%{version}.tar.gz
-# Source0-md5:	20f261708f95787f3dbea3eab89f804d
+Source0:	https://cdn.zabbix.com/zabbix/sources/stable/5.2/%{name}-%{version}.tar.gz
+# Source0-md5:	20445897eb25c65a1ed1b62db7c5f04b
 Source1:	%{name}-apache.conf
 Source2:	%{name}_server.service
 Source3:	%{name}_agentd.service
@@ -303,12 +303,15 @@ This package provides the Zabbix Java Gateway.
 
 configure() {
 	%configure \
+	--enable-dependency-tracking \
 	--enable-agent \
 	--enable-ipv6 \
 	%{__enable_disable java} \
 	--with-jabber \
 	--with-ldap \
 	--with-libcurl \
+	--with-libevent \
+	--with-libpcre \
 	--with-libxml2 \
 	--with-net-snmp \
 	--with-openipmi \
@@ -350,7 +353,7 @@ done
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sysconfdir},/etc/rc.d/init.d,/etc/webapps/%{_webapp},%{_appdir}} \
+install -d $RPM_BUILD_ROOT{%{_sysconfdir},/etc/rc.d/init.d,/etc/webapps/%{_webapp},%{_appdir}/frontends/php} \
 	$RPM_BUILD_ROOT{/var/run/zabbix,/var/log/zabbix,%{systemdunitdir},%{systemdtmpfilesdir}}
 
 %{__make} install \
@@ -376,7 +379,7 @@ install -d $RPM_BUILD_ROOT/var/lib/zabbix
 touch $RPM_BUILD_ROOT/var/lib/zabbix/zabbix.db
 %endif
 
-cp -r frontends $RPM_BUILD_ROOT%{_appdir}
+cp -r ui/* $RPM_BUILD_ROOT%{_appdir}/frontends/php
 
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/apache.conf
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/httpd.conf
diff --git a/config.patch b/config.patch
index ad2db4f..381966c 100644
--- a/config.patch
+++ b/config.patch
@@ -84,17 +84,17 @@
  
  ### Option: SSLCertLocation
  #	Location of SSL client certificates.
---- zabbix-3.2.0.orig/frontends/php/include/classes/setup/CSetupWizard.php	2016-09-13 14:21:05.000000000 +0200
-+++ zabbix-3.2.0/frontends/php/include/classes/setup/CSetupWizard.php	2016-10-01 18:42:06.000000000 +0200
-@@ -386,7 +386,7 @@
- 				new CTag('p', true, _('Alternatively, you can install it manually:')),
- 				new CTag('ol', true, [
- 					new CTag('li', true, new CLink(_('Download the configuration file'), 'setup.php?save_config=1')),
--					new CTag('li', true, _s('Save it as "%1$s"', $config_file_name))
-+					new CTag('li', true, _s('Save it as "%1$s"', '/etc/zabbix/frontend/zabbix.conf.php'))
- 				]),
- 			];
- 		}
+--- a/ui/include/classes/setup/CSetupWizard.php~	2020-12-21 10:47:57.000000000 +0100
++++ b/ui/include/classes/setup/CSetupWizard.php	2021-01-21 21:53:01.877820978 +0100
+@@ -604,7 +604,7 @@ class CSetupWizard extends CForm {
+ 
+ 		$this->setConfig('ZBX_CONFIG_FILE_CORRECT', true);
+ 
+-		$config_file_name = APP::getInstance()->getRootDir().CConfigFile::CONFIG_FILE_PATH;
++		$config_file_name = '/etc/zabbix/frontend/zabbix.conf.php';
+ 		$config = new CConfigFile($config_file_name);
+ 		$config->config = [
+ 			'DB' => [
 --- zabbix-3.2.0.orig/src/zabbix_java/lib/logback.xml	2016-09-13 14:20:55.000000000 +0200
 +++ zabbix-3.2.0/src/zabbix_java/lib/logback.xml	2016-10-01 18:42:06.000000000 +0200
 @@ -2,10 +2,10 @@
diff --git a/sqlite3_dbname.patch b/sqlite3_dbname.patch
index 0a349ae..8623759 100644
--- a/sqlite3_dbname.patch
+++ b/sqlite3_dbname.patch
@@ -20,10 +20,10 @@ diff -dur -x '*~' -x '*.orig' -x '*.rej' zabbix-3.4.4.orig/src/libs/zbxdb/db.c z
  #endif
  
  #ifndef HAVE_MYSQL
-@@ -608,6 +609,10 @@
- 	ZBX_UNUSED(password);
- 	ZBX_UNUSED(dbschema);
- 	ZBX_UNUSED(port);
+@@ -831,6 +831,10 @@ out:
+ 	ZBX_UNUSED(ca);
+ 	ZBX_UNUSED(cipher);
+ 	ZBX_UNUSED(cipher_13);
 +	if (!strchr(dbname, '/') && !strchr(dbname, ':')) {
 +		zbx_snprintf(dbname_buf, sizeof(dbname_buf), "/var/lib/zabbix/%s.db", dbname);
 +		dbname = dbname_buf;
@@ -31,3 +31,4 @@ diff -dur -x '*~' -x '*.orig' -x '*.rej' zabbix-3.4.4.orig/src/libs/zbxdb/db.c z
  #ifdef HAVE_FUNCTION_SQLITE3_OPEN_V2
  	if (SQLITE_OK != sqlite3_open_v2(dbname, &conn, SQLITE_OPEN_READWRITE, NULL))
  #else
+
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/zabbix.git/commitdiff/710f2b0f13a2649cc609eeafdcf1df0ec53838e8