commit icinga for openSUSE:Factory

2017-12-29 Thread root
Hello community,

here is the log from the commit of package icinga for openSUSE:Factory checked 
in at 2017-12-29 18:51:36

Comparing /work/SRC/openSUSE:Factory/icinga (Old)
 and  /work/SRC/openSUSE:Factory/.icinga.new (New)


Package is "icinga"

Fri Dec 29 18:51:36 2017 rev:59 rq:560176 version:1.14.2

Changes:

--- /work/SRC/openSUSE:Factory/icinga/icinga.changes2017-12-20 
10:40:20.352924641 +0100
+++ /work/SRC/openSUSE:Factory/.icinga.new/icinga.changes   2017-12-29 
18:51:42.915012666 +0100
@@ -1,0 +2,8 @@
+Wed Dec 20 15:18:20 UTC 2017 - thard...@suse.com
+
+- update to upstream version 1.14.2
+  * Again, this only affects source installations. Packages are safe.
+* Don't change ownership of STATEDIR
+* Change --with-tmp-{file,path} to default to $localstatedir instead of 
/tmp
+
+---

Old:

  v1.14.1.tar.gz

New:

  v1.14.2.tar.gz



Other differences:
--
++ icinga.spec ++
--- /var/tmp/diff_new_pack.u6aunv/_old  2017-12-29 18:51:50.928711068 +0100
+++ /var/tmp/diff_new_pack.u6aunv/_new  2017-12-29 18:51:50.932709919 +0100
@@ -21,7 +21,7 @@
 %endif
 
 Name:   icinga
-Version:1.14.1
+Version:1.14.2
 Release:0
 
 Summary:Host/service/network monitoring program


++ v1.14.1.tar.gz -> v1.14.2.tar.gz ++
/work/SRC/openSUSE:Factory/icinga/v1.14.1.tar.gz 
/work/SRC/openSUSE:Factory/.icinga.new/v1.14.2.tar.gz differ: char 15, line 1




commit icinga for openSUSE:Factory

2017-12-20 Thread root
Hello community,

here is the log from the commit of package icinga for openSUSE:Factory checked 
in at 2017-12-20 10:40:19

Comparing /work/SRC/openSUSE:Factory/icinga (Old)
 and  /work/SRC/openSUSE:Factory/.icinga.new (New)


Package is "icinga"

Wed Dec 20 10:40:19 2017 rev:58 rq:558566 version:1.14.1

Changes:

--- /work/SRC/openSUSE:Factory/icinga/icinga.changes2017-12-05 
01:29:50.510162307 +0100
+++ /work/SRC/openSUSE:Factory/.icinga.new/icinga.changes   2017-12-20 
10:40:20.352924641 +0100
@@ -1,0 +2,12 @@
+Tue Dec 19 13:55:41 UTC 2017 - thard...@suse.com
+
+- update to upstream version 1.14.1
+  * #1601 & #1604: CVE-2017-16882: Fix source installation permissions 
(packages are not affected)
+  * #8 & #1578 Remove "are stale" log entries  
   
+  * #1603 Fix SOFT recovery for services   
   
+  * #7 Feature/initd run with precache 
   
+  * #1599 & #1600 No host alerts included in alert summary report of type 
"Most Recent Alert"
+  * #1595 Fix database upgrade to 1.13.0 with old schema  
+- the package was never affected by CVE-2017-16882 - bsc#1068870
+
+---

Old:

  v1.14.0.tar.gz

New:

  v1.14.1.tar.gz



Other differences:
--
++ icinga.spec ++
--- /var/tmp/diff_new_pack.YEPrE4/_old  2017-12-20 10:40:22.304783196 +0100
+++ /var/tmp/diff_new_pack.YEPrE4/_new  2017-12-20 10:40:22.304783196 +0100
@@ -21,7 +21,7 @@
 %endif
 
 Name:   icinga
-Version:1.14.0
+Version:1.14.1
 Release:0
 
 Summary:Host/service/network monitoring program
@@ -336,7 +336,7 @@
 
 %install
 make \
-install-unstripped \
+install \
 install-init \
 install-commandmode \
 install-idoutils \


++ v1.14.0.tar.gz -> v1.14.1.tar.gz ++
/work/SRC/openSUSE:Factory/icinga/v1.14.0.tar.gz 
/work/SRC/openSUSE:Factory/.icinga.new/v1.14.1.tar.gz differ: char 12, line 1




commit icinga for openSUSE:Factory

2017-12-04 Thread root
Hello community,

here is the log from the commit of package icinga for openSUSE:Factory checked 
in at 2017-12-05 01:29:49

Comparing /work/SRC/openSUSE:Factory/icinga (Old)
 and  /work/SRC/openSUSE:Factory/.icinga.new (New)


Package is "icinga"

Tue Dec  5 01:29:49 2017 rev:57 rq:547324 version:1.14.0

Changes:

