aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJ0WI <J0WI@users.noreply.github.com>2022-05-10 23:18:17 +0200
committeralice <alice@ayaya.dev>2022-05-11 22:49:12 +0000
commit3c0e28e2e5a2f4cebac26fdc959a6e42c939aef1 (patch)
tree39a069cdf8c22c0b73ee39661e7150927ceb19c4
parentaafb068e5b12101eca2114bd210042f23c072853 (diff)
downloadaports-3c0e28e2e5a2f4cebac26fdc959a6e42c939aef1.tar.gz
aports-3c0e28e2e5a2f4cebac26fdc959a6e42c939aef1.tar.bz2
aports-3c0e28e2e5a2f4cebac26fdc959a6e42c939aef1.tar.xz
main/nagios-plugins: upgrade to 2.4.0
-rw-r--r--main/nagios-plugins/APKBUILD12
-rw-r--r--main/nagios-plugins/check_mysql_query-fix-use-after-free.patch33
2 files changed, 5 insertions, 40 deletions
diff --git a/main/nagios-plugins/APKBUILD b/main/nagios-plugins/APKBUILD
index ac05114ea1..6df90e7c0d 100644
--- a/main/nagios-plugins/APKBUILD
+++ b/main/nagios-plugins/APKBUILD
@@ -3,10 +3,10 @@
# Contributor: Jakub Jirutka <jakub@jirutka.cz>
# Maintainer: Jeff Bilyk <jbilyk@gmail.com>
pkgname=nagios-plugins
-pkgver=2.3.3
-pkgrel=1
+pkgver=2.4.0
+pkgrel=0
pkgdesc="Plugins for Nagios to check services on hosts"
-url="https://nagios-plugins.org"
+url="https://nagios-plugins.org/"
arch="all"
license="GPL-3.0-only"
_depends_by_ssh="openssh-client"
@@ -27,9 +27,8 @@ install="$pkgname.post-upgrade"
pkgusers="nagios"
pkggroups="nagios"
options="suid"
-source="https://www.nagios-plugins.org/download/nagios-plugins-$pkgver.tar.gz
+source="https://github.com/nagios-plugins/nagios-plugins/releases/download/release-$pkgver/nagios-plugins-$pkgver.tar.gz
fix-compilation-warnings-about-sys-poll.patch
- check_mysql_query-fix-use-after-free.patch
check_openrc
nagios-openrc.doasd
"
@@ -153,9 +152,8 @@ _all() {
}
sha512sums="
-2128601b1098eb82f4e7d720b96a5f92d6ad75dc181a94b25c38172767de8b72f9fece3eddb74933b1cd520928ae9416a7dc665e2f059bfe362dd74041d28cd7 nagios-plugins-2.3.3.tar.gz
+f6f4cd604d28161f36c1429dbfa8f07e9fa468d8d8c21925d53d7049f0765504cb785e1f1189a0c93aa1f0cd1fe3985409c420b7724aa39790836af5c3f725ff nagios-plugins-2.4.0.tar.gz
7a62e4808eb8b07ca43bc17a625f4199708da6c52b79eca7a756817cb734648fc3054cd89862638ae925022017db32479d2cfcfddeba79ab4557d7b9ec97c323 fix-compilation-warnings-about-sys-poll.patch
-0daff387c80d2132ec16b3d161e5fffe9e2cae1d3e08fc1c4e65b2bfdf4685c42fb129e4df92b08a17f250018f57eac39b2c8ff299ae378d4442681a88e39f9e check_mysql_query-fix-use-after-free.patch
27050160a71e897343da6d6fd25c322a227702caec98065f82e06cba8929c2f6c538a4563a420fb0a07419622107caba1ad44c2cad195a0c0c76a6a925ec1c4b check_openrc
4a4c267c8403d3a1c8630adda9ddbdf7ce421b65e6dbfc0eb3f2bf03f94df563371e78193e8b3127ba9f3edcf8f1a7f96d9312167e6f924028d16d144e8af5d2 nagios-openrc.doasd
"
diff --git a/main/nagios-plugins/check_mysql_query-fix-use-after-free.patch b/main/nagios-plugins/check_mysql_query-fix-use-after-free.patch
deleted file mode 100644
index 0f9a2784a5..0000000000
--- a/main/nagios-plugins/check_mysql_query-fix-use-after-free.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From: simon-alpine@fraho.eu
-Subject: mysql_check_query crashes on alpine 3.13 after accessing free'd data
-Upstream: reported
-
-see https://gitlab.alpinelinux.org/alpine/aports/-/issues/12601
-and https://github.com/nagios-plugins/nagios-plugins/issues/602
-
---- a/plugins/check_mysql_query.c
-+++ b/plugins/check_mysql_query.c
-@@ -143,17 +143,17 @@
- die (STATE_CRITICAL, "QUERY %s: Fetch row error - %s\n", _("CRITICAL"), error);
- }
-
-- /* free the result */
-- mysql_free_result (res);
--
-- /* close the connection */
-- mysql_close (&mysql);
--
- if (! is_numeric(row[0])) {
- die (STATE_CRITICAL, "QUERY %s: %s - '%s'\n", _("CRITICAL"), _("Is not a numeric"), row[0]);
- }
-
- value = strtod(row[0], NULL);
-+
-+ /* free the result */
-+ mysql_free_result (res);
-+
-+ /* close the connection */
-+ mysql_close (&mysql);
-
- if (verbose >= 3)
- printf("mysql result: %f\n", value);