net-analyzer/nrpe: remove "unused" nrpe-{2.15-r3,3.2.1}.ebuild.
authorMichael Orlitzky <mjo@gentoo.org>
Sat, 31 Aug 2019 20:47:22 +0000 (16:47 -0400)
committerMichael Orlitzky <mjo@gentoo.org>
Sat, 31 Aug 2019 21:34:56 +0000 (17:34 -0400)
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Michael Orlitzky <mjo@gentoo.org>
net-analyzer/nrpe/Manifest
net-analyzer/nrpe/files/nrpe-2.14-multiline.patch [deleted file]
net-analyzer/nrpe/files/nrpe-2.15-autoconf-header.patch [deleted file]
net-analyzer/nrpe/files/nrpe-2.15-metachar-security-fix.patch [deleted file]
net-analyzer/nrpe/files/nrpe-2.15-no-ssl.patch [deleted file]
net-analyzer/nrpe/files/nrpe-2.15-tcpd-et-al.patch [deleted file]
net-analyzer/nrpe/metadata.xml
net-analyzer/nrpe/nrpe-2.15-r3.ebuild [deleted file]
net-analyzer/nrpe/nrpe-3.2.1.ebuild [deleted file]

index 8b0da4d1b7d683b3f7aef112a11a04f32a9b74c3..0091826d8768bc8deec45afe785fbbd444180342 100644 (file)
@@ -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 (file)
index 3af2ef9..0000000
+++ /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_TIMEOUT        10      /* 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 */
-+#define    RESPONSE_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);
--                      }
--#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;
-                       }
-               /* server disconnected */
-               else if(rc==0){
-                       printf("CHECK_NRPE: Received 0 bytes from daemon.  Check the remote server logs for error messages.\n");
-+                      graceful_close(sd,1000);
-                       return STATE_UNKNOWN;
-                       }
-               /* receive underflow */
-               else if(bytes_to_recv<sizeof(receive_packet)){
-                       printf("CHECK_NRPE: Receive underflow - only %d bytes received (%d expected).\n",bytes_to_recv,sizeof(receive_packet));
-+                      graceful_close(sd,1000);
-                       return STATE_UNKNOWN;
-                       }
-@@ -271,21 +269,21 @@ int main(int argc, char **argv){
-               calculated_crc32=calculate_crc32((char *)&receive_packet,sizeof(receive_packet));
-               if(packet_crc32!=calculated_crc32){
-                       printf("CHECK_NRPE: Response packet had invalid CRC32.\n");
--                      close(sd);
-+                      graceful_close(sd,1000);
-                       return STATE_UNKNOWN;
-                         }
-       
-               /* check packet version */
-               if(ntohs(receive_packet.packet_version)!=NRPE_PACKET_VERSION_2){
-                       printf("CHECK_NRPE: Invalid packet version received from server.\n");
--                      close(sd);
-+                      graceful_close(sd,1000);
-                       return STATE_UNKNOWN;
-                       }
-               /* check packet type */
--              if(ntohs(receive_packet.packet_type)!=RESPONSE_PACKET){
-+              if(ntohs(receive_packet.packet_type)!=RESPONSE_PACKET && ntohs(receive_packet.packet_type)!=RESPONSE_PACKET_WITH_MORE){
-                       printf("CHECK_NRPE: Invalid packet type received from server.\n");
--                      close(sd);
-+                      graceful_close(sd,1000);
-                       return STATE_UNKNOWN;
-                       }
-@@ -297,8 +295,18 @@ int main(int argc, char **argv){
-               if(!strcmp(receive_packet.buffer,""))
-                       printf("CHECK_NRPE: No output returned from daemon.\n");
-               else
--                      printf("%s\n",receive_packet.buffer);
--              }
-+                      printf("%s",receive_packet.buffer);
-+
-+              } while (ntohs(receive_packet.packet_type)==RESPONSE_PACKET_WITH_MORE);
-+              /* END MULTI_PACKET LOOP */
-+
-+              /* Finish output with newline */
-+              printf("\n");
-+
-+              /* close the connection */
-+              graceful_close(sd,1000);
-+
-+      }
-       /* reset the alarm */
-       else
-@@ -434,6 +442,14 @@ int graceful_close(int sd, int timeout){
-         struct timeval tv;
-         char buf[1000];
-+#ifdef HAVE_SSL
-+              if(use_ssl==TRUE){
-+                      SSL_shutdown(ssl);
-+                      SSL_free(ssl);
-+                      SSL_CTX_free(ctx);
-+              }
-+#endif
-+
-       /* send FIN packet */
-         shutdown(sd,SHUT_WR);  
-         for(;;){
-Index: nrpe-2.14/src/nrpe.c
-===================================================================
---- nrpe-2.14.orig/src/nrpe.c
-+++ nrpe-2.14/src/nrpe.c
-@@ -1056,6 +1056,8 @@ void handle_connection(int sock){
-       char processed_command[MAX_INPUT_BUFFER];
-       int result=STATE_OK;
-       int early_timeout=FALSE;
-+      int bytes_copied=0;
-+      char *pbuffer=&buffer[0];
-       int rc;
-       int x;
- #ifdef DEBUG
-@@ -1272,6 +1274,14 @@ void handle_connection(int sock){
-       if(buffer[strlen(buffer)-1]=='\n')
-               buffer[strlen(buffer)-1]='\x0';
-+      /* Altinity patch to allow multi packet responses */
-+      /* Loop not indented to allow easier patching */
-+      /* START MULTI_PACKET LOOP */
-+      do {
-+
-+              if(debug==TRUE)
-+                      syslog(LOG_DEBUG,"Sending response - bytes left: %d", strlen(pbuffer));
-+
-       /* clear the response packet buffer */
-       bzero(&send_packet,sizeof(send_packet));
-@@ -1280,11 +1290,17 @@ void handle_connection(int sock){
-       /* initialize response packet data */
-       send_packet.packet_version=(int16_t)htons(NRPE_PACKET_VERSION_2);
--      send_packet.packet_type=(int16_t)htons(RESPONSE_PACKET);
-       send_packet.result_code=(int16_t)htons(result);
--      strncpy(&send_packet.buffer[0],buffer,MAX_PACKETBUFFER_LENGTH);
-+      strncpy(&send_packet.buffer[0],pbuffer,MAX_PACKETBUFFER_LENGTH);
-       send_packet.buffer[MAX_PACKETBUFFER_LENGTH-1]='\x0';
--      
-+
-+      bytes_copied = strlen(&send_packet.buffer[0]);
-+      pbuffer = pbuffer+bytes_copied;
-+      if(strlen(pbuffer)>0)
-+              send_packet.packet_type=(int16_t)htons(RESPONSE_PACKET_WITH_MORE);
-+      else
-+              send_packet.packet_type=(int16_t)htons(RESPONSE_PACKET);
-+
-       /* calculate the crc 32 value of the packet */
-       send_packet.crc32_value=(u_int32_t)0L;
-       calculated_crc32=calculate_crc32((char *)&send_packet,sizeof(send_packet));
-@@ -1303,6 +1319,9 @@ void handle_connection(int sock){
-               SSL_write(ssl,&send_packet,bytes_to_send);
- #endif
-+      } while (strlen(pbuffer) > 0);
-+      /* END MULTI_PACKET LOOP */
-+
- #ifdef HAVE_SSL
-       if(ssl){
-               complete_SSL_shutdown( ssl);
diff --git a/net-analyzer/nrpe/files/nrpe-2.15-autoconf-header.patch b/net-analyzer/nrpe/files/nrpe-2.15-autoconf-header.patch
deleted file mode 100644 (file)
index 81078c4..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Nuar --exclude '*.orig' nrpe-2.15.orig/configure.in nrpe-2.15/configure.in
---- nrpe-2.15.orig/configure.in        2013-09-06 08:27:13.000000000 -0700
-+++ nrpe-2.15/configure.in     2014-04-19 09:32:52.251766643 -0700
-@@ -6,7 +6,8 @@
- AC_INIT([nrpe],[2.15],[nagios-users@lists.sourceforge.net],[nrpe],[http://www.nagios.org])
- AC_CONFIG_SRCDIR([src/nrpe.c])
--AC_CONFIG_HEADERS([include/config.h])
-+AC_CONFIG_HEADERS([include/autoconf.h])
- AC_CONFIG_FILES([Makefile
-+      include/config.h
-       subst
-       src/Makefile
-diff -Nuar --exclude '*.orig' nrpe-2.15.orig/include/config.h.in nrpe-2.15/include/config.h.in
---- nrpe-2.15.orig/include/config.h.in 2013-09-06 08:27:13.000000000 -0700
-+++ nrpe-2.15/include/config.h.in      2014-04-19 09:33:07.620035056 -0700
-@@ -26,6 +26,7 @@
- #include <stdio.h>
- #include <stdlib.h>
-+#include "autoconf.h"
- #define DEFAULT_SERVER_PORT   @nrpe_port@     /* default port to use */
diff --git a/net-analyzer/nrpe/files/nrpe-2.15-metachar-security-fix.patch b/net-analyzer/nrpe/files/nrpe-2.15-metachar-security-fix.patch
deleted file mode 100644 (file)
index c42f8bf..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-Disallow all control characters in argument handling.
-
-This closes a security hole that allowed passing commands via the argument
-handling, if a newline was used to seperate the argument from the rest of the
-command.
-
-X-URL: http://www.exploit-db.com/exploits/32925/
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-
---
-I didn't find any patches from upstream NRPE, so I wrote this quick one.
-If somebody else has a valid use for control characters in NRPE arguments, then
-this could be relaxed slightly.
-
-diff -Nuar --exclude '*.orig' nrpe-2.15.orig/src/nrpe.c nrpe-2.15/src/nrpe.c
---- nrpe-2.15.orig/src/nrpe.c  2014-04-19 09:37:16.022373910 -0700
-+++ nrpe-2.15/src/nrpe.c       2014-04-19 09:46:53.237458939 -0700
-@@ -53,7 +53,7 @@
- #define DEFAULT_COMMAND_TIMEOUT       60                      /* default timeout for execution of plugins */
- #define MAXFD                   64
--#define NASTY_METACHARS         "|`&><'\"\\[]{};"
-+#define NASTY_METACHARS         "|`&><'\"\\[]{};\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f\x7f"
- #define howmany(x,y)  (((x)+((y)-1))/(y))
- #define MAX_LISTEN_SOCKS        16
diff --git a/net-analyzer/nrpe/files/nrpe-2.15-no-ssl.patch b/net-analyzer/nrpe/files/nrpe-2.15-no-ssl.patch
deleted file mode 100644 (file)
index 3b3fc13..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-Without this patch, you can't build nrpe without SSL support. It was
-originally submitted on the Nagios forums by user Matthew L. Daniel:
-
-  https://support.nagios.com/forum/viewtopic.php?t=27027
-
-It was merged into the upstream github repo (NagiosEnterprises/nrpe)
-in commit 3736fdeeac11a.
-
-
-diff --git a/src/nrpe.c b/src/nrpe.c
-index 4bc849b..1e55ab4 100644
---- a/src/nrpe.c
-+++ b/src/nrpe.c
-@@ -102,7 +102,9 @@ int     use_src=FALSE; /* Define parameter for SRC option */
- int           listen_queue_size=DEFAULT_LISTEN_QUEUE_SIZE;
-+#ifdef HAVE_SSL
- void complete_SSL_shutdown( SSL *);
-+#endif
- int main(int argc, char **argv){
-@@ -1815,6 +1817,7 @@ int remove_pid_file(void){
-       return OK;
-         }
-+#ifdef HAVE_SSL
- void complete_SSL_shutdown( SSL *ssl) {
-       /*  
-@@ -1835,6 +1838,7 @@ void complete_SSL_shutdown( SSL *ssl) {
-               if( SSL_shutdown( ssl)) break;
-       }
- }
-+#endif/*HAVE_SSL*/
- /* bail if daemon is running as root */
- int check_privileges(void){
diff --git a/net-analyzer/nrpe/files/nrpe-2.15-tcpd-et-al.patch b/net-analyzer/nrpe/files/nrpe-2.15-tcpd-et-al.patch
deleted file mode 100644 (file)
index b8a0811..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -Nuar --exclude '*.orig' nrpe-2.15.orig/configure.in nrpe-2.15/configure.in
---- nrpe-2.15.orig/configure.in        2013-09-06 08:27:13.000000000 -0700
-+++ nrpe-2.15/configure.in     2014-04-19 09:20:50.406150828 -0700
-@@ -45,7 +45,7 @@
- AC_HEADER_STDC
- AC_HEADER_TIME
- AC_HEADER_SYS_WAIT
--AC_CHECK_HEADERS(ctype.h dirent.h errno.h fcntl.h getopt.h grp.h inttypes.h netdb.h pwd.h signal.h stdint.h strings.h string.h syslog.h tcpd.h unistd.h arpa/inet.h netinet/in.h socket.h sys/types.h sys/time.h sys/resource.h sys/wait.h sys/socket.h sys/stat.h)
-+AC_CHECK_HEADERS(ctype.h dirent.h errno.h fcntl.h getopt.h grp.h inttypes.h netdb.h pwd.h signal.h stdint.h strings.h string.h syslog.h unistd.h arpa/inet.h netinet/in.h socket.h sys/types.h sys/time.h sys/resource.h sys/wait.h sys/socket.h sys/stat.h)
- dnl Checks for typedefs, structures, and compiler characteristics.
- AC_C_CONST
-@@ -164,11 +164,20 @@
- AC_CHECK_LIB(nsl,main,SOCKETLIBS="$SOCKETLIBS -lnsl")
- AC_CHECK_LIB(socket,socket,SOCKETLIBS="$SOCKETLIBS -lsocket")
- AC_SUBST(SOCKETLIBS)
--AC_CHECK_LIB(wrap,main,[
--      LIBWRAPLIBS="$LIBWRAPLIBS -lwrap"
-+
-+AC_ARG_ENABLE([tcp-wrapper],
-+    AS_HELP_STRING([--disable-tcp-wrapper], [Disable building with TCP wrappers. *** DISABLING IS A SECURITY RISK! *** Read the SECURITY file before using this option! @<:@default=enable@:>@]))
-+
-+LIBWRAPLIBS=""
-+AS_IF([test "x$enable_tcp_wrapper" != "xno"], [
-+    AC_CHECK_LIB([wrap],[hosts_access],[
-+        LIBWRAPLIBS="$LIBWRAPLIBS -lwrap"
-       AC_DEFINE(HAVE_LIBWRAP,[1],[Have the TCP wrappers library])
--      ])
-+      AC_DEFINE(HAVE_TCPD_H,[1],[Have the TCP wrappers library])
-+    ])
-+])
- AC_SUBST(LIBWRAPLIBS)
-+
- AC_CHECK_FUNCS(strdup strstr strtoul initgroups closesocket)
- dnl socklen_t check - from curl
-@@ -440,8 +449,11 @@
- AC_SUBST(TARGET_PLATFORM)
- AC_ARG_ENABLE([command-args],
--      AS_HELP_STRING([--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,[1],[Enable command-line arguments]))
-+      AS_HELP_STRING([--enable-command-args],[allows clients to specify command arguments.  *** THIS IS A SECURITY RISK! *** Read the SECURITY file before using this option!]))
-+
-+AS_IF([test "x$enable_command_args" = "xyes"], [
-+      AC_DEFINE(ENABLE_COMMAND_ARGUMENTS,[1],[Enable command-line arguments])
-+])
- AC_ARG_ENABLE([bash-command-substitution],
-       AS_HELP_STRING([--enable-bash-command-substitution],[allows clients to pass bash command substitutions of the form $(command).  *** THIS IS A HIGH SECURITY RISK! *** Read the SECURITY file before using this option!]),
index e47fd6fd83c93ffc42d87ef9795f24101aafa4b0..6d48b12e1abfb6f5e34c3fe92d5b31fe8d4c26d5 100644 (file)
@@ -15,9 +15,6 @@
       Nagios/Icinga master. Make sure you understand the implications
       of this flag as it can be a security risk.
     </flag>
-    <flag name="minimal">
-      Only build the check plugins for Nagios/Icinga, and not the daemon.
-    </flag>
   </use>
   <upstream>
     <remote-id type="sourceforge">nagios</remote-id>
diff --git a/net-analyzer/nrpe/nrpe-2.15-r3.ebuild b/net-analyzer/nrpe/nrpe-2.15-r3.ebuild
deleted file mode 100644 (file)
index afdbdc8..0000000
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils systemd toolchain-funcs multilib user autotools
-
-DESCRIPTION="Nagios Remote Plugin Executor"
-HOMEPAGE="http://www.nagios.org/"
-SRC_URI="mirror://sourceforge/nagios/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
-IUSE="command-args libressl minimal selinux ssl tcpd"
-
-DEPEND="
-       ssl? (
-               !libressl? ( dev-libs/openssl:0= )
-               libressl? ( dev-libs/libressl:0= )
-       )
-       !minimal? ( tcpd? ( sys-apps/tcp-wrappers ) )"
-RDEPEND="${DEPEND}
-       !minimal? (
-               || ( net-analyzer/nagios-plugins net-analyzer/monitoring-plugins )
-       )
-       selinux? ( sec-policy/selinux-nagios )"
-
-pkg_setup() {
-       enewgroup nagios
-       enewuser nagios -1 /bin/bash /dev/null nagios
-
-       elog "If you plan to use \"nrpe_check_control\" then you may want to specify"
-       elog "different command and services files. You can override the defaults"
-       elog "through the \"NAGIOS_COMMAND_FILE\" and \"NAGIOS_SERVICES_FILE\" environment variables."
-       elog "NAGIOS_COMMAND_FILE=${NAGIOS_COMMAND_FILE:-/var/rw/nagios.cmd}"
-       elog "NAGIOS_SERVICES_FILE=${NAGIOS_SERVICES_FILE:-/etc/services.cfg}"
-}
-
-src_prepare() {
-       # Add support for large output,
-       # http://opsview-blog.opsera.com/dotorg/2008/08/enhancing-nrpe.html
-       epatch "${FILESDIR}"/${PN}-2.14-multiline.patch
-
-       # fix configure, among others #326367, #397603
-       epatch "${FILESDIR}"/${PN}-2.15-tcpd-et-al.patch
-
-       # otherwise autoconf will overwrite the custom include/config.h.in
-       epatch "${FILESDIR}"/${PN}-2.15-autoconf-header.patch
-
-       # improve handling of metachars for security
-       epatch "${FILESDIR}"/${PN}-2.15-metachar-security-fix.patch
-
-       # Fix build with USE="-ssl".
-       epatch "${FILESDIR}"/${PN}-2.15-no-ssl.patch
-
-       sed -i -e '/define \(COMMAND\|SERVICES\)_FILE/d' \
-               contrib/nrpe_check_control.c || die
-
-       # change the default location of the pid file
-       sed -i -e '/pid_file/s:/var/run:/run:' sample-config/nrpe.cfg.in || die
-
-       # fix TFU handling of autoheader
-       sed -i -e '/#undef/d' include/config.h.in || die
-
-       eautoreconf
-}
-
-src_configure() {
-       local myconf
-       if use minimal; then
-               myconf="--disable-tcp-wrapper --disable-command-args"
-       else
-               myconf="$(use_enable tcpd tcp-wrapper) $(use_enable command-args)"
-       fi
-
-       econf \
-               --libexecdir=/usr/$(get_libdir)/nagios/plugins \
-               --localstatedir=/var/nagios \
-               --sysconfdir=/etc/nagios \
-               --with-nrpe-user=nagios \
-               --with-nrpe-group=nagios \
-               $(use_enable ssl) \
-               ${myconf}
-}
-
-src_compile() {
-       emake -C src check_nrpe $(use minimal || echo nrpe)
-
-       # Add nifty nrpe check tool
-       $(tc-getCC) ${CPPFLAGS} ${CFLAGS} \
-               -DCOMMAND_FILE=\"${NAGIOS_COMMAND_FILE:-/var/rw/nagios.cmd}\" \
-               -DSERVICES_FILE=\"${NAGIOS_SERVICES_FILE:-/etc/services.cfg}\" \
-               ${LDFLAGS} -o nrpe_check_control contrib/nrpe_check_control.c || die
-}
-
-src_install() {
-       dodoc LEGAL Changelog README SECURITY \
-               contrib/README.nrpe_check_control \
-               $(use ssl && echo README.SSL)
-
-       exeinto /usr/$(get_libdir)/nagios/plugins
-       doexe src/check_nrpe nrpe_check_control
-
-       use minimal && return 0
-
-       ## NON-MINIMAL INSTALL FOLLOWS ##
-
-       insinto /etc/nagios
-       newins sample-config/nrpe.cfg nrpe.cfg
-       fowners root:nagios /etc/nagios/nrpe.cfg
-       fperms 0640 /etc/nagios/nrpe.cfg
-
-       exeinto /usr/libexec
-       doexe src/nrpe
-
-       newinitd "${FILESDIR}"/nrpe.init nrpe
-       systemd_dounit "${FILESDIR}/${PN}.service"
-
-       insinto /etc/xinetd.d/
-       newins "${FILESDIR}/nrpe.xinetd.2" nrpe
-
-       if use tcpd; then
-               sed -i -e '/^reload()/, /^}/ d' -e '/extra_started_commands/s:reload::' \
-                       "${D}"/etc/init.d/nrpe
-       fi
-}
-
-pkg_postinst() {
-       elog "If you are using the nrpe daemon, remember to edit"
-       elog "the config file /etc/nagios/nrpe.cfg"
-
-       if use command-args ; then
-               ewarn ""
-               ewarn "You have enabled command-args for NRPE. This enables"
-               ewarn "the ability for clients to supply arguments to commands"
-               ewarn "which should be run. "
-               ewarn "THIS IS CONSIDERED A SECURITY RISK!"
-               ewarn "Please read /usr/share/doc/${PF}/SECURITY.bz2 for more info"
-       fi
-}
diff --git a/net-analyzer/nrpe/nrpe-3.2.1.ebuild b/net-analyzer/nrpe/nrpe-3.2.1.ebuild
deleted file mode 100644 (file)
index 3a4f9d8..0000000
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2018 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/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="command-args libressl selinux ssl"
-
-DEPEND="sys-apps/tcp-wrappers
-       ssl? (
-               !libressl? ( dev-libs/openssl:0= )
-               libressl? ( dev-libs/libressl: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 command-args) \
-               $(use_enable ssl)
-}
-
-src_compile() {
-       emake all
-}
-
-src_install() {
-       default
-
-       dodoc CHANGELOG.md 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 "startup/openrc-init" nrpe
-       newconfd "startup/openrc-conf" nrpe
-       systemd_newunit "startup/default-service" "${PN}.service"
-
-       insinto /etc/xinetd.d/
-       newins "${FILESDIR}/nrpe.xinetd.2" nrpe
-
-       rm "${D}/usr/bin/nrpe-uninstall" || die 'failed to remove uninstall tool'
-}
-
-pkg_postinst(){
-       elog 'Some users have reported incompatibilities between nrpe-2.x and'
-       elog 'nrpe-3.x. We recommend that you use the same major version for'
-       elog 'both your server and clients.'
-
-       if use command-args ; then
-               ewarn ''
-               ewarn 'You have enabled command-args for NRPE. That lets clients'
-               ewarn 'supply arguments to the commands that are run, and IS A'
-               ewarn 'SECURITY RISK!'
-               ewarn''
-       fi
-}