--- /work/SRC/openSUSE:Factory/icinga/icinga.changes2017-11-27 
22:19:04.561186788 +0100
+++ /work/SRC/openSUSE:Factory/.icinga.new/icinga.changes   2017-12-05 
01:29:50.510162307 +0100
@@ -1,0 +2,9 @@
+Fri Dec  1 21:24:18 UTC 2017 - l...@linux-schulserver.de
+
+- fix a possible symlink attack for files/dirs created by root
+  fixes CVE-2016-8641 (bsc#1011630 and bsc#1018047)
+- the update to 1.14.0 also fixed boo#952777
+- remove the pre-configured administrative account with fixed 
+  password for the WebUI - CVE-2016-0726 (boo#961115)
+
+---



Other differences:
--
++ icinga.spec ++
--- /var/tmp/diff_new_pack.mQkw8X/_old  2017-12-05 01:29:52.290097644 +0100
+++ /var/tmp/diff_new_pack.mQkw8X/_new  2017-12-05 01:29:52.294097498 +0100
@@ -397,8 +397,8 @@
 # install logrotate rule
 install -D -m 0644 icinga.logrotate %{buildroot}%{icinga_logrotatefile}
 
-# install sample htpasswd file
-install -D -m 0644 icinga.htpasswd %{buildroot}%{icinga_http_authfile}
+# install empty htpasswd file (see boo#961115)
+touch %{buildroot}%{icinga_http_authfile}
 
 # create icinga localstatedir
 install -d -m 0755 %{buildroot}%{icinga_localstatedir}

++ README.SUSE ++
--- /var/tmp/diff_new_pack.mQkw8X/_old  2017-12-05 01:29:52.374094592 +0100
+++ /var/tmp/diff_new_pack.mQkw8X/_new  2017-12-05 01:29:52.378094447 +0100
@@ -34,11 +34,12 @@
 3. If you need or want the classic gui, install icinga-www. If you want plain
monitoring with icinga core and configure everything else by hand, you are 
done.
 
-3.1 An example user icingaadmin with password icingaadmin is installed to
-  /etc/icinga/htpasswd.users
+3.1 An empty htpasswd file is installed to
+ /etc/icinga/htpasswd.users
+This allows the Apache server to run, but will not allow anyone to log in.
 
-3.1 Add a new basic auth user for apache:
-  # htpasswd /etc/icinga/htpasswd.users youradmin
+3.2 Add a new basic auth user for apache:
+# htpasswd /etc/icinga/htpasswd.users youradmin
 
 4. Optional: install icinga-idoutils. Icinga Data Output Utils are necessary 
for
various database backed guis such as Icinga Web or Icinga Reporting. 
IDOUtils


++ rcicinga ++
--- /var/tmp/diff_new_pack.mQkw8X/_old  2017-12-05 01:29:52.602086309 +0100
+++ /var/tmp/diff_new_pack.mQkw8X/_new  2017-12-05 01:29:52.606086164 +0100
@@ -171,7 +171,7 @@
 # create checkresult dir if missing
 if [ ! -d "$check_result_path" ]; then
 mkdir -p "$check_result_path"
-chown $icinga_user:$icinga_group "$check_result_path"
+chown --no-dereference $icinga_user:$icinga_group 
"$check_result_path"
 chmod 775 "$check_result_path"
 fi
if [ ! -d "$temp_path" ]; then
@@ -199,7 +199,7 @@
 sleep 1
 ICINGA_TIMEOUT=$(($ICINGA_TIMEOUT - 1))
 done
-chgrp $icinga_cmdgrp "$command_file"
+chgrp --no-dereference $icinga_cmdgrp "$command_file"
 fi
 else
 echo "Error in configuration - please read $ICINGA_CFG_ERR_LOG"




commit icinga for openSUSE:Factory

2017-11-27 Thread root
Hello community,

here is the log from the commit of package icinga for openSUSE:Factory checked 
in at 2017-11-27 22:19:04

Comparing /work/SRC/openSUSE:Factory/icinga (Old)
 and  /work/SRC/openSUSE:Factory/.icinga.new (New)


Package is "icinga"

Mon Nov 27 22:19:04 2017 rev:56 rq:546036 version:1.14.0

Changes:

--- /work/SRC/openSUSE:Factory/icinga/icinga.changes2017-02-20 
13:15:08.396079328 +0100
+++ /work/SRC/openSUSE:Factory/.icinga.new/icinga.changes   2017-11-27 
22:19:04.561186788 +0100
@@ -1,0 +2,6 @@
+Thu Nov 23 13:50:48 UTC 2017 - rbr...@suse.com
+
+- Replace references to /var/adm/fillup-templates with new 
+  %_fillupdir macro (boo#1069468)
+
+---



Other differences:
--
++ icinga.spec ++
--- /var/tmp/diff_new_pack.JPzWbt/_old  2017-11-27 22:19:05.909137865 +0100
+++ /var/tmp/diff_new_pack.JPzWbt/_new  2017-11-27 22:19:05.921137429 +0100
@@ -15,6 +15,11 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+#Compat macro for new _fillupdir macro introduced in Nov 2017
+%if ! %{defined _fillupdir}
+  %define _fillupdir /var/adm/fillup-templates
+%endif
+
 Name:   icinga
 Version:1.14.0
 Release:0
@@ -417,7 +422,7 @@
 install -D -m0755 %{SOURCE1} "%{buildroot}%{_initrddir}/%{name}"
 install -D -m0755 %{SOURCE2} "%{buildroot}%{_initrddir}/ido2db"
 # sysconfig script
-install -D -m 0644 %{SOURCE3} 
"%{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.%{name}"
+install -D -m 0644 %{SOURCE3} "%{buildroot}%{_fillupdir}/sysconfig.%{name}"
 
 # install cronjob (gzip' the logfiles)
 install -D -m 0640 %{SOURCE4} "%{buildroot}%{_sysconfdir}/cron.weekly/%{name}"
@@ -543,7 +548,7 @@
 %{_sbindir}/rc%{name}
 %{_initrddir}/%{name}
 %{icinga_datadir}/p1.pl
-%{_localstatedir}/adm/fillup-templates/sysconfig.%{name}
+%{_fillupdir}/sysconfig.%{name}
 %attr(0755,root,root) %config %{_sysconfdir}/cron.weekly/%{name}
 %dir %{icinga_libdir}
 %dir %{icinga_sysconfdir}





commit icinga for openSUSE:Factory

2017-02-20 Thread root
Hello community,

here is the log from the commit of package icinga for openSUSE:Factory checked 
in at 2017-02-20 13:15:07

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.changes2017-01-10 
10:50:43.562105706 +0100
+++ /work/SRC/openSUSE:Factory/.icinga.new/icinga.changes   2017-02-20 
13:15:08.396079328 +0100
@@ -1,0 +2,8 @@
+Fri Feb  3 10:06:10 UTC 2017 - thard...@suse.com
+
+- remove dedicated systemd scripts and use the default init scripts again 
because of issues
+  with the implementation. Ido2db crashed when the icinga service was 
restarted (bnc#1023400)
+- remove obsolete icinga-fix-systemd-services.patch
+- remove RHEL readme
+
+---

Old:

  icinga-exec-start-pre
  icinga-fix-systemd-services.patch
  icinga_sysvinit_compat
  ido2db-exec-start-pre



Other differences:
--
++ icinga.spec ++
--- /var/tmp/diff_new_pack.VcnZCf/_old  2017-02-20 13:15:10.183827978 +0100
+++ /var/tmp/diff_new_pack.VcnZCf/_new  2017-02-20 13:15:10.187827415 +0100
@@ -15,13 +15,6 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-
-%if 0%{?suse_version} >= 1230
-%define using_systemd 1
-%else
-%define using_sysvinit 1
-%endif
-
 Name:   icinga
 Version:1.14.0
 Release:0
@@ -47,12 +40,8 @@
 Source15:   mini_epn.8
 Source16:   log2ido.8
 Source17:   icinga-favicon.ico
-Source18:   icinga-exec-start-pre
-Source19:   ido2db-exec-start-pre
 # PATCH-FIX-OPENSUSE icinga-workaround-131-apache-conf-issue.patch
 Patch0: icinga-workaround-131-apache-conf-issue.patch
-# PATCH-FIX-OPENSUSE icinga-fix-systemd-services.patch
-Patch1: icinga-fix-systemd-services.patch
 # PATCH-FIX-UPSTREAM icinga-1.11.7-fix-bashisms.patch led...@gmail.com
 Patch2: icinga-1.11.7-fix-bashisms.patch
 Provides:   monitoring_daemon
@@ -61,9 +50,6 @@
 %if 0%{?suse_version} >= 1110
 BuildRequires:  fdupes
 %endif
-%if 0%{?suse_version} > 1310
-BuildRequires:  util-linux-systemd
-%endif
 BuildRequires:  freetype2-devel
 BuildRequires:  gd-devel > 1.8
 BuildRequires:  iputils
@@ -78,10 +64,6 @@
 BuildRequires:  openssl
 BuildRequires:  pcre-devel
 BuildRequires:  zlib-devel
-%if 0%{?using_systemd}
-BuildRequires:  systemd
-Source100:  icinga_sysvinit_compat
-%endif
 Requires:   net-tools
 Requires(pre):  %fillup_prereq
 Requires(pre):  %insserv_prereq
@@ -97,9 +79,6 @@
 %{perl_requires}
 %endif
 %{?libperl_requires}
-%if 0%{?using_systemd}
-%{?systemd_requires}
-%endif
 Requires:   mailx
 Recommends: monitoring-tools
 Recommends: %{name}-plugins-eventhandlers
@@ -285,7 +264,6 @@
 %if 0%{?suse_version} == 1310
 %patch0 -p1
 %endif
-%patch1 -p1
 %patch2 -p1
 
 %build
@@ -354,11 +332,7 @@
 %install
 make \
 install-unstripped \
-%if 0%{?using_systemd}
-install-systemd \
-%else
 install-init \
-%endif
 install-commandmode \
 install-idoutils \
 install-config \
@@ -409,6 +383,8 @@
 
 # remove unnecessary files from www log directory
 rm "%{buildroot}/%{icinga_cgi_logdir}/"{.htaccess,index.htm}
+# remove unnecessary documentation
+rm README.RHEL
 
 # remove setuid from %%{icinga_cmd_filedir}
 chmod -s "%{buildroot}%{icinga_cmd_filedir}"
@@ -436,21 +412,13 @@
 # REST of special SUSE stuff here, if needed
 # init-scripts
 # remove the default init script as SUSE uses an adapted one
-%if 0%{?using_systemd}
-install -D -m0755 %{SOURCE100} %{buildroot}%{_sbindir}/rc%{name}
-ln -sf /usr/sbin/service %{buildroot}%{_sbindir}/rcido2db
-install -D -m0755 %{SOURCE18} 
"%{buildroot}%{icinga_libdir}/icinga-exec-start-pre"
-install -D -m0755 %{SOURCE19} 
"%{buildroot}%{icinga_libdir}/ido2db-exec-start-pre"
-# remove systemd sysconfig file because we use our own
-rm "%{buildroot}%{_sysconfdir}/sysconfig/%{name}"
-%else
 ln -sf ../../%{_initrddir}/%{name} "%{buildroot}%{_sbindir}/rc%{name}"
 ln -sf ../../%{_initrddir}/ido2db "%{buildroot}%{_sbindir}/rcido2db"
 install -D -m0755 %{SOURCE1} "%{buildroot}%{_initrddir}/%{name}"
 install -D -m0755 %{SOURCE2} "%{buildroot}%{_initrddir}/ido2db"
-%endif
 # sysconfig script
 install -D -m 0644 %{SOURCE3} 
"%{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.%{name}"
+
 # install cronjob (gzip' the logfiles)
 install -D -m 0640 %{SOURCE4} "%{buildroot}%{_sysconfdir}/cron.weekly/%{name}"
 %if 0%{?suse_version} >= 1110
@@ -477,9 +445,6 @@
 install -m644 %{SOURCE17} "%{buildroot}/%{icinga_datadir}/favicon.ico"
 
 %pre
-%if 0%{?using_systemd}
-%service_add_pre %{name}.service
-%endif
 # add icinga user and groups
 groupadd -r %{icinga_group} 2

commit icinga for openSUSE:Factory

2016-07-03 Thread h_root
Hello community,

here is the log from the commit of package icinga for openSUSE:Factory checked 
in at 2016-07-03 12:28:37

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.changes2015-07-23 
15:23:05.0 +0200
+++ /work/SRC/openSUSE:Factory/.icinga.new/icinga.changes   2016-07-03 
12:28:42.0 +0200
@@ -1,0 +2,6 @@
+Fri Jun 24 10:23:57 UTC 2016 - l...@linux-schulserver.de
+
+- package all README files to avoid broken symlink from README to
+  README.md
+
+---



Other differences:
--
++ icinga.spec ++
--- /var/tmp/diff_new_pack.TG6z5b/_old  2016-07-03 12:28:43.0 +0200
+++ /var/tmp/diff_new_pack.TG6z5b/_new  2016-07-03 12:28:43.0 +0200
@@ -610,7 +610,7 @@
 
 %files
 %defattr(-,root,root)
-%doc README LICENSE Changelog UPGRADING LEGAL sample-config/ README.SUSE 
examples
+%doc README* LICENSE Changelog UPGRADING LEGAL sample-config/ examples
 %{_mandir}/man8/icinga*.8*
 %{_sbindir}/%{name}
 %attr(0755,root,%{icinga_group}) %{_sbindir}/icingastats





commit icinga for openSUSE:Factory

2015-07-23 Thread h_root
Hello community,

here is the log from the commit of package icinga for openSUSE:Factory checked 
in at 2015-07-23 15:22:58

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.changes2015-06-03 
08:49:11.0 +0200
+++ /work/SRC/openSUSE:Factory/.icinga.new/icinga.changes   2015-07-23 
15:23:05.0 +0200
@@ -1,0 +2,10 @@
+Wed Jul 15 11:49:36 UTC 2015 - thard...@suse.com
+
+- update to upstream version 1.13.3
+  * Bug #7337: Only use SCHEDULE_HOST_DOWNTIME command for Icinga 2.x
+  * Bug #8130: Wrong values for percent_* when using hostgroup in availability 
report
+  * Bug #9020: Solaris package behaves badly upon uninstall
+  * Bug #9106: Icinga no longer sending acknowledgement notifications
+  * Bug #9240: invalid JSON for flapping threshold configuration
+
+---

Old:

  icinga-1.13.2.tar.gz

New:

  icinga-1.13.3.tar.gz



Other differences:
--
++ icinga.spec ++
--- /var/tmp/diff_new_pack.xrKd3r/_old  2015-07-23 15:23:07.0 +0200
+++ /var/tmp/diff_new_pack.xrKd3r/_new  2015-07-23 15:23:07.0 +0200
@@ -23,7 +23,7 @@
 %endif
 
 Name:   icinga
-Version:1.13.2
+Version:1.13.3
 Release:0
 
 Summary:Host/service/network monitoring program

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





commit icinga for openSUSE:Factory

2015-06-02 Thread h_root
Hello community,

here is the log from the commit of package icinga for openSUSE:Factory checked 
in at 2015-06-03 08:49:08

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.changes2015-04-15 
16:24:46.0 +0200
+++ /work/SRC/openSUSE:Factory/.icinga.new/icinga.changes   2015-06-03 
08:49:11.0 +0200
@@ -1,0 +2,7 @@
+Tue May 26 13:43:22 UTC 2015 - thard...@suse.com
+
+- prevent changing of tmp_path permissions (bnc#923928)
+- update to upstream version 1.13.2
+  * Bug #9010: icinga.spec: broken path to downtimes scripts and not packaged 
config files
+
+---

Old:

  icinga-1.13.1.tar.gz

New:

  icinga-1.13.2.tar.gz



Other differences:
--
++ icinga.spec ++
--- /var/tmp/diff_new_pack.tE1hZx/_old  2015-06-03 08:49:12.0 +0200
+++ /var/tmp/diff_new_pack.tE1hZx/_new  2015-06-03 08:49:12.0 +0200
@@ -23,7 +23,7 @@
 %endif
 
 Name:   icinga
-Version:1.13.1
+Version:1.13.2
 Release:0
 
 Summary:Host/service/network monitoring program
@@ -405,12 +405,6 @@
 mv "%{buildroot}%{icinga_sysconfdir}/idomod.cfg-sample" 
"%{buildroot}%{icinga_sysconfdir}/idomod.cfg"
 mv "%{buildroot}%{icinga_sysconfdir}/modules/idoutils.cfg-sample" 
"%{buildroot}%{icinga_sysconfdir}/modules/idoutils.cfg"
 
-# these configs are already available under examples
-rm "%{buildroot}%{icinga_sysconfdir}/modules/flapjack.cfg"
-rm "%{buildroot}%{icinga_sysconfdir}/modules/livestatus.cfg"
-rm "%{buildroot}%{icinga_sysconfdir}/modules/mod_gearman.cfg"
-rm "%{buildroot}%{icinga_sysconfdir}/modules/pnp4nagios.cfg"
-
 # fix resource.cfg eventhandler path - otherwise it creates problem with the 
update_config_files script
 sed -i "s|/usr/lib/nagios/plugins/eventhandlers|%{icinga_eventhandlerdir}|g" 
"%{buildroot}%{icinga_sysconfdir}/resource.cfg"
 
@@ -712,6 +706,10 @@
 %config(noreplace) %{icinga_sysconfdir}/ido2db.cfg
 %config(noreplace) %{icinga_sysconfdir}/idomod.cfg
 %config(noreplace) %{icinga_sysconfdir}/modules/idoutils.cfg
+%config(noreplace) %{icinga_sysconfdir}/modules/flapjack.cfg
+%config(noreplace) %{icinga_sysconfdir}/modules/livestatus.cfg
+%config(noreplace) %{icinga_sysconfdir}/modules/mod_gearman.cfg
+%config(noreplace) %{icinga_sysconfdir}/modules/pnp4nagios.cfg
 %config(noreplace) %{icinga_sysconfdir}/objects/ido2db_check_proc.cfg
 %{_sbindir}/rcido2db
 %if 0%{?using_systemd}

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

++ icinga-exec-start-pre ++
--- /var/tmp/diff_new_pack.tE1hZx/_old  2015-06-03 08:49:12.0 +0200
+++ /var/tmp/diff_new_pack.tE1hZx/_new  2015-06-03 08:49:12.0 +0200
@@ -43,8 +43,18 @@
 
 # make sure that all necessary directories are there
 install -d -m755 -o$icinga_user -g$icinga_group $(dirname "$lock_file")
-install -d -m775 -o$icinga_user -g$icinga_group "$temp_path"
 install -d -m775 -o$icinga_user -g$icinga_group $(dirname "$temp_file")
+if [ ! -d "$temp_path" ]; then
+case "$temp_path" in
+/var/run/icinga/tmp)
+install -d -m775 -o$icinga_user -g$icinga_group "$temp_path"
+;;
+*)
+/bin/logger -t rcicinga "$temp_path does not exist - creating now"
+install -d -m775 -o$icinga_user -g$icinga_group "$temp_path"
+;;
+esac
+fi
 
 # create command file with correct permissions
 mkfifo -m 660 "$command_file"





commit icinga for openSUSE:Factory

2015-04-15 Thread h_root
Hello community,

here is the log from the commit of package icinga for openSUSE:Factory checked 
in at 2015-04-15 16:24:45

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.changes2015-04-10 
09:51:31.0 +0200
+++ /work/SRC/openSUSE:Factory/.icinga.new/icinga.changes   2015-04-15 
16:24:46.0 +0200
@@ -1,0 +2,6 @@
+Tue Apr  7 15:29:47 UTC 2015 - thard...@suse.com
+
+- update to upstream version 1.13.1
+  * Bug #8986: wrong fd initilization preventing checks using file descriptors
+
+---

Old:

  icinga-1.13.0.tar.gz

New:

  icinga-1.13.1.tar.gz



Other differences:
--
++ icinga.spec ++
--- /var/tmp/diff_new_pack.9R93xA/_old  2015-04-15 16:24:47.0 +0200
+++ /var/tmp/diff_new_pack.9R93xA/_new  2015-04-15 16:24:47.0 +0200
@@ -23,7 +23,7 @@
 %endif
 
 Name:   icinga
-Version:1.13.0
+Version:1.13.1
 Release:0
 
 Summary:Host/service/network monitoring program

++ icinga-1.13.0.tar.gz -> icinga-1.13.1.tar.gz ++
/work/SRC/openSUSE:Factory/icinga/icinga-1.13.0.tar.gz 
/work/SRC/openSUSE:Factory/.icinga.new/icinga-1.13.1.tar.gz differ: char 4, 
line 1





commit icinga for openSUSE:Factory

2015-02-27 Thread h_root
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.changes2015-02-06 
10:23:27.0 +0100
+++ /work/SRC/openSUSE:Factory/.icinga.new/icinga.changes   2015-02-27 
11:10:07.0 +0100
@@ -1,0 +2,12 @@
+Thu Feb 19 12:08:54 UTC 2015 - thard...@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 - l...@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.0 +0100
+++ /var/tmp/diff_new_pack.bQLrHU/_new  2015-02-27 11:10:09.0 +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.0 +0100
+++ /var/tmp/diff_new_pack.bQLrHU/_new  2015-02-27 11:10:09.0 +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.0 +0100
+++ /var/tmp/diff_new_pack.bQLrHU/_new  2015-02-27 11:10:09.0 +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/icin

commit icinga for openSUSE:Factory

2015-02-06 Thread h_root
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.changes2014-12-29 
00:30:24.0 +0100
+++ /work/SRC/openSUSE:Factory/.icinga.new/icinga.changes   2015-02-06 
10:23:27.0 +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.0 +0100
+++ /var/tmp/diff_new_pack.Fi8hdH/_new  2015-02-06 10:23:28.0 +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.0 +0100
+++ /var/tmp/diff_new_pack.Fi8hdH/_new  2015-02-06 10:23:28.0 +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.sh2014-09-03 12:27:46.0 +0300
-+++ icinga-1.11.7-fix-bashisms/indent.sh   2014-12-20 19:39:48.0 
+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.0 +0300
-+++ icinga-1.11.7-fix-bashisms/maketar.sh  2014-12-20 19:39:28.0 
+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.0 +0300
-+++ icinga-1.11.7-fix-bashisms/module/idoutils/db/scripts/create_mysqldb.sh
2014-12-20 19:33:04.0 +0200
-@@ -78,14 +78,14 @@
+Index: icinga-1.11.7/module/idoutils/db/scripts/create_mysqldb.sh
+===

commit icinga for openSUSE:Factory

2014-12-28 Thread h_root
Hello community,

here is the log from the commit of package icinga for openSUSE:Factory checked 
in at 2014-12-29 00:30:20

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.changes2014-12-21 
12:04:17.0 +0100
+++ /work/SRC/openSUSE:Factory/.icinga.new/icinga.changes   2014-12-29 
00:30:24.0 +0100
@@ -1,0 +2,7 @@
+Sat Dec 20 17:43:00 UTC 2014 - Led 
+
+- fix bashism in scripts
+- add patches:
+  * icinga-1.11.7-fix-bashisms.patch
+
+---

New:

  icinga-1.11.7-fix-bashisms.patch



Other differences:
--
++ icinga.spec ++
--- /var/tmp/diff_new_pack.plmLND/_old  2014-12-29 00:30:28.0 +0100
+++ /var/tmp/diff_new_pack.plmLND/_new  2014-12-29 00:30:28.0 +0100
@@ -54,6 +54,8 @@
 Patch0: icinga-workaround-131-apache-conf-issue.patch
 # PATCH-FIX-OPENSUSE icinga-fix-systemd-services.patch
 Patch1: icinga-fix-systemd-services.patch
+# PATCH-FIX-UPSTREAM icinga-1.11.7-fix-bashisms.patch led...@gmail.com
+Patch2: icinga-1.11.7-fix-bashisms.patch
 Provides:   monitoring_daemon
 BuildRequires:  apache2-devel
 BuildRequires:  nagios-rpm-macros >= 0.10
@@ -285,6 +287,7 @@
 %patch0 -p1
 %endif
 %patch1 -p1
+%patch2 -p1
 
 %build
 export PATH_TO_TRACEROUTE="%{_sbindir}/traceroute"

++ icinga-1.11.7-fix-bashisms.patch ++
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.0 +0300
+++ icinga-1.11.7-fix-bashisms/indent.sh2014-12-20 19:39:48.0 
+0200
@@ -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.sh2014-09-03 12:27:46.0 +0300
+++ icinga-1.11.7-fix-bashisms/maketar.sh   2014-12-20 19:39:28.0 
+0200
@@ -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.0 +0300
+++ icinga-1.11.7-fix-bashisms/module/idoutils/db/scripts/create_mysqldb.sh 
2014-12-20 19:33:04.0 +0200
@@ -78,14 +78,14 @@
  \q
 EOS2
 umask $UMASK
-if [ $? == 0 ]; then
+if [ $? = 0 ]; then
echo "Check icinga schema version with DB User 
$DBUSER..."
 mysql $DB -u $DBUSER -p$DBPASS -h $DBHOST -s <> icinga.te
+   echo "$rules" | audit2allow -R >> icinga.te
# Fall though and rebuild policy
else
exit 0
@@ -29,11 +29,11 @@
exit 0
fi
else
-   echo -e $USAGE
+   echo $USAGE
exit 1
fi
 elif [ $# -ge 2 ] ; then
-   echo -e $USAGE
+   echo $USAGE
exit 1
 fi
 
++ icinga-exec-start-pre ++
--- /var/tmp/diff_new_pack.plmLND/_old  2014-12-29 00:30:28.0 +0100
+++ /var/tmp/diff_new_pack.plmLND/_new  2014-12-29 00:30:28.0 +0100
@@ -7,7 +7,7 @@
 
 
 # grab a config option
-function get_var() {
+get_var() {
 if [ -n "$2" ]; then
 set -- `grep ^$1 $2 | sed 's@=@ @' | tr -d '[:cntrl:]'`
 else


++ ido2db-exec-start-pre ++
--- /var/tmp/diff_new_pack.plmLND/_old  2014-12-29 00:30:28.0 +0100
+++ /var/tmp/diff_new_pack.plmLND/_new  2014-12-29 00:30:28.0 +0100
@@ -7,7 +7,7 @@
 
 
 # grab a config option
-function get_var() {
+get_var() {
 if [ -n "$2" ]; then
 set -- `grep ^$1 $2 | sed 's@=@ @' | tr -d '[:cntrl:]'`
 else

++ rcicinga ++
--- /var/tmp/diff_new_pack.plmLND/_old  2014-12-29 00:30:28.0 +0100
+++ /var/tmp/diff_new_pack.plmLND/_new  2014-12-29 00:30:28.0 +0100
@@ -38,7 +38,7 @@
 ICINGA_DAEMONCHK='/usr/lib/icinga/cgi/daemonchk.cgi'
 
 # Read config and log errors in logfile
-function config_check () {
+config_check() {
 case "$1" in
 verbose)
 $ICINGA_BIN -v "$ICINGA_CFG" >"$ICINGA_CFG_ERR_LOG" 2>&1
@@ -61,7 +61,7 @@
 }
 
 # grab a config option
-function get_var() {
+get_var() {
 if [ -n "$2" ]; then
 set -- `grep ^$1 $2 | sed 's@=@ @' | tr -d '[:cntrl:]'`
 else
@@ -72,14 +72,14 @@
 }
 
 # check some default files and directories
-function check_files() {
+check_files() {
 

commit icinga for openSUSE:Factory

2014-12-21 Thread h_root
Hello community,

here is the log from the commit of package icinga for openSUSE:Factory checked 
in at 2014-12-21 12:04:36

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.changes2014-12-16 
14:47:51.0 +0100
+++ /work/SRC/openSUSE:Factory/.icinga.new/icinga.changes   2014-12-21 
12:04:17.0 +0100
@@ -1,0 +2,5 @@
+Sat Dec 13 22:44:00 UTC 2014 - Led 
+
+- fix bashisms in post scripts
+
+---



Other differences:
--
++ icinga.spec ++
--- /var/tmp/diff_new_pack.c5V7OQ/_old  2014-12-21 12:04:18.0 +0100
+++ /var/tmp/diff_new_pack.c5V7OQ/_new  2014-12-21 12:04:18.0 +0100
@@ -490,10 +490,10 @@
   # First installation: create an alias for the default nagiosadmin user
   if [ -r etc/aliases ]; then
 if ! grep -q "^%{name}:" etc/aliases; then
-echo -e "%{name}:\troot" >> etc/aliases
+echo "%{name}: root" >> etc/aliases
 %{logmsg} "Added alias for user %{name} to /etc/aliases"
 if [ -x usr/bin/newaliases ]; then
-usr/bin/newaliases &>/dev/null || true
+usr/bin/newaliases >/dev/null 2>&1 || true
 else
 %{logmsg} "Cannot execute newaliases. Please run it manually."
 fi
@@ -530,7 +530,7 @@
 else
 wwwusr=$(awk '/^[ \t]*User[ \t]+[a-zA-Z0-9]+/ {print $2}' 
etc/apache2/*.conf)
 fi
-if [ "$wwwusr" == "" ]; then # otherwise, use the default
+if [ -z "$wwwusr" ]; then # otherwise, use the default
 wwwusr=%{icinga_command_user}
 fi
 # if apache user is not in cmdgrp, add it


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



commit icinga for openSUSE:Factory

2014-12-16 Thread h_root
Hello community,

here is the log from the commit of package icinga for openSUSE:Factory checked 
in at 2014-12-16 14:48:17

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.changes2014-11-29 
08:39:58.0 +0100
+++ /work/SRC/openSUSE:Factory/.icinga.new/icinga.changes   2014-12-16 
14:47:51.0 +0100
@@ -1,0 +2,6 @@
+Thu Dec  4 17:18:07 UTC 2014 - l...@linux-schulserver.de
+
+- use a bash script for rcicinga to integrate some additional 
+  options from old sysvinit script (check, check_verbose)
+
+---

New:

  icinga_sysvinit_compat



Other differences:
--
++ icinga.spec ++
--- /var/tmp/diff_new_pack.qEiVtY/_old  2014-12-16 14:47:54.0 +0100
+++ /var/tmp/diff_new_pack.qEiVtY/_new  2014-12-16 14:47:54.0 +0100
@@ -79,6 +79,7 @@
 BuildRequires:  zlib-devel
 %if 0%{?using_systemd}
 BuildRequires:  systemd
+Source100:  icinga_sysvinit_compat
 %endif
 Requires:   net-tools
 Requires(pre):  %fillup_prereq
@@ -432,7 +433,7 @@
 # init-scripts
 # remove the default init script as SUSE uses an adapted one
 %if 0%{?using_systemd}
-ln -sf /usr/sbin/service %{buildroot}%{_sbindir}/rc%{name}
+install -D -m0755 %{SOURCE100} %{buildroot}%{_sbindir}/rc%{name}
 ln -sf /usr/sbin/service %{buildroot}%{_sbindir}/rcido2db
 install -D -m0755 %{SOURCE18} 
"%{buildroot}%{icinga_libdir}/icinga-exec-start-pre"
 install -D -m0755 %{SOURCE19} 
"%{buildroot}%{icinga_libdir}/ido2db-exec-start-pre"
@@ -607,12 +608,13 @@
 %{_mandir}/man8/icinga*.8*
 %{_sbindir}/%{name}
 %attr(0755,root,%{icinga_group}) %{_sbindir}/icingastats
-%{_sbindir}/rc%{name}
 %if 0%{?using_systemd}
+%attr(0755,root,root) %{_sbindir}/rc%{name}
 %{icinga_libdir}/icinga-exec-start-pre
 %exclude %{icinga_libdir}/ido2db-exec-start-pre
 %{_unitdir}/icinga.service
 %else
+%{_sbindir}/rc%{name}
 %{_initrddir}/%{name}
 %endif
 %{icinga_datadir}/p1.pl


++ icinga_sysvinit_compat ++
#! /bin/sh
# Copyright (c) 2014 SUSE Linux GmbH, Germany.
# Author: Lars Vogdt
# 
# /usr/sbin/rcicinga
#
# Systemd enhancements script for Icinga
#

. /etc/rc.status

ICINGA_BIN='/usr/sbin/icinga'
ICINGA_CFG='/etc/icinga/icinga.cfg'
ICINGA_CFG_ERR_LOG='/var/log/icinga/config.err'

# Read config and log errors in logfile
config_check () {
case "$1" in
verbose)
$ICINGA_BIN -v "$ICINGA_CFG" >"$ICINGA_CFG_ERR_LOG" 2>&1
if [ $? -eq 0 ]; then
return 0
else
return 1
fi
;;
*)   
$ICINGA_BIN -v "$ICINGA_CFG" >/dev/null 2>&1
if [ $? -eq 0 ]; then
return 0
else
$ICINGA_BIN -v "$ICINGA_CFG" >"$ICINGA_CFG_ERR_LOG" 2>&1
return 1
fi
;;
esac
}

# Check for missing binaries (stale symlinks should not happen)
# Note: Special treatment of stop for LSB conformance
test -x "$ICINGA_BIN" || { echo "$ICINGA_BIN not installed or not executable.";
if [ "$1" = "stop" ]; then exit 0;
else exit 5; fi; }

# Check for existence of needed config file
test -r "$ICINGA_CFG" || { echo "$ICINGA_CFG not existing or readable.";
if [ "$1" = "stop" ]; then exit 0;
else exit 6; fi; }

# Reset status of this service
rc_reset

case "$1" in
check)
echo -n "Starting configuration check "
config_check
if [ $? -eq 0 ]; then
echo "- passed configuration check"
test -f $ICINGA_CFG_ERR_LOG && rm $ICINGA_CFG_ERR_LOG
rc_reset
else
echo "- detected Error in configuration files"
echo "Please read $ICINGA_CFG_ERR_LOG"
rc_failed
fi
rc_status -v
;;
check_verbose)
echo "Running verbose configuration check..."
config_check verbose
exitcode=$?
cat "$ICINGA_CFG_ERR_LOG"
rc_failed $exitcode
rc_status -v
rc_exit
;;
*)
/bin/systemctl $* icinga.service
;;
esac
rc_exit
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit icinga for openSUSE:Factory

2014-11-28 Thread h_root
Hello community,

here is the log from the commit of package icinga for openSUSE:Factory checked 
in at 2014-11-29 08:39:53

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.changes2014-09-12 
10:03:58.0 +0200
+++ /work/SRC/openSUSE:Factory/.icinga.new/icinga.changes   2014-11-29 
08:39:58.0 +0100
@@ -1,0 +2,16 @@
+Thu Nov 27 16:16:18 UTC 2014 - thard...@suse.com
+
+- remove patch source condition
+
+---
+Thu Nov 20 10:46:40 UTC 2014 - thard...@suse.com
+
+- restrict apache conf patch only to openSUSE 13.1 since it seems to be the 
only affected version
+- renamed icinga-fix-apache-issues-by-using-old-conf.patch to 
icinga-workaround-131-apache-conf-issue.patch
+
+---
+Fri Nov 14 16:41:37 UTC 2014 - thard...@suse.com
+
+- use icinga-fix-apache-issues-by-using-old-conf.patch only for openSUSE 13.1 
and older versions
+
+---

Old:

  icinga-fix-apache-issues-by-using-old-conf.patch

New:

  icinga-workaround-131-apache-conf-issue.patch



Other differences:
--
++ icinga.spec ++
--- /var/tmp/diff_new_pack.TrFJtd/_old  2014-11-29 08:39:59.0 +0100
+++ /var/tmp/diff_new_pack.TrFJtd/_new  2014-11-29 08:39:59.0 +0100
@@ -50,8 +50,8 @@
 Source17:   icinga-favicon.ico
 Source18:   icinga-exec-start-pre
 Source19:   ido2db-exec-start-pre
-# PATCH-FIX-OPENSUSE icinga-fix-apache-issues-by-using-old-conf.patch
-Patch0: icinga-fix-apache-issues-by-using-old-conf.patch
+# PATCH-FIX-OPENSUSE icinga-workaround-131-apache-conf-issue.patch
+Patch0: icinga-workaround-131-apache-conf-issue.patch
 # PATCH-FIX-OPENSUSE icinga-fix-systemd-services.patch
 Patch1: icinga-fix-systemd-services.patch
 Provides:   monitoring_daemon
@@ -280,7 +280,9 @@
 
 %prep
 %setup -q
+%if 0%{?suse_version} == 1310
 %patch0 -p1
+%endif
 %patch1 -p1
 
 %build


++ icinga-workaround-131-apache-conf-issue.patch ++
--- icinga-1.10.3.old/sample-config/httpd.conf.in   2014-02-11 
12:05:36.0 +0100
+++ icinga-1.10.3/sample-config/httpd.conf.in   2014-02-18 17:19:04.804017535 
+0100
@@ -5,62 +5,38 @@
 # configuration file.  Customize the paths, etc. as
 # needed to fit your system.
 
+
 ScriptAlias @cgiurl@ "@sbindir@"
 
 
 #  SSLRequireSSL
Options ExecCGI
AllowOverride None
-
+   Order allow,deny
+   Allow from all
+#  Order deny,allow
+#  Deny from all
+#  Allow from 127.0.0.1
AuthName "Icinga Access"
AuthType Basic
AuthUserFile @HTTPAUTHFILE@
+   Require valid-user
+
 
-   
-  # Apache 2.4
-  
- Require all granted
- # Require local
- Require valid-user
-  
-   
-   
-  # Apache 2.2
-  Order allow,deny
-  Allow from all
-  #  Order deny,allow
-  #  Deny from all
-  #  Allow from 127.0.0.1
-  Require valid-user
-
- 
-
-Alias @htmurl@ "@datadir@/"
+Alias @htmurl@ "@datadir@"
 
-
+
 #  SSLRequireSSL
Options None
AllowOverride All
-
+   Order allow,deny
+   Allow from all
+#  Order deny,allow
+#  Deny from all
+#  Allow from 127.0.0.1
AuthName "Icinga Access"
AuthType Basic
AuthUserFile @HTTPAUTHFILE@
-
-   
-  # Apache 2.4
-  
- Require all granted
- # Require local
- Require valid-user
-  
-   
-   
-  # Apache 2.2
-  Order allow,deny
-  Allow from all
-  #  Order deny,allow
-  #  Deny from all
-  #  Allow from 127.0.0.1
-  Require valid-user
-   
+   Require valid-user
 
+
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit icinga for openSUSE:Factory

2014-09-12 Thread h_root
Hello community,

here is the log from the commit of package icinga for openSUSE:Factory checked 
in at 2014-09-12 10:03:32

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.changes2014-09-03 
20:00:18.0 +0200
+++ /work/SRC/openSUSE:Factory/.icinga.new/icinga.changes   2014-09-12 
10:03:58.0 +0200
@@ -1,0 +2,8 @@
+Wed Sep  3 12:47:59 UTC 2014 - thard...@suse.com
+
+- update to upstream version 1.11.7
+  * Use versioned dependencies in the RPM spec file #7071 - GB
+  * Import 1.11.7 schema changes from Icinga 2 #6939 - MF
+  * New programstatus column 'endpoint_name' requires schema update to 1.11.7! 
#6939
+
+---

Old:

  icinga-1.11.6.tar.gz

New:

  icinga-1.11.7.tar.gz



Other differences:
--
++ icinga.spec ++
--- /var/tmp/diff_new_pack.5xIb71/_old  2014-09-12 10:04:00.0 +0200
+++ /var/tmp/diff_new_pack.5xIb71/_new  2014-09-12 10:04:00.0 +0200
@@ -23,7 +23,7 @@
 %endif
 
 Name:   icinga
-Version:1.11.6
+Version:1.11.7
 Release:0
 
 Summary:Host/service/network monitoring program
@@ -133,7 +133,7 @@
 Group:  System/Monitoring
 Provides:   %{name}-classicui
 Provides:   monitoring_webfrontend
-Requires:   %{name}-classicui-config
+Requires:   %{name}-classicui-config = %{version}
 Requires:   %{name}-doc = %{version}
 Requires(pre):  apache2
 

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


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



commit icinga for openSUSE:Factory

2014-09-03 Thread h_root
Hello community,

here is the log from the commit of package icinga for openSUSE:Factory checked 
in at 2014-09-03 18:22:48

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.changes2014-08-14 
14:59:06.0 +0200
+++ /work/SRC/openSUSE:Factory/.icinga.new/icinga.changes   2014-09-03 
20:00:18.0 +0200
@@ -1,0 +2,5 @@
+Mon Sep  1 13:55:30 UTC 2014 - thard...@suse.com
+
+- add util-linux-systemd as build require for newer SUSE distributions (> 13.1)
+
+---



Other differences:
--
++ icinga.spec ++
--- /var/tmp/diff_new_pack.pTc3Bl/_old  2014-09-03 20:00:22.0 +0200
+++ /var/tmp/diff_new_pack.pTc3Bl/_new  2014-09-03 20:00:22.0 +0200
@@ -60,6 +60,9 @@
 %if 0%{?suse_version} >= 1110
 BuildRequires:  fdupes
 %endif
+%if 0%{?suse_version} > 1310
+BuildRequires:  util-linux-systemd
+%endif
 BuildRequires:  freetype2-devel
 BuildRequires:  gd-devel > 1.8
 BuildRequires:  iputils


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



commit icinga for openSUSE:Factory

2014-08-14 Thread h_root
Hello community,

here is the log from the commit of package icinga for openSUSE:Factory checked 
in at 2014-08-14 14:58:30

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.changes2014-07-28 
06:50:31.0 +0200
+++ /work/SRC/openSUSE:Factory/.icinga.new/icinga.changes   2014-08-14 
14:59:06.0 +0200
@@ -1,0 +2,11 @@
+Thu Aug  7 09:35:29 UTC 2014 - thard...@suse.com
+
+- update to upstream version 1.11.6
+  * idoutils: Fix customvariable* tables are not case sensitive (mysql) #6788 
- MF
+  * installation: Fix misspelled systemd configure options, added hint in 
Makefile #6710 - SS
+  * spec: Add shadow-utils as a dependency for Redhat packaging #4495 - SS
+  * spec: Build dependency for "make" is missing - GB
+  * Fix comments in cgiutils.c #6712
+  * Fix customvariable tables requires schema version update to 1.11.6! #6788
+
+---

Old:

  icinga-1.11.5.tar.gz

New:

  icinga-1.11.6.tar.gz



Other differences:
--
++ icinga.spec ++
--- /var/tmp/diff_new_pack.WrDpnc/_old  2014-08-14 14:59:07.0 +0200
+++ /var/tmp/diff_new_pack.WrDpnc/_new  2014-08-14 14:59:07.0 +0200
@@ -23,7 +23,7 @@
 %endif
 
 Name:   icinga
-Version:1.11.5
+Version:1.11.6
 Release:0
 
 Summary:Host/service/network monitoring program

++ icinga-1.11.5.tar.gz -> icinga-1.11.6.tar.gz ++
/work/SRC/openSUSE:Factory/icinga/icinga-1.11.5.tar.gz 
/work/SRC/openSUSE:Factory/.icinga.new/icinga-1.11.6.tar.gz differ: char 4, 
line 1


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



commit icinga for openSUSE:Factory

2014-07-27 Thread h_root
Hello community,

here is the log from the commit of package icinga for openSUSE:Factory checked 
in at 2014-07-28 06:50:30

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.changes2014-06-30 
21:50:27.0 +0200
+++ /work/SRC/openSUSE:Factory/.icinga.new/icinga.changes   2014-07-28 
06:50:31.0 +0200
@@ -1,0 +2,5 @@
+Tue Jul  8 09:38:36 UTC 2014 - thard...@suse.com
+
+- use systemctl to restart Apache on modern distributions
+
+---



Other differences:
--
++ icinga.spec ++
--- /var/tmp/diff_new_pack.DeIURh/_old  2014-07-28 06:50:33.0 +0200
+++ /var/tmp/diff_new_pack.DeIURh/_new  2014-07-28 06:50:33.0 +0200
@@ -543,17 +543,22 @@
 then
 # this is the initial installation: enable icinga
 test -x %{_sbindir}/a2enflag && %{_sbindir}/a2enflag ICINGA >/dev/null
+%if 0%{?using_systemd}
+  %{_bindir}/systemctl try-restart apache2
+%else
+  %restart_on_update apache2
+%endif
 fi
-%restart_on_update apache2
-
-%preun www
-%restart_on_update apache2
 
 %postun www
 if [ "$1" = "0" ]; then
 # deinstallation of the package - remove the apache flag
 test -x %{_sbindir}/a2disflag && %{_sbindir}/a2disflag ICINGA >/dev/null
+%if 0%{?using_systemd}
+  %{_bindir}/systemctl try-restart apache2
+%else
 %restart_on_update apache2
+%endif
 fi
 
 %post idoutils


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



commit icinga for openSUSE:Factory

2014-06-30 Thread h_root
Hello community,

here is the log from the commit of package icinga for openSUSE:Factory checked 
in at 2014-06-30 21:45:21

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.changes2014-05-17 
21:43:46.0 +0200
+++ /work/SRC/openSUSE:Factory/.icinga.new/icinga.changes   2014-06-30 
21:45:46.0 +0200
@@ -1,0 +2,34 @@
+Tue Jun 24 14:24:22 UTC 2014 - thard...@suse.com
+
+- require latest nagios-rpm-macros package to allow building on openSUSE 
Factory 
+- make the classic ui package icinga-www independent from Icinga 1
+- move config files from the package icinga-www to icinga-www-config
+
+---
+Fri Jun 20 21:18:02 UTC 2014 - mar...@gmx.de
+
+- update to upstream version 1.11.5
+  * classic-ui: fix status.cgi gets stuck in loop when sorting on "All 
Unhandled Problems" #5886 - RB
+  * classic ui: Only show command expander if backend is Icinga 1.x 
(incompatible with Icinga 2) #6408 - MF
+  * classic ui: Fix CSRF protection in cmd.cgi matches only compiled in URL 
#6459 - MF
+  * classic-ui: config.cgi missing new option #6502 - RB
+  * initscript: Fixed Typo in ido2db and icinga init scripts preventing them 
to kill -9 their processes #6410 - MaH
+  * cgi.cfg: Add url_cgi_path allowing to override the default 
'$htmurl/cgi-bin' required for CSRF checks #6459
+** Required for icinga2-classicui Debian package
+
+---
+Mon Jun  2 08:50:58 UTC 2014 - thard...@suse.com
+
+- update to upstream version 1.11.4
+  * core: Icinga should warn about deprecated configuration objects and 
attributes #6075 - MF
+  * core: Fix config parser with object custom variables #6330 - MF
+  * core: Allow Classic UI config parser to ignore unknown objects #5826 - MF
+  * classic ui: Fix jquery.dd source file, update to 2.38 #6324 - MF
+  * config parser now marks the following attributes and objects as DEPRECATED 
(they have been since 0.8.0)
+** retry_check_interval (hosts, services)
+** normal_check_internal (hosts, services)
+** checks_enabled (hosts)
+** hostextinfo object
+** serviceextinfo object
+
+---

Old:

  icinga-1.11.3.tar.gz

New:

  icinga-1.11.5.tar.gz



Other differences:
--
++ icinga.spec ++
--- /var/tmp/diff_new_pack.1AOyJk/_old  2014-06-30 21:45:50.0 +0200
+++ /var/tmp/diff_new_pack.1AOyJk/_new  2014-06-30 21:45:50.0 +0200
@@ -23,7 +23,7 @@
 %endif
 
 Name:   icinga
-Version:1.11.3
+Version:1.11.5
 Release:0
 
 Summary:Host/service/network monitoring program
@@ -56,7 +56,7 @@
 Patch1: icinga-fix-systemd-services.patch
 Provides:   monitoring_daemon
 BuildRequires:  apache2-devel
-BuildRequires:  nagios-rpm-macros >= 0.08
+BuildRequires:  nagios-rpm-macros >= 0.10
 %if 0%{?suse_version} >= 1110
 BuildRequires:  fdupes
 %endif
@@ -128,8 +128,9 @@
 %package www
 Summary:Provides the HTML and CGI files for the Icinga web interface
 Group:  System/Monitoring
+Provides:   %{name}-classicui
 Provides:   monitoring_webfrontend
-Requires:   %{name} = %{version}
+Requires:   %{name}-classicui-config
 Requires:   %{name}-doc = %{version}
 Requires(pre):  apache2
 
@@ -147,6 +148,16 @@
 CGI files for the Icinga web interface. In addition, HTML
 documentation is included in this package
 
+%package www-config
+Summary:Classic UI configuration for %{name}
+Group:  System/Monitoring
+Provides:   %{name}-classicui-config
+Conflicts:  icinga2-classicui-config
+Requires(pre):  apache2
+
+%description www-config
+This packages contains the classic ui configuration for %{name}.
+
 %package devel
 Summary:Provides include files that Icinga-related applications may 
compile against
 Group:  Development/Libraries/C and C++
@@ -632,10 +643,6 @@
 
 %files www
 %defattr(-,root,root)
-%config(noreplace) %{apacheconfdir}/%{name}.conf
-%config(noreplace) %{icinga_sysconfdir}/cgi.cfg
-%config(noreplace) %{icinga_sysconfdir}/cgiauth.cfg
-%config(noreplace) %attr(0640,root,%{apachegroup}) %{icinga_http_authfile}
 %dir %{icinga_cgidir}/
 %{icinga_cgidir}/avail.cgi
 %{icinga_cgidir}/cmd.cgi
@@ -666,6 +673,13 @@
 %{icinga_datadir}/jquery-ui-addon
 %attr(0775,%{icinga_command_user},%{icinga_command_group}) %dir 
%{icinga_cgi_logdir}
 
+%files www-config
+%defattr(-,root,root,-)
+%config(noreplace) %{apacheconfdir}/%{name}.conf
+%config(noreplace) %{icinga_sysconfdir}/cgi.cfg
+%config(norepla

commit icinga for openSUSE:Factory

2014-05-17 Thread h_root
Hello community,

here is the log from the commit of package icinga for openSUSE:Factory checked 
in at 2014-05-17 21:43:44

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.changes2014-04-25 
16:09:35.0 +0200
+++ /work/SRC/openSUSE:Factory/.icinga.new/icinga.changes   2014-05-17 
21:43:46.0 +0200
@@ -1,0 +2,22 @@
+Mon May 12 09:05:59 UTC 2014 - thard...@suse.com
+
+- update to upstream version 1.11.3
+  * classic ui: add 'is_reachable' attribute to extinfo details (Icinga 2 
only) #6186 - MF
+  * core: Revert "add colon to illegal_object_name_chars" (#4227) #5931 - MF
+  * core: Remove t-tap/ #6022 - MF
+  * core: Remove json checker #6023 - MF
+  * core: Revert "add colon to illegal_object_name_chars" (#4227) #5931
+  * idoutils: Add {host,service}{groups,status] columns: notes, notes_url, 
action_url, is_reachable. (Icinga 2) #6060
+** bump schema version to 1.11.3
+  * core: Remove json checker
+
+---
+Thu May  8 12:46:33 UTC 2014 - thard...@suse.com
+
+- update to upstream version 1.11.2
+  * core: fix regex using servicegroup members *,service fails to expand after 
lookup (Ricardo Melo) #3881 - MF
+  * classic ui: fix parser bailing on command object custom variables (Icinga 
2 only) #5940 - MF
+  * classic ui: fix CGIs don't work on OS X #5943 - GB
+  * classic ui: drop experimental 'check_service' attribute (Icinga 2 only) 
#5841 - MF
+
+---

Old:

  icinga-1.11.1.tar.gz

New:

  icinga-1.11.3.tar.gz



Other differences:
--
++ icinga.spec ++
--- /var/tmp/diff_new_pack.fE8eT9/_old  2014-05-17 21:43:47.0 +0200
+++ /var/tmp/diff_new_pack.fE8eT9/_new  2014-05-17 21:43:47.0 +0200
@@ -23,7 +23,7 @@
 %endif
 
 Name:   icinga
-Version:1.11.1
+Version:1.11.3
 Release:0
 
 Summary:Host/service/network monitoring program
@@ -269,9 +269,6 @@
 %patch0 -p1
 %patch1 -p1
 
-# remove GPLv3+ source files which are not needed for this package
-rm "t-tap/"*.c
-
 %build
 export PATH_TO_TRACEROUTE="%{_sbindir}/traceroute"
 %configure \

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


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



commit icinga for openSUSE:Factory

2014-04-25 Thread h_root
Hello community,

here is the log from the commit of package icinga for openSUSE:Factory checked 
in at 2014-04-25 16:09:33

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.changes2014-03-14 
15:16:25.0 +0100
+++ /work/SRC/openSUSE:Factory/.icinga.new/icinga.changes   2014-04-25 
16:09:35.0 +0200
@@ -1,0 +2,10 @@
+Mon Apr 14 13:54:01 UTC 2014 - thard...@suse.com
+
+- update to upstream version 1.11.1
+  * classic ui: add 'check_service' attribute to extinfo details (Icinga 2 
only) #5841 - MF
+  * classic ui: CVE-2014-2386: fix small buffer overflows when checking strlen 
against MAX_INPUT_BUFFER (Tim Landscheidt, Wikimedia) #5873 - RB
+  * idoutils: oracle: fix missing programstatus config_dump_in_progress #5080 
#5776 - TD
+  * idoutils: oracle: fix missing symbol for startup schema checks #5777 - TD
+  * idoutils: pgsql: fix table creates for icinga 2 endpoints #5850 - GB
+
+---

Old:

  icinga-1.11.0.tar.gz

New:

  icinga-1.11.1.tar.gz



Other differences:
--
++ icinga.spec ++
--- /var/tmp/diff_new_pack.mQ8Hqn/_old  2014-04-25 16:09:36.0 +0200
+++ /var/tmp/diff_new_pack.mQ8Hqn/_new  2014-04-25 16:09:36.0 +0200
@@ -23,7 +23,7 @@
 %endif
 
 Name:   icinga
-Version:1.11.0
+Version:1.11.1
 Release:0
 
 Summary:Host/service/network monitoring program

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


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



commit icinga for openSUSE:Factory

2014-03-14 Thread h_root
Hello community,

here is the log from the commit of package icinga for openSUSE:Factory checked 
in at 2014-03-14 15:16:22

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.changes2014-02-24 
15:50:25.0 +0100
+++ /work/SRC/openSUSE:Factory/.icinga.new/icinga.changes   2014-03-14 
15:16:25.0 +0100
@@ -1,0 +2,30 @@
+Thu Mar 13 12:50:18 UTC 2014 - thard...@suse.com
+
+- removed init services on systemd distributions
+- removed obsolete rpmlint entry
+- removed man page for convertcfg because it was removed upstream
+- update to upstream version 1.11
+  * core: add commands for {en,dis}able freshness checks per host/service 
(Philip Matuskiewicz) #5422 #4430 - MF
+  * core: add statehistory entries for newly added services (checkresult with 
OK state) #3854 - MF
+  * core: add option to anonymize external command user in icinga log #5689 - 
RB
+  * classic ui: add status.cgi modifed_attributes filter parameter #4880 - RB
+  * classic ui: add "current_notification_number" to jsonoutput of hosts and 
services in status.cgi #5370 - RB
+  * classic ui: add groups Notes and Action URL links to status summary, 
overview and grid #5301 - RB
+  * classic ui: include more logos #4057 - CF/RB
+  * classic ui: add Support for gzip compressed logs #4519 - RB
+  * idoutils: ido2db should check db schema on startup, and bail early on 
errors #5272 - MF
+  * docs: Define SELinux contexts rather than using chcon command #3555 - WN
+  * docs: explain "Check results for service x on host y are stale by 0d 0h 0m 
10s (threshold=0d 0h 10m 0s). Forcing an immediate check of the service..." 
#5252 - WN
+  * docs: addons: suggest nsca-ng as nsca alternative #5253 - WN
+  * docs: rename nagios plugins to monitoring plugins #5460 - WN/MF
+  * core: allow exclude (!) to work for regexp matches for hosts (Franky Van 
Liedekerke) #5324 - MF
+  * core: fix retained host check attempts being 0/1 #5061 - MF
+  * core: fix passive check result processing for host checks is not working 
(Marco Hoyer) #5671 - MF
+  * core: fix service escalations with no host mapping are not accepted (Tomas 
Dubec) #5687 - MF
+  * classic ui: getcgivars() fails to produce proper key/value list causing a 
potential buffer-overflow condition #5276 - CF
+  * classic ui: fix vulnerability against CSRF attacks CVE-2013-7107 #5346 - RB
+  * classic ui: fix timepicker is resetting time in input field #5239 - RB
+  * classic ui: fix small buffer overflows when checking strlen against 
MAX_INPUT_BUFFER #5663
+  * ...
+
+---

Old:

  convertcfg.8
  icinga-1.10.3.tar.gz

New:

  icinga-1.11.0.tar.gz



Other differences:
--
++ icinga.spec ++
--- /var/tmp/diff_new_pack.GeNnTW/_old  2014-03-14 15:16:26.0 +0100
+++ /var/tmp/diff_new_pack.GeNnTW/_new  2014-03-14 15:16:26.0 +0100
@@ -16,21 +16,22 @@
 #
 
 
-%if 0%{?suse_version} >= 1210
+%if 0%{?suse_version} >= 1230
 %define using_systemd 1
 %else
 %define using_sysvinit 1
 %endif
 
 Name:   icinga
-Version:1.10.3
+Version:1.11.0
 Release:0
 
 Summary:Host/service/network monitoring program
 License:GPL-2.0
 Group:  System/Monitoring
 Url:http://www.icinga.org/
-Source0:%{name}-%{version}.tar.gz
+Source0:
http://github.com/Icinga/icinga-core/releases/download/v%{version}/%{name}-%{version}.tar.gz
+
 Source1:rc%{name}
 Source2:rcido2db
 Source3:%{name}.sysconfig
@@ -43,7 +44,6 @@
 Source10:   README.SUSE
 Source11:   README.SUSE.idoutils
 Source12:   update_icinga_paths.sh
-Source13:   convertcfg.8
 Source14:   new_mini_epn.8
 Source15:   mini_epn.8
 Source16:   log2ido.8
@@ -164,7 +164,7 @@
 may compile against.
 
 %package -n monitoring-tools
-Summary:Provides convertcfg and mini_epn for Icinga and Nagios
+Summary:Provides mini_epn for Icinga and Nagios
 Group:  System/Monitoring
 Requires:   monitoring_daemon
 Provides:   icinga-monitoring-tools = %{version}-%{release}
@@ -176,7 +176,7 @@
 %endif
 
 %description -n monitoring-tools
-This package provides the programs convertcfg, mini_epn and new_mini_epn
+This package provides the programs mini_epn and new_mini_epn
 for Icinga and Nagios.
 
 %package idoutils
@@ -428,9 +428,9 @@
 %else
 ln -sf ../../%{_initrddir}/%{name} "%{buildroot}%{_sbindir}/rc%{name}"
 ln -sf ../../%{_initrddir}/ido2db "%{buildroot}%{_sbindir}/rcido2db"
-%endif
 install -D -m0755 %{SOURCE1} "%{buildroot}%{_initrddir}/%{name}"
 install -D -m0755 %{SOUR

commit icinga for openSUSE:Factory

2014-02-24 Thread h_root
Hello community,

here is the log from the commit of package icinga for openSUSE:Factory checked 
in at 2014-02-24 15:50:22

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.changes2014-02-11 
11:58:04.0 +0100
+++ /work/SRC/openSUSE:Factory/.icinga.new/icinga.changes   2014-02-24 
15:50:25.0 +0100
@@ -1,0 +2,29 @@
+Wed Feb 19 08:24:58 UTC 2014 - thard...@suse.com
+
+- optimized order of icinga-exec-start-pre script
+
+---
+Tue Feb 18 17:36:16 UTC 2014 - thard...@suse.com
+
+- update to upstream version 1.10.3
+  * initscript: implement IcingaPrecacheFallback option for the init script 
(thx Immobilienscout24) #4968 - GB
+  * core: fix passive host check commands check service's passive check 
acceptance (thx Naemon) #5568 - MF
+  * core: fix host state translation for passive host check results #5575 - MF
+  * classic ui: aggressively check for possible buffer overflows in cmd.cgi 
(thx GitHub) #5434 - MF
+  * classic ui: add missing jquery and jquery-ui-timepicker-addon sources 
#5564 - MF
+  * idoutils: wait for child processes on exit preventing zombies (thx Laurent 
Bigonville) #4427 - MF
+  * initscript: fix ido2db returning invalid lsb codes (Marco Hoyer) #4825 - MF
+  * spec: only add apache user to the icingacmd group if existing #5263 - MF
+  * spec: fix usermod error on SUSE #5430 - GB
+  * spec: backport fedora spec file fixes (thx Fedora & Shawn Starr) #5545 - MF
+- add systemd service files on systemd systems (the init scripts will be 
removed in the future on these systems)
+- added icinga-exec-start-pre and ido2db-exec-start-pre scripts to set up the 
environment before the icinga processes are started by systemd
+- added icinga-fix-systemd-services.patch - make sure that the ExecStartPre 
script are called and there is no need for a separate sysconfig file for the 
icinga systemd service
+- added icinga-fix-apache-issues-by-using-old-conf.patch - Apache 2.4 has 
issues with the new Icinga apache conf.d file so staying with the old for now
+- removed 0001-classic-ui-fix-CVE-2013-7107.patch - because of upstream fix
+- removed icinga-fix-create-mysql-script.patch - because of upstream fix
+- removed icinga-add-ifdefine-to-apache.patch - superseeded by 
icinga-fix-apache-issues-by-using-old-conf.patch
+- icinga-www now requires icinga-doc to provide the language flag images and 
documentation
+- consistently use spaces instead of tabs in icinga.spec
+
+---

Old:

  0001-classic-ui-fix-CVE-2013-7107.patch
  icinga-1.10.2.tar.gz
  icinga-add-ifdefine-to-apache.patch
  icinga-fix-create-mysql-script.patch

New:

  icinga-1.10.3.tar.gz
  icinga-exec-start-pre
  icinga-fix-apache-issues-by-using-old-conf.patch
  icinga-fix-systemd-services.patch
  ido2db-exec-start-pre



Other differences:
--
++ icinga.spec ++
--- /var/tmp/diff_new_pack.mewwBy/_old  2014-02-24 15:50:26.0 +0100
+++ /var/tmp/diff_new_pack.mewwBy/_new  2014-02-24 15:50:26.0 +0100
@@ -16,8 +16,14 @@
 #
 
 
+%if 0%{?suse_version} >= 1210
+%define using_systemd 1
+%else
+%define using_sysvinit 1
+%endif
+
 Name:   icinga
-Version:1.10.2
+Version:1.10.3
 Release:0
 
 Summary:Host/service/network monitoring program
@@ -42,12 +48,12 @@
 Source15:   mini_epn.8
 Source16:   log2ido.8
 Source17:   icinga-favicon.ico
-# PATCH-FIX-OPENSUSE icinga-add-ifdefine-to-apache.patch
-Patch0: icinga-add-ifdefine-to-apache.patch
-# PATCH-FIX-OPENSUSE icinga-fix-create-mysql-script.patch
-Patch1: icinga-fix-create-mysql-script.patch
-# PATCH-FIX-UPSTREAM 0001-classic-ui-fix-CVE-2013-7107.patch bnc#859424
-Patch2: 0001-classic-ui-fix-CVE-2013-7107.patch
+Source18:   icinga-exec-start-pre
+Source19:   ido2db-exec-start-pre
+# PATCH-FIX-OPENSUSE icinga-fix-apache-issues-by-using-old-conf.patch
+Patch0: icinga-fix-apache-issues-by-using-old-conf.patch
+# PATCH-FIX-OPENSUSE icinga-fix-systemd-services.patch
+Patch1: icinga-fix-systemd-services.patch
 Provides:   monitoring_daemon
 BuildRequires:  apache2-devel
 BuildRequires:  nagios-rpm-macros >= 0.08
@@ -68,6 +74,9 @@
 BuildRequires:  openssl
 BuildRequires:  pcre-devel
 BuildRequires:  zlib-devel
+%if 0%{?using_systemd}
+BuildRequires:  systemd
+%endif
 Requires:   net-tools
 Requires(pre):  %fillup_prereq
 Requires(pre):  %insserv_prereq
@@ -83,6 +92,9 @@
 %{perl_requires}
 %endif
 %{?libperl_requires}
+%if 0%{?using_systemd}
+%{?systemd_requires}
+%end

commit icinga for openSUSE:Factory

2014-02-11 Thread h_root
Hello community,

here is the log from the commit of package icinga for openSUSE:Factory checked 
in at 2014-02-11 11:58:02

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.changes2014-01-23 
15:45:22.0 +0100
+++ /work/SRC/openSUSE:Factory/.icinga.new/icinga.changes   2014-02-11 
11:58:04.0 +0100
@@ -1,0 +2,5 @@
+Tue Feb  4 12:37:59 UTC 2014 - thard...@suse.com
+
+- added 0001-classic-ui-fix-CVE-2013-7107.patch - fixed vulnerability against 
CSRF attacks CVE-2013-7107 (bnc#859424)
+
+---

New:

  0001-classic-ui-fix-CVE-2013-7107.patch



Other differences:
--
++ icinga.spec ++
--- /var/tmp/diff_new_pack.VCmpk5/_old  2014-02-11 11:58:05.0 +0100
+++ /var/tmp/diff_new_pack.VCmpk5/_new  2014-02-11 11:58:05.0 +0100
@@ -46,6 +46,8 @@
 Patch0: icinga-add-ifdefine-to-apache.patch
 # PATCH-FIX-OPENSUSE icinga-fix-create-mysql-script.patch
 Patch1: icinga-fix-create-mysql-script.patch
+# PATCH-FIX-UPSTREAM 0001-classic-ui-fix-CVE-2013-7107.patch bnc#859424
+Patch2: 0001-classic-ui-fix-CVE-2013-7107.patch
 Provides:   monitoring_daemon
 BuildRequires:  apache2-devel
 BuildRequires:  nagios-rpm-macros >= 0.08
@@ -254,6 +256,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 # remove GPLv3+ source files which are not needed for this package
 rm "t-tap/"*.c

++ 0001-classic-ui-fix-CVE-2013-7107.patch ++
>From 9e9b6a5f26dfcf255fb63bf2326e23a40796f982 Mon Sep 17 00:00:00 2001
From: Ricardo Bartels 
Date: Mon, 23 Dec 2013 17:22:10 +0100
Subject: [PATCH] classic-ui: fix vulnerability against CSRF attacks
 CVE-2013-7107 #5346

This is the fix for CVE-2013-7107. From now on the HTTP referer gets
checked if the request of cmd.cgi actually comes from cmd.cgi.
Otherwise the request will be rejected and the user be notified if
possible. Also a new cgi.cfg option "disable_cmd_cgi_csrf_protection"
got added to disable the protection and allow external programs to
submit commands.

backported to 1.10.2

refs: #5346
---
 cgi/cgiutils.c  |  4 
 cgi/cmd.c   | 17 +
 sample-config/cgi.cfg.in| 12 
 .../updates/cgi.cfg_added_1.10.2_to_1.10.2p1.cfg| 17 +
 4 files changed, 50 insertions(+)
 create mode 100644 sample-config/updates/cgi.cfg_added_1.10.2_to_1.10.2p1.cfg

diff --git a/cgi/cgiutils.c b/cgi/cgiutils.c
index 2cc5908..e909336 100644
--- a/cgi/cgiutils.c
+++ b/cgi/cgiutils.c
@@ -184,6 +184,7 @@ int add_notif_num_hard = 0;
 intadd_notif_num_soft = 0;
 intenforce_comments_on_actions = FALSE;
 intweek_starts_on_monday = FALSE;
+intdisable_cmd_cgi_csrf_protection = FALSE;
 
 intshow_partial_hostgroups = FALSE;
 intshow_partial_servicegroups = FALSE;
@@ -691,6 +692,9 @@ int read_cgi_config_file(char *filename) {
else if (!strcmp(var, "display_status_totals"))
display_status_totals = (atoi(val) > 0) ? TRUE : FALSE;
 
+   else if (!strcmp(var, "disable_cmd_cgi_csrf_protection"))
+   disable_cmd_cgi_csrf_protection = (atoi(val) > 0) ? 
TRUE : FALSE;
+
else if (!strcmp(var, "authorization_config_file")) {
authorization_config_file = strdup(val);
strip(authorization_config_file);
diff --git a/cgi/cmd.c b/cgi/cmd.c
index e8b3e41..cce3581 100644
--- a/cgi/cmd.c
+++ b/cgi/cmd.c
@@ -38,6 +38,7 @@
 #include "../include/cgiutils.h"
 #include "../include/cgiauth.h"
 #include "../include/getcgi.h"
+#include "../include/locations.h"
 
 /** @name External vars
 @{ **/
@@ -57,6 +58,7 @@ extern int  send_ack_notifications;
 extern int  default_expiring_acknowledgement_duration;
 extern int  set_expire_ack_by_default;
 extern int  default_expiring_disabled_notifications_duration;
+extern int  disable_cmd_cgi_csrf_protection;
 
 extern int  display_header;
 extern int  daemon_check;
@@ -2070,6 +2072,9 @@ void commit_command_data(int cmd) {
scheduled_downtime *temp_downtime;
servicegroup *temp_servicegroup = NULL;
contact *temp_contact = NULL;
+   char *referer;
+   char *referer_check;
+   char *buffer;
int x = 0;
int e = 0;
short error_found = FALSE;
@@ -2079,6 +2084,18 @@ void commit_command_data(int cmd) {
/* get authentication information */
get_authentication_informati

commit icinga for openSUSE:Factory

2014-01-23 Thread h_root
Hello community,

here is the log from the commit of package icinga for openSUSE:Factory checked 
in at 2014-01-17 11:03:54

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.changes2014-01-08 
20:06:45.0 +0100
+++ /work/SRC/openSUSE:Factory/.icinga.new/icinga.changes   2014-01-23 
15:45:22.0 +0100
@@ -1,0 +2,5 @@
+Thu Jan  9 18:08:04 UTC 2014 - thard...@suse.com
+
+- updated the required nagios-rpm-macros version
+
+---



Other differences:
--
++ icinga.spec ++
--- /var/tmp/diff_new_pack.3viOo6/_old  2014-01-23 15:45:23.0 +0100
+++ /var/tmp/diff_new_pack.3viOo6/_new  2014-01-23 15:45:23.0 +0100
@@ -48,7 +48,7 @@
 Patch1: icinga-fix-create-mysql-script.patch
 Provides:   monitoring_daemon
 BuildRequires:  apache2-devel
-BuildRequires:  nagios-rpm-macros >= 0.06-22
+BuildRequires:  nagios-rpm-macros >= 0.08
 %if 0%{?suse_version} >= 1110
 BuildRequires:  fdupes
 %endif


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



commit icinga for openSUSE:Factory

2014-01-08 Thread h_root
Hello community,

here is the log from the commit of package icinga for openSUSE:Factory checked 
in at 2014-01-08 20:06:43

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.changes2013-12-11 
11:28:27.0 +0100
+++ /work/SRC/openSUSE:Factory/.icinga.new/icinga.changes   2014-01-08 
20:06:45.0 +0100
@@ -1,0 +2,25 @@
+Tue Jan  7 10:39:42 UTC 2014 - thard...@suse.com
+
+- imported upstream version 1.10.2
+  - includes fix for possible denial of service in CGI executables: 
CVE-2013-7108 (bnc#856837)
+  * core: Add an Icinga syntax plugin for Vim #4150 - LE/MF
+  * core: Document dropped options log_external_commands_user and 
event_profiling_enabled #4957 - BA
+  * core: type in spec file on ido2db startup #5000 - MF
+  * core: Build fails: xdata/xodtemplate.c requires stdint.h #5021 - SH
+
+  * classic ui: fix status output in JSON format not including short and long 
plugin output properly #5217 - RB
+  * classic ui: fix possible buffer overflows #5250 - RB
+  * classic ui: fix Off-by-one memory access in process_cgivars() #5251 - RB
+
+  * idoutils: idoutils oracle compile error #5059 - TD
+  * idoutils: Oracle update script 1.10.0 failes while trying to drop 
nonexisting index #5256 - RB
+- imported upstream version 1.10.1
+  * core: add line number information to config verification error messages 
#4967 - GB
+  * core/idoutils: revert check_source attribute due to mod_gearman 
manipulating in-memory checkresult list #4958 - MF
+** classic ui/idoutils schema: functionality is kept only for Icinga 2 
support
+  * classic ui: fix context help on mouseover in cmd.cgi (Marc-Christian 
Petersen) #4971 - MF
+  * classic ui: correction of colspan value in status.cgi (Bernd Arnold) #4961 
- MF
+  * idoutils: fix pgsql update script #4953 - AW/MF
+  * idoutils: fix logentry_type being integer, not unsigned long (thx David 
Mikulksi) #4953 - MF
+
+---

Old:

  icinga-1.10.0.tar.gz

New:

  icinga-1.10.2.tar.gz



Other differences:
--
++ icinga.spec ++
--- /var/tmp/diff_new_pack.SYr77g/_old  2014-01-08 20:06:46.0 +0100
+++ /var/tmp/diff_new_pack.SYr77g/_new  2014-01-08 20:06:46.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package icinga
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
 
 
 Name:   icinga
-Version:1.10.0
+Version:1.10.2
 Release:0
 
 Summary:Host/service/network monitoring program

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


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



commit icinga for openSUSE:Factory

2013-12-11 Thread h_root
Hello community,

here is the log from the commit of package icinga for openSUSE:Factory checked 
in at 2013-12-11 11:28:26

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.changes2013-11-07 
12:52:16.0 +0100
+++ /work/SRC/openSUSE:Factory/.icinga.new/icinga.changes   2013-12-11 
11:28:27.0 +0100
@@ -1,0 +2,5 @@
+Mon Dec  2 17:23:21 UTC 2013 - thard...@suse.com
+
+- fixed file permission of icingastats - bnc#851619  
+
+---



Other differences:
--
++ icinga.spec ++
--- /var/tmp/diff_new_pack.lcjFjn/_old  2013-12-11 11:28:28.0 +0100
+++ /var/tmp/diff_new_pack.lcjFjn/_new  2013-12-11 11:28:28.0 +0100
@@ -530,7 +530,7 @@
 %{_mandir}/man8/icinga*.8*
 %{_initrddir}/%{name}
 %{_sbindir}/%{name}
-%attr(0754,root,%{icinga_group}) %{_sbindir}/icingastats
+%attr(0755,root,%{icinga_group}) %{_sbindir}/icingastats
 %{_sbindir}/rc%{name}
 %{icinga_datadir}/p1.pl
 %{_localstatedir}/adm/fillup-templates/sysconfig.%{name}


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



commit icinga for openSUSE:Factory

2013-11-07 Thread h_root
Hello community,

here is the log from the commit of package icinga for openSUSE:Factory checked 
in at 2013-11-07 12:52:15

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.changes2013-10-14 
14:29:47.0 +0200
+++ /work/SRC/openSUSE:Factory/.icinga.new/icinga.changes   2013-11-07 
12:52:16.0 +0100
@@ -1,0 +2,36 @@
+Wed Oct 30 22:39:34 UTC 2013 - l...@linux-schulserver.de
+
+- switch to all unhandled problems per default in index.html
+
+---
+Tue Oct 29 07:47:30 UTC 2013 - thard...@suse.com
+
+- imported upstream version 1.10.0 
+  * idoutils: slahistory table must be removed manually after enable_sla 
removal #4363
+- DROP TABLE icinga_slahistory
+  * idoutils: timedevents & timedeventqueue tables are deprecated and removed 
#4482
+  * core: allow exclude (!) to work for regexp matches as well (Matthias Kerk) 
#3720 - MF
+  * core: make logging of external command errors more verbose (Anton Lofgren, 
op5 team) #4402 - MF
+  * core: avoid unnecessary ctime() calls when debugging is disabled, increase 
performance (Opsview Team) #4681 - MF
+  * core: add check source to checkresult/status data #4709 - MF
+  * core: fix check fails when using environment variables (Sven Nierlein) 
#2647 - MF
+  * classic ui: add display filter modification for status.cgi #852 - RB
+  * classic ui: log errors into cgi log (use_logging=1) #4389 - MF
+  * classic ui: show custom variables in extended info #4390 - MF
+  * classic ui: allow to exclude custom variable name/value based on pattern 
#4390 - MF
+  * classic ui: add make install-classicui-standalone-conf as seperated config 
installation #4664 - MF
+  * classic ui: added performance data to extinfo json output #4728 - RB
+  * classic ui: show backend version info from status file (1.x or 2.x) #4737 
- MF
+  * classic ui: added option for partial servicegroups #2740 - RB
+  * classic ui: show check source in extinfo #4709 - MF
+  * classic ui: added live search #1657 - Kepi/RB
+  * idoutils: add a table trimming option for 'downtime history' #3989 - MF
+  * idoutils: allow to disable customvar status updates with 
dump_customvar_status=0|1 in idomod.cfg #4479 - MF
+  * idoutils: add check_source to status tables #4709 - MF
+  * idoutils: add object_id (host, service) to logentries status updates/state 
changes #4754 - MF
+  * install: allow enable perfdata config switch via configure #3996 - MF
+  * install: add --enable-debug=yes/no to set specific compiler flags for gdb, 
valgrind #4387 - MF
+  * install: detect /etc/apache2/conf-available on debian with apache2.4 #4509 
- MF
+  * install: add manpages from debian upstream #4055 - MF
+
+---

Old:

  icinga-1.9.3.tar.gz

New:

  icinga-1.10.0.tar.gz



Other differences:
--
++ icinga.spec ++
--- /var/tmp/diff_new_pack.hXpg1y/_old  2013-11-07 12:52:17.0 +0100
+++ /var/tmp/diff_new_pack.hXpg1y/_new  2013-11-07 12:52:17.0 +0100
@@ -17,7 +17,7 @@
 
 
 Name:   icinga
-Version:1.9.3
+Version:1.10.0
 Release:0
 
 Summary:Host/service/network monitoring program
@@ -277,7 +277,7 @@
--with-gd-inc="%{_includedir}" \
--with-htmurl="/%{name}" \
--with-cgiurl="/%{name}/cgi-bin" \
-   
--with-mainurl="/%{name}/cgi-bin/status.cgi?host=all&type=detail&servicestatustypes=29"
 \
+   --with-mainurl="/%{name}/cgi-bin/status.cgi?allunhandledproblems" \
--with-init-dir="%{_initrddir}" \
--with-lockfile="%{icinga_lockfile}" \
--with-icinga-user="%{icinga_user}" \

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


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



commit icinga for openSUSE:Factory

2013-10-14 Thread h_root
Hello community,

here is the log from the commit of package icinga for openSUSE:Factory checked 
in at 2013-10-14 14:29:46

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.changes2013-09-23 
15:21:19.0 +0200
+++ /work/SRC/openSUSE:Factory/.icinga.new/icinga.changes   2013-10-14 
14:29:47.0 +0200
@@ -1,0 +2,6 @@
+Thu Oct 10 10:41:23 UTC 2013 - ha...@rzg.mpg.de
+
+- use correct variable for checking the status of the icinga-binary 
+  in rcicinga 
+
+---



Other differences:
--

++ rcicinga ++
--- /var/tmp/diff_new_pack.0QNO8t/_old  2013-10-14 14:29:48.0 +0200
+++ /var/tmp/diff_new_pack.0QNO8t/_new  2013-10-14 14:29:48.0 +0200
@@ -276,7 +276,7 @@
 rc_failed 1
 fi
 else
-checkproc -p "$lock_file" "$NAGIOS_BIN"
+checkproc -p "$lock_file" "$ICINGA_BIN"
 fi
 rc_status -v
 ;;

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



commit icinga for openSUSE:Factory

2013-09-23 Thread h_root
Hello community,

here is the log from the commit of package icinga for openSUSE:Factory checked 
in at 2013-09-23 15:21:18

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.changes2013-09-12 
14:28:23.0 +0200
+++ /work/SRC/openSUSE:Factory/.icinga.new/icinga.changes   2013-09-23 
15:21:19.0 +0200
@@ -1,0 +2,11 @@
+Sun Sep 22 00:20:55 UTC 2013 - l...@linux-schulserver.de
+
+- add favicon.ico from Icinga webside to avoid messages in apache
+
+---
+Mon Sep 16 10:55:44 UTC 2013 - l...@linux-schulserver.de
+
+- provide and obsolete renamed icinga-monitoring-tools in 
+  subpackage monitoring-tools
+
+---

New:

  icinga-favicon.ico



Other differences:
--
++ icinga.spec ++
--- /var/tmp/diff_new_pack.idGBxe/_old  2013-09-23 15:21:20.0 +0200
+++ /var/tmp/diff_new_pack.idGBxe/_new  2013-09-23 15:21:20.0 +0200
@@ -41,6 +41,7 @@
 Source14:   new_mini_epn.8
 Source15:   mini_epn.8
 Source16:   log2ido.8
+Source17:   icinga-favicon.ico
 # PATCH-FIX-OPENSUSE icinga-add-ifdefine-to-apache.patch
 Patch0: icinga-add-ifdefine-to-apache.patch
 # PATCH-FIX-OPENSUSE icinga-fix-create-mysql-script.patch
@@ -152,6 +153,8 @@
 Summary:Provides convertcfg and mini_epn for Icinga and Nagios
 Group:  System/Monitoring
 Requires:   monitoring_daemon
+Provides:   icinga-monitoring-tools = %{version}-%{release}
+Obsoletes:  icinga-monitoring-tools < %{version}-%{release}
 %if 0%{?suse_version} < 1140
 Requires:   perl = %{perl_version}
 %else
@@ -425,6 +428,9 @@
 install -m644 %{SOURCE15} "%{buildroot}%{_mandir}/man8/"
 install -m644 %{SOURCE16} "%{buildroot}%{_mandir}/man8/"
 
+# install favicon.ico
+install -m644 %{SOURCE17} "%{buildroot}/%{icinga_datadir}/favicon.ico"
+
 %pre
 # add icinga user and groups
 groupadd -r %{icinga_group} 2>/dev/null || :
@@ -588,6 +594,7 @@
 %{icinga_cgidir}/daemonchk.cgi
 %{icinga_cgidir}/traceroute.cgi
 %dir %{icinga_datadir}
+%{icinga_datadir}/favicon.ico
 %{icinga_datadir}/images
 %{icinga_datadir}/index.html
 %{icinga_datadir}/js

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



commit icinga for openSUSE:Factory

2013-09-12 Thread h_root
Hello community,

here is the log from the commit of package icinga for openSUSE:Factory checked 
in at 2013-09-12 14:28:22

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.changes2013-09-07 
12:32:11.0 +0200
+++ /work/SRC/openSUSE:Factory/.icinga.new/icinga.changes   2013-09-12 
14:28:23.0 +0200
@@ -1,0 +2,8 @@
+Wed Sep 11 13:08:44 UTC 2013 - l...@linux-schulserver.de
+
+- Remove conflicts: nagios for new subpackage monitoring-tools and
+  remove the (identical) binaries in Nagios package instead, so 
+  nagios can recommend the new subpackage as icinga does
+- added log2ido manpage
+
+---

New:

  log2ido.8



Other differences:
--
++ icinga.spec ++
--- /var/tmp/diff_new_pack.NYtyu1/_old  2013-09-12 14:28:24.0 +0200
+++ /var/tmp/diff_new_pack.NYtyu1/_new  2013-09-12 14:28:24.0 +0200
@@ -40,6 +40,7 @@
 Source13:   convertcfg.8
 Source14:   new_mini_epn.8
 Source15:   mini_epn.8
+Source16:   log2ido.8
 # PATCH-FIX-OPENSUSE icinga-add-ifdefine-to-apache.patch
 Patch0: icinga-add-ifdefine-to-apache.patch
 # PATCH-FIX-OPENSUSE icinga-fix-create-mysql-script.patch
@@ -80,7 +81,7 @@
 %endif
 %{?libperl_requires}
 Requires:   mailx
-Recommends: %{name}-monitoring-tools
+Recommends: monitoring-tools
 Recommends: %{name}-plugins-eventhandlers
 Recommends: %{name}-www
 Recommends: cron
@@ -147,7 +148,7 @@
 This package provides include files that Icinga-related applications
 may compile against.
 
-%package monitoring-tools
+%package -n monitoring-tools
 Summary:Provides convertcfg and mini_epn for Icinga and Nagios
 Group:  System/Monitoring
 Requires:   monitoring_daemon
@@ -156,9 +157,8 @@
 %else
 %{perl_requires}
 %endif
-Conflicts:  nagios
 
-%description monitoring-tools
+%description -n monitoring-tools
 This package provides the programs convertcfg, mini_epn and new_mini_epn
 for Icinga and Nagios.
 
@@ -423,6 +423,7 @@
 install -m644 %{SOURCE13} "%{buildroot}%{_mandir}/man8/"
 install -m644 %{SOURCE14} "%{buildroot}%{_mandir}/man8/"
 install -m644 %{SOURCE15} "%{buildroot}%{_mandir}/man8/"
+install -m644 %{SOURCE16} "%{buildroot}%{_mandir}/man8/"
 
 %pre
 # add icinga user and groups
@@ -553,7 +554,7 @@
 %dir %{icinga_spooldir}/checkresults
 %ghost %{icinga_cmd_filedir}
 
-%files monitoring-tools
+%files -n monitoring-tools
 %defattr(-,root,root)
 %{_sbindir}/convertcfg
 %{_sbindir}/mini_epn
@@ -604,6 +605,7 @@
 %defattr(-,root,root)
 %doc module/idoutils/db/queries UPGRADING module/idoutils/db/README 
module/idoutils/config README.SUSE.idoutils
 %{_mandir}/man8/ido2db.8*
+%{_mandir}/man8/log2ido.8*
 %{_initrddir}/ido2db
 %config(noreplace) %{icinga_sysconfdir}/ido2db.cfg
 %config(noreplace) %{icinga_sysconfdir}/idomod.cfg

++ log2ido.8 ++
'\" t
.\" Title: log2ido
.\"Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 
.\"  Date: 09/11/2013
.\"Manual: log2ido
.\"Source: Icinga
.\"  Language: English
.\"
.TH LOG2IDO 8 "September 11, 2013" "Icinga" "log2ido"
.\" -
.\" * set default formatting
.\" -
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.ad l
.\" -
.\" * MAIN CONTENT STARTS HERE *
.\" -
.SH NAME
log2ido \- sends the contents of an archived Icinga log file to ido2db daemon
.SH SYNOPSIS
.B \fBlog2ido\fR
\-s  \-d  \-i  [\-t ] [\-p ]
.SH DESCRIPTION
.sp
Sends the contents of an archived Icinga log file to STDOUT, a TCP socket, or a 
Unix domain socket in a format that is understood by the \fBIDO2DB\fR daemon.
.SH OPTIONS
.TP
.B \-s 
Name of the Icinga log file to read from.
.TP
.B \-d 
If destination is a TCP socket, the address/hostname to connect to. 
If destination is a Unix domain socket, the path to the socket.
If destination is STDOUT (for redirection, etc), a single dash (-).
.TP
.B \-i 
This option identifies the "name" associated with this particular
instance of Icinga and is used to seperate data coming from multiple
instances. Defaults to 'default' (without quotes).
.TP
.B \-t 
Specifies the type of destination socket.  Valid values include:
  tcp
  unix (default)
.TP
.B \-p 
Port number to connect to if destination is TCP socket.
.SH AUTHOR
.sp
This manpage was written

commit icinga for openSUSE:Factory

2013-09-07 Thread h_root
Hello community,

here is the log from the commit of package icinga for openSUSE:Factory checked 
in at 2013-09-07 12:32:11

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.changes2013-09-03 
22:07:48.0 +0200
+++ /work/SRC/openSUSE:Factory/.icinga.new/icinga.changes   2013-09-07 
12:32:11.0 +0200
@@ -1,0 +2,7 @@
+Thu Sep  5 17:32:58 CEST 2013 - m...@suse.de
+
+- add libperl_requires, as we link against libperl and thus
+  need a specific version of perl
+- conflict icinga-monitoring-tools with nagios
+
+---



Other differences:
--
++ icinga.spec ++
--- /var/tmp/diff_new_pack.SzM06U/_old  2013-09-07 12:32:13.0 +0200
+++ /var/tmp/diff_new_pack.SzM06U/_new  2013-09-07 12:32:13.0 +0200
@@ -78,6 +78,7 @@
 %else
 %{perl_requires}
 %endif
+%{?libperl_requires}
 Requires:   mailx
 Recommends: %{name}-monitoring-tools
 Recommends: %{name}-plugins-eventhandlers
@@ -155,6 +156,7 @@
 %else
 %{perl_requires}
 %endif
+Conflicts:  nagios
 
 %description monitoring-tools
 This package provides the programs convertcfg, mini_epn and new_mini_epn

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



commit icinga for openSUSE:Factory

2013-09-03 Thread h_root
Hello community,

here is the log from the commit of package icinga for openSUSE:Factory checked 
in at 2013-09-03 22:07:45

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.changes2013-03-18 
07:05:56.0 +0100
+++ /work/SRC/openSUSE:Factory/.icinga.new/icinga.changes   2013-09-03 
22:07:48.0 +0200
@@ -1,0 +2,74 @@
+Tue Aug 27 14:42:37 UTC 2013 - thard...@suse.com
+
+- updated fix for bnc#834828 to use the default password if none provided
+
+---
+Tue Aug 27 12:23:50 UTC 2013 - thard...@suse.com
+
+- fixed bnc#834828 by asking for the password and changing the log permissions 
+
+---
+Mon Jul  8 13:31:53 UTC 2013 - thard...@suse.com
+
+- imported upstream version 1.9.3
+  * core: fix init script status exit codes on not running daemon and present 
pid file #4243 - MF
+  * idoutils: fix workaround on libdbi fetch_next_row() bug applied for 
postgresql too, causing faulty queries #4367 - MF
+
+---
+Fri Jul  5 10:04:57 UTC 2013 - thard...@suse.com
+
+- moved convertcfg, mini_epn and new_mini_epn to the sub package
+  icinga-monitoring-tools so that it could be also used by Nagios
+
+---
+Sun Jun 30 20:02:58 UTC 2013 - l...@linux-schulserver.de
+
+- update to 1.9.2:
+  * core: fix bug with non-ASCII (> 127) illegal macro output 
+characters on char-to-int cast (Jason Young) #4211 - MF
+  * core: bail early if main config file cannot be read - MF
+  * classic ui: fixed searching hostgroup results in wrong 'all' 
+view filter urls #4206 - RB
+  * classic ui: fix URL construction issue in icinga_reload_scroll_position() 
+javascript (Karsten Sühring) #4233 - MF
+  * idoutils: fix mysql: output/perfdata limits cut escaped string 
+leaving '\' at the end (Yannik Charton) #4196 - MF
+  * idoutils: bugfixes for socket queue, transactions and libdbi 
+handling #4049 - GB
+  * idoutils: fix ido2db gradually consumes more and more CPU time 
+with time #4210 - CF
+  * idoutils: fix wrong clob freeing in eventhandlers #4357 - TD
+
+---
+Wed May 22 09:07:13 UTC 2013 - thard...@suse.com
+
+- imported upstream version 1.9.1
+  * core: fix objects.cache does not get updated on (re)start, but config 
verify (Christian Ruppert) #4155 - MF
+  * classic ui: fixed UNICODE characters in JSON output from getting discarded 
#4193 - RB
+  * idoutils: fix segfaults on reload with multiple neb modules of the same 
binary #4033 - MF 
+
+---
+Tue May  7 15:30:46 UTC 2013 - thard...@suse.com
+
+- imported upstream version 1.9.0 (check the official changelog for further 
details)
+  * idoutils uses a socket queue and transactions for large object dumps! 
#3527 #3533
+  * ido2db.cfg enable_sla is now deprecated! #3450
+  * icinga.cfg event_profiling_enabled is now deprecated! #4054
+  * core: increase performance with hash comparing hosts/services on config 
read #3722 - GB
+  * core: introduce warning level -vv on config verification #3510 - MF
+  * core: refuse to start if neb modules fail to load (Andreas Ericsson, op5 
Team) #3812 - MF
+  * core: keep logfile open, reducing open/close performance decreases 
(Andreas Ericsson, op5 Team) #3390 - MF
+  * core: enhance illegal macro character processing performance (Andreas 
Ericsson, op5 Team) #3389 - MF
+  * core: add the notification type by string to debug logs; set CUSTOM=8, 
STALKING=9 (Andreas Ericsson, op5 Team) #3818 - MF
+  * core: skip writing status.dat if explicitely set to /dev/null (e.g. when 
using alternate data retrieval methods like IDOUtils) (Andreas Ericsson, op5 
Team) #3819 - MF
+  * core: avoid writing objects.cache if set to /dev/null (Andreas Ericsson, 
op5 Team) #3819 - MF
+  * core: increase performance on host->service relation counter (config 
reading, flapping) #3820 - MF
+  * core: fix unable to exclude hostgroups when using nested hostgroups 
(Alexander Sulfrian) #2619 - MF
+  * classic ui: increase performance with hash comparing hosts/services to 
show/filter #3722 - GB
+  * classic ui: Add "set_expire_ack_by_default" to cgi configuration #3476 - CF
+  * classic ui: Add "send_ack_notifications" to cgi configuration (TheCry) 
#3467 - CF
+  * classic ui: Changed field size for hours to 4 when setting flexible 
downtime #3484 - RB
+  * ...
+ 
+
+---

Old:

  icinga-1.8.4.tar.gz

New:

 

commit icinga for openSUSE:Factory

2013-03-17 Thread h_root
Hello community,

here is the log from the commit of package icinga for openSUSE:Factory checked 
in at 2013-03-18 07:05:54

Comparing /work/SRC/openSUSE:Factory/icinga (Old)
 and  /work/SRC/openSUSE:Factory/.icinga.new (New)


Package is "icinga", Maintainer is ""

Changes:

--- /work/SRC/openSUSE:Factory/icinga/icinga.changes2013-02-14 
20:39:32.0 +0100
+++ /work/SRC/openSUSE:Factory/.icinga.new/icinga.changes   2013-03-18 
07:05:56.0 +0100
@@ -1,0 +2,8 @@
+Sun Mar 10 21:26:00 UTC 2013 - l...@linux-schulserver.de
+
+- move temp_file and temp_dir below /var/run/icinga as this location
+  is tmpfs on newer systems which speeds up tempfile creation and 
+  "handles" the removal during shutdown automatically
+- use daemonchk.cgi for "rcicinga status", if possible
+
+---



Other differences:
--
++ icinga.spec ++
--- /var/tmp/diff_new_pack.IwbZ9i/_old  2013-03-18 07:05:58.0 +0100
+++ /var/tmp/diff_new_pack.IwbZ9i/_new  2013-03-18 07:05:58.0 +0100
@@ -278,7 +278,9 @@
--with-ido2db-lockfile="%{icinga_ido2db_lockfile}" \
--with-ido-sockfile="%{icinga_ido2db_socketfile}" \
--with-idomod-tmpfile="%{icinga_idomod_tmpfile}" \
-   --with-state-dir="%{icinga_spooldir}"
+   --with-state-dir="%{icinga_spooldir}" \
+   --with-temp-file="%{icinga_tempfile}" \
+   --with-temp-dir="%{icinga_tempdir}"
 
 make %{?_smp_mflags} all
 

++ rcicinga ++
--- /var/tmp/diff_new_pack.IwbZ9i/_old  2013-03-18 07:05:58.0 +0100
+++ /var/tmp/diff_new_pack.IwbZ9i/_new  2013-03-18 07:05:58.0 +0100
@@ -31,10 +31,11 @@
 
 . /etc/rc.status
 
-ICINGA_BIN="/usr/sbin/icinga"
-ICINGA_CFG="/etc/icinga/icinga.cfg"
-ICINGA_SYSCONFIG="/etc/sysconfig/icinga"
-ICINGA_CFG_ERR_LOG="/var/log/icinga/config.err"
+ICINGA_BIN='/usr/sbin/icinga'
+ICINGA_CFG='/etc/icinga/icinga.cfg'
+ICINGA_SYSCONFIG='/etc/sysconfig/icinga'
+ICINGA_CFG_ERR_LOG='/var/log/icinga/config.err'
+ICINGA_DAEMONCHK='/usr/lib/icinga/cgi/daemonchk.cgi'
 
 # Read config and log errors in logfile
 function config_check () {
@@ -135,6 +136,7 @@
 status_file="$(get_var status_file)"
 log_file="$(get_var log_file)"
 temp_file="$(get_var temp_file)"
+temp_path="$(get_var temp_path)"
 state_retention_file="$(get_var state_retention_file)"
 command_file="$(get_var command_file)"
 resource_file="$(get_var resource_file)"
@@ -154,10 +156,11 @@
 : ${state_retention_file:=/var/spool/icinga/retention.dat}
 : ${status_file:=/var/spool/icinga/status.dat}
 : ${check_external_commands:=0}
+: ${temp_path:=/var/run/icinga/tmp}
+: ${temp_file:=/var/run/icinga/icinga.tmp}
 # files to remove
 : ${command_file:=/var/run/icinga/icinga.cmd}
 : ${lock_file:=/var/run/icinga/icinga.pid}
-: ${temp_file:=/tmp/icinga.tmp}
 
 # Reset status of this service
 rc_reset
@@ -165,14 +168,23 @@
 case "$1" in
 start)
 echo -n "Starting Icinga "
-
 # create checkresult dir if missing
 if [ ! -d "$check_result_path" ]; then
 mkdir -p "$check_result_path"
 chown $icinga_user:$icinga_group "$check_result_path"
 chmod 775 "$check_result_path"
 fi
-
+   if [ ! -d "$temp_path" ]; then
+   case "$temp_path" in
+   /var/run/icinga/tmp)
+   install -d -m775 -o$icinga_user 
-g$icinga_group "$temp_path"
+   ;;
+   *)
+   /bin/logger -t rcicinga "$temp_path 
does not exist - creating now"
+   install -d -m775 -o$icinga_user 
-g$icinga_group "$temp_path"
+   ;;
+   esac
+   fi
 config_check
 if [ $? -eq 0 ]; then
 # check if icinga is already running
@@ -181,7 +193,6 @@
 check_files
 check_lock_file
 fi
-
 startproc $NICELEVEL -p "$lock_file" "$ICINGA_BIN" -d "$ICINGA_CFG"
 if [ "$check_external_commands" != 0 ]; then
 while [ ! -e "$command_file" ] && [ $ICINGA_TIMEOUT -gt 0 ]; do
@@ -203,7 +214,6 @@
 # happen, and then the exiting icinga will remove the
 # new Lockfile, allowing multiple icinga daemons
 # to (sooner or later) run - John Sellens
-
 if checkproc "$ICINGA_BIN" ; then
 killproc -p "$lock_file" -TERM "$ICINGA_BIN"
 sleep 1
@@ -259,7 +269,15 @@
 ;;
 status)
 echo -n "Checking for Icinga "
-checkproc -p "$lock_file" "$ICINGA_BIN"
+if [ -x "$ICINGA_DAEMONCHK" ]; then
+

commit icinga for openSUSE:Factory

2013-02-14 Thread h_root
Hello community,

here is the log from the commit of package icinga for openSUSE:Factory checked 
in at 2013-02-14 20:39:31

Comparing /work/SRC/openSUSE:Factory/icinga (Old)
 and  /work/SRC/openSUSE:Factory/.icinga.new (New)


Package is "icinga", Maintainer is ""

Changes:

--- /work/SRC/openSUSE:Factory/icinga/icinga.changes2013-01-21 
17:37:33.0 +0100
+++ /work/SRC/openSUSE:Factory/.icinga.new/icinga.changes   2013-02-14 
20:39:32.0 +0100
@@ -1,0 +2,6 @@
+Thu Feb 14 09:49:27 UTC 2013 - l...@linux-schulserver.de
+
+- provide 'monitoring_daemon' in the init script to allow other 
+  init scripts to depend on it
+
+---



Other differences:
--
++ rcicinga ++
--- /var/tmp/diff_new_pack.b3wozq/_old  2013-02-14 20:39:33.0 +0100
+++ /var/tmp/diff_new_pack.b3wozq/_new  2013-02-14 20:39:33.0 +0100
@@ -16,7 +16,7 @@
 # System startup script for icinga
 #
 ### BEGIN INIT INFO
-# Provides:   icinga
+# Provides:   icinga monitoring_daemon
 # Required-Start: $local_fs $remote_fs $syslog $network
 # Required-Stop:  $local_fs $remote_fs $syslog $network
 # Should-Start:   $time sendmail httpd2 $named cron ido2db

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



commit icinga for openSUSE:Factory

2013-01-21 Thread h_root
Hello community,

here is the log from the commit of package icinga for openSUSE:Factory checked 
in at 2013-01-21 17:37:31

Comparing /work/SRC/openSUSE:Factory/icinga (Old)
 and  /work/SRC/openSUSE:Factory/.icinga.new (New)


Package is "icinga", Maintainer is ""

Changes:

--- /work/SRC/openSUSE:Factory/icinga/icinga.changes2012-12-19 
10:58:57.0 +0100
+++ /work/SRC/openSUSE:Factory/.icinga.new/icinga.changes   2013-01-21 
17:37:33.0 +0100
@@ -1,0 +2,11 @@
+Mon Jan 14 10:30:39 UTC 2013 - thard...@suse.com
+
+- imported upstream version 1.8.4
+  * core: add fix for CVE-2012-6096 - history.cgi remote command execution 
(Eric Stanley, Markus Frosch) #3532 - MF
+  * classic ui: Changed field size for hours to 4 when setting flexible 
downtime #3484 - RB
+  * classic ui: fixed Warning and Unknown States are mixed up in Alert Summary 
Report #3488 - RB
+  * idoutils: fix empty output/perfdata segfaults for mysql string truncate 
#3516 - MF
+  * idoutils: unlink leftover socket on startup, if using unix sockets - MF
+  * idoutils: fix long output data causes wrong data in database #2342 - MF
+
+---

Old:

  icinga-1.8.3.tar.gz

New:

  icinga-1.8.4.tar.gz



Other differences:
--
++ icinga.spec ++
--- /var/tmp/diff_new_pack.Of7uKM/_old  2013-01-21 17:37:36.0 +0100
+++ /var/tmp/diff_new_pack.Of7uKM/_new  2013-01-21 17:37:36.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package icinga
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
 
 
 Name:   icinga
-Version:1.8.3
+Version:1.8.4
 Release:0
 
 Summary:Host/service/network monitoring program

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

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



commit icinga for openSUSE:Factory

2012-12-19 Thread h_root
Hello community,

here is the log from the commit of package icinga for openSUSE:Factory checked 
in at 2012-12-19 10:58:54

Comparing /work/SRC/openSUSE:Factory/icinga (Old)
 and  /work/SRC/openSUSE:Factory/.icinga.new (New)


Package is "icinga", Maintainer is ""

Changes:

--- /work/SRC/openSUSE:Factory/icinga/icinga.changes2012-11-13 
17:03:36.0 +0100
+++ /work/SRC/openSUSE:Factory/.icinga.new/icinga.changes   2012-12-19 
10:58:57.0 +0100
@@ -1,0 +2,48 @@
+Tue Dec 18 00:13:02 UTC 2012 - crrodrig...@opensuse.org
+
+- Package links to libperl.so so it must use exact perl 
+  version as requires.
+
+---
+Mon Dec 17 15:46:24 UTC 2012 - l...@linux-schulserver.de
+
+- Use usermod instead of groupmod when suse_version > 1220 due to
+  pwdutils/shadow switch.
+- move macro definition to a place where the macro %%name is defined
+- added man pages for new_mini_epn, convertcfg and mini_epn
+  => conflicts with nagios manpages
+
+---
+Wed Dec 12 09:35:17 UTC 2012 - thard...@suse.com
+
+- imported upstream version 1.8.3
+  * idoutils: fix unknown column contactaddress_id (thx fmbiete) #3483 - MF 
+
+---
+Wed Nov 28 17:42:25 UTC 2012 - thard...@suse.com
+
+- imported upstream version 1.8.2
+  FIXES
+  * core: fix macro escaping logs incorrect warning for $$escapes #3404 - MF
+  * core: fix wrong escalation notification due to state based escalation 
range behaviour changes #3441 - MF
+  * idoutils: fix many memory leaks in ido2db on dbi_result_free and others 
(thx Klaus Wagner) #3406 - MF
+  * idoutils: fix ido2db crashes when Oracle queries fail #3324 - GB
+  * idoutils: fix ORA-1461 writing data to varchar2 exceeding field size limit 
output, command_arg and commandline data written to Oracle #3324 #3325 - TD
+  * idoutils: fix unsafe handling of dbi_conn_sequence_last, rewrite 
last_insert_id/sequence fetching #3408 - MF
+  * idoutils: fix ido2db does not cleanly exit the client on wrong schema 
version check in db_hello #3419 - MF
+  * idoutils: fix FROM_UNIXTIME(NULL) does not work with MySQL 5.0.x #3399 
#3466 - CF
+  * install: drop unused daemon-init-readhat script (spec uses daemon-init) 
#3402 - MF
+  * install: fix broken configure ssl detection for idoutils on ubuntu/debian 
(Oliver Skibbe) #3413 - MF
+  * classic ui: fix cmd.cgi does not honor commandpipe location; overwrites 
from empty environment variable #3418 - MF
+  * classic ui: fixed double-listed host dependencies in host extinfo.cgi 
#3295 - RB
+  * classic ui: fixed sort_icinga_logfiles_by_name() in readlogs.c fails to 
take NULL pointers into consideration #3398 - CF
+  * classic ui: fixed committing acknowledgement cmd negates flags for 
send_notification and sticky_ack #3329 - RB
+  * classic ui: fixed backtrack_archives only getting calculated on a daily 
log rotation basis #3416 - RB
+  * classic ui: fixed invalid freeing of last_check in 'scheduling queue' for 
first time checks #3444 - RB
+  * docs: add missing cmd_mod description in cgi params #3438 - MF
+  * docs: search_string as cgi GET param works also for status.cgi #3451 - MF
+  * docs: fix typo pqsql -> pgsql #3461 - WN
+  CHANGES
+  * icinga.cfg - enable_state_based_escalation_ranges=0 (disabled if not set) 
fix for #3441
+
+---

Old:

  icinga-1.8.1.tar.gz

New:

  convertcfg.8
  icinga-1.8.3.tar.gz
  mini_epn.8
  new_mini_epn.8



Other differences:
--
++ icinga.spec ++
--- /var/tmp/diff_new_pack.5bsbPw/_old  2012-12-19 10:59:02.0 +0100
+++ /var/tmp/diff_new_pack.5bsbPw/_new  2012-12-19 10:59:02.0 +0100
@@ -16,13 +16,8 @@
 #
 
 
-%define apacheconfdir  %{_sysconfdir}/apache2/conf.d
-%define apachegroupwww
-# Macro that print mesages to syslog at package (un)install time
-%define logmsg logger -t %{name}/rpm
-
 Name:   icinga
-Version:1.8.1
+Version:1.8.3
 Release:0
 
 Summary:Host/service/network monitoring program
@@ -42,6 +37,9 @@
 Source10:   README.SUSE
 Source11:   README.SUSE.idoutils
 Source12:   update_icinga_paths.sh
+Source13:   convertcfg.8
+Source14:   new_mini_epn.8
+Source15:   mini_epn.8
 # PATCH-FIX-OPENSUSE icinga-add-ifdefine-to-apache.patch
 Patch0: icinga-add-ifdefine-to-apache.patch
 Provides:   monitoring_daemon
@@ -73,10 +71,10 @@
 Requires(pre):  grep
 Requires(pre):  pwdutils
 Requires(pre):  sed
-%if 0%{?suse_version} >= 1110
-Requires:   perl >= 5.10.0
+%if 0%{?suse_version} < 1140
+Requires:   perl = %{perl_versio

commit icinga for openSUSE:Factory

2012-11-13 Thread h_root
Hello community,

here is the log from the commit of package icinga for openSUSE:Factory checked 
in at 2012-11-13 17:03:35

Comparing /work/SRC/openSUSE:Factory/icinga (Old)
 and  /work/SRC/openSUSE:Factory/.icinga.new (New)


Package is "icinga", Maintainer is ""

Changes:

--- /work/SRC/openSUSE:Factory/icinga/icinga.changes2012-10-31 
06:59:07.0 +0100
+++ /work/SRC/openSUSE:Factory/.icinga.new/icinga.changes   2012-11-13 
17:03:36.0 +0100
@@ -1,0 +2,6 @@
+Tue Nov  6 08:44:15 UTC 2012 - thard...@suse.com
+
+- imported upstream version 1.8.1
+  * core: fix faulty macro cleaning, replacing spaces with pluses where they 
shouldn't be cleaned #3397 - MF
+
+---

Old:

  icinga-1.8.0.tar.gz

New:

  icinga-1.8.1.tar.gz



Other differences:
--
++ icinga.spec ++
--- /var/tmp/diff_new_pack.mQayrp/_old  2012-11-13 17:03:37.0 +0100
+++ /var/tmp/diff_new_pack.mQayrp/_new  2012-11-13 17:03:38.0 +0100
@@ -22,7 +22,7 @@
 %define logmsg logger -t %{name}/rpm
 
 Name:   icinga
-Version:1.8.0
+Version:1.8.1
 Release:0
 
 Summary:Host/service/network monitoring program

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

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



commit icinga for openSUSE:Factory

2012-10-30 Thread h_root
Hello community,

here is the log from the commit of package icinga for openSUSE:Factory checked 
in at 2012-10-31 06:59:05

Comparing /work/SRC/openSUSE:Factory/icinga (Old)
 and  /work/SRC/openSUSE:Factory/.icinga.new (New)


Package is "icinga", Maintainer is ""

Changes:

--- /work/SRC/openSUSE:Factory/icinga/icinga.changes2012-10-19 
08:46:43.0 +0200
+++ /work/SRC/openSUSE:Factory/.icinga.new/icinga.changes   2012-10-31 
06:59:07.0 +0100
@@ -1,0 +2,31 @@
+Fri Oct 26 09:12:53 UTC 2012 - lijewski.ste...@gmail.com
+
+- icingastats is created with 754 (root,icinga) privilegs, cause
+ it's mostly running under icinga group
+
+---
+Thu Oct 18 15:25:15 UTC 2012 - thard...@suse.com
+
+- imported upstream version 1.8.0
+  * core: pass long_output to neb api for statechange data #2650 - MF
+  * core/classic ui: make hashfunc more efficient by using sdbm #2761 - MF/GB
+  * core: try the most common macros ($ARGn$, $USERn$) first (Andreas 
Ericsson) #2674 - MF
+  * core: use binary search when looking up macro names, instead of insane 
strcmp() loops (Andreas Ericsson) #2675 - MF
+  * core: add useful message to p1.pl when epn plugin does not call exit() 
(Sven Nierlein) #2431 -MF
+  * core: re-enable state based escalation ranges, using cast tricks #2878 - MF
+*  * livestatus and other neb modules not using the icinga headers won't 
see those
+  * core: add a command to disable notifications program-wide with expire time 
as scheduled event #905 - MF
+*  * DISABLE_NOTIFICATIONS_EXPIRE_TIME, works for global notifications
+  * core: add hint on icinga.cfg package location, and tip to read Changelog 
CHANGES on upgrades #2879 - MF
+  * core: add new callback NEBTYPE_CONTACTNOTIFICATIONMETHOD_EXECUTE to allow 
override of sending notifications #2041 - MF
+  * core: only reap results when checkresult_list is not overloaded 
(max_check_result_list_items) (thx Thomas Gelf) #3099 - MF
+  * core: log a message when reaper max time is reached #3159 - MF
+
+  * classic ui: Dropped statuswml.cgi #2654 - RB
+  * classic ui: Dropped statuswrl.cgi #2359 - RB
+  * classic ui: Added action_url/notes_url to status.cgi for csvoutput and 
jsonoutput #2553 - RB
+  * classic ui: Added pagination to various cgi's (thx to ideas and partly 
source from Nagios, Thruk, Icinga Web) #2725 - RB
+  * classic ui: Changed search in config.cgi to regex #2884 - RB
+  * classic ui: Added config option to let read-only users see comments and 
downtimes #2699 - RB 
+
+---

Old:

  fix_epn_segfault.patch
  icinga-1.7.2.tar.gz
  icinga-fix-fsf-address.patch

New:

  icinga-1.8.0.tar.gz



Other differences:
--
++ icinga.spec ++
--- /var/tmp/diff_new_pack.S4NLiD/_old  2012-10-31 06:59:09.0 +0100
+++ /var/tmp/diff_new_pack.S4NLiD/_new  2012-10-31 06:59:09.0 +0100
@@ -22,7 +22,7 @@
 %define logmsg logger -t %{name}/rpm
 
 Name:   icinga
-Version:1.7.2
+Version:1.8.0
 Release:0
 
 Summary:Host/service/network monitoring program
@@ -44,10 +44,6 @@
 Source12:   update_icinga_paths.sh
 # PATCH-FIX-OPENSUSE icinga-add-ifdefine-to-apache.patch
 Patch0: icinga-add-ifdefine-to-apache.patch
-# PATCH-FIX
-Patch2: icinga-fix-fsf-address.patch
-# PATCH-FIX-UPSTREAM fix_epn_segfault.patch [bnc#780107]
-Patch3: fix_epn_segfault.patch
 Provides:   monitoring_daemon
 BuildRequires:  apache2-devel
 BuildRequires:  nagios-rpm-macros >= 0.05
@@ -233,8 +229,6 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch2 -p1
-%patch3 -p1
 
 # remove GPLv3+ source files which are not needed for this package
 rm "t-tap/"*.c
@@ -252,12 +246,13 @@
--libdir="%{icinga_libdir}" \
--sbindir="%{icinga_cgidir}" \
--sysconfdir="%{icinga_sysconfdir}" \
-   --with-cgiurl="/%{name}/cgi-bin" \
--with-command-user="%{icinga_command_user}" \
--with-command-group="%{icinga_command_group}" \
--with-gd-lib="%{_libdir}" \
--with-gd-inc="%{_includedir}" \
--with-htmurl="/%{name}" \
+   --with-cgiurl="/%{name}/cgi-bin" \
+   
--with-mainurl="/%{name}/cgi-bin/status.cgi?host=all&type=detail&servicestatustypes=29"
 \
--with-init-dir="%{_initrddir}" \
--with-lockfile="%{icinga_lockfile}" \
--with-icinga-user="%{icinga_user}" \
@@ -498,7 +493,7 @@
 %{_mandir}/man8/mini_epn_icinga.8*
 %{_initrddir}/%{name}
 %{_sbindir}/%{name}
-%{_sbindir}/icingastats
+%attr(0754,root,%{icinga_group}) %{_sbindir}/icingastats
 %{_sbindir}/mini_epn
 %{_sbindir}/new_mini_epn
 %{_sbindir}/rc%{name}
@@ -549,15 +544,12 @@
 %{icinga_cgidir}/showlo

commit icinga for openSUSE:Factory

2012-10-18 Thread h_root
Hello community,

here is the log from the commit of package icinga for openSUSE:Factory checked 
in at 2012-10-19 08:46:41

Comparing /work/SRC/openSUSE:Factory/icinga (Old)
 and  /work/SRC/openSUSE:Factory/.icinga.new (New)


Package is "icinga", Maintainer is ""

Changes:

--- /work/SRC/openSUSE:Factory/icinga/icinga.changes2012-10-08 
07:12:59.0 +0200
+++ /work/SRC/openSUSE:Factory/.icinga.new/icinga.changes   2012-10-19 
08:46:43.0 +0200
@@ -1,0 +2,7 @@
+Thu Oct 11 12:26:18 UTC 2012 - l...@linux-schulserver.de
+
+- add virtual provides 'monitoring_daemon' and 
+  'monitoring_webfrontend' to allow 3rd party packages to run also 
+  with nagios compatible solutions like icinga  
+
+---



Other differences:
--
++ icinga.spec ++
--- /var/tmp/diff_new_pack.ajphc4/_old  2012-10-19 08:46:44.0 +0200
+++ /var/tmp/diff_new_pack.ajphc4/_new  2012-10-19 08:46:44.0 +0200
@@ -48,6 +48,7 @@
 Patch2: icinga-fix-fsf-address.patch
 # PATCH-FIX-UPSTREAM fix_epn_segfault.patch [bnc#780107]
 Patch3: fix_epn_segfault.patch
+Provides:   monitoring_daemon
 BuildRequires:  apache2-devel
 BuildRequires:  nagios-rpm-macros >= 0.05
 %if 0%{?suse_version} >= 1110
@@ -109,6 +110,7 @@
 %package www
 Summary:Provides the HTML and CGI files for the Icinga web interface
 Group:  System/Monitoring
+Provides:   monitoring_webfrontend
 Requires:   %{name} = %{version}
 Recommends: %{name}-doc = %{version}
 Requires(pre):  apache2

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



commit icinga for openSUSE:Factory

2012-10-07 Thread h_root
Hello community,

here is the log from the commit of package icinga for openSUSE:Factory checked 
in at 2012-10-08 07:12:57

Comparing /work/SRC/openSUSE:Factory/icinga (Old)
 and  /work/SRC/openSUSE:Factory/.icinga.new (New)


Package is "icinga", Maintainer is ""

Changes:

--- /work/SRC/openSUSE:Factory/icinga/icinga.changes2012-09-17 
16:57:51.0 +0200
+++ /work/SRC/openSUSE:Factory/.icinga.new/icinga.changes   2012-10-08 
07:12:59.0 +0200
@@ -1,0 +2,5 @@
+Wed Sep 26 16:26:34 UTC 2012 - thard...@suse.com
+
+- added upstream patch to fix the segfault caused by the epn rewrite in #2197 
(bnc#780107)
+
+---

New:

  fix_epn_segfault.patch



Other differences:
--
++ icinga.spec ++
--- /var/tmp/diff_new_pack.Irw0UX/_old  2012-10-08 07:13:03.0 +0200
+++ /var/tmp/diff_new_pack.Irw0UX/_new  2012-10-08 07:13:03.0 +0200
@@ -46,6 +46,8 @@
 Patch0: icinga-add-ifdefine-to-apache.patch
 # PATCH-FIX
 Patch2: icinga-fix-fsf-address.patch
+# PATCH-FIX-UPSTREAM fix_epn_segfault.patch [bnc#780107]
+Patch3: fix_epn_segfault.patch
 BuildRequires:  apache2-devel
 BuildRequires:  nagios-rpm-macros >= 0.05
 %if 0%{?suse_version} >= 1110
@@ -230,6 +232,7 @@
 %setup -q
 %patch0 -p1
 %patch2 -p1
+%patch3 -p1
 
 # remove GPLv3+ source files which are not needed for this package
 rm "t-tap/"*.c

++ fix_epn_segfault.patch ++
commit cedcb4a3f9fd34e2a72988e560a884fb0d8891af
Author: Michael Friedrich 
Date:   Tue Aug 28 10:27:33 2012 +0200

core: fix epn rewrite in #2197 causes segfault

thanks dennis lichtenthaeler for the fix.

fixes #3027

diff --git a/base/utils.c b/base/utils.c
index b1891b9..c174a8a 100644
--- a/base/utils.c
+++ b/base/utils.c
@@ -3601,6 +3601,7 @@ int file_uses_embedded_perl(char *fname) {
/* grab the first line - we should see Perl. go home if not */
if (fgets(buf, 80, fp) == NULL || strstr(buf, "/bin/perl") == NULL) {
fclose(fp);
+   return FALSE;
}
 
/* epn directives must be found in first ten lines of plugin */
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit icinga for openSUSE:Factory

2012-09-17 Thread h_root
Hello community,

here is the log from the commit of package icinga for openSUSE:Factory checked 
in at 2012-09-17 16:57:49

Comparing /work/SRC/openSUSE:Factory/icinga (Old)
 and  /work/SRC/openSUSE:Factory/.icinga.new (New)


Package is "icinga", Maintainer is ""

Changes:

--- /work/SRC/openSUSE:Factory/icinga/icinga.changes2012-07-23 
10:15:48.0 +0200
+++ /work/SRC/openSUSE:Factory/.icinga.new/icinga.changes   2012-09-17 
16:57:51.0 +0200
@@ -1,0 +2,49 @@
+Mon Aug 27 15:20:48 UTC 2012 - thard...@suse.com
+
+- imported upstream version 1.7.2
+  * core: fix duplicated events on check scheduling logic for new events 
(Andreas Ericsson) #2676 #2993 - MF
+  * core: avoid duplicate events when scheduling forced host|service check 
(Imri Zvik) #2993 - MF
+  * core: get rid of the instame macro usage while logging alerts and states 
(Andreas Ericsson) #2665 - MF
+  * core: revamp the detection of embedded perl usage directive "# icinga: 
+epn" (Andreas Ericsson) #2197 - MF
+  * core: fix whitespaces are not stripped using multiple templates ("use abc, 
def, ghi") #2701 - MF
+  * core: add hint on icinga.cfg package location, and tip to read Changelog 
CHANGES on upgrades #2879 - MF
+  * core: bail out early with config error if resource.cfg macros contain NULL 
values #2879 - MF
+  * core: fix logical bug on icinga.cfg detection on config read #2879 - MF
+  * core: fsync() files before fclose() (Andreas Ericsson) #2948 - MF
+  * core: remove weird switch() statement when scanning checkresult queue 
(Andreas Ericsson) #2950 - MF
+  * core: fix deleting too old check result files (Andreas Ericsson) #2951 - MF
+
+  * idoutils: fix icinga mysql db creation script grants access to all dbs 
#2917 - MF
+  * idoutils: fix ignoring mysql password in create_mysqldb.sh #2994 - MF
+
+  * icinga.spec: forced update on icinga.cfg change package locations #2923 -MF
+  * icinga.spec: fix permissions on ido2db.cfg potentially world readable 
(Aaron Russo) #2897 - MF
+- removed obsolete create_mysqldb script paches
+
+---
+Mon Aug 20 07:54:40 UTC 2012 - thard...@suse.com
+
+- fixed create_mysqldb script - provided mysql password wasn't passed on
+
+---
+Thu Aug 16 13:36:20 UTC 2012 - thard...@suse.com
+
+- cleaned up init files
+
+---
+Mon Aug  6 10:37:24 UTC 2012 - thard...@suse.com
+
+- reverted icinga home directory change 
+
+---
+Sat Aug  4 12:59:42 UTC 2012 - thard...@suse.com
+
+- added missing dependency to the new recurring downtimes plugin 
+
+---
+Fri Aug  3 14:49:23 UTC 2012 - thard...@suse.com
+
+- added a new package which provides the recurring downtimes scripts from 
contrib http://docs.icinga.org/latest/en/recurring_downtimes.html
+- updated the icinga user home directory - /var/lib/icinga is not needed 
anymore
+
+---

Old:

  icinga-1.7.1.tar.gz
  icinga-fix-create_mysqldb.patch

New:

  icinga-1.7.2.tar.gz



Other differences:
--
++ icinga.spec ++
--- /var/tmp/diff_new_pack.Jgf0w8/_old  2012-09-17 16:57:53.0 +0200
+++ /var/tmp/diff_new_pack.Jgf0w8/_new  2012-09-17 16:57:53.0 +0200
@@ -22,7 +22,7 @@
 %define logmsg logger -t %{name}/rpm
 
 Name:   icinga
-Version:1.7.1
+Version:1.7.2
 Release:0
 
 Summary:Host/service/network monitoring program
@@ -45,8 +45,6 @@
 # PATCH-FIX-OPENSUSE icinga-add-ifdefine-to-apache.patch
 Patch0: icinga-add-ifdefine-to-apache.patch
 # PATCH-FIX
-Patch1: icinga-fix-create_mysqldb.patch
-# PATCH-FIX
 Patch2: icinga-fix-fsf-address.patch
 BuildRequires:  apache2-devel
 BuildRequires:  nagios-rpm-macros >= 0.05
@@ -218,10 +216,19 @@
 monitoring, redundancy and disabling and enabling service checks and
 notifications.
 
+%package plugins-downtimes
+Summary:Recurring Downtimes Management for %{name}
+Group:  System/Monitoring
+Requires:   %{name} = %{version}
+Requires:   perl-Date-Calc
+
+%description plugins-downtimes
+Provides scripts to manage recurring downtimes for %{name}.
+http://docs.icinga.org/latest/en/recurring_downtimes.html
+
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 %patch2 -p1
 
 # remove GPLv3+ source files which are not needed for this package
@@ -271,22 +278,21 @@
--with-idomod-tmpfile="%{icinga_idomod_tmpfile}" \
--with-state-dir="%{icinga_spooldir}"
 
-#
-# make daemonchk.cgi and event 

commit icinga for openSUSE:Factory

2012-07-23 Thread h_root
Hello community,

here is the log from the commit of package icinga for openSUSE:Factory checked 
in at 2012-07-23 10:11:58

Comparing /work/SRC/openSUSE:Factory/icinga (Old)
 and  /work/SRC/openSUSE:Factory/.icinga.new (New)


Package is "icinga", Maintainer is ""

Changes:

--- /work/SRC/openSUSE:Factory/icinga/icinga.changes2012-03-12 
20:14:00.0 +0100
+++ /work/SRC/openSUSE:Factory/.icinga.new/icinga.changes   2012-07-23 
10:15:48.0 +0200
@@ -1,0 +2,93 @@
+Wed Jun 20 10:06:31 UTC 2012 - thard...@suse.com
+
+- imported upstream version 1.7.1
+  *  core: use prefix in solaris service definition #2609 - TD/CF
+  * core: fix various memory leaks in downtime eventhandling on SIGHUP (Carlos 
Velasco) #2666 - MF
+  * classic ui: Fixed status.cgi time out when displaying hostgroups in large 
environments #2617 - RB
+  * classic ui: Fixed Invalid JSON output for hostgroup overview (Torsten 
Rehn) #2680 - RB
+  * classic ui: Fixed Confusing use of display_name in JSON and CSV output 
(Torsten Rehn) #2681 - RB
+  * classic ui: Fixed wrong totals in "Service Status Summary" on Status 
Summary page (Mark Ziesemer) #2689 - RB
+  * idoutils: fix small compiler issues #2620 - TD/CF
+  * idoutils: fix upgradedb script typos & past changes #2682 - MF
+  * config: check_ido2db_procs.cfg should not depend on local-service template 
#2616 - MF
+  * install: adapt lsb headers for icinga and ido2db #2637 - MF
+  * install: fix typo in 
contrib/eventhandlers/redundancy-scenario1/handle-master-proc-event (thanks 
uosiu) #2671 - MF
+
+---
+Tue Jun 19 17:56:21 UTC 2012 - thard...@suse.com
+
+- cleaned up rcicinga and added checkresult directory creation before start
+- added patch to fix wrong fsf address in some license files
+- extracted update_path_script parts from %post to a separate file located 
under doc
+
+---
+Fri Jun 15 18:38:48 UTC 2012 - thard...@suse.com
+
+- fixed icinga-create_mysqldb.sh - it granted icinga access to all dbs - so 
please check the permissions of your mysql icinga user
+- removed all other ido2utils scripts since they are not supported by upstream
+- updated readme - better distinguishable topics
+
+---
+Fri Jun 15 12:24:01 UTC 2012 - thard...@suse.com
+
+- updated readme - mysql example command granted icinga access to all dbs
+
+---
+Wed Jun 13 12:29:29 UTC 2012 - l...@linux-schulserver.de
+
+- added 'show-errors' to icinga init script as documented in the 
+  wiki
+
+---
+Tue Jun  5 13:29:20 UTC 2012 - thard...@suse.com
+
+- changed eventhandlers directory from /usr/lib/nagios/plugins/eventhandler to 
/lib/icinga/eventhandler (unpackaged files do not get copied)
+- moved remaining files and the checkresults directory from /var/lib/icinga to 
/var/spool/icinga
+- moved /var/lib/icinga to /var/spool/icinga/
+- removed nagios directories from the packages (/var/lib/nagios/*)
+- changed /var/spool/icinga/icinga.cmd to /var/run/icinga/icinga.cmd
+- changed /var/spool/icinga/ido2db.sock to /var/run/icinga/ido2db.sock
+- added post scripts to update the existing configuration files accordingly
+- replaced the existing default http-passwd file with the one from upstream - 
user icingaadmin with password icingaadmin
+- adapted the RHEL upstream icinga and icinga-idoutils readmes for SUSE and 
packaged them
+- idoutils db schema has changed, check 
/usr/share/doc/packages/icinga-idoutils/README.SUSE.idoutils how to upgrade it
+- imported upstream version 1.7.0
+  * core: notifications: Create contact list after eventbroker callbacks 
(Andreas Ericsson) #2110 - MF
+  * core: fix event removal from queues with O(1) removal from doubly linked 
lists (Andreas Ericsson) #2183 - MF
+  * core: avoid senseless looping when free()'ing macros (Andreas Ericsson) 
#2184 - MF
+  * core: avoid insane looping through event list when rescheduling checks 
(Mathias Kettner, Andreas Ericsson) #2182 - MF
+  * core: allow empty host groups in service and host dependencies if 
allow_empty_hostgroup_assignment flag is set (Daniel Wittenberg) #2255 - MF
+  * core: fix compatibility problems on solaris 10 (affects core, cgis, ido) 
(Carl R. Friend) #2292 - MF/RB/TD
+  * core: add trigger_time to downtimes to allow calculating of flexible 
downtimes endtime #2537 - MF
+  * core: add nebmodule version/name check for idomod (this allows future 
version dependencies) #2569 - MF
+
+  * classic ui: Added option for max log entries displayed in showlog.cgi 
#2145 - RB
+  * classic ui: Added config option for status totals in status.cgi #2018 - R

commit icinga for openSUSE:Factory

2012-03-12 Thread h_root
Hello community,

here is the log from the commit of package icinga for openSUSE:Factory checked 
in at 2012-03-12 20:13:04

Comparing /work/SRC/openSUSE:Factory/icinga (Old)
 and  /work/SRC/openSUSE:Factory/.icinga.new (New)


Package is "icinga", Maintainer is ""

Changes:

--- /work/SRC/openSUSE:Factory/icinga/icinga.changes2012-03-01 
17:20:10.0 +0100
+++ /work/SRC/openSUSE:Factory/.icinga.new/icinga.changes   2012-03-12 
20:14:00.0 +0100
@@ -1,0 +2,6 @@
+Fri Mar  2 16:36:48 UTC 2012 - thard...@suse.com
+
+- Changed the spec file to use the nagios-rpm-macro variables
+- Fixed a rare bug in rcido2db when the pid directory was missing during first 
start
+
+---



Other differences:
--
++ icinga.spec ++
--- /var/tmp/diff_new_pack.UtyQ6t/_old  2012-03-12 20:14:01.0 +0100
+++ /var/tmp/diff_new_pack.UtyQ6t/_new  2012-03-12 20:14:01.0 +0100
@@ -16,23 +16,21 @@
 #
 
 
-%define logdir %{_localstatedir}/log/icinga
+%define apacheconfdir  %{_sysconfdir}/apache2/conf.d
+# overload eventhandlerdir with the original value for now to not break 
backward
+# compatibility, this will be changed with the next upstream version 
integration
+# to /usr/lib/icinga/eventhandler
+%define icinga_eventhandlerdir %{_prefix}/lib/nagios/plugins/eventhandlers/
 
 Name:   icinga
 Version:1.6.1
-Release:0
-%define nsusr icinga
-%define nsgrp icinga
-%define cmdgrp icingacmd
-%define cmdusr wwwrun
+Release:2
+License:GPL-2.0
 # Macro that print mesages to syslog at package (un)install time
 %define nnmmsg logger -t %{name}/rpm
-%define apacheuser wwwrun
-%define apachegroup www
 Summary:Host/service/network monitoring program
-License:GPL-2.0
-Group:  System/Monitoring
 Url:http://www.icinga.org/
+Group:  System/Monitoring
 Source0:%{name}-%{version}.tar.gz
 Source1:rc%{name}
 Source2:rcido2db
@@ -47,6 +45,7 @@
 # PATCH-FIX-OPENSUSE icinga-add-ifdefine-to-apache.patch
 Patch0: icinga-add-ifdefine-to-apache.patch
 BuildRequires:  apache2-devel
+BuildRequires:  nagios-rpm-macros
 %if 0%{?suse_version} >= 1110
 BuildRequires:  fdupes
 %endif
@@ -173,6 +172,7 @@
 Group:  System/Monitoring
 Requires:   %{name}-idoutils = %{version}
 Recommends: oracle-client
+Provides:   %{name}-idoutils-drivers-dbd = %{version}
 
 %description idoutils-oracle
 This package requires all needed packages for using IDOUtils with OracleDB.
@@ -212,8 +212,8 @@
 %patch0 -p1
 
 # replace default ido2db lock and socket file settings
-sed -ie 
"s|@localstatedir@/ido2db.lock|%{_localstatedir}/run/%{name}/ido2db.pid|g; \
- 
s|@localstatedir@/ido.sock|%{_localstatedir}/spool/%{name}/ido2db.sock|g;" \
+sed -ie "s|@localstatedir@/ido2db.lock|%{icinga_ido2db_lockfile}|g; \
+ s|@localstatedir@/ido.sock|%{icinga_ido2db_socketfile}|g;" \
"module/idoutils/config/ido2db.cfg-sample.in" \
"module/idoutils/config/idomod.cfg-sample.in";
 
@@ -223,29 +223,29 @@
 %build
 export PATH_TO_TRACEROUTE="%{_sbindir}/traceroute"
 %configure \
-   --exec-prefix=%{_sbindir} \
-   --bindir=%{_sbindir} \
-   --sbindir=%{_prefix}/lib/%{name}/cgi \
-   --libexecdir=%{_prefix}/lib/nagios/plugins \
-   --datarootdir=%{_datadir}/%{name} \
-   --sysconfdir=/%{_sysconfdir}/%{name} \
-   --with-p1-file-dir=/%{_datadir}/%{name} \
-   --with-init-dir=/etc/init.d \
-   --localstatedir=%{_localstatedir}/lib/%{name} \
-   --with-checkresult-dir="%{_localstatedir}/lib/%{name}/checkresults" \
-   --with-cgiurl=/%{name}/cgi-bin \
-   --with-htmurl=/%{name} \
-   --with-httpd-conf=%{_sysconfdir}/apache2/conf.d \
-   --with-lockfile=%{_localstatedir}/run/%{name}/%{name}.pid \
-   --with-ext-cmd-file-dir="%{_localstatedir}/spool/%{name}" \
-   --with-log-dir=%{logdir} \
-   --with-cgi-log-dir=%{logdir}/www \
-   --with-icinga-user=%{nsusr} \
-   --with-icinga-group=%{nsgrp} \
-   --with-command-user=%{cmdusr} \
-   --with-command-group=%{cmdgrp} \
-   --with-gd-lib=%{_libdir} \
-   --with-gd-inc=%{_includedir} \
+   --exec-prefix="%{_sbindir}" \
+   --bindir="%{_sbindir}" \
+   --sbindir="%{icinga_cgidir}" \
+   --libexecdir="%{icinga_plugindir}" \
+   --datarootdir="%{icinga_datadir}" \
+   --sysconfdir="%{icinga_sysconfdir}" \
+   --with-p1-file-dir="%{icinga_datadir}" \
+   --with-init-dir="%{_sysconfdir}/init.d" \
+   --localstatedir="%{icinga_localstatedir}"  \
+   --with-checkresult-dir="%{icinga_localstated

commit icinga for openSUSE:Factory

2012-03-01 Thread h_root
Hello community,

here is the log from the commit of package icinga for openSUSE:Factory checked 
in at 2012-03-01 17:20:08

Comparing /work/SRC/openSUSE:Factory/icinga (Old)
 and  /work/SRC/openSUSE:Factory/.icinga.new (New)


Package is "icinga", Maintainer is ""

Changes:

--- /work/SRC/openSUSE:Factory/icinga/icinga.changes2011-10-14 
09:51:18.0 +0200
+++ /work/SRC/openSUSE:Factory/.icinga.new/icinga.changes   2012-03-01 
17:20:10.0 +0100
@@ -1,0 +2,48 @@
+Tue Feb 21 16:41:40 UTC 2012 - thard...@suse.com
+
+- Added changelog entry about the icinga-api removal
+
+---
+Thu Feb 16 09:03:31 UTC 2012 - sasc...@suse.de
+
+- Added some detail about the last version updates
+
+---
+Mon Feb 13 10:47:45 UTC 2012 - co...@suse.com
+
+- patch license to follow spdx.org standard
+
+---
+Fri Dec  2 15:32:05 UTC 2011 - thard...@suse.com
+
+- Imported Upstream version 1.6.1:
+  * core: fix freshness checks are generating stale alerts, even
+if result was received in time
+
+---
+Fri Dec 01 14:29:26 UTC 2011 - thard...@suse.com
+
+- imported Upstream version 1.6.0
+  * package: complete remove icinga-api as module #1935
+** Development is being discontinued for now, 1.5.0 was last combined 
release.
+  * core: fix downtime and comments delete with wrong loop pointers
+causing segfaults
+  * core: fix $NOTIFICATIONRECIPIENTS$ macro contains all contacts
+assigned to host|service, not only notified contacts
+  * core: plug memory leak in downtimes comment add
+  * core: make first_notification_delay depend on the first !OK hard state
+change and don't reset timer for new hard states which would replace it
+  * core: fix memory leak in xodtemplate.c
+  * classic ui: fix for Classic-UI displays bad timeperiods
+  * classic ui: fixed wrong color in histogram and trends for 
unknown/unreachable
+  * classic ui: fixed search not returning all results, only first match
+  * classic ui: fixed wrong output from status.cgi with option 
hostservicedetail
+  * classic ui: fix typo in histogram.c
+  * idoutils: host state change last_hard_state overrides last_state,
+last_hard_state always -1
+  * idoutils: extend conninfo.agent_version field  to varchar(16)
+  * idoutils: terminate threads cleanly, including db connection
+  * install: rework the version updates in icinga and idoutils
+  - See ChangeLog for more details
+
+---

Old:

  icinga-1.5.1.tar.gz
  icinga-remove-obsolete-api.patch

New:

  icinga-1.6.1.tar.gz



Other differences:
--
++ icinga.spec ++
--- /var/tmp/diff_new_pack.Nb4BY2/_old  2012-03-01 17:20:14.0 +0100
+++ /var/tmp/diff_new_pack.Nb4BY2/_new  2012-03-01 17:20:14.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package icinga
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,15 +16,11 @@
 #
 
 
-# set to 1 to also build the obsolete api packages
-%define build_api 0
-
 %define logdir %{_localstatedir}/log/icinga
 
 Name:   icinga
-Version:1.5.1
-Release:2
-License:GPLv2
+Version:1.6.1
+Release:0
 %define nsusr icinga
 %define nsgrp icinga
 %define cmdgrp icingacmd
@@ -34,8 +30,9 @@
 %define apacheuser wwwrun
 %define apachegroup www
 Summary:Host/service/network monitoring program
-Url:http://www.icinga.org/
+License:GPL-2.0
 Group:  System/Monitoring
+Url:http://www.icinga.org/
 Source0:%{name}-%{version}.tar.gz
 Source1:rc%{name}
 Source2:rcido2db
@@ -49,10 +46,6 @@
 Source12:   htpasswd.users
 # PATCH-FIX-OPENSUSE icinga-add-ifdefine-to-apache.patch
 Patch0: icinga-add-ifdefine-to-apache.patch
-%if 0%{?build_api} == 0
-# PATCH-FIX-OPENSUSE icinga-remove-obsolete-api.patch
-Patch1: icinga-remove-obsolete-api.patch
-%endif
 BuildRequires:  apache2-devel
 %if 0%{?suse_version} >= 1110
 BuildRequires:  fdupes
@@ -214,44 +207,9 @@
 monitoring, redundancy and disabling and enabling service checks and
 notifications.
 
-%if 0%{?build_api} != 0
-
-%package api
-Summary:PHP api for icinga
-Group:  System/Monitoring
-Recommends: %{name}-idoutils
-Rec

commit icinga for openSUSE:Factory

2011-10-14 Thread h_root

Hello community,

here is the log from the commit of package icinga for openSUSE:Factory
checked in at Fri Oct 14 09:47:45 CEST 2011.




--- openSUSE:Factory/icinga/icinga.changes  2011-10-06 17:22:15.0 
+0200
+++ /mounts/work_src_done/STABLE/icinga/icinga.changes  2011-10-13 
21:13:48.0 +0200
@@ -1,0 +2,5 @@
+Thu Oct 13 19:13:41 UTC 2011 - co...@suse.com
+
+- remove fragile service
+
+---

calling whatdependson for head-i586


Old:

  _service

New:

  icinga-1.5.1.tar.gz



Other differences:
--
continue with "q"...



Remember to have fun...

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



commit icinga for openSUSE:Factory

2011-10-06 Thread h_root

Hello community,

here is the log from the commit of package icinga for openSUSE:Factory
checked in at Thu Oct 6 17:22:17 CEST 2011.




--- openSUSE:Factory/icinga/icinga.changes  2011-09-23 02:03:16.0 
+0200
+++ /mounts/work_src_done/STABLE/icinga/icinga.changes  2011-10-05 
18:21:51.0 +0200
@@ -1,0 +2,5 @@
+Wed Oct  5 16:17:03 UTC 2011 - thard...@suse.com
+
+- fixed incorrect rcicinga meta data 
+
+---

calling whatdependson for head-i586




Other differences:
--
++ icinga.spec ++
--- /var/tmp/diff_new_pack.zqllmF/_old  2011-10-06 17:22:13.0 +0200
+++ /var/tmp/diff_new_pack.zqllmF/_new  2011-10-06 17:22:13.0 +0200
@@ -23,7 +23,7 @@
 
 Name:   icinga
 Version:1.5.1
-Release:1
+Release:2
 License:GPLv2
 %define nsusr icinga
 %define nsgrp icinga


++ rcicinga ++
--- /var/tmp/diff_new_pack.zqllmF/_old  2011-10-06 17:22:13.0 +0200
+++ /var/tmp/diff_new_pack.zqllmF/_new  2011-10-06 17:22:13.0 +0200
@@ -19,8 +19,8 @@
 # Provides:   icinga
 # Required-Start: $local_fs $remote_fs $syslog $network
 # Required-Stop:  $local_fs $remote_fs $syslog $network
-# Should-Start:   $time sendmail httpd2 $named cron ndo2db
-# Should-Stop:sendmail ndo2db
+# Should-Start:   $time sendmail httpd2 $named cron ido2db
+# Should-Stop:sendmail ido2db
 # Default-Start:  3 5
 # Default-Stop:   0 1 2 6
 # Short-Description: Network monitor Icinga

continue with "q"...



Remember to have fun...

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



commit icinga for openSUSE:Factory

2011-09-21 Thread h_root

Hello community,

here is the log from the commit of package icinga for openSUSE:Factory
checked in at Wed Sep 21 17:05:30 CEST 2011.




--- icinga/icinga.changes   2011-09-15 17:08:53.0 +0200
+++ /mounts/work_src_done/STABLE/icinga/icinga.changes  2011-09-21 
14:45:48.0 +0200
@@ -2 +2,7 @@
-Thu Sep 15 15:06:28 UTC 2011 - thard...@suse.de
+Tue Sep 20 11:12:36 UTC 2011 - thard...@suse.com
+
+- imported Upstream version 1.5.1
+- ran spec-cleaner and added patch tags
+
+---
+Thu Sep 15 15:06:28 UTC 2011 - thard...@suse.com
@@ -8 +14 @@
-Fri Sep  9 13:50:06 UTC 2011 - thard...@suse.de
+Fri Sep  9 13:50:06 UTC 2011 - thard...@suse.com
@@ -14 +20 @@
-Mon Sep  2 14:55:17 UTC 2011 - thard...@suse.de
+Mon Sep  2 14:55:17 UTC 2011 - thard...@suse.com
@@ -33 +39 @@
-Mon Jul 11 18:51:42 UTC 2011 - thard...@novell.com
+Mon Jul 11 18:51:42 UTC 2011 - thard...@suse.com
@@ -38 +44 @@
-Mon Jul 11 18:37:09 UTC 2011 - thard...@novell.com
+Mon Jul 11 18:37:09 UTC 2011 - thard...@suse.com
@@ -53 +59 @@
-Tue Jun 21 17:33:49 UTC 2011 - thard...@novell.com
+Tue Jun 21 17:33:49 UTC 2011 - thard...@suse.com
@@ -58 +64 @@
-Fri Jun 17 09:18:23 UTC 2011 - thard...@novell.com
+Fri Jun 17 09:18:23 UTC 2011 - thard...@suse.com
@@ -64 +70 @@
-Thu Jun  9 12:54:17 UTC 2011 - thard...@novell.com
+Thu Jun  9 12:54:17 UTC 2011 - thard...@suse.com
@@ -69 +75 @@
-Wed Jun  8 13:01:52 UTC 2011 - thard...@novell.com
+Wed Jun  8 13:01:52 UTC 2011 - thard...@suse.com
@@ -74 +80 @@
-Fri May 20 14:24:59 UTC 2011 - thard...@novell.com
+Fri May 20 14:24:59 UTC 2011 - thard...@suse.com
@@ -79 +85 @@
-Fri May 20 14:14:04 UTC 2011 - thard...@novell.com
+Fri May 20 14:14:04 UTC 2011 - thard...@suse.com
@@ -85 +91 @@
-Thu May 19 12:51:44 UTC 2011 - thard...@novell.com
+Thu May 19 12:51:44 UTC 2011 - thard...@suse.com
@@ -92 +98 @@
-Fri May  6 14:16:22 UTC 2011 - thard...@novell.com
+Fri May  6 14:16:22 UTC 2011 - thard...@suse.com
@@ -97 +103 @@
-Fri May  6 12:56:33 UTC 2011 - thard...@novell.com
+Fri May  6 12:56:33 UTC 2011 - thard...@suse.com
@@ -104 +110 @@
-Thu Mar 31 11:58:59 UTC 2011 - thard...@novell.com
+Thu Mar 31 11:58:59 UTC 2011 - thard...@suse.com
@@ -109 +115 @@
-Thu Mar  3 16:18:45 UTC 2011 - thard...@novell.com
+Thu Mar  3 16:18:45 UTC 2011 - thard...@suse.com
@@ -115 +121 @@
-Mon Feb 28 18:07:39 UTC 2011 - thard...@novell.com
+Mon Feb 28 18:07:39 UTC 2011 - thard...@suse.com
@@ -121 +127 @@
-Mon Feb 28 16:14:39 UTC 2011 - thard...@novell.com
+Mon Feb 28 16:14:39 UTC 2011 - thard...@suse.com
@@ -145 +151 @@
-Fri Feb 18 10:22:12 UTC 2011 - thard...@novell.com
+Fri Feb 18 10:22:12 UTC 2011 - thard...@suse.com

calling whatdependson for head-i586


Old:

  _service:download_url:icinga-1.5.0.tar.gz
  icinga-apache.patch
  icinga-remove-api.patch

New:

  _service:download_url:icinga-1.5.1.tar.gz
  icinga-add-ifdefine-to-apache.patch
  icinga-remove-obsolete-api.patch



Other differences:
--
++ icinga.spec ++
--- /var/tmp/diff_new_pack.lWCQ1L/_old  2011-09-21 17:05:18.0 +0200
+++ /var/tmp/diff_new_pack.lWCQ1L/_new  2011-09-21 17:05:18.0 +0200
@@ -1,6 +1,8 @@
 #
 # spec file for package icinga
 #
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+#
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
 # upon. The license for this file, and modifications and additions to the
@@ -9,16 +11,19 @@
 # case the license is the MIT License). An "Open Source License" is a
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
 # set to 1 to also build the obsolete api packages
 %define build_api 0
 
 %define logdir %{_localstatedir}/log/icinga
 
 Name:   icinga
-Version:1.5.0
-Release:4
+Version:1.5.1
+Release:1
 License:GPLv2
 %define nsusr icinga
 %define nsgrp icinga
@@ -42,9 +47,11 @@
 Source8:ido2db.8
 Source9:mini_epn_icinga.8
 Source12:   htpasswd.users
-Patch0: icinga-apache.patch
+# PATCH-FIX-OPENSUSE icinga-add-ifdefine-to-apache.patch
+Patch0: icinga-add-ifdefine-to-apache.patch
 %if 0%{?build_api} == 0
-Patch1:icinga-remove-api.patch
+# PATCH-FIX-OPENSUSE icinga-remove-obsolete-api.patch
+Patch1: icinga-remove-obsolete-api.patch
 %endif
 BuildRequires:  apache2-devel
 %if 0%{?suse_version} >= 1110
@@ -56,35 +63,35 @@
 BuildRequires:  krb5-devel
 BuildRequires:  libdbi-devel
 BuildRequires:  libjpeg-devel
+BuildRequires:  libopenssl-devel
 BuildRequires:  libpng-devel
 BuildRequires:  mailx
-BuildRequires:  pcre-devel
-BuildRequires:  net-tools
-BuildRequires:  zlib-dev

commit icinga for openSUSE:Factory

2011-09-19 Thread h_root

Hello community,

here is the log from the commit of package icinga for openSUSE:Factory
checked in at Mon Sep 19 17:22:49 CEST 2011.




New Changes file:

--- /dev/null   2010-08-26 16:28:41.0 +0200
+++ /mounts/work_src_done/STABLE/icinga/icinga.changes  2011-09-15 
17:08:53.0 +0200
@@ -0,0 +1,190 @@
+---
+Thu Sep 15 15:06:28 UTC 2011 - thard...@suse.de
+
+- removed unnecessary testing source files because of conflicting licenses
+- little spec file optimizations
+
+---
+Fri Sep  9 13:50:06 UTC 2011 - thard...@suse.de
+
+- cleaned up icinga.spec
+- removed specs for other distributions
+
+---
+Mon Sep  2 14:55:17 UTC 2011 - thard...@suse.de
+
+- made icinga-api building optional but disabling it by default
+  just set build_api to 1 to build the packages
+
+---
+Sun Aug 28 12:27:47 UTC 2011 - thard...@suse.com
+
+- removed obsolete icinga-api
+- added icinga-remove-api.patch
+- little spec file optimizations
+
+---
+Sat Aug 27 17:07:16 UTC 2011 - thard...@suse.com
+
+- initial version 1.5.0
+- removed obsolete patch with-p1-file-dir
+
+---
+Mon Jul 11 18:51:42 UTC 2011 - thard...@novell.com
+
+- activated Fedora 15 
+
+---
+Mon Jul 11 18:37:09 UTC 2011 - thard...@novell.com
+
+- initial version 1.4.2
+- added 1.5 with-p1-file-dir.patch
+- created new ido2db init script
+- updated icinga init script (no spool sgid needed anymore)
+- major spec file changes
+- fixed wrong var pathes
+
+---
+Mon Jul 11 16:02:33 UTC 2011 - l...@linux-schulserver.de
+
+- changed cron job according to bnc#701208
+
+---
+Tue Jun 21 17:33:49 UTC 2011 - thard...@novell.com
+
+- remove ido2db lock and socket files while stopping the init script
+
+---
+Fri Jun 17 09:18:23 UTC 2011 - thard...@novell.com
+
+- using the Build Service SourceService for the tarball
+- using the default spec for other distributions
+
+---
+Thu Jun  9 12:54:17 UTC 2011 - thard...@novell.com
+
+- added db update notification for idoutils
+
+---
+Wed Jun  8 13:01:52 UTC 2011 - thard...@novell.com
+
+- initial version 1.4.1
+
+---
+Fri May 20 14:24:59 UTC 2011 - thard...@novell.com
+
+- reverted idoutils db path
+
+---
+Fri May 20 14:14:04 UTC 2011 - thard...@novell.com
+
+- fixed a wrong cmd configuration entry
+- fixed some rpmlint warnings
+
+---
+Thu May 19 12:51:44 UTC 2011 - thard...@novell.com
+
+- initial version 1.4.0 
+- removed db creation scripts - 1.4.0 has its own now
+- removed openssl patch - now obsolete
+
+---
+Fri May  6 14:16:22 UTC 2011 - thard...@novell.com
+
+- SLES 10 Perl issue fixed
+
+---
+Fri May  6 12:56:33 UTC 2011 - thard...@novell.com
+
+- added fix for ssl support and enabled it
+- updated mysql db creation script
+- fixed some rpmlint warnings
+
+---
+Thu Mar 31 11:58:59 UTC 2011 - thard...@novell.com
+
+- initial version 1.3.1
+
+---
+Thu Mar  3 16:18:45 UTC 2011 - thard...@novell.com
+
+- fixed ido2db db initializiation scripts
+- fixed /var/run/spool/icinga permissions
+
+---
+Mon Feb 28 18:07:39 UTC 2011 - thard...@novell.com
+
+- fixed SLES 10 building problem
+- fixed empty file warnings
+
+---
+Mon Feb 28 16:14:39 UTC 2011 - thard...@novell.com
+
+- fixed icinga-api permissions
+- replaced the ido2db init script with a basic version because of problems
+- added simple db creation script for mysql and pgsql for idoutils
+- moved icinga-api docs to icinga-api-doc
+- fixed idoutils oracle dependency
+
+---
+Tue Feb 22 10:03:57 UTC 2011 - l...@linux-schulserver.de
+
+- fix pathname to database in icinga-installdb
+- require perl(DBD::mysql) in icinga-idoutils-mysql
+
+