[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-plugins-snmp/files/
commit: 70fea962ceef821a065e9ad209ead1e493b22d29
Author: Jakov Smolic sartura hr>
AuthorDate: Fri Jan 1 20:43:28 2021 +
Commit: David Seifert gentoo org>
CommitDate: Fri Jan 1 20:43:28 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70fea962
net-analyzer/nagios-plugins-snmp: Update fno-common.patch
Closes: https://github.com/gentoo/gentoo/pull/18903
Closes: https://bugs.gentoo.org/762955
Signed-off-by: Jakov Smolic sartura.hr>
Signed-off-by: David Seifert gentoo.org>
.../nagios-plugins-snmp-0.6.0-fno-common.patch | 155 +++--
1 file changed, 79 insertions(+), 76 deletions(-)
diff --git
a/net-analyzer/nagios-plugins-snmp/files/nagios-plugins-snmp-0.6.0-fno-common.patch
b/net-analyzer/nagios-plugins-snmp/files/nagios-plugins-snmp-0.6.0-fno-common.patch
index 5fd2ff1c235..926a96d74d1 100644
---
a/net-analyzer/nagios-plugins-snmp/files/nagios-plugins-snmp-0.6.0-fno-common.patch
+++
b/net-analyzer/nagios-plugins-snmp/files/nagios-plugins-snmp-0.6.0-fno-common.patch
@@ -1,83 +1,86 @@
+diff --git a/src/nagios_common_snmp.c b/src/nagios_common_snmp.c
+index 5bdc571..73f96e8 100755
--- a/src/nagios_common_snmp.c
+++ b/src/nagios_common_snmp.c
-@@ -1,5 +1,22 @@
- #include "nagios_common_snmp.h"
-
-+char plugin_name[30]; /* plugin name */
-+char plugin_tmp_prefix[50];
-+char output[MAX_OUTPUT];
-+int output_overflow;
-+char *p_output;
-+char *o_host;
-+int o_verb;
-+char* error;
-+int o_port,o_timeout;
-+int o_help, o_verbose,o_version,o_v2c;
-+int retries;
-+int o_snmpver,snmp_bulk;
-+char *o_community,*o_login,*o_passwd,*o_privpasswd;
-+char *o_protocols[2],*o_authproto,*o_privproto;
-+struct snmp_session session, *ss;
-+
-+
- int init_plugins_gettext(){
- if (setlocale( LC_ALL, "" )==NULL) return 1;
- bindtextdomain( PACKAGE, LOCALEDIR );
+@@ -1,5 +1,21 @@
+ #include "nagios_common_snmp.h"
+
++char plugin_name[30]; /* plugin name */
++char plugin_tmp_prefix[50];
++char output[MAX_OUTPUT];
++int output_overflow;
++char *p_output;
++char *o_host;
++int o_verb;
++char* error;
++int o_port,o_timeout;
++int o_help, o_verbose,o_version,o_v2c;
++int retries;
++int o_snmpver,snmp_bulk;
++char *o_community,*o_login,*o_passwd,*o_privpasswd;
++char *o_protocols[2],*o_authproto,*o_privproto;
++struct snmp_session session, *ss;
++
+ int init_plugins_gettext(){
+ if (setlocale( LC_ALL, "" )==NULL) return 1;
+ bindtextdomain( PACKAGE, LOCALEDIR );
+diff --git a/src/nagios_common_snmp.h b/src/nagios_common_snmp.h
+index 8903fd0..1b3fa3a 100755
--- a/src/nagios_common_snmp.h
+++ b/src/nagios_common_snmp.h
@@ -56,8 +56,8 @@ int init_plugins_gettext();
- /*** Utilities
/
- /* cache utilities */
-
--char plugin_name[30]; /* plugin name */
--char plugin_tmp_prefix[50];
-+extern char plugin_name[30]; /* plugin name */
-+extern char plugin_tmp_prefix[50];
-
- /* defined in configure script */
- /*#define BASE_CACHE "/tmp/cache"*/
+ /*** Utilities
/
+ /* cache utilities */
+
+-char plugin_name[30]; /* plugin name */
+-char plugin_tmp_prefix[50];
++extern char plugin_name[30]; /* plugin name */
++extern char plugin_tmp_prefix[50];
+
+ /* defined in configure script */
+ /*#define BASE_CACHE "/tmp/cache"*/
@@ -71,12 +71,12 @@ int write_cache(snmp_table **descT,int num);
-
- /* maximum caracters in ouput */
- #define MAX_OUTPUT 500
--char output[MAX_OUTPUT];
--int output_overflow;
-+extern char output[MAX_OUTPUT];
-+extern int output_overflow;
-
- /* maximum caracters for performance output label*/
- #define MAX_LABEL_SIZE 50
--char *p_output;
-+extern char *p_output;
-
- /* Put data in output */
- void strcat_output(const char *string);
+
+ /* maximum caracters in ouput */
+ #define MAX_OUTPUT 500
+-char output[MAX_OUTPUT];
+-int output_overflow;
++extern char output[MAX_OUTPUT];
++extern int output_overflow;
+
+ /* maximum caracters for performance output label*/
+ #define MAX_LABEL_SIZE 50
+-char *p_output;
++extern char *p_output;
+
+ /* Put data in output */
+ void strcat_output(const char *string);
@@ -143,18 +143,18 @@ int get_options (int narg, char* const
valarg[],options_nagsnmp *liste, int n_li
- #define TIMEOUT_DEFAULT 3
-
- /* standard options */
--char *o_host;
--int o_verb;
--char* error;
-+extern char *o_host;
-+extern int o_verb;
-+extern char* error;
- /* snmp options */
--int o_port,o_timeout;
--int o_help, o_verbose,o_version,o_v2c;
--int retries;
--int o_snmpver,snmp_bulk;
--char *o_community,*o_login,*o_passwd,*o_privpasswd;
--char *o_protocols[2],*o_authproto,*o_privproto;
-+extern int o_port,o_timeout;
-+extern int o_help, o_verbose,o_version,o_v2c;
-+extern int retries;
-+extern int o_snmpver,snmp_bulk;
-+extern char *o_community,*o_login,*o_passwd,*o_privpasswd;
-+extern char *o_protocols[2],*o_authproto,*o_privproto;
- /* snmp sessions */
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-plugins-snmp/files/, net-analyzer/nagios-plugins-snmp/
commit: ee2353247311d477ac24d91dead7b99f3b7ac6ec
Author: Jakov Smolic sartura hr>
AuthorDate: Fri Jan 1 18:04:23 2021 +
Commit: David Seifert gentoo org>
CommitDate: Fri Jan 1 18:04:23 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee235324
net-analyzer/nagios-plugins-snmp: Fix build with gcc-10
Closes: https://bugs.gentoo.org/707454
Signed-off-by: Jakov Smolic sartura.hr>
Signed-off-by: David Seifert gentoo.org>
.../nagios-plugins-snmp-0.6.0-fno-common.patch | 83 ++
.../nagios-plugins-snmp-0.6.0-r2.ebuild| 4 +-
2 files changed, 86 insertions(+), 1 deletion(-)
diff --git
a/net-analyzer/nagios-plugins-snmp/files/nagios-plugins-snmp-0.6.0-fno-common.patch
b/net-analyzer/nagios-plugins-snmp/files/nagios-plugins-snmp-0.6.0-fno-common.patch
new file mode 100644
index 000..5fd2ff1c235
--- /dev/null
+++
b/net-analyzer/nagios-plugins-snmp/files/nagios-plugins-snmp-0.6.0-fno-common.patch
@@ -0,0 +1,83 @@
+--- a/src/nagios_common_snmp.c
b/src/nagios_common_snmp.c
+@@ -1,5 +1,22 @@
+ #include "nagios_common_snmp.h"
+
++char plugin_name[30]; /* plugin name */
++char plugin_tmp_prefix[50];
++char output[MAX_OUTPUT];
++int output_overflow;
++char *p_output;
++char *o_host;
++int o_verb;
++char* error;
++int o_port,o_timeout;
++int o_help, o_verbose,o_version,o_v2c;
++int retries;
++int o_snmpver,snmp_bulk;
++char *o_community,*o_login,*o_passwd,*o_privpasswd;
++char *o_protocols[2],*o_authproto,*o_privproto;
++struct snmp_session session, *ss;
++
++
+ int init_plugins_gettext(){
+ if (setlocale( LC_ALL, "" )==NULL) return 1;
+ bindtextdomain( PACKAGE, LOCALEDIR );
+--- a/src/nagios_common_snmp.h
b/src/nagios_common_snmp.h
+@@ -56,8 +56,8 @@ int init_plugins_gettext();
+ /*** Utilities
/
+ /* cache utilities */
+
+-char plugin_name[30]; /* plugin name */
+-char plugin_tmp_prefix[50];
++extern char plugin_name[30]; /* plugin name */
++extern char plugin_tmp_prefix[50];
+
+ /* defined in configure script */
+ /*#define BASE_CACHE "/tmp/cache"*/
+@@ -71,12 +71,12 @@ int write_cache(snmp_table **descT,int num);
+
+ /* maximum caracters in ouput */
+ #define MAX_OUTPUT 500
+-char output[MAX_OUTPUT];
+-int output_overflow;
++extern char output[MAX_OUTPUT];
++extern int output_overflow;
+
+ /* maximum caracters for performance output label*/
+ #define MAX_LABEL_SIZE 50
+-char *p_output;
++extern char *p_output;
+
+ /* Put data in output */
+ void strcat_output(const char *string);
+@@ -143,18 +143,18 @@ int get_options (int narg, char* const
valarg[],options_nagsnmp *liste, int n_li
+ #define TIMEOUT_DEFAULT 3
+
+ /* standard options */
+-char *o_host;
+-int o_verb;
+-char* error;
++extern char *o_host;
++extern int o_verb;
++extern char* error;
+ /* snmp options */
+-int o_port,o_timeout;
+-int o_help, o_verbose,o_version,o_v2c;
+-int retries;
+-int o_snmpver,snmp_bulk;
+-char *o_community,*o_login,*o_passwd,*o_privpasswd;
+-char *o_protocols[2],*o_authproto,*o_privproto;
++extern int o_port,o_timeout;
++extern int o_help, o_verbose,o_version,o_v2c;
++extern int retries;
++extern int o_snmpver,snmp_bulk;
++extern char *o_community,*o_login,*o_passwd,*o_privpasswd;
++extern char *o_protocols[2],*o_authproto,*o_privproto;
+ /* snmp sessions */
+-struct snmp_session session, *ss;
++extern struct snmp_session session, *ss;
+
+ /* Common options definition and check */
+ #define common_usage "[-v -V] -H -C [-2] | (-l login
-x passwd [-X pass -L ,) [-p ] [-t ]"
diff --git
a/net-analyzer/nagios-plugins-snmp/nagios-plugins-snmp-0.6.0-r2.ebuild
b/net-analyzer/nagios-plugins-snmp/nagios-plugins-snmp-0.6.0-r2.ebuild
index 6eb4daae21e..005fd81aef6 100644
--- a/net-analyzer/nagios-plugins-snmp/nagios-plugins-snmp-0.6.0-r2.ebuild
+++ b/net-analyzer/nagios-plugins-snmp/nagios-plugins-snmp-0.6.0-r2.ebuild
@@ -19,7 +19,9 @@ DEPEND="
net-analyzer/net-snmp"
RDEPEND="${DEPEND}"
-S="${WORKDIR}/nagios-plugins-snmp"
+S="${WORKDIR}"/nagios-plugins-snmp
+
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
src_prepare() {
default
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-plugins-snmp/
commit: 07f4ad3b1e8912358e540bd059fb44f48c0be640
Author: David Seifert gentoo org>
AuthorDate: Sat Oct 24 17:18:38 2020 +
Commit: David Seifert gentoo org>
CommitDate: Sat Oct 24 17:18:38 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07f4ad3b
net-analyzer/nagios-plugins-snmp: Port to EAPI 7
Closes: https://bugs.gentoo.org/742215
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: David Seifert gentoo.org>
.../nagios-plugins-snmp-0.6.0-r2.ebuild| 29 ++
1 file changed, 13 insertions(+), 16 deletions(-)
diff --git
a/net-analyzer/nagios-plugins-snmp/nagios-plugins-snmp-0.6.0-r2.ebuild
b/net-analyzer/nagios-plugins-snmp/nagios-plugins-snmp-0.6.0-r2.ebuild
index c89ed52c824..6eb4daae21e 100644
--- a/net-analyzer/nagios-plugins-snmp/nagios-plugins-snmp-0.6.0-r2.ebuild
+++ b/net-analyzer/nagios-plugins-snmp/nagios-plugins-snmp-0.6.0-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=4
+EAPI=7
-inherit autotools user
+inherit autotools
DESCRIPTION="Additional Nagios plugins for monitoring SNMP capable devices"
HOMEPAGE="http://nagios.manubulon.com;
@@ -12,31 +12,28 @@ SRC_URI="http://nagios.manubulon.com/${P}.tgz;
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ~ppc ppc64 ~sparc x86"
-IUSE=""
-DEPEND="net-analyzer/net-snmp"
+DEPEND="
+ acct-group/nagios
+ acct-user/nagios
+ net-analyzer/net-snmp"
RDEPEND="${DEPEND}"
-S=${WORKDIR}/nagios-plugins-snmp
-
-pkg_setup() {
- enewgroup nagios
- enewuser nagios -1 /bin/bash /var/nagios/home nagios
-}
+S="${WORKDIR}/nagios-plugins-snmp"
src_prepare() {
- sed -i -e '/^CFLAGS=""/d' configure.in
+ default
+ sed -i -e '/^CFLAGS=""/d' configure.in || die
+ mv configure.{in,ac} || die
eautoreconf
}
src_configure() {
econf \
- --sysconfdir=/etc/nagios \
- --libexec=/usr/$(get_libdir)/nagios/plugins
+ --sysconfdir="${EPREFIX}"/etc/nagios \
+ --libexec="${EPREFIX}"/usr/$(get_libdir)/nagios/plugins
}
-DOCS=( README NEWS AUTHORS )
-
src_install() {
default
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-plugins-snmp/
commit: 44c8b5cd3db8e67d9c070a833c9c719943fa23cf Author: Amy Liffey gentoo org> AuthorDate: Fri Jul 21 08:21:51 2017 + Commit: Amy Liffey gentoo org> CommitDate: Fri Jul 21 08:30:40 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44c8b5cd net-analyzer/nagios-plugins-snmp: remove inactive proxy maintainer Package-Manager: Portage-2.3.6, Repoman-2.3.1 net-analyzer/nagios-plugins-snmp/metadata.xml | 10 -- 1 file changed, 10 deletions(-) diff --git a/net-analyzer/nagios-plugins-snmp/metadata.xml b/net-analyzer/nagios-plugins-snmp/metadata.xml index d47d6761c6f..b7624565aca 100644 --- a/net-analyzer/nagios-plugins-snmp/metadata.xml +++ b/net-analyzer/nagios-plugins-snmp/metadata.xml @@ -2,18 +2,8 @@ http://www.gentoo.org/dtd/metadata.dtd;> - and...@ahamilto.net - Andrew Hamilton - Maintainer. Assign bugs to him. - - creff...@gentoo.org Chris Reffett - Proxy maintainer. CC him on bugs. - - - proxy-ma...@gentoo.org - Proxy Maintainers sysad...@gentoo.org
