- updated to 6.0.30

[packages/zabbix.git] / go.patch

diff --git a/go.patch b/go.patch
index 043a804cdad76141ae23161b0c58c032a2491741..7bd7477898ec49da5bcf223d2f6d0e0cc14f4fc1 100644 (file)
--- a/go.patch
+++ b/go.patch
@@ -1,23 +1,23 @@
-diff -ur zabbix-6.0.19.orig/src/go/Makefile.am zabbix-6.0.19/src/go/Makefile.am
---- zabbix-6.0.19.orig/src/go/Makefile.am      2023-06-27 09:11:01.000000000 +0200
-+++ zabbix-6.0.19/src/go/Makefile.am   2023-07-20 16:29:58.932599626 +0200
+diff -ur zabbix-6.0.30.orig/src/go/Makefile.am zabbix-6.0.30/src/go/Makefile.am
+--- zabbix-6.0.30.orig/src/go/Makefile.am      2024-06-13 13:35:04.929039431 +0200
++++ zabbix-6.0.30/src/go/Makefile.am   2024-06-13 14:02:09.087986478 +0200
 @@ -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}
  
-@@ -61,8 +61,8 @@
-       rm -f bin/zabbix_agent2 bin/mock_server
+@@ -73,8 +73,8 @@
+       -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} \
 -              go install -ldflags="${AGENT_GOLDFLAGS}" ${TARGETS}
 +      CGO_CFLAGS="${CGO_CFLAGS}" CGO_LDFLAGS="${CGO_LDFLAGS}" GOBIN=${DESTDIR}${GOBIN} \
@@ -25,12 +25,12 @@ diff -ur zabbix-6.0.19.orig/src/go/Makefile.am zabbix-6.0.19/src/go/Makefile.am
        $(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 @@
+@@ -83,7 +83,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 -mod=vendor -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 -mod=vendor -ldflags="${WEBSERVICE_GOLDFLAGS}" golang.zabbix.com/agent2/cmd/zabbix_web_service
  
  install-exec-local: ${INSTALL_TARGETS}