From 7606fbf37529f500776926096a2dae3f75262c3e Mon Sep 17 00:00:00 2001 From: Anatoly Kamchatnov Date: Wed, 1 Aug 2018 19:48:22 +0300 Subject: community/zabbix: upgrade to 3.4.12 --- community/zabbix/APKBUILD | 45 +++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 22 deletions(-) (limited to 'community/zabbix') diff --git a/community/zabbix/APKBUILD b/community/zabbix/APKBUILD index 985aa4a11d..5ccb5f0df3 100644 --- a/community/zabbix/APKBUILD +++ b/community/zabbix/APKBUILD @@ -3,12 +3,12 @@ # Contributor: Leonardo Arena # Maintainer: Natanael Copa pkgname=zabbix -pkgver=3.4.8 +pkgver=3.4.12 pkgrel=0 pkgdesc="Enterprise-class open source distributed monitoring" url="http://www.zabbix.com" arch="all" -license="GPL" +license="GPL-2.0-or-later" depends="fping" _php=php7 _php_depends="$_php ${_php}-gd ${_php}-curl ${_php}-bcmath ${_php}-sockets @@ -21,9 +21,10 @@ makedepends="postgresql-dev curl-dev net-snmp-dev libevent-dev pcre-dev install="$pkgname.pre-install" pkgusers="zabbix" pkggroups="zabbix" +options="!check" # no tests available subpackages="$pkgname-doc $pkgname-agent $pkgname-pgsql $pkgname-mysql $pkgname-sqlite - $pkgname-webif::noarch $pkgname-utils $pkgname-setup::noarch" -source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz + $pkgname-webif::noarch $pkgname-utils $pkgname-setup::noarch $pkgname-openrc" +source="https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz zabbix-server.initd zabbix-server.confd zabbix-agentd.initd @@ -35,14 +36,14 @@ source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz zabbix_server.conf.patch " -_builddir="$srcdir"/$pkgname-$pkgver +builddir="$srcdir"/$pkgname-$pkgver # security fixes: # 3.0.4-r0: # - CVE N/A ZBX-11023 prepare() { - cd "$_builddir" + cd "$builddir" # update_config_sub || return 1 for i in $source; do case $i in @@ -63,7 +64,7 @@ prepare() { # update_config_sub # Fix config file locations for file in server agentd proxy; do - sed -i "$_builddir"/conf/zabbix_${file}.conf \ + sed -i "$builddir"/conf/zabbix_${file}.conf \ -e 's|SNMPTrapperFile=/tmp|SNMPTrapperFile=/var/log/zabbix|' \ -e 's|PidFile=/tmp|PidFile=/var/run/zabbix|' \ -e 's|LogFile=/tmp|LogFile=/var/log/zabbix|' || return 1 @@ -93,7 +94,7 @@ build() { cd "$srcdir" msg "Building for $db" cp -r "$pkgname-$pkgver" "$pkgname-$pkgver-$db" - cd "$_builddir-$db" + cd "$builddir-$db" case $db in sqlite3) ./configure \ @@ -118,16 +119,16 @@ build() { package() { # doing manual install for i in agentd proxy server; do - install -D -m755 "$_builddir"/man/zabbix_$i.man \ + install -D -m755 "$builddir"/man/zabbix_$i.man \ "$pkgdir"/usr/share/man/man8/zabbix_$i.8 done for i in get sender; do - install -D -m755 "$_builddir"/man/zabbix_$i.man \ + install -D -m755 "$builddir"/man/zabbix_$i.man \ "$pkgdir"/usr/share/man/man1/zabbix_$i.1 done install -d -m0750 -o zabbix -g zabbix \ "$pkgdir"/var/run/zabbix "$pkgdir"/var/log/zabbix - install -D -m0644 "$_builddir"/conf/zabbix_server.conf \ + install -D -m0644 "$builddir"/conf/zabbix_server.conf \ "$pkgdir"/etc/zabbix/zabbix_server.conf for i in server proxy; do install -D -m0755 "$srcdir"/zabbix-$i.initd \ @@ -141,7 +142,7 @@ setup() { pkgdesc="Zabbix images and sql files" depends= mkdir -p "$subpkgdir"/usr/share/zabbix/ || return 1 - mv "$_builddir"/database "$subpkgdir"/usr/share/zabbix/ + mv "$builddir"/database "$subpkgdir"/usr/share/zabbix/ } _do_db() { @@ -150,14 +151,14 @@ _do_db() { local i= mkdir -p "$subpkgdir"/usr/sbin if [ "$1" != "sqlite3" ]; then - mv "$_builddir-$1"/src/zabbix_server/zabbix_server \ + mv "$builddir-$1"/src/zabbix_server/zabbix_server \ "$subpkgdir"/usr/sbin/ || return 1 fi - mv "$_builddir-$1"/src/zabbix_proxy/zabbix_proxy \ + mv "$builddir-$1"/src/zabbix_proxy/zabbix_proxy \ "$subpkgdir"/usr/sbin/ || return 1 - install -D -m0644 "$_builddir"/conf/zabbix_proxy.conf \ + install -D -m0644 "$builddir"/conf/zabbix_proxy.conf \ "$pkgdir"/etc/zabbix/zabbix_proxy.conf || return 1 - cd "$_builddir" + cd "$builddir" for i in upgrades/dbpatches/*/$1; do [ -e $i ] || continue mkdir -p "$subpkgdir"/usr/share/zabbix/${i%/*} @@ -174,9 +175,9 @@ utils() { pkgdesc="Zabbix client utilities" depends= mkdir -p "$subpkgdir"/usr/bin - mv "$_builddir-postgresql"/src/zabbix_get/zabbix_get \ + mv "$builddir-postgresql"/src/zabbix_get/zabbix_get \ "$subpkgdir"/usr/bin - mv "$_builddir-postgresql"/src/zabbix_sender/zabbix_sender \ + mv "$builddir-postgresql"/src/zabbix_sender/zabbix_sender \ "$subpkgdir"/usr/bin } @@ -185,7 +186,7 @@ webif() { depends="$_php_depends" _wwwdir="$subpkgdir"/usr/share/webapps/zabbix mkdir -p $_wwwdir - mv "$_builddir"/frontends/php/* "$_wwwdir" + mv "$builddir"/frontends/php/* "$_wwwdir" } agent() { @@ -194,17 +195,17 @@ agent() { install="$subpkgname.pre-install" install -d -m0750 -o zabbix -g zabbix \ "$subpkgdir"/var/run/zabbix "$subpkgdir"/var/log/zabbix - install -D -m0644 "$_builddir"/conf/zabbix_agentd.conf \ + install -D -m0644 "$builddir"/conf/zabbix_agentd.conf \ "$subpkgdir"/etc/zabbix/zabbix_agentd.conf install -D -m0755 "$srcdir"/zabbix-agentd.initd \ "$subpkgdir"/etc/init.d/zabbix-agentd mkdir -p "$subpkgdir"/usr/sbin - mv "$_builddir-postgresql"/src/zabbix_agent/zabbix_agentd \ + mv "$builddir-postgresql"/src/zabbix_agent/zabbix_agentd \ "$subpkgdir"/usr/sbin/ } -sha512sums="a4e3573b3ffc07bf9a5a68b784a56569219caf7dbcadfc2d0eb5d87e1f3aa3b5ddf339b61a41e432487d55d2f4788f1a8a722574b07b8ecb7abd3c99ce7c7d70 zabbix-3.4.8.tar.gz +sha512sums="6707ff5a15d2c139775b4b5de32ceb4982c90aa4023af310ab9cb849895387984d32f59b7dc9fbaff8f317a630238437e4651ab8272b4535fb5fc3d88750e3ef zabbix-3.4.12.tar.gz 9998ee172a28002d98bacc3f76038ff52b8cf2b206e101418d76b4ca3de94afaf92cb4f7a6235ecf177f74beb9dd3ea1f3983c4f164b4f60bb601acba65aa175 zabbix-server.initd 9c06527bf653c40585fa7eeb3f7a0b2fc454031d24cd0d1633aed87b78a681c5227a193c5b9fcfcea0839135874e27ba7dd9b198573f905f680a2856f79e9512 zabbix-server.confd 523013cab3ba79cbc00db92f09d4c5d514fd6aa9cbebf8f29227dc91fbc19d2f8375af74c21d2037e4f3380a818f808194dbc94e69709ef2cf90f66e715895c4 zabbix-agentd.initd -- cgit v1.2.3