diff options
| author | Ian Stakenvicius <axs@gentoo.org> | 2017-01-24 12:56:48 -0500 |
|---|---|---|
| committer | Ian Stakenvicius <axs@gentoo.org> | 2017-02-01 16:34:15 -0500 |
| commit | 9fa320ddc943401a679c4a98572b47fc2441758b (patch) | |
| tree | d47ca53a1b5226d9c015e2fd35b6812ebf6514f2 /net-analyzer/check_mk/files | |
| parent | 6d788217d3ae4cc4eba52ca144168e2a2ddb1dcd (diff) | |
| download | gentoo-9fa320ddc943401a679c4a98572b47fc2441758b.tar.gz gentoo-9fa320ddc943401a679c4a98572b47fc2441758b.tar.xz | |
net-analyzer/check_mk: version bump, drop bundled livestatus
Significant modifications to sources (shebangs, direct calls to python)
to ensure python2 is used instead of python3.
Livestatus is no longer built and installed, now net-analyzer/mk-livestatus
is expected to be used instead.
net-analyzer/check_mk_agent (new package soon to be committed) is
hard-blocked; stripping the agent out of this package seems not
appropriate as the bundled copies should still exist anyways.
Nagios4 use-flag added to enforce synchronization of nagios-core dep with
the mk-livestatus dependency. Note: not sure if nagios/icigna
dependencies are needed when not building livestatus anymore; check_mk by
default expects a full nagios/icigna/nagvis/pnp4nagios deployment (for
multisite at least) but whether the package should enforce this via
dependencies is uncertain.
Package-Manager: portage-2.3.0
Diffstat (limited to 'net-analyzer/check_mk/files')
| -rw-r--r-- | net-analyzer/check_mk/files/check_mk-1.2.8p16-setup.sh.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/net-analyzer/check_mk/files/check_mk-1.2.8p16-setup.sh.patch b/net-analyzer/check_mk/files/check_mk-1.2.8p16-setup.sh.patch new file mode 100644 index 00000000000..b30d1ad1dad --- /dev/null +++ b/net-analyzer/check_mk/files/check_mk-1.2.8p16-setup.sh.patch @@ -0,0 +1,35 @@ +--- a/setup.sh 2014-07-04 09:24:45.000000000 +0200 ++++ b/setup.sh 2015-08-28 13:22:19.986733809 +0200 +@@ -564,6 +564,17 @@ + + compile_livestatus () + { ++ echo "Skipping internal compile of livestatus, do it in ebuild instead" ++ cat <<EOF > $SRCDIR/livestatus.src/src/livestatus.h ++#ifndef livestatus_h ++#define livestatus_h ++#define DEFAULT_SOCKET_PATH "$livesock" ++#endif // livestatus_h ++EOF ++} ++ ++avoid_compile_livestatus () ++{ + local D=$SRCDIR/livestatus.src + rm -rf $D + mkdir -p $D +@@ -1018,9 +1029,11 @@ + # WATO. Also create an empty and Apache-writable auth.serials + serials_file=$DESTDIR${htpasswd_file%/*}/auth.serials && + touch "$serials_file" && +- (chown $wwwuser "$serials_file" || true) && +- (chown $wwwuser "$htpasswd_file" || true) && +- create_sudo_configuration && ++ # Permissions will be set within src_install ++ #(chown $wwwuser "$serials_file" || true) && ++ #(chown $wwwuser "$htpasswd_file" || true) && ++ # disable sudo configuration as this will be done within src_install ++ #create_sudo_configuration && + if [ "$enable_mkeventd" = yes ] + then + if [ -z "$YES" ] ; then echo -n "(Compiling Event Console binaries..." ; fi |