[packages/zabbix] up to 7.0.3
atler
atler at pld-linux.org
Thu Aug 22 17:36:45 CEST 2024
commit 3ade84f074172891ce0a1bef7b870da809eb4c4f
Author: Jan Palus <atler at pld-linux.org>
Date: Thu Aug 22 17:05:04 2024 +0200
up to 7.0.3
config.patch | 2 +-
go-destdir.patch | 20 --------------------
go-vendor.patch | 51 ++++++++++++++++++---------------------------------
sqlite3_dbname.patch | 42 ++++++++++++++++++++++++++++--------------
zabbix.spec | 22 +++++++++++++---------
5 files changed, 60 insertions(+), 77 deletions(-)
---
diff --git a/zabbix.spec b/zabbix.spec
index 13d5014..5d74fe8 100644
--- a/zabbix.spec
+++ b/zabbix.spec
@@ -24,15 +24,15 @@
Summary: Zabbix - network monitoring software
Summary(pl.UTF-8): Zabbix - oprogramowanie do monitorowania sieci
Name: zabbix
-Version: 6.0.33
+Version: 7.0.3
Release: 1
License: GPL v2+
Group: Networking/Utilities
# https://www.zabbix.com/download_sources
-Source0: https://cdn.zabbix.com/zabbix/sources/stable/6.0/%{name}-%{version}.tar.gz
-# Source0-md5: 100fd4ef73de6918e65ea71166658521
+Source0: https://cdn.zabbix.com/zabbix/sources/stable/7.0/%{name}-%{version}.tar.gz
+# Source0-md5: 94c2eb56bedc9bbf6056a16358065b11
Source100: go-vendor.tar.xz
-# Source100-md5: 22791de70b0fee7153fc13217f5a17fb
+# Source100-md5: 5a9271acf477fa5382f3970139495695
Source1: %{name}-apache.conf
Source2: %{name}_server.service
Source3: %{name}_agentd.service
@@ -50,13 +50,12 @@ tar -caf ~/go-vendor.tar.xz -C ../../ src/go/vendor
Patch0: config.patch
Patch1: sqlite3_dbname.patch
Patch2: always_compile_ipc.patch
-Patch3: go-destdir.patch
-Patch4: go-vendor.patch
+Patch3: go-vendor.patch
URL: https://www.zabbix.com/
BuildRequires: OpenIPMI-devel
BuildRequires: autoconf
BuildRequires: automake >= 1:1.15
-BuildRequires: curl-devel
+BuildRequires: curl-devel >= 7.19.1
BuildRequires: iksemel-devel
%{?with_java:%buildrequires_jdk}
BuildRequires: rpm-build >= 4.6
@@ -69,7 +68,7 @@ BuildRequires: libxml2-devel
%{?with_mysql:BuildRequires: mysql-devel}
BuildRequires: net-snmp-devel
BuildRequires: openldap-devel >= 2.4.6
-BuildRequires: openssl-devel >= 0.9.7d
+BuildRequires: openssl-devel >= 1.1.0
BuildRequires: pcre-devel
%{?with_pgsql:BuildRequires: postgresql-devel}
BuildRequires: rpmbuild(macros) >= 2.021
@@ -149,6 +148,7 @@ Requires: systemd-units >= 38
Obsoletes: zabbix-agent-inetd
Obsoletes: zabbix-agent-standalone
Requires(post,preun): /sbin/chkconfig
+Requires: curl-libs >= 7.19.1
Requires: rc-scripts
%description agentd
@@ -251,6 +251,7 @@ Ten pakiet zawiera proxy Zabbix.
Summary: MySQL support for Zabbix proxy
Summary(pl.UTF-8): Obsługa MySQL dla proxy do Zabbiksa
Group: Networking/Utilities
+Requires: curl-libs >= 7.19.1
Provides: %{name}-proxy(db) = %{version}-%{release}
Obsoletes: zabbix-proxy-postgresql
Obsoletes: zabbix-proxy-sqlite3
@@ -265,6 +266,7 @@ Ten pakiet zawiera proxy Zabbix z obsługą MySQL.
Summary: PostgreSQL support for Zabbix proxy
Summary(pl.UTF-8): Obsługa PostgreSQL dla proxy do Zabbiksa
Group: Networking/Utilities
+Requires: curl-libs >= 7.19.1
Provides: %{name}-proxy(db) = %{version}-%{release}
Obsoletes: zabbix-proxy-mysql
Obsoletes: zabbix-proxy-sqlite3
@@ -279,6 +281,7 @@ Ten pakiet zawiera proxy Zabbix z obsługą PostgreSQL.
Summary: SQLite 3 support for Zabbix proxy
Summary(pl.UTF-8): Obsługa SQLite 3 dla proxy do Zabbiksa
Group: Networking/Utilities
+Requires: curl-libs >= 7.19.1
Provides: %{name}-proxy(db) = %{version}-%{release}
Obsoletes: zabbix-proxy-mysql
Obsoletes: zabbix-proxy-postgresql
@@ -321,6 +324,7 @@ Ten pakiet zawiera serwer Zabbiksa.
Summary: MySQL support for Zabbix server
Summary(pl.UTF-8): Obsługa MySQL sla serwera Zabbiksa
Group: Networking/Utilities
+Requires: curl-libs >= 7.19.1
Provides: %{name}-server(db) = %{version}-%{release}
Obsoletes: zabbix-server-postgresql
Obsoletes: zabbix-server-sqlite3
@@ -336,6 +340,7 @@ Ten pakiet zawiera serwer Zabbiksa z obsługą bazy danych MySQL.
Summary: PostgreSQL support for Zabbix server
Summary(pl.UTF-8): Obsługa PostgreSQL sla serwera Zabbiksa
Group: Networking/Utilities
+Requires: curl-libs >= 7.19.1
Provides: %{name}-server(db) = %{version}-%{release}
Obsoletes: zabbix-server-mysql
Obsoletes: zabbix-server-sqlite3
@@ -362,7 +367,6 @@ This package provides the Zabbix Java Gateway.
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch4 -p1
%build
%{__libtoolize}
diff --git a/config.patch b/config.patch
index b6b76d4..9b29abd 100644
--- a/config.patch
+++ b/config.patch
@@ -122,7 +122,7 @@ diff -urNp -x '*.orig' zabbix-5.2.3.org/ui/include/classes/setup/CSetupWizard.ph
$this->setConfig('ZBX_CONFIG_FILE_CORRECT', true);
-- $config_file_name = APP::getInstance()->getRootDir().CConfigFile::CONFIG_FILE_PATH;
+- $config_file_name = APP::getRootDir().CConfigFile::CONFIG_FILE_PATH;
+ $config_file_name = '/etc/zabbix/frontend/zabbix.conf.php';
$config = new CConfigFile($config_file_name);
$config->config = [
diff --git a/go-destdir.patch b/go-destdir.patch
deleted file mode 100644
index fcfc60f..0000000
--- a/go-destdir.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- zabbix-6.0.15/src/go/Makefile.am.orig 2023-04-02 01:39:06.004592284 +0200
-+++ zabbix-6.0.15/src/go/Makefile.am 2023-04-02 01:40:27.811983809 +0200
-@@ -61,7 +61,7 @@
- -rm -f sbom-zws.xml
-
- install-golang.zabbix.com/agent2/cmd/zabbix_agent2:
-- CGO_CFLAGS="${CGO_CFLAGS}" CGO_LDFLAGS="${CGO_LDFLAGS}" GOBIN=${GOBIN} \
-+ CGO_CFLAGS="${CGO_CFLAGS}" CGO_LDFLAGS="${CGO_LDFLAGS}" GOBIN=$(DESTDIR)${GOBIN} \
- go install -ldflags="${AGENT_GOLDFLAGS}" ${TARGETS}
- $(MKDIR_P) "$(DESTDIR)$(AGENT2_CONFIG_PLUGINS_PATH)"
- test -f "$(DESTDIR)$(AGENT2_CONFIG_FILE)" || cp "conf/zabbix_agent2.conf" "$(DESTDIR)$(AGENT2_CONFIG_FILE)"
-@@ -71,7 +71,7 @@
- done
-
- install-golang.zabbix.com/agent2/cmd/zabbix_web_service:
-- GOBIN=${GOBIN} go install -ldflags="${WEBSERVICE_GOLDFLAGS}" golang.zabbix.com/agent2/cmd/zabbix_web_service
-+ GOBIN=$(DESTDIR)${GOBIN} go install -ldflags="${WEBSERVICE_GOLDFLAGS}" golang.zabbix.com/agent2/cmd/zabbix_web_service
-
- install-exec-local: ${INSTALL_TARGETS}
-
diff --git a/go-vendor.patch b/go-vendor.patch
index 2dd8fd5..78a8572 100644
--- a/go-vendor.patch
+++ b/go-vendor.patch
@@ -1,33 +1,18 @@
---- zabbix-6.0.15/src/go/Makefile.am.orig 2023-04-02 01:41:24.660175099 +0200
-+++ zabbix-6.0.15/src/go/Makefile.am 2023-04-02 01:43:32.786108513 +0200
-@@ -49,10 +49,10 @@
- all: build
-
- golang.zabbix.com/agent2/cmd/zabbix_agent2:
-- CGO_CFLAGS="${CGO_CFLAGS}" CGO_LDFLAGS="${CGO_LDFLAGS}" go build -tags="${AGENT_GOTAGS}" -ldflags="${AGENT_GOLDFLAGS}" -o bin golang.zabbix.com/agent2/cmd/zabbix_agent2
-+ CGO_CFLAGS="${CGO_CFLAGS}" CGO_LDFLAGS="${CGO_LDFLAGS}" go build -mod=vendor -tags="${AGENT_GOTAGS}" -ldflags="${AGENT_GOLDFLAGS}" -o bin golang.zabbix.com/agent2/cmd/zabbix_agent2
-
- golang.zabbix.com/agent2/cmd/zabbix_web_service:
-- go build -ldflags="${WEBSERVICE_GOLDFLAGS}" -o bin golang.zabbix.com/agent2/cmd/zabbix_web_service
-+ go build -mod=vendor -ldflags="${WEBSERVICE_GOLDFLAGS}" -o bin golang.zabbix.com/agent2/cmd/zabbix_web_service
-
- build: ${TARGETS}
-
-@@ -62,7 +62,7 @@
-
- install-golang.zabbix.com/agent2/cmd/zabbix_agent2:
- CGO_CFLAGS="${CGO_CFLAGS}" CGO_LDFLAGS="${CGO_LDFLAGS}" GOBIN=$(DESTDIR)${GOBIN} \
-- go install -ldflags="${AGENT_GOLDFLAGS}" ${TARGETS}
-+ go install -mod=vendor -ldflags="${AGENT_GOLDFLAGS}" ${TARGETS}
- $(MKDIR_P) "$(DESTDIR)$(AGENT2_CONFIG_PLUGINS_PATH)"
- test -f "$(DESTDIR)$(AGENT2_CONFIG_FILE)" || cp "conf/zabbix_agent2.conf" "$(DESTDIR)$(AGENT2_CONFIG_FILE)"
- for cfg in conf/zabbix_agent2.d/plugins.d/*.conf; do \
-@@ -71,7 +71,7 @@
- done
-
- install-golang.zabbix.com/agent2/cmd/zabbix_web_service:
-- GOBIN=$(DESTDIR)${GOBIN} go install -ldflags="${WEBSERVICE_GOLDFLAGS}" golang.zabbix.com/agent2/cmd/zabbix_web_service
-+ GOBIN=$(DESTDIR)${GOBIN} go install -mod=vendor -ldflags="${WEBSERVICE_GOLDFLAGS}" golang.zabbix.com/agent2/cmd/zabbix_web_service
-
- install-exec-local: ${INSTALL_TARGETS}
-
+--- zabbix-7.0.3/src/go/Makefile.am.orig 2024-08-22 15:13:38.617557743 +0200
++++ zabbix-7.0.3/src/go/Makefile.am 2024-08-22 15:16:13.296462739 +0200
+@@ -50,6 +50,7 @@
+ bin/zabbix_agent2: FORCE
+ CGO_CFLAGS="${CGO_CFLAGS}" CGO_LDFLAGS="${CGO_LDFLAGS}" \
+ $(GO) build \
++ -mod=vendor \
+ -tags="${AGENT_GOTAGS}" \
+ -ldflags="${AGENT_GOLDFLAGS}" \
+ -o bin \
+@@ -57,6 +58,7 @@
+
+ bin/zabbix_web_service: FORCE
+ $(GO) build \
++ -mod=vendor \
+ -ldflags="${WEBSERVICE_GOLDFLAGS}" \
+ -o bin \
+ golang.zabbix.com/agent2/cmd/zabbix_web_service
diff --git a/sqlite3_dbname.patch b/sqlite3_dbname.patch
index 2749a43..79dc5fd 100644
--- a/sqlite3_dbname.patch
+++ b/sqlite3_dbname.patch
@@ -8,25 +8,39 @@
# If the Net Service Name connection method is used to connect to Oracle database, specify the service name from
# the tnsnames.ora file or set to empty string; also see the TWO_TASK environment variable if DBName is set to
# empty string.
-diff -urNp -x '*.orig' zabbix-5.2.3.org/src/libs/zbxdb/db.c zabbix-5.2.3/src/libs/zbxdb/db.c
---- zabbix-5.2.3.org/src/libs/zbxdb/db.c 2020-12-14 11:27:17.000000000 +0100
-+++ zabbix-5.2.3/src/libs/zbxdb/db.c 2021-08-24 11:18:52.356778296 +0200
-@@ -383,6 +383,7 @@ int zbx_db_connect(char *host, char *use
+--- zabbix-7.0.3/src/libs/zbxdb/db.c.orig 2024-08-22 14:35:46.382451647 +0200
++++ zabbix-7.0.3/src/libs/zbxdb/db.c 2024-08-22 15:08:36.432915877 +0200
+@@ -437,6 +437,7 @@ int zbx_db_connect_basic(const zbx_confi
unsigned int i = 0;
#elif defined(HAVE_SQLITE3)
char *p, *path = NULL;
-+ char dbname_buf[1024];
++ char *dbpath = NULL;
#endif
- #ifndef HAVE_MYSQL
-@@ -830,6 +831,10 @@ out:
- ZBX_UNUSED(cipher);
- ZBX_UNUSED(cipher_13);
- ZBX_UNUSED(read_only_recoverable);
-+ if (!strchr(dbname, '/') && !strchr(dbname, ':')) {
-+ zbx_snprintf(dbname_buf, sizeof(dbname_buf), "/var/lib/zabbix/%s.db", dbname);
-+ dbname = dbname_buf;
+ /* Allow executing statements during a connection initialization. Make sure to mark transaction as failed. */
+@@ -851,10 +852,15 @@ int zbx_db_connect_basic(const zbx_confi
+ ZBX_PG_READ_ONLY_RECOVERABLE = cfg->read_only_recoverable;
+ out:
+ #elif defined(HAVE_SQLITE3)
++ if (!strchr(cfg->config_dbname, '/') && !strchr(cfg->config_dbname, ':')) {
++ dbpath = zbx_dsprintf(NULL, "/var/lib/zabbix/%s.db", cfg->config_dbname);
++ } else {
++ dbpath = strdup(cfg->config_dbname);
+ }
#ifdef HAVE_FUNCTION_SQLITE3_OPEN_V2
- if (SQLITE_OK != sqlite3_open_v2(dbname, &conn, SQLITE_OPEN_READWRITE, NULL))
+- if (SQLITE_OK != sqlite3_open_v2(cfg->config_dbname, &conn, SQLITE_OPEN_READWRITE, NULL))
++ if (SQLITE_OK != sqlite3_open_v2(dbpath, &conn, SQLITE_OPEN_READWRITE, NULL))
#else
+- if (SQLITE_OK != sqlite3_open(cfg->config_dbname, &conn))
++ if (SQLITE_OK != sqlite3_open(dbpath, &conn))
+ #endif
+ {
+ zbx_db_errlog(ERR_Z3001, 0, sqlite3_errmsg(conn), cfg->config_dbname);
+@@ -895,6 +901,7 @@ out:
+
+ zbx_free(path);
+ out:
++ free(dbpath);
+ #endif /* HAVE_SQLITE3 */
+ if (ZBX_DB_OK != ret)
+ zbx_db_close_basic();
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/zabbix.git/commitdiff/3ade84f074172891ce0a1bef7b870da809eb4c4f
More information about the pld-cvs-commit
mailing list