[packages/zabbix] Vendorize go dependencies

[glen]

commit e56a6d2dc84ea5ae3a919f1f9072016b8abb8705
Author: Elan Ruusamäe <glen at pld-linux.org>
Date:   Tue Aug 24 18:47:43 2021 +0300

    Vendorize go dependencies

 go-vendor.patch | 28 ++++++++++++++++++++++++++++
 zabbix.spec     | 13 +++++++++++--
 2 files changed, 39 insertions(+), 2 deletions(-)
---
diff --git a/zabbix.spec b/zabbix.spec
index 235d65d..c88f2f8 100644
--- a/zabbix.spec
+++ b/zabbix.spec
@@ -20,7 +20,7 @@ Summary:	Zabbix - network monitoring software
 Summary(pl.UTF-8):	Zabbix - oprogramowanie do monitorowania sieci
 Name:		zabbix
 Version:	5.4.3
-Release:	0.1
+Release:	0.6
 License:	GPL v2+
 Group:		Networking/Utilities
 # https://www.zabbix.com/download_sources
@@ -33,10 +33,18 @@ Source4:	%{name}_proxy.service
 Source5:	%{name}_java.service
 Source6:	%{name}.tmpfiles
 Source7:	%{name}_agentd.init
+%if 0
+cd src/go/
+go mod vendor
+tar -caf ~/go-vendor.tar.xz -C ../../ src/go/vendor
+%endif
+Source8:	go-vendor.tar.xz
+# Source8-md5:	61f2ee9647280765b622a5e1e8cdfbba
 Patch0:		config.patch
 Patch1:		sqlite3_dbname.patch
 Patch2:		always_compile_ipc.patch
 Patch3:		go-destdir.patch
+Patch4:		go-vendor.patch
 URL:		https://www.zabbix.com/
 BuildRequires:	OpenIPMI-devel
 BuildRequires:	autoconf
@@ -323,11 +331,12 @@ Requires:	systemd-units >= 38
 This package provides the Zabbix Java Gateway.
 
 %prep
-%setup -q
+%setup -q -a8
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 %{__libtoolize}
diff --git a/go-vendor.patch b/go-vendor.patch
new file mode 100644
index 0000000..578c8fc
--- /dev/null
+++ b/go-vendor.patch
@@ -0,0 +1,28 @@
+--- 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 @@
+ 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
+ 
+ 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
+ 
+ build: ${TARGETS}
+ 
+@@ -53,10 +53,10 @@
+ 
+ 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}
+ 
+ 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-exec-local: ${INSTALL_TARGETS}
+ 
================================================================

---- gitweb:

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