diff options
| author | Kevin Daudt <kdaudt@alpinelinux.org> | 2020-10-27 10:07:52 +0000 |
|---|---|---|
| committer | Kevin Daudt <kdaudt@alpinelinux.org> | 2020-10-27 12:05:54 +0000 |
| commit | 958f16cf0c812260b3c00af3fa4d242fefac16fe (patch) | |
| tree | ebf94d3a8f8d9df2271145ac4fe14019244aaeaf | |
| parent | a9c38d83b8b917ab5e3d1ed7cdc1150f6e6359ac (diff) | |
community/zabbix: upgrade to 5.2.0
| -rw-r--r-- | community/zabbix/APKBUILD | 10 | ||||
| -rw-r--r-- | community/zabbix/agent2-fix-32bits-build-issue.patch | 23 |
2 files changed, 29 insertions, 4 deletions
diff --git a/community/zabbix/APKBUILD b/community/zabbix/APKBUILD index 460b40b9444..bc65e8822f4 100644 --- a/community/zabbix/APKBUILD +++ b/community/zabbix/APKBUILD @@ -3,8 +3,8 @@ # Contributor: Leonardo Arena <rnalrd@alpinelinux.org> # Maintainer: Kevin Daudt <kdaudt@alpinelinux.org> pkgname=zabbix -pkgver=5.0.4 -pkgrel=2 +pkgver=5.2.0 +pkgrel=0 pkgdesc="Enterprise-class open source distributed monitoring" url="http://www.zabbix.com" arch="all" @@ -39,6 +39,7 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/zabbix/zabbix/archive/${pkgv musl-fix-includes.patch zabbix_server.conf.patch zabbix_agent2.conf.patch + agent2-fix-32bits-build-issue.patch " builddir="$srcdir/$pkgname-${pkgver/_/}" @@ -253,7 +254,7 @@ agent2_openrc() { "$subpkgdir"/etc/init.d/zabbix-agent2 } -sha512sums="2d4206f0f07833fc6cdeb6892a1f27b350b3a352e9cddc231b2865b23e2480156df46e1212368cfe21b783c85a92db788954ee81fe6c2eae5bd25c8f9aaa4e41 zabbix-5.0.4.tar.gz +sha512sums="aca4badbb4ec03266b0bbc8c8888f2263e5538c583d3f72c67829f5aab1d9e6a004b22c13ace4e7d1ace73635a1b68bcbaab6695ab0f44e0d153e1896506c12e zabbix-5.2.0.tar.gz 9998ee172a28002d98bacc3f76038ff52b8cf2b206e101418d76b4ca3de94afaf92cb4f7a6235ecf177f74beb9dd3ea1f3983c4f164b4f60bb601acba65aa175 zabbix-server.initd 9c06527bf653c40585fa7eeb3f7a0b2fc454031d24cd0d1633aed87b78a681c5227a193c5b9fcfcea0839135874e27ba7dd9b198573f905f680a2856f79e9512 zabbix-server.confd 7beca0fc6e254c1692e0e74deb9eb3d06ac78f5f6b08f3ab0491861e11e09f00f57bb4d22e11517dab86456e87bd13110805bfb38a715d2f1e68549937b29c76 zabbix-agentd.initd @@ -263,4 +264,5 @@ a26e7ac422ff60a4b8eed3603022c3a1bde640870bb9286ab061c3cb5c2fd7e91ddb317cb3d1cf61 7f70dfd602aa164ec8cc65ebb7e8274c685975f6aea9051933928051b8d9b6e368e5a673a07e7084a2105468c5085d72fa7b9f934460f10648d594f28f031a91 automake.patch 72709df7624d99b2eaab8d91d95167580e80da10b3ac65b7f27f12d858f0d051d4f9143bcabceae2bfd51aeb7c4ca93e2b74670637ec0925b026e3c52475d52b musl-fix-includes.patch 183e2d99800d8eebb932cb31c5a3e8742ce6a15e87aec50dc49d9c20b35840eb7ede9920aa62d2c7a5e3f584f5c3df398aa08e93f98fa537a3ba6db63b472a1f zabbix_server.conf.patch -84cc513fb5593d571e06e13afd0f6cfef78cbca71824f4d79dbaac71dcb7f8c4708a78b354fa4b9b814abc7edc170f513cebd7c247182c200e5fde4f928aa085 zabbix_agent2.conf.patch" +84cc513fb5593d571e06e13afd0f6cfef78cbca71824f4d79dbaac71dcb7f8c4708a78b354fa4b9b814abc7edc170f513cebd7c247182c200e5fde4f928aa085 zabbix_agent2.conf.patch +0703ae832f80d3c456e7e329edfb4a98831cbf1bf1cff5845fd1e0475203dda94b8258d7b71645d85b1db24a0ccf65837205779cb9abf4b31ce90f8587892b52 agent2-fix-32bits-build-issue.patch" diff --git a/community/zabbix/agent2-fix-32bits-build-issue.patch b/community/zabbix/agent2-fix-32bits-build-issue.patch new file mode 100644 index 00000000000..d5ff9b4f0b0 --- /dev/null +++ b/community/zabbix/agent2-fix-32bits-build-issue.patch @@ -0,0 +1,23 @@ +From f98a305e0af0682c47f9dc88cc62441ff4db94ff Mon Sep 17 00:00:00 2001 +From: Eriks Sneiders <eriks.sneiders@zabbix.com> +Date: Fri, 16 Oct 2020 17:46:36 +0300 +Subject: [PATCH] ...G...... [ZBX-18505] fix Zabbix agent 2 compilation on + alpine docker + +--- + src/go/plugins/system/swap/swap_nix.go | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/go/plugins/system/swap/swap_nix.go b/src/go/plugins/system/swap/swap_nix.go +index 9f7968109fb..9c76f25d9e6 100644 +--- a/src/go/plugins/system/swap/swap_nix.go ++++ b/src/go/plugins/system/swap/swap_nix.go +@@ -29,5 +29,5 @@ func getSwap() (uint64, uint64, error) { + return 0, 0, err + } + +- return info.Totalswap, info.Freeswap, nil ++ return uint64(info.Totalswap), uint64(info.Freeswap), nil + } +-- +2.11.0 |