diff options
| author | Kevin Daudt <kdaudt@alpinelinux.org> | 2019-11-27 16:32:00 +0000 |
|---|---|---|
| committer | Kevin Daudt <kdaudt@alpinelinux.org> | 2019-11-27 17:12:28 +0000 |
| commit | 45089646f6c9e2a8263bb1509cbb871cd844900e (patch) | |
| tree | 09b33a50710e094236c109c4b3295c6581739301 /community | |
| parent | 8faeee37e5b1bd0daa5f87423a65f0e2213a3be8 (diff) | |
| download | aports-45089646f6c9e2a8263bb1509cbb871cd844900e.tar.bz2 aports-45089646f6c9e2a8263bb1509cbb871cd844900e.tar.xz | |
community/zabbix: upgrade to 4.4.3
Diffstat (limited to 'community')
| -rw-r--r-- | community/zabbix/APKBUILD | 16 | ||||
| -rw-r--r-- | community/zabbix/zabbix_agent2.conf.patch | 14 |
2 files changed, 14 insertions, 16 deletions
diff --git a/community/zabbix/APKBUILD b/community/zabbix/APKBUILD index 0f7b19098a..75f1f04d67 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=4.4.1 -pkgrel=1 +pkgver=4.4.3 +pkgrel=0 pkgdesc="Enterprise-class open source distributed monitoring" url="http://www.zabbix.com" arch="all" @@ -37,7 +37,6 @@ source="https://downloads.sourceforge.net/zabbix/zabbix-$pkgver.tar.gz musl-fix-includes.patch zabbix_server.conf.patch zabbix_agent2.conf.patch - zabbix_agent2-uname-linux.patch " # Agent2 does not build on x86 atm @@ -232,10 +231,10 @@ agent2() { install -d -m0750 -o zabbix -g zabbix \ "$subpkgdir"/var/run/zabbix "$subpkgdir"/var/log/zabbix mkdir -p "$subpkgdir"/usr/sbin - cp "$builddir-postgresql"/go/src/zabbix/cmd/zabbix_agent2/zabbix_agent2 \ - "$subpkgdir"/usr/sbin + cp "$builddir-postgresql"/src/go/bin/zabbix_agent2 \ + "$subpkgdir"/usr/sbin/zabbix_agent2 - install -D -m0644 "$builddir"/go/src/zabbix/conf/zabbix_agent2.conf \ + install -D -m0644 "$builddir"/src/go/conf/zabbix_agent2.conf \ "$subpkgdir"/etc/zabbix/zabbix_agent2.conf } @@ -248,7 +247,7 @@ agent2_openrc() { "$subpkgdir"/etc/init.d/zabbix-agent2 } -sha512sums="8ea542a6af31dad20180899b68a47adb0fd0f2e07f9abef8892d59ec3a58ea01862d3c336be327912ffa50473c3cd4cc7bf311ed51d85898972ae3fe4c2167ce zabbix-4.4.1.tar.gz +sha512sums="51f65e2196812e121431db6c8efbc8e48f9920455b60a6f54bb1ce1f20f9e1db5a2b78f369ebc5113f2e1faef61f01d1aa7f99e413e24eff07cd497f4a53cd90 zabbix-4.4.3.tar.gz 9998ee172a28002d98bacc3f76038ff52b8cf2b206e101418d76b4ca3de94afaf92cb4f7a6235ecf177f74beb9dd3ea1f3983c4f164b4f60bb601acba65aa175 zabbix-server.initd 9c06527bf653c40585fa7eeb3f7a0b2fc454031d24cd0d1633aed87b78a681c5227a193c5b9fcfcea0839135874e27ba7dd9b198573f905f680a2856f79e9512 zabbix-server.confd 0d50795233ee469e36e9788f8685b16207a37f8a9370e6591688906176e7cb8387ce06f132d7e582a1757fdea7c584a70ccfac39a604da315d71121fa629cbb7 zabbix-agentd.initd @@ -258,5 +257,4 @@ a26e7ac422ff60a4b8eed3603022c3a1bde640870bb9286ab061c3cb5c2fd7e91ddb317cb3d1cf61 7f70dfd602aa164ec8cc65ebb7e8274c685975f6aea9051933928051b8d9b6e368e5a673a07e7084a2105468c5085d72fa7b9f934460f10648d594f28f031a91 automake.patch 72709df7624d99b2eaab8d91d95167580e80da10b3ac65b7f27f12d858f0d051d4f9143bcabceae2bfd51aeb7c4ca93e2b74670637ec0925b026e3c52475d52b musl-fix-includes.patch 183e2d99800d8eebb932cb31c5a3e8742ce6a15e87aec50dc49d9c20b35840eb7ede9920aa62d2c7a5e3f584f5c3df398aa08e93f98fa537a3ba6db63b472a1f zabbix_server.conf.patch -4478e52d044d6cd888084d2cdfc77883ae7c90f3494b52a511445776a2a851d6bc25ed7d7a196e35b826ba10b3dcca2f762adc7c52727b07254d02aaa04d319b zabbix_agent2.conf.patch -e04fc508ab91effea43b0f631051dd8f63b219d72002e39117b58af286bd6f451702f84a7a1083d7dab6fa294725b390e2f515ca1432a241a321a763570f5d1a zabbix_agent2-uname-linux.patch" +84cc513fb5593d571e06e13afd0f6cfef78cbca71824f4d79dbaac71dcb7f8c4708a78b354fa4b9b814abc7edc170f513cebd7c247182c200e5fde4f928aa085 zabbix_agent2.conf.patch" diff --git a/community/zabbix/zabbix_agent2.conf.patch b/community/zabbix/zabbix_agent2.conf.patch index 566035c59f..5e6441165a 100644 --- a/community/zabbix/zabbix_agent2.conf.patch +++ b/community/zabbix/zabbix_agent2.conf.patch @@ -1,17 +1,17 @@ -diff --git a/go/src/zabbix/conf/zabbix_agent2.conf b/go/src/zabbix/conf/zabbix_agent2.conf +diff --git a/src/go/conf/zabbix_agent2.conf b/src/go/conf/zabbix_agent2.conf index c635f2069d..d75b925d72 100644 ---- a/go/src/zabbix/conf/zabbix_agent2.conf -+++ b/go/src/zabbix/conf/zabbix_agent2.conf +--- a/src/go/conf/zabbix_agent2.conf ++++ b/src/go/conf/zabbix_agent2.conf @@ -27,7 +27,7 @@ # Default: # LogFile= --LogFile=/tmp/zabbix_agentd.log +-LogFile=/tmp/zabbix_agent2.log +LogFile=/var/log/zabbix/zabbix_agent2.log ### Option: LogFileSize # Maximum size of log file in MB. -@@ -142,7 +142,7 @@ ServerActive=127.0.0.1 +@@ -124,7 +124,7 @@ ServerActive=127.0.0.1 # Default: # Hostname= @@ -20,7 +20,7 @@ index c635f2069d..d75b925d72 100644 ### Option: HostnameItem # Item used for generating Hostname if it is undefined. Ignored if Hostname is defined. -@@ -150,7 +150,7 @@ Hostname=Zabbix server +@@ -132,7 +132,7 @@ Hostname=Zabbix server # # Mandatory: no # Default: @@ -29,7 +29,7 @@ index c635f2069d..d75b925d72 100644 ### Option: HostMetadata # Optional parameter that defines host metadata. -@@ -276,7 +276,7 @@ Hostname=Zabbix server +@@ -247,7 +247,7 @@ Hostname=Zabbix server # Default: # ControlSocket= |