commit nsca for openSUSE:Factory
Hello community,
here is the log from the commit of package nsca for openSUSE:Factory checked in
at 2017-11-20 17:04:58
Comparing /work/SRC/openSUSE:Factory/nsca (Old)
and /work/SRC/openSUSE:Factory/.nsca.new (New)
Package is "nsca"
Mon Nov 20 17:04:58 2017 rev:8 rq:542827 version:2.9.2
Changes:
--- /work/SRC/openSUSE:Factory/nsca/nsca.changes2017-11-10
14:57:13.880438564 +0100
+++ /work/SRC/openSUSE:Factory/.nsca.new/nsca.changes 2017-11-20
17:06:14.699940420 +0100
@@ -1,0 +2,6 @@
+Wed Nov 8 16:10:11 UTC 2017 - dims...@opensuse.org
+
+- Only have pre and post scriptlets in case we build with systemd
+ support. Without systemd support, the escriptlets would be empty.
+
+---
Other differences:
--
++ nsca.spec ++
--- /var/tmp/diff_new_pack.mlKMrE/_old 2017-11-20 17:06:16.291882784 +0100
+++ /var/tmp/diff_new_pack.mlKMrE/_new 2017-11-20 17:06:16.295882640 +0100
@@ -131,11 +131,13 @@
# install apparmor profile
install -Dm644 %{SOURCE6} %{buildroot}%{_sysconfdir}/apparmor.d/usr.bin.nsca
+%if %{with systemd}
%pre
%service_add_pre %{name}.service
%post
%service_add_post %{name}.service
+%endif
%preun
%if %{with systemd}
commit nsca for openSUSE:Factory
Hello community,
here is the log from the commit of package nsca for openSUSE:Factory checked in
at 2017-11-10 14:56:49
Comparing /work/SRC/openSUSE:Factory/nsca (Old)
and /work/SRC/openSUSE:Factory/.nsca.new (New)
Package is "nsca"
Fri Nov 10 14:56:49 2017 rev:7 rq:539625 version:2.9.2
Changes:
--- /work/SRC/openSUSE:Factory/nsca/nsca.changes2017-03-20
17:08:43.312994410 +0100
+++ /work/SRC/openSUSE:Factory/.nsca.new/nsca.changes 2017-11-10
14:57:13.880438564 +0100
@@ -1,0 +2,17 @@
+Tue Nov 7 09:38:47 UTC 2017 - joop.boo...@opensuse.org
+
+- Fixed E: nsca implicit-fortify-decl ./nsca.c:495 via
+ nsca-2.9.2-implicit-fortify-decl.patch
+
+---
+Thu Jun 29 16:05:30 UTC 2017 - l...@linux-schulserver.de
+
+- added nsca-2.9.2-implicit_functions.patch to add missing includes
+ crabbed out by the compiler
+- enable and support systemd
+- fix copy and paste error in triggerun and run for the old name
+ (nagios-nsca) of this package
+- rebase all patches and add/correct the comments for them in the
+ spec file
+
+---
New:
nsca-2.9.2-implicit-fortify-decl.patch
nsca-2.9.2-implicit_functions.patch
nsca.service
Other differences:
--
++ nsca.spec ++
--- /var/tmp/diff_new_pack.HvBDTY/_old 2017-11-10 14:57:15.008397766 +0100
+++ /var/tmp/diff_new_pack.HvBDTY/_new 2017-11-10 14:57:15.012397621 +0100
@@ -16,6 +16,12 @@
#
+%if 0%{?suse_version} >= 1230
+%bcond_without systemd
+%else
+%bcond_with systemd
+%endif
+
Name: nsca
Version:2.9.2
Release:0
@@ -30,12 +36,18 @@
Source4:send_nsca.1
Source5:nsca.1
Source6:usr.bin.nsca
-# PATCH-MISSING-TAG -- See http://en.opensuse.org/Packaging/Patches
+Source7:nsca.service
+# PATCH-FIX-UPSTREAM fix some compiler warnings that might become errors
Patch1: nsca.abuild.patch
-# PATCH-MISSING-TAG -- See http://en.opensuse.org/Packaging/Patches
+# PATCH-FIX-OPENSUSE disable the xinetd service per default - in that case it
is also not
+# needed to bind on any specific address
Patch2: nsca.xinetd.patch
-# PATCH-MISSING-TAG -- See http://en.opensuse.org/Packaging/Patches
+# PATCH-FIX-OPENSUSE adapt the spool directory to follow openSUSE guidelines
Patch3: nsca.spooldir.patch
+# PATCH-FIX-UPSTREAM add missing includes for special functions
+Patch4: nsca-2.9.2-implicit_functions.patch
+# PATCH-FIX-UPSTREAM fixed implicit-fortify-decl
+Patch5: nsca-2.9.2-implicit-fortify-decl.patch
BuildRequires: libmcrypt-devel
BuildRequires: nagios-rpm-macros
BuildRequires: tcpd-devel
@@ -43,7 +55,12 @@
Recommends: monitoring_daemon
Provides: nagios-nsca = %{version}
Obsoletes: nagios-nsca < 2.9.0
+%if %{with systemd}
+BuildRequires: systemd
+%{?systemd_requires}
+%else
PreReq: %insserv_prereq
+%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -65,9 +82,11 @@
%prep
%setup -q
-%patch1
-%patch2
-%patch3
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
%build
export CFLAGS="%{optflags}"
@@ -93,8 +112,14 @@
install -m 644 sample-config/nsca.cfg %{buildroot}%{_sysconfdir}/
install -m 644 sample-config/send_nsca.cfg %{buildroot}%{_sysconfdir}/
install -m 644 sample-config/nsca.xinetd
%{buildroot}%{_sysconfdir}/xinetd.d/nsca
+# startup scripts
+%if %{with systemd}
+install -Dm0644 %{SOURCE7} %{buildroot}%{_unitdir}/%{name}.service
+ln -s -f %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}
+%else
install -m 755 %{SOURCE1}%{buildroot}%{_sysconfdir}/init.d/nsca
ln -sf ../../%{_sysconfdir}/init.d/nsca %{buildroot}%{_sbindir}/rcnsca
+%endif
chmod 644 README
# install SuSEfirewall2 script
%if 0%{?suse_version} > 1020
@@ -106,15 +131,46 @@
# install apparmor profile
install -Dm644 %{SOURCE6} %{buildroot}%{_sysconfdir}/apparmor.d/usr.bin.nsca
+%pre
+%service_add_pre %{name}.service
+
+%post
+%service_add_post %{name}.service
+
%preun
+%if %{with systemd}
+%service_del_preun %{name}.service
+%else
%stop_on_removal nsca
+%endif
%postun
+%if %{with systemd}
+%service_del_postun %{name}.service
+%else
%restart_on_update nsca
%insserv_cleanup
+%endif
-%triggerpostun -- nagios-nrpe < 2.9.2
+%triggerun -- nagios-nsca < 2.9.2
STATUS='/var/adm/update-scripts/%{name}'
+%if %{with systemd}
+if [ -x %{_bindir}/systemctl ]; then
+ %{_bindir}/systemctl status nsca.service >/dev/null
+ if test $? = 0; then
+ echo "%{_bindir}/systemctl restart nsca.service" >> "$STATUS"
+ else
+touch "$STATUS"
+fi
+ %{_bindir}/systemctl status xinetd.service
commit nsca for openSUSE:Factory
Hello community,
here is the log from the commit of package nsca for openSUSE:Factory checked in
at 2017-03-20 17:08:42
Comparing /work/SRC/openSUSE:Factory/nsca (Old)
and /work/SRC/openSUSE:Factory/.nsca.new (New)
Package is "nsca"
Mon Mar 20 17:08:42 2017 rev:6 rq:479839 version:2.9.2
Changes:
--- /work/SRC/openSUSE:Factory/nsca/nsca.changes2016-12-29
22:50:51.933116283 +0100
+++ /work/SRC/openSUSE:Factory/.nsca.new/nsca.changes 2017-03-20
17:08:43.312994410 +0100
@@ -1,0 +2,7 @@
+Wed Mar 15 18:36:24 UTC 2017 - dims...@opensuse.org
+
+- Add %insserv_prereq PreReq: since we still install legacy initd
+ services it is our own duty to ensure the legacy tools to handle
+ them are installed.
+
+---
Other differences:
--
++ nsca.spec ++
--- /var/tmp/diff_new_pack.1RwyiX/_old 2017-03-20 17:08:44.012895584 +0100
+++ /var/tmp/diff_new_pack.1RwyiX/_new 2017-03-20 17:08:44.012895584 +0100
@@ -1,7 +1,7 @@
#
# spec file for package nsca
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -43,6 +43,7 @@
Recommends: monitoring_daemon
Provides: nagios-nsca = %{version}
Obsoletes: nagios-nsca < 2.9.0
+PreReq: %insserv_prereq
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
commit nsca for openSUSE:Factory
Hello community,
here is the log from the commit of package nsca for openSUSE:Factory checked in
at 2014-03-20 07:31:44
Comparing /work/SRC/openSUSE:Factory/nsca (Old)
and /work/SRC/openSUSE:Factory/.nsca.new (New)
Package is nsca
Changes:
--- /work/SRC/openSUSE:Factory/nsca/nsca.changes2013-02-15
18:48:49.0 +0100
+++ /work/SRC/openSUSE:Factory/.nsca.new/nsca.changes 2014-03-20
07:31:45.0 +0100
@@ -1,0 +2,6 @@
+Tue Mar 18 15:14:24 UTC 2014 - l...@linux-schulserver.de
+
+- add apparmor profile in /etc/apparmor.d/usr.bin.nsca
+- do not self obsolete nagios-nsca* itself, use lower version
+
+---
New:
usr.bin.nsca
Other differences:
--
++ nsca.spec ++
--- /var/tmp/diff_new_pack.qAuHNh/_old 2014-03-20 07:31:46.0 +0100
+++ /var/tmp/diff_new_pack.qAuHNh/_new 2014-03-20 07:31:46.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package nsca
#
-# 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
@@ -29,6 +29,7 @@
Source3:nsca-SuSEfirewall2
Source4:send_nsca.1
Source5:nsca.1
+Source6:usr.bin.nsca
# PATCH-MISSING-TAG -- See http://en.opensuse.org/Packaging/Patches
Patch1: nsca.abuild.patch
# PATCH-MISSING-TAG -- See http://en.opensuse.org/Packaging/Patches
@@ -38,9 +39,10 @@
BuildRequires: libmcrypt-devel
BuildRequires: nagios-rpm-macros
BuildRequires: tcpd-devel
+Recommends: apparmor-parser
Recommends: monitoring_daemon
Provides: nagios-nsca = %{version}
-Obsoletes: nagios-nsca 2.9.2
+Obsoletes: nagios-nsca 2.9.0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -53,7 +55,7 @@
Summary:The Nagios Service Check Acceptor Client
Group: System/Monitoring
Provides: nagios-nsca-client = %{version}
-Obsoletes: nagios-nsca-client 2.9.2
+Obsoletes: nagios-nsca-client 2.9.0
%description client
The purpose of this add-on is to allow the execution of NetSaint and
@@ -100,6 +102,8 @@
# install man pages
install -Dm644 %{SOURCE4} %{buildroot}%{_mandir}/man1/send_nsca.1
install -m644 %{SOURCE5} %{buildroot}%{_mandir}/man1/nsca.1
+# install apparmor profile
+install -Dm644 %{SOURCE6} %{buildroot}%{_sysconfdir}/apparmor.d/usr.bin.nsca
%preun
%stop_on_removal nsca
@@ -160,9 +164,11 @@
%files
%defattr(-,root,root)
+%dir %{_sysconfdir}/apparmor.d
%{_bindir}/nsca
%{_sysconfdir}/init.d/nsca
%{_sbindir}/rcnsca
+%config(noreplace) %{_sysconfdir}/apparmor.d/usr.bin.nsca
%config(noreplace) %{_sysconfdir}/nsca.cfg
%config(noreplace) %{_sysconfdir}/xinetd.d/nsca
%config(noreplace) %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name}
++ usr.bin.nsca ++
# Last Modified: Tue Mar 18 11:12:55 2014
#include tunables/global
/usr/bin/nsca {
#include abstractions/base
#include abstractions/nameservice
capability chown,
capability dac_override,
capability setgid,
capability setuid,
/etc/hosts.allow r,
/etc/hosts.deny r,
/etc/nsca.cfg r,
/etc/nagios/nsca.cfg r,
/var/run/icinga/icinga.cmd w,
/var/run/nagios/nagios.cmd w,
/var/run/nsca.pid w,
/var/spool/icinga/** w,
/var/spool/nagios/** w,
}
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit nsca for openSUSE:Factory
Hello community, here is the log from the commit of package nsca for openSUSE:Factory checked in at 2013-02-15 18:48:48 Comparing /work/SRC/openSUSE:Factory/nsca (Old) and /work/SRC/openSUSE:Factory/.nsca.new (New) Package is nsca, Maintainer is Changes: New Changes file: --- /dev/null 2013-02-09 11:18:20.872010756 +0100 +++ /work/SRC/openSUSE:Factory/.nsca.new/nsca.changes 2013-02-15 18:48:49.0 +0100 @@ -0,0 +1,218 @@ +--- +Thu Feb 14 09:51:38 UTC 2013 - l...@linux-schulserver.de + +- rename the package from nagios-nsca to nsca (following upstream + name) +- require 'monitoring_daemon' in init script as nsca also runs + together with icinga +- add man pages for send_nsca and nsca from Debian + +--- +Thu Oct 11 12:27:55 UTC 2012 - l...@linux-schulserver.de + +- recommend 'monitoring_daemon' to allow nsca to run with + compatible monitoring solutions + +--- +Fri Feb 3 09:48:56 UTC 2012 - l...@linux-schulserver.de + +- update to 2.9.1: + + Applied patch to allow packets arriving with a future time stamp +(Daniel Wittenberg) + + Updated server (nsca) to allow packets with older, smaller +packet size (Eric Stanley) +- use macros from nagios-rpm-macros package +- added rpmlintrc + +--- +Wed Dec 21 10:29:59 UTC 2011 - co...@suse.com + +- remove call to suse_update_config (very old work around) + +--- +Thu Nov 10 22:46:33 UTC 2011 - schneem...@b1-systems.de + +- update to version 2.9 +* Add config directive to submit directly to checkresults directory (Mike Lindsey) +* Support multi-line check output with 4000 character limit (Mike Lindsey) + +- fixes in skipped version 2.8 +* Added --with-log-facility option to control syslog logging (Ryan Ordway and Brian Seklecki) +* Fixed bug where daemon would segfault if mcrypt library was not initialized before timeout (Holger Weiss) +* Fixed bug with switching from dump file to command file when running under single mode (Ton Voon) +* Fix for small memory leak with running as a single process daemon (Daniel) + +--- +Fri Aug 31 11:16:58 CEST 2007 - tsie...@suse.de + +- cleanup spec file (removed unneeded %dir entry) + +--- +Mon Aug 13 07:25:49 CEST 2007 - tsie...@suse.de + +- update to version 2.7.2 +* fixed bug with NSCA daemon eating CPU if child process + couldn't accept a connection in multi-process mode (Chris Wilson) + +--- +Fri Feb 9 11:46:40 CET 2007 - tsie...@suse.de + +- update to version 2.7.1 + * Fixed bug that prevented single mode daemon from working properly + * Added sample scripts for testing functionality to nsca_tests/ +(Ton Voon/Altinity) + +--- +Mon Jan 29 15:11:00 CET 2007 - tsie...@suse.de + +- update to version 2.7 + * Fixed crash from malformed command line +(therefore removed removed nagios-nsca.send_nsca.formatstring.patch) + * Updated to config.sub and config.guess to latest from GNU Savannah + * changed default user and group to nagios nagios (#236135) + +--- +Thu Dec 7 17:18:24 CET 2006 - tsie...@suse.de + +- package split: nagios-nsca for the server and + nagios-nsca-client for the remote host +- removed unneeded BuildRequires (nagios) + +--- +Fri Dec 1 12:59:22 CET 2006 - tsie...@suse.de + +- update to version 2.6 + * spec file fix + * segfault fix in encryption library cleanup + * daemon now exits with an error if it can't drop privileges + * added chroot support (Sean Finney) + * added support for writing a PID file + * added support for reloading config files with SIGHUP + * removed obsolete patches which are included in upstream now + +- fix NscaBin location in init script + +--- +Tue Oct 10 11:57:22 CEST 2006 - o...@suse.de + +- fix send_nsca segfault with -c and -d options + +--- +Thu Feb 2 21:19:30 CET 2006 - st...@suse.de + +- fixed crash while encrypt_cleanup() + +--- +Wed Jan 25 21:38:33 CET 2006 - m...@suse.de + +- converted neededforbuild to BuildRequires +
