aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Daudt <kdaudt@alpinelinux.org>2021-01-26 05:40:14 +0000
committerKevin Daudt <kdaudt@alpinelinux.org>2021-01-26 06:34:35 +0000
commit3c7a8ef89d8373808ac95c64554b4a6e85ec1bfe (patch)
tree54bca04b86ac2f2e0e8ea5f22bdcbbc6d22f0048
parenta33c179f749504e8926e1fc25735e9eedeaa908a (diff)
downloadaports-master.tar.gz
aports-master.tar.bz2
aports-master.tar.xz
community/zabbix: upgrade to 5.2.4HEADmaster
-rw-r--r--community/zabbix/APKBUILD10
-rw-r--r--community/zabbix/agent2-fix-procfs-32bits-int.patch22
2 files changed, 28 insertions, 4 deletions
diff --git a/community/zabbix/APKBUILD b/community/zabbix/APKBUILD
index f87d0c9e78..0a9f2260aa 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.2.3
-pkgrel=1
+pkgver=5.2.4
+pkgrel=0
pkgdesc="Enterprise-class open source distributed monitoring"
url="http://www.zabbix.com"
arch="all !mips64" # limited by go
@@ -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-procfs-32bits-int.patch
"
builddir="$srcdir/$pkgname-${pkgver/_/}"
@@ -252,7 +253,7 @@ agent2_openrc() {
"$subpkgdir"/etc/init.d/zabbix-agent2
}
-sha512sums="ed27a90638e40138592d124e4a93c01a2f99e14936c8b15136b892d26c39e0f11de36e794f72f9a744a12401d16ee9910603ab0007eeed28302fb440b3122640 zabbix-5.2.3.tar.gz
+sha512sums="b2710fad10f21cd68c2655e7cbcd6e8ca2a4a0ff7bf3b51a4a3ba5fa74ec8ce89377d46fb70144fbeaeba2378c17e1d92a50ca32b7d494aa3d45d60468163655 zabbix-5.2.4.tar.gz
9998ee172a28002d98bacc3f76038ff52b8cf2b206e101418d76b4ca3de94afaf92cb4f7a6235ecf177f74beb9dd3ea1f3983c4f164b4f60bb601acba65aa175 zabbix-server.initd
9c06527bf653c40585fa7eeb3f7a0b2fc454031d24cd0d1633aed87b78a681c5227a193c5b9fcfcea0839135874e27ba7dd9b198573f905f680a2856f79e9512 zabbix-server.confd
7beca0fc6e254c1692e0e74deb9eb3d06ac78f5f6b08f3ab0491861e11e09f00f57bb4d22e11517dab86456e87bd13110805bfb38a715d2f1e68549937b29c76 zabbix-agentd.initd
@@ -262,4 +263,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
+c3d08d34763271763816e99ae6088d59d97a90661c6bb66c9704da97855f7435c5d395e6948f013dfcbf806f1d7e4f10530478821cbb5af61ce29404f555bc38 agent2-fix-procfs-32bits-int.patch"
diff --git a/community/zabbix/agent2-fix-procfs-32bits-int.patch b/community/zabbix/agent2-fix-procfs-32bits-int.patch
new file mode 100644
index 0000000000..50ce762f83
--- /dev/null
+++ b/community/zabbix/agent2-fix-procfs-32bits-int.patch
@@ -0,0 +1,22 @@
+Reason: int is 32-bits on 32-bits arches, which is not large enough to fit a
+terrabyte in.
+diff --git a/src/go/plugins/proc/procfs_linux.go b/src/go/plugins/proc/procfs_linux.go
+index 113d395..0e8ba30 100644
+--- a/src/go/plugins/proc/procfs_linux.go
++++ b/src/go/plugins/proc/procfs_linux.go
+@@ -231,12 +231,13 @@ func byteFromProcFileData(data []byte, valueName string) (float64, bool, error)
+ if len(line) < 3 {
+ continue
+ }
+-
+- v, err := strconv.Atoi(strings.TrimSpace(line[:len(line)-2]))
++ val, err := strconv.Atoi(strings.TrimSpace(line[:len(line)-2]))
+ if err != nil {
+ return 0, false, err
+ }
+
++ v := int64(val)
++
+ switch line[len(line)-2:] {
+ case "kB":
+ v *= kB