Hello community,
here is the log from the commit of package icinga for openSUSE:Factory checked
in at 2015-02-06 10:23:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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 2014-12-29
00:30:24.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.icinga.new/icinga.changes 2015-02-06
10:23:27.000000000 +0100
@@ -1,0 +2,33 @@
+Thu Jan 29 13:43:14 UTC 2015 - thard...@suse.com
+
+-update to upstream version 1.12.0
+ * core/idoutils: Populate long_output column on notification history neb
events #7362 - MF
+ * classic ui: start with unhandled problems view instead of TAC #4817 - MF
+ * classic ui: Adding alias to title in host/service overview #5900 - WN
+ * classic ui: Add display of extra icons in status overview of hosts and
services #6829 - RD/RB
+ * classic ui: Add config option to set Sticky Acknowledgment checkbox
default #6237 - CF
+ * classic ui: Add config option to sort status data by default #5965 - RB
+ * classic ui: Add sorting of comments and downtimes #5339 - RB
+ * classic ui: Add link to online documentation #6606 - RB
+ * idoutils: Add program_version column to programstatus table #7390 - MF
+ * idoutils: Extend size of column 'alias' for MySQL tables hosts & contacts
#6382 - MF
+ * idoutils: Import 'is_json' for custom vars into schema (Icinga 2) #7568 -
MF
+ * classic ui: Fix grammatical errors in popup text #7451 - CF
+ * classic ui: Fix order of hosts and service checks in tac.cgi #6965 - RB
+ * idoutils: check for undersized data-packets and ignore them to eliminate
null transactions to the database #4221 - CF
+ * initscript: Correct bash-specific syntax in startup script #7450 - CF
+ * spec: Use versioned dependencies in the RPM spec file #7017 - GB
+ * core/idoutils: Populate long_output column on notification history neb
events #7362
+ * idoutils: Add program_version column to programstatus table #7390
+ ** required for Icinga Web 2 and Icinga 2
+ * idoutils: 'alias' column is now TEXT in MySQL #6382
+ * idoutils: Import 'is_json' for custom vars into schema (Icinga 2) #7568
+
+-------------------------------------------------------------------
+Wed Jan 28 17:27:33 UTC 2015 - l...@linux-schulserver.de
+
+- add Alias=monitoring_daemon.service to systemd file to have a
+ similar virtual provides like in the old times
+- rebased icinga-1.11.7-fix-bashisms.patch
+
+-------------------------------------------------------------------
Old:
----
icinga-1.11.7.tar.gz
New:
----
icinga-1.12.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ icinga.spec ++++++
--- /var/tmp/diff_new_pack.Fi8hdH/_old 2015-02-06 10:23:28.000000000 +0100
+++ /var/tmp/diff_new_pack.Fi8hdH/_new 2015-02-06 10:23:28.000000000 +0100
@@ -23,7 +23,7 @@
%endif
Name: icinga
-Version: 1.11.7
+Version: 1.12.0
Release: 0
Summary: Host/service/network monitoring program
++++++ icinga-1.11.7-fix-bashisms.patch ++++++
--- /var/tmp/diff_new_pack.Fi8hdH/_old 2015-02-06 10:23:28.000000000 +0100
+++ /var/tmp/diff_new_pack.Fi8hdH/_new 2015-02-06 10:23:28.000000000 +0100
@@ -1,24 +1,27 @@
-diff -Ndur icinga-1.11.7/indent.sh icinga-1.11.7-fix-bashisms/indent.sh
---- icinga-1.11.7/indent.sh 2014-09-03 12:27:46.000000000 +0300
-+++ icinga-1.11.7-fix-bashisms/indent.sh 2014-12-20 19:39:48.000000000
+0200
+Index: icinga-1.11.7/indent.sh
+===================================================================
+--- icinga-1.11.7.orig/indent.sh
++++ icinga-1.11.7/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 "$@"
-diff -Ndur icinga-1.11.7/maketar.sh icinga-1.11.7-fix-bashisms/maketar.sh
---- icinga-1.11.7/maketar.sh 2014-09-03 12:27:46.000000000 +0300
-+++ icinga-1.11.7-fix-bashisms/maketar.sh 2014-12-20 19:39:28.000000000
+0200
+Index: icinga-1.11.7/maketar.sh
+===================================================================
+--- icinga-1.11.7.orig/maketar.sh
++++ icinga-1.11.7/maketar.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
###
# Make a tarball
# (c) 2013 NETWAYS GmbH
-diff -Ndur icinga-1.11.7/module/idoutils/db/scripts/create_mysqldb.sh
icinga-1.11.7-fix-bashisms/module/idoutils/db/scripts/create_mysqldb.sh
---- icinga-1.11.7/module/idoutils/db/scripts/create_mysqldb.sh 2014-09-03
12:27:46.000000000 +0300
-+++ icinga-1.11.7-fix-bashisms/module/idoutils/db/scripts/create_mysqldb.sh
2014-12-20 19:33:04.000000000 +0200
-@@ -78,14 +78,14 @@
+Index: icinga-1.11.7/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
+@@ -78,14 +78,14 @@ select now();
\q
EOS2
umask $UMASK
@@ -35,10 +38,11 @@
echo "Database ready"
RET=0
else
-diff -Ndur icinga-1.11.7/module/idoutils/db/scripts/create_oracledb.sh
icinga-1.11.7-fix-bashisms/module/idoutils/db/scripts/create_oracledb.sh
---- icinga-1.11.7/module/idoutils/db/scripts/create_oracledb.sh
2014-09-03 12:27:46.000000000 +0300
-+++ icinga-1.11.7-fix-bashisms/module/idoutils/db/scripts/create_oracledb.sh
2014-12-20 19:33:48.000000000 +0200
-@@ -72,7 +72,7 @@
+Index: icinga-1.11.7/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
+@@ -72,7 +72,7 @@ connect sys/${SYSPASS}@${DB} as sysdba;
EOS1
RET=$?
@@ -47,7 +51,7 @@
#create icinga schema objects using newly created user
$SP /nolog <<EOS2
--exit if connect errornous
-@@ -85,7 +85,7 @@
+@@ -85,7 +85,7 @@ connect ${DBUSER}/${DBPASS}@${DB}
EOS2
RET=$?
#check if dbversion entered(last insert)
@@ -56,7 +60,7 @@
echo "Connecting now as $DBUSER on $DB and check icinga schema
version"
$SP /nolog <<EOS3
connect ${DBUSER}/${DBPASS}@${DB}
-@@ -96,7 +96,7 @@
+@@ -96,7 +96,7 @@ select sysdate from dual;
exit;
EOS3
@@ -65,10 +69,11 @@
echo "Database ready"
RET=0
else
-diff -Ndur icinga-1.11.7/selinux/icinga.sh
icinga-1.11.7-fix-bashisms/selinux/icinga.sh
---- icinga-1.11.7/selinux/icinga.sh 2014-09-03 12:27:46.000000000 +0300
-+++ icinga-1.11.7-fix-bashisms/selinux/icinga.sh 2014-12-20
19:37:52.000000000 +0200
-@@ -14,12 +14,12 @@
+Index: icinga-1.11.7/selinux/icinga.sh
+===================================================================
+--- icinga-1.11.7.orig/selinux/icinga.sh
++++ icinga-1.11.7/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
echo "Found avc's to update policy with"
@@ -83,7 +88,7 @@
# Fall though and rebuild policy
else
exit 0
-@@ -29,11 +29,11 @@
+@@ -29,11 +29,11 @@ if [ $# -eq 1 ]; then
exit 0
fi
else
++++++ icinga-1.11.7.tar.gz -> icinga-1.12.0.tar.gz ++++++
/work/SRC/openSUSE:Factory/icinga/icinga-1.11.7.tar.gz
/work/SRC/openSUSE:Factory/.icinga.new/icinga-1.12.0.tar.gz differ: char 5,
line 1
++++++ icinga-fix-systemd-services.patch ++++++
--- /var/tmp/diff_new_pack.Fi8hdH/_old 2015-02-06 10:23:28.000000000 +0100
+++ /var/tmp/diff_new_pack.Fi8hdH/_new 2015-02-06 10:23:28.000000000 +0100
@@ -1,7 +1,12 @@
-diff -rup icinga-1.10.3.old/icinga-systemd.in icinga-1.10.3/icinga-systemd.in
---- icinga-1.10.3.old/icinga-systemd.in 2014-02-11 12:05:36.000000000
+0100
-+++ icinga-1.10.3/icinga-systemd.in 2014-02-18 17:53:07.100946824 +0100
-@@ -4,8 +4,9 @@ After=syslog.target network.target ido2d
+Index: icinga-1.11.7/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
[Service]
EnvironmentFile=@systemd_sysconfig_dir@/icinga
@@ -13,9 +18,10 @@
ExecReload=/bin/kill -HUP $MAINPID
[Install]
-diff -rup icinga-1.10.3.old/ido2db-systemd.in icinga-1.10.3/ido2db-systemd.in
---- icinga-1.10.3.old/ido2db-systemd.in 2014-02-11 12:05:36.000000000
+0100
-+++ icinga-1.10.3/ido2db-systemd.in 2014-02-18 17:53:56.292945120 +0100
+Index: icinga-1.11.7/ido2db-systemd.in
+===================================================================
+--- icinga-1.11.7.orig/ido2db-systemd.in
++++ icinga-1.11.7/ido2db-systemd.in
@@ -4,7 +4,8 @@ After=syslog.target network.target
[Service]
@@ -26,4 +32,3 @@
ExecReload=/bin/kill -HUP $MAINPID
[Install]
-Only in icinga-1.10.3.old/: .sysconfig-env.in.swp
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
