commit icinga for openSUSE:Factory

27 Feb 2015

Hello community,

here is the log from the commit of package icinga for openSUSE:Factory checked in at 2015-02-27 11:10:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/icinga (Old)
 and      /work/SRC/openSUSE:Factory/.icinga.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "icinga"

Changes:
--------

--- /work/SRC/openSUSE:Factory/icinga/icinga.changes	2015-02-06 10:23:27.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.icinga.new/icinga.changes	2015-02-27 11:10:07.000000000 +0100
@@ -1,0 +2,12 @@
+Thu Feb 19 12:08:54 UTC 2015 - thardeck@suse.com
+
+- update to upstream version 1.12.2
+  * Bug #3305: Duplicate service definitions are not generating a config validation error
+  * Docs - Bug #7801: Add a minified js library for the html docs
+
+-------------------------------------------------------------------
+Tue Feb 17 21:10:00 UTC 2015 - lars@linux-schulserver.de
+
+- fix systemd service alias
+
+-------------------------------------------------------------------

Old:
----
  icinga-1.12.0.tar.gz

New:
----
  icinga-1.12.2.tar.gz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ icinga.spec ++++++
--- /var/tmp/diff_new_pack.bQLrHU/_old	2015-02-27 11:10:09.000000000 +0100
+++ /var/tmp/diff_new_pack.bQLrHU/_new	2015-02-27 11:10:09.000000000 +0100
@@ -23,7 +23,7 @@
 %endif
 
 Name:           icinga
-Version:        1.12.0
+Version:        1.12.2
 Release:        0
 
 Summary:        Host/service/network monitoring program

++++++ icinga-1.11.7-fix-bashisms.patch ++++++
--- /var/tmp/diff_new_pack.bQLrHU/_old	2015-02-27 11:10:09.000000000 +0100
+++ /var/tmp/diff_new_pack.bQLrHU/_new	2015-02-27 11:10:09.000000000 +0100
@@ -1,26 +1,26 @@
-Index: icinga-1.11.7/indent.sh
+Index: icinga-1.12.0/indent.sh
 ===================================================================
---- icinga-1.11.7.orig/indent.sh
-+++ icinga-1.11.7/indent.sh
+--- icinga-1.12.0.orig/indent.sh
++++ icinga-1.12.0/indent.sh
 @@ -1,3 +1,3 @@
 -#!/bin/bash
 +#!/bin/sh
  
  astyle --style=java --indent=tab --unpad-paren --pad-oper --pad-header --suffix=none --brackets=linux "$@"
-Index: icinga-1.11.7/maketar.sh
+Index: icinga-1.12.0/maketar.sh
 ===================================================================
---- icinga-1.11.7.orig/maketar.sh
-+++ icinga-1.11.7/maketar.sh
+--- icinga-1.12.0.orig/maketar.sh
++++ icinga-1.12.0/maketar.sh
 @@ -1,4 +1,4 @@
 -#!/bin/bash
 +#!/bin/sh
  ###
  # Make a tarball
  # (c) 2013 NETWAYS GmbH
-Index: icinga-1.11.7/module/idoutils/db/scripts/create_mysqldb.sh
+Index: icinga-1.12.0/module/idoutils/db/scripts/create_mysqldb.sh
 ===================================================================
---- icinga-1.11.7.orig/module/idoutils/db/scripts/create_mysqldb.sh
-+++ icinga-1.11.7/module/idoutils/db/scripts/create_mysqldb.sh
+--- icinga-1.12.0.orig/module/idoutils/db/scripts/create_mysqldb.sh
++++ icinga-1.12.0/module/idoutils/db/scripts/create_mysqldb.sh
 @@ -78,14 +78,14 @@ select now();
   \q
  EOS2
@@ -38,10 +38,10 @@
                  echo "Database ready"
                  RET=0
          else
-Index: icinga-1.11.7/module/idoutils/db/scripts/create_oracledb.sh
+Index: icinga-1.12.0/module/idoutils/db/scripts/create_oracledb.sh
 ===================================================================
---- icinga-1.11.7.orig/module/idoutils/db/scripts/create_oracledb.sh
-+++ icinga-1.11.7/module/idoutils/db/scripts/create_oracledb.sh
+--- icinga-1.12.0.orig/module/idoutils/db/scripts/create_oracledb.sh
++++ icinga-1.12.0/module/idoutils/db/scripts/create_oracledb.sh
 @@ -72,7 +72,7 @@ connect sys/${SYSPASS}@${DB} as sysdba;
  EOS1
  RET=$?
@@ -69,10 +69,10 @@
                  echo "Database ready"
                   RET=0
       	else
-Index: icinga-1.11.7/selinux/icinga.sh
+Index: icinga-1.12.0/selinux/icinga.sh
 ===================================================================
---- icinga-1.11.7.orig/selinux/icinga.sh
-+++ icinga-1.11.7/selinux/icinga.sh
+--- icinga-1.12.0.orig/selinux/icinga.sh
++++ icinga-1.12.0/selinux/icinga.sh
 @@ -14,12 +14,12 @@ if [ $# -eq 1 ]; then
  		rules=`ausearch --start $time -m avc --raw -se icinga`
  		if [ x"$rules" != "x" ] ; then

++++++ icinga-1.12.0.tar.gz -> icinga-1.12.2.tar.gz ++++++
/work/SRC/openSUSE:Factory/icinga/icinga-1.12.0.tar.gz /work/SRC/openSUSE:Factory/.icinga.new/icinga-1.12.2.tar.gz differ: char 5, line 1


++++++ icinga-fix-systemd-services.patch ++++++
--- /var/tmp/diff_new_pack.bQLrHU/_old	2015-02-27 11:10:09.000000000 +0100
+++ /var/tmp/diff_new_pack.bQLrHU/_new	2015-02-27 11:10:09.000000000 +0100
@@ -1,12 +1,8 @@
-Index: icinga-1.11.7/icinga-systemd.in
+Index: icinga-1.12.0/icinga-systemd.in
 ===================================================================
---- icinga-1.11.7.orig/icinga-systemd.in
-+++ icinga-1.11.7/icinga-systemd.in
-@@ -1,11 +1,13 @@
- [Unit]
- Description=Icinga Open-Source Monitoring System
-+Alias=monitoring_daemon.service
- After=syslog.target network.target ido2db.service
+--- icinga-1.12.0.orig/icinga-systemd.in
++++ icinga-1.12.0/icinga-systemd.in
+@@ -4,9 +4,11 @@ After=syslog.target network.target ido2d
  
  [Service]
  EnvironmentFile=@systemd_sysconfig_dir@/icinga
@@ -18,10 +14,12 @@
  ExecReload=/bin/kill -HUP $MAINPID
  
  [Install]
-Index: icinga-1.11.7/ido2db-systemd.in
+ WantedBy=multi-user.target
++Alias=monitoring_daemon.service
+Index: icinga-1.12.0/ido2db-systemd.in
 ===================================================================
---- icinga-1.11.7.orig/ido2db-systemd.in
-+++ icinga-1.11.7/ido2db-systemd.in
+--- icinga-1.12.0.orig/ido2db-systemd.in
++++ icinga-1.12.0/ido2db-systemd.in
 @@ -4,7 +4,8 @@ After=syslog.target network.target
  
  [Service]

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠hilbert.suse.de

tags

participants (1)