[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nrpe/files/, net-analyzer/nrpe/
commit: bc77e1137940198a2ff4ca5f62842dcfdf1bb3e4
Author: Michael Orlitzky gentoo org>
AuthorDate: Sat Aug 31 20:47:22 2019 +
Commit: Michael Orlitzky gentoo org>
CommitDate: Sat Aug 31 21:34:56 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc77e113
net-analyzer/nrpe: remove "unused" nrpe-{2.15-r3,3.2.1}.ebuild.
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Michael Orlitzky gentoo.org>
net-analyzer/nrpe/Manifest | 1 -
net-analyzer/nrpe/files/nrpe-2.14-multiline.patch | 204 -
.../nrpe/files/nrpe-2.15-autoconf-header.patch | 24 ---
.../files/nrpe-2.15-metachar-security-fix.patch| 26 ---
net-analyzer/nrpe/files/nrpe-2.15-no-ssl.patch | 39
net-analyzer/nrpe/files/nrpe-2.15-tcpd-et-al.patch | 50 -
net-analyzer/nrpe/metadata.xml | 3 -
net-analyzer/nrpe/nrpe-2.15-r3.ebuild | 140 --
net-analyzer/nrpe/nrpe-3.2.1.ebuild| 77
9 files changed, 564 deletions(-)
diff --git a/net-analyzer/nrpe/Manifest b/net-analyzer/nrpe/Manifest
index 8b0da4d1b7d..0091826d876 100644
--- a/net-analyzer/nrpe/Manifest
+++ b/net-analyzer/nrpe/Manifest
@@ -1,2 +1 @@
-DIST nrpe-2.15.tar.gz 419695 BLAKE2B
999ecc633cbd2dc516ff0654db3ac0cc58a88d93ae4ace1040888fe73d8fb471306d95312ac364c79b3a47300ac57c0c429a24697c37bfa639f1da55cb6bc756
SHA512
03ce9774b5112d03235dc9da075770d89d1bcc5ffa5faf221ff7ea8ec5c92ded1e1ae9222581a87cf53736d190ac047e1acce7edc2f31f26c432d786cdef0e73
DIST nrpe-3.2.1.tar.gz 518015 BLAKE2B
c9be2bf24e3d9977a7ff5c2f0e08bfe841729289af836bb7ac6ccb2c173a519958b12cc3e90ece612ac6c2527ad472ef1464be648a66b11ff8ad483d5ad78cc1
SHA512
ec6ff42a00bd97ed80010a82e26dc35fd419f2feda65820cda0108068173c1ae44eee698833a50fd2079429a6f5eb1321c4f06b09c6708bc5fbe48f176389856
diff --git a/net-analyzer/nrpe/files/nrpe-2.14-multiline.patch
b/net-analyzer/nrpe/files/nrpe-2.14-multiline.patch
deleted file mode 100644
index 3af2ef95bab..000
--- a/net-analyzer/nrpe/files/nrpe-2.14-multiline.patch
+++ /dev/null
@@ -1,204 +0,0 @@
-Add support for large output
-
-http://opsview-blog.opsera.com/dotorg/2008/08/enhancing-nrpe.htmlIndex:
nrpe-2.14/include/common.h
-===
-Index: nrpe-2.14/include/common.h
-===
nrpe-2.14.orig/include/common.h
-+++ nrpe-2.14/include/common.h
-@@ -41,7 +41,7 @@
- #define DEFAULT_SOCKET_TIMEOUT10 /* timeout after 10 seconds */
- #define DEFAULT_CONNECTION_TIMEOUT 300/* timeout if daemon is waiting
for connection more than this time */
-
--#define MAX_INPUT_BUFFER 2048/* max size of most buffers we use */
-+#define MAX_INPUT_BUFFER 16384 /* max size of most buffers we use */
- #define MAX_FILENAME_LENGTH 256
-
- #define MAX_HOST_ADDRESS_LENGTH 256 /* max size of a host address */
-@@ -55,12 +55,14 @@
-
- #define QUERY_PACKET 1 /* id code for a packet
containing a query */
- #define RESPONSE_PACKET 2 /* id code for a packet
containing a response */
-+#defineRESPONSE_PACKET_WITH_MORE 3 /* id code for a packet containing
a response, with more data to follow */
-
- #define NRPE_PACKET_VERSION_3 3 /* packet version identifier
*/
- #define NRPE_PACKET_VERSION_2 2
- #define NRPE_PACKET_VERSION_1 1 /* older packet version
identifiers (no longer supported) */
-
- #define MAX_PACKETBUFFER_LENGTH 1024/* max amount of data
we'll send in one query/response */
-+
/* WARNING - do not change this as older clients/servers will not work
*/
-
- typedef struct packet_struct{
- int16_t packet_version;
-Index: nrpe-2.14/src/check_nrpe.c
-===
nrpe-2.14.orig/src/check_nrpe.c
-+++ nrpe-2.14/src/check_nrpe.c
-@@ -221,6 +221,11 @@ int main(int argc, char **argv){
- return STATE_UNKNOWN;
- }
-
-+ /* Altinity patch: Allow multiple packets to be received */
-+ /* Indentation not corrected to allow simpler patching */
-+ /* START MULTI_PACKET LOOP */
-+ do {
-+
- /* wait for the response packet */
- bytes_to_recv=sizeof(receive_packet);
- if(use_ssl==FALSE)
-@@ -233,31 +238,24 @@ int main(int argc, char **argv){
- /* reset timeout */
- alarm(0);
-
-- /* close the connection */
--#ifdef HAVE_SSL
-- if(use_ssl==TRUE){
-- SSL_shutdown(ssl);
-- SSL_free(ssl);
-- SSL_CTX_free(ctx);
-- }
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nrpe/files/, net-analyzer/nrpe/
commit: c4935b71037ff671ee78d8185e657c87cc29a76e
Author: Tomas Mozes gmail com>
AuthorDate: Fri Jun 2 05:54:42 2017 +
Commit: Michael Orlitzky gentoo org>
CommitDate: Wed Jun 7 12:23:15 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4935b71
net-analyzer/nrpe: bump to 3.1.1, drop old
Package-Manager: Portage-2.3.6, Repoman-2.3.2
Signed-off-by: Michael Orlitzky gentoo.org>
net-analyzer/nrpe/Manifest | 2 +-
net-analyzer/nrpe/files/{nrpe-3.1.0.init => nrpe-3.1.1.init} | 0
net-analyzer/nrpe/{nrpe-3.1.0.ebuild => nrpe-3.1.1.ebuild} | 0
3 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-analyzer/nrpe/Manifest b/net-analyzer/nrpe/Manifest
index 9dbbbda4871..1ec17f2638d 100644
--- a/net-analyzer/nrpe/Manifest
+++ b/net-analyzer/nrpe/Manifest
@@ -1,2 +1,2 @@
DIST nrpe-2.15.tar.gz 419695 SHA256
66383b7d367de25ba031d37762d83e2b55de010c573009c6f58270b137131072 SHA512
03ce9774b5112d03235dc9da075770d89d1bcc5ffa5faf221ff7ea8ec5c92ded1e1ae9222581a87cf53736d190ac047e1acce7edc2f31f26c432d786cdef0e73
WHIRLPOOL
f97ad7431138fd96588bb4e9d13404a0425bbdb8582c7c472cb20621bb77a9e9ecdeed88b9247ea20815da33c5b123368a540c5a0a058921e59367c2ce2a2b10
-DIST nrpe-3.1.0.tar.gz 501028 SHA256
22942b546f1af9b3f277daa68742b7f72a53145079adf0f086e4554e1482f24a SHA512
d67ae7cbd7f72fccc341e7da6d8774ee28da93dd14a18e6c6fbce6c9ba3fab19451ededea3cff0945ec1569026ee10f12a44bebbeac12a3b8210ed9aec4b39b8
WHIRLPOOL
ecb41098e5bc87a8eaa0af8853fbe48b85a1c84a01ad5484f89aa231bb99a7604e4d67aa495651487577e3c85471bc274123809b40d791ade2c55d46d37b3e1b
+DIST nrpe-3.1.1.tar.gz 515215 SHA256
cfb3d4fb036e81cbb8a6d9c34f24b7d9395ecfaa55234a0572382ea30c54fd8d SHA512
1d4cb6e35ad88f1dcd66b552ac1b3892cbd894f182b2ab35929bb656423187a7e93ac3e9c812a72f10aaecd0924fc7bc36719abbeec2d65363534830972b5d92
WHIRLPOOL
f77db69c351488ea2e83d60094f82447c1bf4adea9da0cff2264346fdc7679941fb148546bd290da3d498851f84859164ac13c55e58e24785f808309bb8e14ae
diff --git a/net-analyzer/nrpe/files/nrpe-3.1.0.init
b/net-analyzer/nrpe/files/nrpe-3.1.1.init
similarity index 100%
rename from net-analyzer/nrpe/files/nrpe-3.1.0.init
rename to net-analyzer/nrpe/files/nrpe-3.1.1.init
diff --git a/net-analyzer/nrpe/nrpe-3.1.0.ebuild
b/net-analyzer/nrpe/nrpe-3.1.1.ebuild
similarity index 100%
rename from net-analyzer/nrpe/nrpe-3.1.0.ebuild
rename to net-analyzer/nrpe/nrpe-3.1.1.ebuild
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nrpe/files/, net-analyzer/nrpe/
commit: 1aa4d1f895af173e41d53f5d811a62788a68d7f2
Author: Michael Orlitzky gentoo org>
AuthorDate: Fri May 12 21:56:12 2017 +
Commit: Michael Orlitzky gentoo org>
CommitDate: Fri May 12 21:56:29 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1aa4d1f8
net-analyzer/nrpe: new version 3.1.0.
This new ebuild is missing a lot of the custom patching of the 2.x
series, ultimately because I just don't have time to forward-port a
bunch of patches. Here's a quick summary of the changes:
* Command arguments are unconditionally disabled, because they're
a security risk. This flag would be easy to bring back, but it
should be masked if we do.
* The daemon and tcp wrappers are no longer optional. While I admit
that having them be optional is useful, a giant patch to the build
system is not the way to go about it. Send that mess upstream!
* The nrpe_check_control tool is not installed. This is "contrib"
upstream, and doesn't use the correct paths from the build
system. Needs to be fixed upstream.
Thanks to Tomáš Mózes for the heads-up about the new version, and for
testing the ebuild and init script. It looks like our nrpe-2.x and
nrpe-3.x have some incompatibilities, possibly due to our patches
against the 2.x series. I've added an elog recommending that users not
mix major versions on the client/server.
Gentoo-Bug: 616092
Package-Manager: Portage-2.3.3, Repoman-2.3.1
net-analyzer/nrpe/Manifest | 1 +
net-analyzer/nrpe/files/nrpe-3.1.0.init | 16 +
net-analyzer/nrpe/nrpe-3.1.0.ebuild | 64 +
3 files changed, 81 insertions(+)
diff --git a/net-analyzer/nrpe/Manifest b/net-analyzer/nrpe/Manifest
index 51876a8e1c1..9dbbbda4871 100644
--- a/net-analyzer/nrpe/Manifest
+++ b/net-analyzer/nrpe/Manifest
@@ -1 +1,2 @@
DIST nrpe-2.15.tar.gz 419695 SHA256
66383b7d367de25ba031d37762d83e2b55de010c573009c6f58270b137131072 SHA512
03ce9774b5112d03235dc9da075770d89d1bcc5ffa5faf221ff7ea8ec5c92ded1e1ae9222581a87cf53736d190ac047e1acce7edc2f31f26c432d786cdef0e73
WHIRLPOOL
f97ad7431138fd96588bb4e9d13404a0425bbdb8582c7c472cb20621bb77a9e9ecdeed88b9247ea20815da33c5b123368a540c5a0a058921e59367c2ce2a2b10
+DIST nrpe-3.1.0.tar.gz 501028 SHA256
22942b546f1af9b3f277daa68742b7f72a53145079adf0f086e4554e1482f24a SHA512
d67ae7cbd7f72fccc341e7da6d8774ee28da93dd14a18e6c6fbce6c9ba3fab19451ededea3cff0945ec1569026ee10f12a44bebbeac12a3b8210ed9aec4b39b8
WHIRLPOOL
ecb41098e5bc87a8eaa0af8853fbe48b85a1c84a01ad5484f89aa231bb99a7604e4d67aa495651487577e3c85471bc274123809b40d791ade2c55d46d37b3e1b
diff --git a/net-analyzer/nrpe/files/nrpe-3.1.0.init
b/net-analyzer/nrpe/files/nrpe-3.1.0.init
new file mode 100644
index 000..acf8b549ee7
--- /dev/null
+++ b/net-analyzer/nrpe/files/nrpe-3.1.0.init
@@ -0,0 +1,16 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+: ${CFGFILE:=/etc/nagios/nrpe.cfg}
+
+extra_started_commands="reload"
+command="/usr/bin/${SVCNAME}"
+command_args="-c ${CFGFILE} --daemon"
+pidfile=/run/nrpe.pid
+
+reload() {
+ebegin "Reloading ${SVCNAME}"
+start-stop-daemon --exec $command --pidfile $pidfile --signal HUP
+eend $?
+}
diff --git a/net-analyzer/nrpe/nrpe-3.1.0.ebuild
b/net-analyzer/nrpe/nrpe-3.1.0.ebuild
new file mode 100644
index 000..e6ed550c91c
--- /dev/null
+++ b/net-analyzer/nrpe/nrpe-3.1.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit systemd user
+
+DESCRIPTION="Nagios Remote Plugin Executor"
+HOMEPAGE="https://github.com/NagiosEnterprises/nrpe;
+SRC_URI="${HOMEPAGE}/releases/download/release-${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="selinux ssl"
+
+DEPEND="sys-apps/tcp-wrappers
+ ssl? ( dev-libs/openssl:0 )"
+RDEPEND="${DEPEND}
+ || ( net-analyzer/nagios-plugins net-analyzer/monitoring-plugins )
+ selinux? ( sec-policy/selinux-nagios )"
+
+pkg_setup() {
+ enewgroup nagios
+ enewuser nagios -1 /bin/bash /var/nagios/home nagios
+}
+
+src_configure() {
+ econf \
+ --libexecdir=/usr/$(get_libdir)/nagios/plugins \
+ --localstatedir=/var/nagios \
+ --sysconfdir=/etc/nagios \
+ --with-nrpe-user=nagios \
+ --with-nrpe-group=nagios \
+ --with-piddir=/run \
+ $(use_enable ssl)
+}
+
+src_compile() {
+ emake all
+}
+
+src_install() {
+ default
+
+ dodoc Changelog SECURITY.md
+ insinto /etc/nagios
+ newins sample-config/nrpe.cfg nrpe.cfg
+ fowners root:nagios /etc/nagios/nrpe.cfg
+ fperms 0640 /etc/nagios/nrpe.cfg
+
+ newinitd "${FILESDIR}/nrpe-${PV}.init" nrpe
+ systemd_dounit "${FILESDIR}/${PN}.service"
+
+ insinto
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nrpe/files/, net-analyzer/nrpe/
commit: 9dc0aa1615c187829e2d3c1f9019a72559ee185f
Author: Michael Orlitzky gentoo org>
AuthorDate: Mon Aug 31 15:43:48 2015 +
Commit: Michael Orlitzky gentoo org>
CommitDate: Mon Aug 31 15:44:05 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9dc0aa16
net-analyzer/nrpe: remove old ebuilds and patches.
Package-Manager: portage-2.2.20.1
.../nrpe/files/nagios-nrpe-2.13-command-args.patch | 15 --
.../nrpe/files/nagios-nrpe-2.13-multiline.patch| 200 -
.../nrpe/files/nagios-nrpe-2.13-tcpd.patch | 33
net-analyzer/nrpe/files/nrpe-2.14-tcpd-et-al.patch | 74
net-analyzer/nrpe/nrpe-2.15-r1.ebuild | 127 -
net-analyzer/nrpe/nrpe-2.15.ebuild | 127 -
6 files changed, 576 deletions(-)
diff --git a/net-analyzer/nrpe/files/nagios-nrpe-2.13-command-args.patch
b/net-analyzer/nrpe/files/nagios-nrpe-2.13-command-args.patch
deleted file mode 100644
index fe6751a..000
--- a/net-analyzer/nrpe/files/nagios-nrpe-2.13-command-args.patch
+++ /dev/null
@@ -1,15 +0,0 @@
configure.old 2008-03-10 22:04:41.0 +0100
-+++ configure.in 2012-01-04 09:46:38.0 +0100
-@@ -362,7 +362,11 @@
- AC_SUBST(NAGIOS_INSTALL_OPTS)
-
-
--AC_ARG_ENABLE(command-args,--enable-command-args allows clients to specify
command arguments. *** THIS IS A SECURITY RISK! *** Read the SECURITY file
before using this option!,AC_DEFINE_UNQUOTED(ENABLE_COMMAND_ARGUMENTS))
-+AC_ARG_ENABLE(command-args,--enable-command-args allows clients to specify
command arguments. *** THIS IS A SECURITY RISK! *** Read the SECURITY file
before using this option!,[
-+ if test x$enableval = xyes; then
-+ AC_DEFINE_UNQUOTED(ENABLE_COMMAND_ARGUMENTS)
-+ fi
-+ ])
-
-
- AC_PATH_PROG(PERL,perl)
diff --git a/net-analyzer/nrpe/files/nagios-nrpe-2.13-multiline.patch
b/net-analyzer/nrpe/files/nagios-nrpe-2.13-multiline.patch
deleted file mode 100644
index 8d96149..000
--- a/net-analyzer/nrpe/files/nagios-nrpe-2.13-multiline.patch
+++ /dev/null
@@ -1,200 +0,0 @@
-diff --git a/include/common.h b/include/common.h
-index 202dec4..86f8e32 100755
a/include/common.h
-+++ b/include/common.h
-@@ -41,7 +41,7 @@
- #define DEFAULT_SOCKET_TIMEOUT10 /* timeout after 10 seconds */
- #define DEFAULT_CONNECTION_TIMEOUT 300/* timeout if daemon is waiting
for connection more than this time */
-
--#define MAX_INPUT_BUFFER 2048/* max size of most buffers we use */
-+#define MAX_INPUT_BUFFER 16384 /* max size of most buffers we use */
- #define MAX_FILENAME_LENGTH 256
-
- #define MAX_HOST_ADDRESS_LENGTH 256 /* max size of a host address */
-@@ -55,12 +55,14 @@
-
- #define QUERY_PACKET 1 /* id code for a packet
containing a query */
- #define RESPONSE_PACKET 2 /* id code for a packet
containing a response */
-+#defineRESPONSE_PACKET_WITH_MORE 3 /* id code for a packet containing
a response, with more data to follow */
-
- #define NRPE_PACKET_VERSION_3 3 /* packet version identifier
*/
- #define NRPE_PACKET_VERSION_2 2
- #define NRPE_PACKET_VERSION_1 1 /* older packet version
identifiers (no longer supported) */
-
- #define MAX_PACKETBUFFER_LENGTH 1024/* max amount of data
we'll send in one query/response */
-+
/* WARNING - do not change this as older clients/servers will not work
*/
-
- typedef struct packet_struct{
- int16_t packet_version;
-diff --git a/src/check_nrpe.c b/src/check_nrpe.c
-index 0adced1..ff4b920 100755
a/src/check_nrpe.c
-+++ b/src/check_nrpe.c
-@@ -221,6 +221,11 @@ int main(int argc, char **argv){
- return STATE_UNKNOWN;
- }
-
-+ /* Altinity patch: Allow multiple packets to be received */
-+ /* Indentation not corrected to allow simpler patching */
-+ /* START MULTI_PACKET LOOP */
-+ do {
-+
- /* wait for the response packet */
- bytes_to_recv=sizeof(receive_packet);
- if(use_ssl==FALSE)
-@@ -233,31 +238,24 @@ int main(int argc, char **argv){
- /* reset timeout */
- alarm(0);
-
-- /* close the connection */
--#ifdef HAVE_SSL
-- if(use_ssl==TRUE){
-- SSL_shutdown(ssl);
-- SSL_free(ssl);
-- SSL_CTX_free(ctx);
-- }
--#endif
-- graceful_close(sd,1000);
--
- /* recv() error */
- if(rc<0){
- printf("CHECK_NRPE: Error receiving data from
daemon.\n");
-+ graceful_close(sd,1000);
- return STATE_UNKNOWN;
-
