[arch-commits] Commit in monitoring-plugins/repos/community-x86_64 (4 files)
Jonathan Steel
jsteel at archlinux.org
Sun Jan 3 19:12:12 UTC 2021
Date: Sunday, January 3, 2021 @ 19:12:12
Author: jsteel
Revision: 805669
archrelease: copy trunk to community-x86_64
Added:
monitoring-plugins/repos/community-x86_64/0001-mariadb.patch
(from rev 805668, monitoring-plugins/trunk/0001-mariadb.patch)
monitoring-plugins/repos/community-x86_64/PKGBUILD
(from rev 805668, monitoring-plugins/trunk/PKGBUILD)
Deleted:
monitoring-plugins/repos/community-x86_64/0001-mariadb.patch
monitoring-plugins/repos/community-x86_64/PKGBUILD
--------------------+
0001-mariadb.patch | 52 +++++++++++++-------------
PKGBUILD | 102 +++++++++++++++++++++++----------------------------
2 files changed, 73 insertions(+), 81 deletions(-)
Deleted: 0001-mariadb.patch
===================================================================
--- 0001-mariadb.patch 2021-01-03 19:12:04 UTC (rev 805668)
+++ 0001-mariadb.patch 2021-01-03 19:12:12 UTC (rev 805669)
@@ -1,26 +0,0 @@
-From 399cc141526ee77e1befce469f1fab40645f299d Mon Sep 17 00:00:00 2001
-From: Bernard Spil <Sp1l at users.noreply.github.com>
-Date: Mon, 6 Nov 2017 17:31:44 +0100
-Subject: [PATCH] Fix build issue with MariaDB 10.2
-
-As of 10.2 MariaDB no longer defines MYSQL_PORT.
----
- plugins/common.h | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/plugins/common.h b/plugins/common.h
-index 8719b502..6bf4fca4 100644
---- a/plugins/common.h
-+++ b/plugins/common.h
-@@ -174,6 +174,11 @@
- *
- */
-
-+/* MariaDB 10.2 client does not set MYSQL_PORT */
-+#ifndef MYSQL_PORT
-+# define MYSQL_PORT 3306
-+#endif
-+
- enum {
- OK = 0,
- ERROR = -1
Copied: monitoring-plugins/repos/community-x86_64/0001-mariadb.patch (from rev 805668, monitoring-plugins/trunk/0001-mariadb.patch)
===================================================================
--- 0001-mariadb.patch (rev 0)
+++ 0001-mariadb.patch 2021-01-03 19:12:12 UTC (rev 805669)
@@ -0,0 +1,26 @@
+From 399cc141526ee77e1befce469f1fab40645f299d Mon Sep 17 00:00:00 2001
+From: Bernard Spil <Sp1l at users.noreply.github.com>
+Date: Mon, 6 Nov 2017 17:31:44 +0100
+Subject: [PATCH] Fix build issue with MariaDB 10.2
+
+As of 10.2 MariaDB no longer defines MYSQL_PORT.
+---
+ plugins/common.h | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/plugins/common.h b/plugins/common.h
+index 8719b502..6bf4fca4 100644
+--- a/plugins/common.h
++++ b/plugins/common.h
+@@ -174,6 +174,11 @@
+ *
+ */
+
++/* MariaDB 10.2 client does not set MYSQL_PORT */
++#ifndef MYSQL_PORT
++# define MYSQL_PORT 3306
++#endif
++
+ enum {
+ OK = 0,
+ ERROR = -1
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-01-03 19:12:04 UTC (rev 805668)
+++ PKGBUILD 2021-01-03 19:12:12 UTC (rev 805669)
@@ -1,55 +0,0 @@
-# Maintainer: Jonathan Steel <jsteel at archlinux.org>
-# Contributor: Idares <idares at seznam dot cz>
-
-pkgname=monitoring-plugins
-pkgver=2.2
-pkgrel=6
-pkgdesc="Plugins for Icinga, Naemon, Nagios, Shinken, Sensu and other monitoring applications"
-arch=('x86_64')
-url="https://www.monitoring-plugins.org"
-license=('GPL3')
-depends=('perl')
-makedepends=('net-snmp' 'postgresql-libs' 'libdbi' 'mariadb-libs'
- 'procps-ng' 'iputils' 'fping' 'dnsutils' 'rpcbind' 'smbclient' 'openssh'
- 'inetutils' 'postfix' 'perl-net-snmp')
-optdepends=('net-snmp: for SNMP checking'
- 'postgresql-libs: for check_pgsql'
- 'mariadb-libs: for check_mysql_query and check_mysql'
- 'libdbi: for check_dbi'
- 'libldap: for check_ldap')
-provides=('nagios-plugins')
-conflicts=('nagios-plugins')
-replaces=('nagios-plugins')
-source=("https://www.monitoring-plugins.org/download/$pkgname-$pkgver.tar.gz"
- '0001-mariadb.patch')
-sha256sums=('296a538f00a9cbef7f528ff2d43af357a44b384dc98a32389a675b62a6dd3665'
- '2e478c220563c194f61d68860cfbb56cf9ce1179b2590343c679a1609a5fba6d')
-
-prepare() {
- cd $pkgname-$pkgver
-
- patch -Np1 < ../0001-mariadb.patch
-}
-
-build() {
- cd $pkgname-$pkgver
-
- ./configure --prefix=/usr --libexecdir=/usr/lib/monitoring-plugins \
- --with-ping-command='/usr/bin/ping -4 -n -U -w %d -c %d %s' \
- --with-ping6-command='/usr/bin/ping -6 -n -U -w %d -c %d %s'
-
- make
-}
-
-package() {
- cd $pkgname-$pkgver
-
- make DESTDIR="$pkgdir" install
-
- install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-
- for i in ABOUT-NLS ACKNOWLEDGEMENTS AUTHORS CODING ChangeLog \
- FAQ NEWS README REQUIREMENTS SUPPORT THANKS; do
- install -Dm644 $i "$pkgdir"/usr/share/doc/$pkgname/$i
- done
-}
Copied: monitoring-plugins/repos/community-x86_64/PKGBUILD (from rev 805668, monitoring-plugins/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-01-03 19:12:12 UTC (rev 805669)
@@ -0,0 +1,47 @@
+# Maintainer: Jonathan Steel <jsteel at archlinux.org>
+# Contributor: Idares <idares at seznam dot cz>
+
+pkgname=monitoring-plugins
+pkgver=2.3
+pkgrel=1
+pkgdesc="Plugins for Icinga, Naemon, Nagios, Shinken, Sensu and other monitoring applications"
+arch=('x86_64')
+url="https://www.monitoring-plugins.org"
+license=('GPL3')
+depends=('perl')
+makedepends=('net-snmp' 'postgresql-libs' 'libdbi' 'mariadb-libs'
+ 'procps-ng' 'iputils' 'fping' 'dnsutils' 'rpcbind' 'smbclient' 'openssh'
+ 'inetutils' 'postfix' 'perl-net-snmp')
+optdepends=('net-snmp: for SNMP checking'
+ 'postgresql-libs: for check_pgsql'
+ 'mariadb-libs: for check_mysql_query and check_mysql'
+ 'libdbi: for check_dbi'
+ 'libldap: for check_ldap')
+provides=('nagios-plugins')
+conflicts=('nagios-plugins')
+replaces=('nagios-plugins')
+source=("https://www.monitoring-plugins.org/download/$pkgname-$pkgver.tar.gz")
+sha256sums=('3fd96efaa751c7646fe3ba25f9714859a204176a155d12fe0ee420e39e90f56c')
+
+build() {
+ cd $pkgname-$pkgver
+
+ ./configure --prefix=/usr --libexecdir=/usr/lib/monitoring-plugins \
+ --with-ping-command='/usr/bin/ping -4 -n -U -w %d -c %d %s' \
+ --with-ping6-command='/usr/bin/ping -6 -n -U -w %d -c %d %s'
+
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+
+ make DESTDIR="$pkgdir" install
+
+ install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
+
+ for i in ABOUT-NLS ACKNOWLEDGEMENTS AUTHORS CODING ChangeLog \
+ FAQ NEWS README REQUIREMENTS SUPPORT THANKS; do
+ install -Dm644 $i "$pkgdir"/usr/share/doc/$pkgname/$i
+ done
+}
More information about the arch-commits
mailing list