diff options
author | Michael Orlitzky <mjo@gentoo.org> | 2015-08-31 12:08:49 -0400 |
---|---|---|
committer | Michael Orlitzky <mjo@gentoo.org> | 2015-08-31 12:08:49 -0400 |
commit | e05d77e5b5a85672092c5c156b1371da178b520f (patch) | |
tree | fb75300057a820bea09a65f7ffd5c1571242b417 /net-analyzer/nrpe/files | |
parent | net-analyzer/nrpe: remove old ebuilds and patches. (diff) | |
download | gentoo-e05d77e5b5a85672092c5c156b1371da178b520f.tar.gz gentoo-e05d77e5b5a85672092c5c156b1371da178b520f.tar.bz2 gentoo-e05d77e5b5a85672092c5c156b1371da178b520f.zip |
net-analyzer/nrpe: revbump to add selinux and no-ssl support.
Add a conditional dep on sec-policy/selinux-nagios, and pull in an
(unreleased) upstream patch to fix the build when USE="-ssl". Also add
a slot on the openssl dependency to make repoman happy.
Bug: 462572
Bug: 554536
Package-Manager: portage-2.2.20.1
Diffstat (limited to 'net-analyzer/nrpe/files')
-rw-r--r-- | net-analyzer/nrpe/files/nrpe-2.15-no-ssl.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/net-analyzer/nrpe/files/nrpe-2.15-no-ssl.patch b/net-analyzer/nrpe/files/nrpe-2.15-no-ssl.patch new file mode 100644 index 000000000000..3b3fc135455f --- /dev/null +++ b/net-analyzer/nrpe/files/nrpe-2.15-no-ssl.patch @@ -0,0 +1,39 @@ +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){ |