commit b0d487bd5855244bd4c7ae0b8582cb7dda5c2e05
Author: Jan Palus <at...@pld-linux.org>
Date: Sun Apr 2 02:28:36 2023 +0200
up to 6.0.15 (latest lts)
go-destdir.patch | 11 ++++++++---
go-vendor.patch | 17 +++++++++++------
zabbix.spec | 16 +++++++++-------
3 files changed, 28 insertions(+), 16 deletions(-)
---
diff --git a/zabbix.spec b/zabbix.spec
index 5ee5b43..f0ac125 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: 5.4.3
-Release: 3
+Version: 6.0.15
+Release: 1
License: GPL v2+
Group: Networking/Utilities
# https://www.zabbix.com/download_sources
-Source0:
https://cdn.zabbix.com/zabbix/sources/stable/5.4/%{name}-%{version}.tar.gz
-# Source0-md5: 5dccb536c164e45c7d5c1a5a9d64be43
+Source0:
https://cdn.zabbix.com/zabbix/sources/stable/6.0/%{name}-%{version}.tar.gz
+# Source0-md5: 54712b943e39287ed47a5118edff295b
Source100: go-vendor.tar.xz
-# Source100-md5: 61f2ee9647280765b622a5e1e8cdfbba
+# Source100-md5: e8ffa2ed45f01a1c1df2545c1efa7917
Source1: %{name}-apache.conf
Source2: %{name}_server.service
Source3: %{name}_agentd.service
@@ -412,7 +412,7 @@ done
%install
rm -rf $RPM_BUILD_ROOT
install -d \
-
$RPM_BUILD_ROOT{%{_sysconfdir}/zabbix_agent2.conf.d,/etc/webapps/%{_webapp}} \
+ $RPM_BUILD_ROOT/etc/webapps/%{_webapp} \
$RPM_BUILD_ROOT{/etc/rc.d/init.d,%{_appdir}/frontends/php} \
$RPM_BUILD_ROOT{/var/run/zabbix,/var/log/zabbix,%{systemdunitdir},%{systemdtmpfilesdir}}
@@ -629,7 +629,9 @@ ln -sf zabbix_proxy-sqlite3 %{_sbindir}/zabbix_proxy || :
%files agent2
%defattr(644,root,root,755)
%attr(640,root,zabbix) %config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/zabbix_agent2.conf
-%dir %attr(751,root,zabbix) %{_sysconfdir}/zabbix_agent2.conf.d
+%dir %attr(751,root,zabbix) %{_sysconfdir}/zabbix_agent2.d
+%dir %attr(751,root,zabbix) %{_sysconfdir}/zabbix_agent2.d/plugins.d
+%attr(640,root,zabbix) %config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/zabbix_agent2.d/plugins.d/*.conf
%attr(754,root,root) /etc/rc.d/init.d/zabbix_agent2
%attr(755,root,root) %{_sbindir}/zabbix_agent2
%{_mandir}/man8/zabbix_agent2.8*
diff --git a/go-destdir.patch b/go-destdir.patch
index d66e19b..ac2c33e 100644
--- a/go-destdir.patch
+++ b/go-destdir.patch
@@ -1,15 +1,20 @@
---- zabbix-5.4.3/src/go/Makefile.am~ 2021-07-19 17:04:10.000000000 +0300
-+++ zabbix-5.4.3/src/go/Makefile.am 2021-08-24 14:54:36.169315447 +0300
-@@ -52,11 +52,11 @@
+--- 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 bin/zabbix_agent2 bin/mock_server
install-zabbix.com/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-zabbix.com/cmd/zabbix_web_service:
- GOBIN=${GOBIN} go install -ldflags="${WEBSERVICE_GOLDFLAGS}"
zabbix.com/cmd/zabbix_web_service
+ GOBIN=$(DESTDIR)${GOBIN} go install -ldflags="${WEBSERVICE_GOLDFLAGS}"
zabbix.com/cmd/zabbix_web_service
install-exec-local: ${INSTALL_TARGETS}
+
diff --git a/go-vendor.patch b/go-vendor.patch
index 578c8fc..df1ba68 100644
--- a/go-vendor.patch
+++ b/go-vendor.patch
@@ -1,11 +1,11 @@
---- zabbix-5.4.3/src/go/Makefile.am 2021-08-24 18:11:56.298334804 +0300
-+++ zabbix-5.4.3/src/go/Makefile.am 2021-08-24 18:27:30.560260563 +0300
-@@ -40,10 +40,10 @@
+--- 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
zabbix.com/cmd/zabbix_agent2:
-- CGO_CFLAGS="${CGO_CFLAGS}" CGO_LDFLAGS="${CGO_LDFLAGS}" go build
-ldflags="${AGENT_GOLDFLAGS}" -o bin zabbix.com/cmd/zabbix_agent2
-+ CGO_CFLAGS="${CGO_CFLAGS}" CGO_LDFLAGS="${CGO_LDFLAGS}" go build
-mod=vendor -ldflags="${AGENT_GOLDFLAGS}" -o bin zabbix.com/cmd/zabbix_agent2
+- CGO_CFLAGS="${CGO_CFLAGS}" CGO_LDFLAGS="${CGO_LDFLAGS}" go build
-tags="${AGENT_GOTAGS}" -ldflags="${AGENT_GOLDFLAGS}" -o bin
zabbix.com/cmd/zabbix_agent2
++ CGO_CFLAGS="${CGO_CFLAGS}" CGO_LDFLAGS="${CGO_LDFLAGS}" go build
-mod=vendor -tags="${AGENT_GOTAGS}" -ldflags="${AGENT_GOLDFLAGS}" -o bin
zabbix.com/cmd/zabbix_agent2
zabbix.com/cmd/zabbix_web_service:
- go build -ldflags="${WEBSERVICE_GOLDFLAGS}" -o bin
zabbix.com/cmd/zabbix_web_service
@@ -13,12 +13,17 @@
build: ${TARGETS}
-@@ -53,10 +53,10 @@
+@@ -62,7 +62,7 @@
install-zabbix.com/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-zabbix.com/cmd/zabbix_web_service:
- GOBIN=$(DESTDIR)${GOBIN} go install -ldflags="${WEBSERVICE_GOLDFLAGS}"
zabbix.com/cmd/zabbix_web_service
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/zabbix.git/commitdiff/b0d487bd5855244bd4c7ae0b8582cb7dda5c2e05
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
