diff --git a/network/icinga2/icinga2.SlackBuild b/network/icinga2/icinga2.SlackBuild index 96dee8fce4..addcefefbf 100644 --- a/network/icinga2/icinga2.SlackBuild +++ b/network/icinga2/icinga2.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=icinga2 -VERSION=${VERSION:-2.3.5} +VERSION=${VERSION:-2.3.11} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -90,7 +90,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/v$VERSION.tar.gz +tar xvf $CWD/v$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION chown -R root:root . find -L . \ @@ -120,10 +120,10 @@ cd .. mv $PKG/usr/share/man $PKG/usr/man # Match config with monitoring-plugins, manubulon-snmp-plugins & nagios-plugins packages -sed -i -e 's#^\(const ManubulonPluginDir =\).*#\1 "/usr/libexec/manubulon-snmp-plugins"#' \ - -e 's#^\(const PluginDir =\).*#\1 "/usr/libexec/monitoring-plugins"#' \ - -e 's#^\(const PluginContribDir =\).*#\1 "/usr/libexec/nagios"#' \ - $PKG/etc/$PRGNAM/constants.conf +sed -e 's#^\(const ManubulonPluginDir =\).*#\1 "/usr/libexec/manubulon-snmp-plugins"#' \ + -e 's#^\(const PluginDir =\).*#\1 "/usr/libexec/monitoring-plugins"#' \ + -e 's#^\(const PluginContribDir =\).*#\1 "/usr/libexec/nagios"#' \ + -i $PKG/etc/$PRGNAM/constants.conf # Convert SYSV init script to BSD style mv $PKG/etc/init.d $PKG/etc/rc.d @@ -134,6 +134,10 @@ chmod -R 0775 $PKG/var/{cache,log,lib,run,spool}/$PRGNAM chown -R icinga:icinga $PKG/var/{cache,log,lib,run,spool}/$PRGNAM chown icinga:icingacmd $PKG/var/{log/$PRGNAM,run/$PRGNAM/cmd} +# The logrotate script also needs some love +sed -e 's#service icinga2#/etc/rc.d/rc.icinga2#' \ + -i $PKG/etc/logrotate.d/$PRGNAM + # Finally, append .new to files find $PKG/etc $PKG/usr/share/$PRGNAM -type f ! -name "README" -exec mv {} {}.new \; diff --git a/network/icinga2/icinga2.info b/network/icinga2/icinga2.info index cfe6cdfe2d..14d7c68ce2 100644 --- a/network/icinga2/icinga2.info +++ b/network/icinga2/icinga2.info @@ -1,8 +1,8 @@ PRGNAM="icinga2" -VERSION="2.3.5" +VERSION="2.3.11" HOMEPAGE="https://www.icinga.org/" -DOWNLOAD="https://github.com/Icinga/icinga2/archive/v2.3.5.tar.gz" -MD5SUM="c739cdf969dfbc5c105c4bd31a8917a3" +DOWNLOAD="https://github.com/Icinga/icinga2/archive/v2.3.11.tar.gz" +MD5SUM="8c8367363b00e10022fd6baf28d3603e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="yajl"