X-Original-To: alpine-aports@lists.alpinelinux.org Received: from mail-qk0-f176.google.com (mail-qk0-f176.google.com [209.85.220.176]) by lists.alpinelinux.org (Postfix) with ESMTP id EDE0D5C4CC8 for ; Thu, 7 Sep 2017 14:58:44 +0000 (GMT) Received: by mail-qk0-f176.google.com with SMTP id a128so27471649qkc.5 for ; Thu, 07 Sep 2017 07:58:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=duniel-no.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=kE9GXMgioES6hRLWutq2rvZKLG20CmTVRNU7CyVZYs0=; b=HPjLXBbhlO9MPS9umLHhvJSM2/wQMwOLvvk2UywGDpPrvYtNQTHCFBPhkA/rOzbUGG XhX5gavpVS5DLCTARqwQhg+F9BwK+d+xMcW5JyvUmcITdm0gbFeRvvCIN/VhVZVog9B5 6QCgLJW2XKZwLsk2h8Xhn/smSDsfgMSA+gOFDwRFlMxHNq642AyoH3KFIyMMPxf0q9e9 Yr2tS2p6svBewFvM7Y526SXXho8eJaVe5LWSOWBRASO1HfAktWEtp/Zc84Tzj/70pygB 2qRq+sCWyVksuQ9e7PRigJ+XnG7tmKw9oQiA4yQgGw7eDgW+dUK9pkNyfSLO0Xz8SXfy JNNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=kE9GXMgioES6hRLWutq2rvZKLG20CmTVRNU7CyVZYs0=; b=jUzornjax43qXTAxm822opQJRSa4VdUuiYp2TGz45kwpr6TG16zdS+7hnj45jHOo1i BvLD/DfbPAb0H9J3C68uHGLEuKrsICFb0W5TESXkokWsuXV9uWVMmOiN3cgI9LozsUO2 nTVorPa2xWgigUnO5N+GPaYSGjjEazq4rWlAiEIfjKgNsqF3jUtyxlG80dwqlEZiJpSe hqSvxvNM9p+AjefGZgq9oJ/WkBVKJGaK3lNi+9OyL9v7ycA+eizItFudL1j5RWfCa8+g PtqipiKsOWid7MFBIl6VNLLBNamDMAxI0J/zIaGO8uk4pqKJmxqaWW4xQAAF9s0N4EnB 68wg== X-Gm-Message-State: AHPjjUjt3nTd31zkGN579oFciRuDDFuJzRV3b57CPzOCmbj4wKTaqd4g HpZoA2akCxEdTexdwE8= X-Google-Smtp-Source: AOwi7QAOD+R7e80nxlBU6Y65h+P6iXBCYBctQPjQ7Osj2naZLJbo1j9MQ9gmyzNXyRl69zMVjQMugw== X-Received: by 10.233.237.5 with SMTP id c5mr4187304qkg.309.1504796324120; Thu, 07 Sep 2017 07:58:44 -0700 (PDT) Received: from localhost.localdomain ([85.113.170.92]) by smtp.gmail.com with ESMTPSA id w23sm1815218qtj.0.2017.09.07.07.58.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Sep 2017 07:58:43 -0700 (PDT) From: Daniel Isaksen To: alpine-aports@lists.alpinelinux.org Cc: Daniel Isaksen Subject: [alpine-aports] [PATCH] community/zabbix: update to 3.4.1 Date: Thu, 7 Sep 2017 16:58:34 +0200 Message-Id: <20170907145834.24959-1-d@duniel.no> X-Mailer: git-send-email 2.11.0 X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: --- community/zabbix/APKBUILD | 26 +++++++++++++------------- community/zabbix/ZBX-11549.patch | 1 + community/zabbix/automake.patch | 1 + community/zabbix/musl-fix-includes.patch | 1 + community/zabbix/zabbix-agent.pre-install | 1 + community/zabbix/zabbix-agentd.initd | 1 + community/zabbix/zabbix-getloadavg.patch | 1 + community/zabbix/zabbix-proxy.initd | 1 + community/zabbix/zabbix-server.confd | 1 + community/zabbix/zabbix-server.initd | 1 + community/zabbix/zabbix.pre-install | 1 + community/zabbix/zabbix_server.conf.patch | 1 + 12 files changed, 24 insertions(+), 13 deletions(-) diff --git a/community/zabbix/APKBUILD b/community/zabbix/APKBUILD index da03c01acf..a83cbeb88a 100644 --- a/community/zabbix/APKBUILD +++ b/community/zabbix/APKBUILD @@ -3,7 +3,7 @@ # Contributor: Leonardo Arena # Maintainer: Natanael Copa pkgname=zabbix -pkgver=3.2.7 +pkgver=3.4.1 pkgrel=0 pkgdesc="Enterprise-class open source distributed monitoring" url="http://www.zabbix.com" @@ -14,7 +14,7 @@ _php=php7 _php_depends="$_php ${_php}-gd ${_php}-curl ${_php}-bcmath ${_php}-sockets ${_php}-iconv ${_php}-xmlreader ${_php}-xmlwriter ${_php}-ctype ${_php}-gettext" -makedepends="postgresql-dev curl-dev net-snmp-dev +makedepends="postgresql-dev curl-dev net-snmp-dev libevent-dev pcre-dev sqlite-dev mariadb-dev curl-dev openipmi-dev unixodbc-dev libxml2-dev autoconf automake libssh2-dev gnutls-dev $_php_depends" @@ -22,7 +22,7 @@ install="$pkgname.pre-install" pkgusers="zabbix" pkggroups="zabbix" subpackages="$pkgname-doc $pkgname-agent $pkgname-pgsql $pkgname-mysql - $pkgname-webif::noarch $pkgname-sqlite $pkgname-utils $pkgname-setup::noarch" + $pkgname-webif::noarch $pkgname-utils $pkgname-setup::noarch" source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz zabbix-server.initd zabbix-server.confd @@ -90,7 +90,7 @@ build() { " # we run build for each db type # make sure prepare is same for each db - for db in postgresql mysql sqlite3; do + for db in postgresql mysql; do cd "$srcdir" msg "Building for $db" cp -r "$pkgname-$pkgver" "$pkgname-$pkgver-$db" @@ -192,12 +192,12 @@ agent() { } -sha512sums="f60c82829c076a7f8b9d2f0c7dc91f7b65594ac4dcfaa08b19a61b730d8d21afc161636f793416613a47220535334fb675bb105738b130677c729fc0e31cd3e3 zabbix-3.2.7.tar.gz -3a25bf9f428f55545dd735aea2855e0e4927e006ca01a2f918ec161ffe9b2ec66e46598bf34208e24535e1d04e33087f42eb8226b17eb4118abd6507bbb10ff5 zabbix-server.initd -a91821c6086a1fc0197750cc68073419defcb7d775b11b14a993409a8f61c7a1a0a0af95de27eed9f3b8357f8362640cb1b26b91b56f4f1d714ca6f222d02b80 zabbix-server.confd -7cc2672b717f1b47b12342fe225e9dc3838c61a0bf81d359d0a71efb0adc9b354fb8bc8b5bb64c9defa5700bcaf651b35778194a50b6b03b0a723dce76460092 zabbix-agentd.initd -e19490e724c6e4ecdadf7ee3898567b82f18ea2a894ef709bfc181c3076d50435b45429207dd4d537aacbec0242d83393240e48b434d9681ebb0d67a45643ed1 zabbix-proxy.initd -b65c6ba7701d98ae7f6fe2124c1d2b8b8fea3c3cc7ee080bf99f5afff0aaa6a025c2a1f5136b4700b53d1b7609e6185642650d7edd013c554b2af37fddae771c zabbix-getloadavg.patch -9bff8966cb8b3f1767bfb1b3f3529bca5c9957f2c8179a40ded3b4e43615ba9fb408aef43092fd119b7df80b042555d05c9780fac3760176b95524aa48252fee automake.patch -9b87ec1ea4a9cbb501c16012d498cdae82a696f4cd495e1e8cb201d9e31c6e135da5bb264c6273f2de87297bd3e4bd16f66703610686f5d610e3316ee24aac91 musl-fix-includes.patch -e0c9f937d39e15fa34e70e8ae9e6578b221b51c13dc0515e807675d153a85ab6370ed20ce2d06aa4457baaf3963edce525cd00e85fb105b36b58741798d13836 zabbix_server.conf.patch" +sha512sums="e3ce49cbbb6ada1d12fa80ff366b9e819b8d7b8c60474698457f8250682614af0d2e5de6c2f6a9e34ab10bb8fd01eac51d8365489606b6d0aefc103c5780ebce zabbix-3.4.1.tar.gz +9998ee172a28002d98bacc3f76038ff52b8cf2b206e101418d76b4ca3de94afaf92cb4f7a6235ecf177f74beb9dd3ea1f3983c4f164b4f60bb601acba65aa175 zabbix-server.initd +9c06527bf653c40585fa7eeb3f7a0b2fc454031d24cd0d1633aed87b78a681c5227a193c5b9fcfcea0839135874e27ba7dd9b198573f905f680a2856f79e9512 zabbix-server.confd +523013cab3ba79cbc00db92f09d4c5d514fd6aa9cbebf8f29227dc91fbc19d2f8375af74c21d2037e4f3380a818f808194dbc94e69709ef2cf90f66e715895c4 zabbix-agentd.initd +a26e7ac422ff60a4b8eed3603022c3a1bde640870bb9286ab061c3cb5c2fd7e91ddb317cb3d1cf61034adda0a080fc212ad416c9e2853a1deb03c5279753f4e2 zabbix-proxy.initd +9fc413b11a01c8202c7ee1c7950d6ca3de2d2d6cd01bea994cd4bc412533b53c4e4b1f58fc3c8df16ea70902053e278e2c5dcc936ce3e0a686a6eac62310ef53 zabbix-getloadavg.patch +7f70dfd602aa164ec8cc65ebb7e8274c685975f6aea9051933928051b8d9b6e368e5a673a07e7084a2105468c5085d72fa7b9f934460f10648d594f28f031a91 automake.patch +72709df7624d99b2eaab8d91d95167580e80da10b3ac65b7f27f12d858f0d051d4f9143bcabceae2bfd51aeb7c4ca93e2b74670637ec0925b026e3c52475d52b musl-fix-includes.patch +183e2d99800d8eebb932cb31c5a3e8742ce6a15e87aec50dc49d9c20b35840eb7ede9920aa62d2c7a5e3f584f5c3df398aa08e93f98fa537a3ba6db63b472a1f zabbix_server.conf.patch" diff --git a/community/zabbix/ZBX-11549.patch b/community/zabbix/ZBX-11549.patch index bff252b847..e85155fae8 100644 --- a/community/zabbix/ZBX-11549.patch +++ b/community/zabbix/ZBX-11549.patch @@ -8,3 +8,4 @@ switch ($last) { case 'g': + diff --git a/community/zabbix/automake.patch b/community/zabbix/automake.patch index d92e10b077..609e1571d4 100644 --- a/community/zabbix/automake.patch +++ b/community/zabbix/automake.patch @@ -9,3 +9,4 @@ AC_CANONICAL_HOST + diff --git a/community/zabbix/musl-fix-includes.patch b/community/zabbix/musl-fix-includes.patch index c36759dcde..d3c037320c 100644 --- a/community/zabbix/musl-fix-includes.patch +++ b/community/zabbix/musl-fix-includes.patch @@ -11,3 +11,4 @@ #ifdef HAVE_ARPA_NAMESER_H #ifdef MAC_OS_X # define BIND_8_COMPAT 1 + diff --git a/community/zabbix/zabbix-agent.pre-install b/community/zabbix/zabbix-agent.pre-install index 9cc2bfb908..175c11d7a5 100644 --- a/community/zabbix/zabbix-agent.pre-install +++ b/community/zabbix/zabbix-agent.pre-install @@ -4,3 +4,4 @@ addgroup -S zabbix 2>/dev/null adduser -S -D -H -h /dev/null -s /sbin/nologin -G zabbix -g zabbix zabbix 2>/dev/null exit 0 + diff --git a/community/zabbix/zabbix-agentd.initd b/community/zabbix/zabbix-agentd.initd index 5b49535a59..56d67db8ae 100644 --- a/community/zabbix/zabbix-agentd.initd +++ b/community/zabbix/zabbix-agentd.initd @@ -31,3 +31,4 @@ stop() { eend $? } + diff --git a/community/zabbix/zabbix-getloadavg.patch b/community/zabbix/zabbix-getloadavg.patch index c6a458e1b4..46a5a7159b 100644 --- a/community/zabbix/zabbix-getloadavg.patch +++ b/community/zabbix/zabbix-getloadavg.patch @@ -29,3 +29,4 @@ int SYSTEM_CPU_NUM(AGENT_REQUEST *request, AGENT_RESULT *result) { char *type; + diff --git a/community/zabbix/zabbix-proxy.initd b/community/zabbix/zabbix-proxy.initd index 619596415e..8c7832a615 100644 --- a/community/zabbix/zabbix-proxy.initd +++ b/community/zabbix/zabbix-proxy.initd @@ -19,3 +19,4 @@ stop() { start-stop-daemon --stop --user zabbix --pidfile /var/run/zabbix/zabbix_proxy.pid eend $? } + diff --git a/community/zabbix/zabbix-server.confd b/community/zabbix/zabbix-server.confd index 3cc9996400..cfe4091f4a 100644 --- a/community/zabbix/zabbix-server.confd +++ b/community/zabbix/zabbix-server.confd @@ -1,2 +1,3 @@ pidfile="/var/run/zabbix/zabbix_server.pid" command="/usr/sbin/zabbix_server" + diff --git a/community/zabbix/zabbix-server.initd b/community/zabbix/zabbix-server.initd index c2697cba4d..d8f75e552f 100644 --- a/community/zabbix/zabbix-server.initd +++ b/community/zabbix/zabbix-server.initd @@ -9,3 +9,4 @@ depend() { start_pre() { checkpath -d -m 0775 -o zabbix:zabbix /var/run/zabbix } + diff --git a/community/zabbix/zabbix.pre-install b/community/zabbix/zabbix.pre-install index 9cc2bfb908..175c11d7a5 100644 --- a/community/zabbix/zabbix.pre-install +++ b/community/zabbix/zabbix.pre-install @@ -4,3 +4,4 @@ addgroup -S zabbix 2>/dev/null adduser -S -D -H -h /dev/null -s /sbin/nologin -G zabbix -g zabbix zabbix 2>/dev/null exit 0 + diff --git a/community/zabbix/zabbix_server.conf.patch b/community/zabbix/zabbix_server.conf.patch index 44c22f114f..bd363ea0ff 100644 --- a/community/zabbix/zabbix_server.conf.patch +++ b/community/zabbix/zabbix_server.conf.patch @@ -9,3 +9,4 @@ ### Option: DBHost # Database host name. + -- 2.11.0 --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---