[packages/zabbix] up to 6.0.30
atler
atler at pld-linux.org
Tue May 21 20:33:33 CEST 2024
commit f55baa991091326d1d9dcf9f572a550b921a3533
Author: Jan Palus <atler at pld-linux.org>
Date: Tue May 21 20:17:45 2024 +0200
up to 6.0.30
go-destdir.patch | 8 ++++----
go-vendor.patch | 20 ++++++++++----------
zabbix.spec | 6 +++---
3 files changed, 17 insertions(+), 17 deletions(-)
---
diff --git a/zabbix.spec b/zabbix.spec
index f5d3529..1212642 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.29
+Version: 6.0.30
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: 73314d5d61722baf9236a4755f07a100
+# Source0-md5: 7f553e63c07f330996ad06ea87ea2f38
Source100: go-vendor.tar.xz
-# Source100-md5: 4a9250ca3ff0b8cf94e6540f8f542628
+# Source100-md5: b25dd4b2a72c62d6fa1378031b261a3d
Source1: %{name}-apache.conf
Source2: %{name}_server.service
Source3: %{name}_agentd.service
diff --git a/go-destdir.patch b/go-destdir.patch
index 1acabc9..fcfc60f 100644
--- a/go-destdir.patch
+++ b/go-destdir.patch
@@ -3,7 +3,7 @@
@@ -61,7 +61,7 @@
-rm -f sbom-zws.xml
- install-zabbix.com/cmd/zabbix_agent2:
+ 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}
@@ -12,9 +12,9 @@
@@ -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-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 df1ba68..2dd8fd5 100644
--- a/go-vendor.patch
+++ b/go-vendor.patch
@@ -3,19 +3,19 @@
@@ -49,10 +49,10 @@
all: build
- 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
+ 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
- zabbix.com/cmd/zabbix_web_service:
-- go build -ldflags="${WEBSERVICE_GOLDFLAGS}" -o bin zabbix.com/cmd/zabbix_web_service
-+ go build -mod=vendor -ldflags="${WEBSERVICE_GOLDFLAGS}" -o bin zabbix.com/cmd/zabbix_web_service
+ 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-zabbix.com/cmd/zabbix_agent2:
+ 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}
@@ -25,9 +25,9 @@
@@ -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
-+ GOBIN=$(DESTDIR)${GOBIN} go install -mod=vendor -ldflags="${WEBSERVICE_GOLDFLAGS}" zabbix.com/cmd/zabbix_web_service
+ 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}
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/zabbix.git/commitdiff/f55baa991091326d1d9dcf9f572a550b921a3533
More information about the pld-cvs-commit
mailing list