Hello community, here is the log from the commit of package monit for openSUSE:Factory checked in at Sat Nov 20 12:35:19 CET 2010. -------- --- monit/monit.changes 2009-11-03 20:20:36.000000000 +0100 +++ /mounts/work_src_done/STABLE/monit/monit.changes 2010-10-13 14:26:09.000000000 +0200 @@ -1,0 +2,60 @@ +Thu Sep 23 22:17:18 UTC 2010 - pascal.bleser@opensuse.org + +- fixed typo in init script, "description" -> "Description" +- added missing dependency on $remote_fs in init script +- dropped monit-no_strip.patch, as upstream doesn't forcibly strip symbols any more +- /var/run/monit is now created at runtime, in order to work properly if /var/run is on tmpfs +- documentation split out into -doc subpackage + +- update to 5.2: + + new features: + * added support for monitoring processes without pidfile using pattern matching + * added support for swap monitoring + * allow to override the default action when service doesn't exist + * Monit automatically registers credentials with M/Monit now, so it's not necessary to set it manually in M/Monit anymore + * added memcache protocol test + * added openssl FIPS to Monit httpd + * the 'check system' can now use start/stop program statements too + * added the option to set the "Reply-To" mail header in mail-format + * display backtrace on error if debug mode is enabled (requires backtrace support in libc) + + bugfixes: + * show real process uptime - formerly the presented uptime was based on create and modify timestamp of process' pidfile which provides invalid uptime if the pidfile is replaced and process keeps running with original PID + * when user triggered action for some service (such as stop) and before that action completed user triggered another action for the same service (such as start), the second action has been ignored. Monit will not accept new action and return temporary error until the previous action completed + * if process resource usage gathering failed, retry next cycle as the error can be temporary + * fixed sporadic failures when SSL was used + * ICMP echo test (ping): + - fixed sporadic false positive/negative + - removed limit of 20 pings per cycle + * DNS test: + - accept NS root request refusal as correct response because server reacts on request + - accept authority answer as alternative to record + * RADIUS test fix + * M/Monit heartbeat is fully independent of testing cycle now to prevent false positive when service test blocks + * fixed SMTP STARTTLS protocol, required for servers that adhere strictly to RFC 3207 4.2 + * service name: + - allow the service name to start with "/" + - fixed handling of the service names which contain "/" in the name in Monit web interface + * when 'check system' is not defined, monit adds it automatically using hostname for service name + * remove extra NL characters from message when resource succeeded event is sent + * fixed display of cpu user/system/wait usage which temporarily displayed -1.0% between two monitoring cycles while cpu monitoring was initializing + * fixed display of port response time as -1 if 'monit status' was called in the middle of service test + * fixed display of service initializing state after monit start or reload + * fixed MONIT_DESCRIPTION environment variable + +------------------------------------------------------------------- +Tue Aug 10 14:45:36 UTC 2010 - lmuelle@suse.de + +- Remove merged superfluous hz patch. + +------------------------------------------------------------------- +Tue Aug 10 14:42:30 UTC 2010 - lmuelle@suse.de + +- Add Should-Start $syslog $time $named to the init script; (bnc#553082). + +------------------------------------------------------------------- +Tue Feb 23 20:19:41 UTC 2010 - pascal.bleser@opensuse.org + +- update to 5.1.1: + * several more protocol tests and bugfixes were added + +------------------------------------------------------------------- @@ -6,0 +67,12 @@ +Wed Sep 30 00:00:00 UTC 2009 - pascal.bleser@opensuse.org + +- update to 5.0.3 + + +------------------------------------------------------------------- +Thu Apr 16 00:00:00 UTC 2009 - pascal.bleser@opensuse.org + +- update to 5.0 + + +------------------------------------------------------------------- @@ -13,0 +86,12 @@ +Tue Nov 6 00:00:00 UTC 2007 - guru@unixtech.be + +- update to 4.10 + + +------------------------------------------------------------------- +Thu Sep 20 00:00:00 UTC 2007 - guru@unixtech.be + +- moved to openSUSE Build Service + + +------------------------------------------------------------------- @@ -18,0 +103,5 @@ +Sat Mar 24 00:00:00 UTC 2007 - guru@unixtech.be + +- new package, based on SUSE/Factory's monit source RPM (2007-03-24) + +------------------------------------------------------------------- @@ -134,0 +224 @@ + calling whatdependson for head-i586 Old: ---- monit-4.10.1.tar.bz2 monit-hz.patch no-strip.patch page_shift.patch vendor-files.tar.gz New: ---- monit-5.2.tar.bz2 monit-page_shift.patch monit-vendor-files.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ monit.spec ++++++ --- /var/tmp/diff_new_pack.kUlbbc/_old 2010-11-20 12:34:46.000000000 +0100 +++ /var/tmp/diff_new_pack.kUlbbc/_new 2010-11-20 12:34:46.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package monit (Version 4.10.1) +# spec file for package monit (Version 5.2) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 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 @@ -19,30 +19,30 @@ Name: monit -BuildRequires: bison flex openssl-devel -Version: 4.10.1 -Release: 69 -License: GPL v2 or later -Group: System/Monitoring +Version: 5.2 +Release: 1 Summary: Service Manager and Monitor System -Url: http://www.tildeslash.com/monit/ -AutoReqProv: on -Source: http://www.tildeslash.com/monit/dist/%{name}-%{version}.tar.bz2 -Source1: vendor-files.tar.gz -Patch: page_shift.patch -Patch1: no-strip.patch -Patch2: monit-hz.patch -%if %ul_version >= 1 -%define VENDOR UL -%else +# http://mmonit.com/monit/dist/monit-%{version}.tar.gz +Source: monit-%{version}.tar.bz2 +Source1: monit-vendor-files.tar.gz +Patch1: monit-page_shift.patch +Url: http://mmonit.com/monit/download/ +Group: System/Monitoring +License: GNU General Public License (GPL) +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: bison flex gcc glibc-devel make openssl-devel +BuildRequires: autoconf automake libtool +Obsoletes: monit-beta < %{version} +Provides: monit-beta = %{version} +%if 0%{?suse_version} >= 1030 +BuildRequires: licenses +Requires: licenses +%endif %if "%{_vendor}" == "suse" %define VENDOR SUSE %else %define VENDOR %_vendor %endif -%endif -BuildRoot: %{_tmppath}/%{name}-%{version}-build -PreReq: %fillup_prereq %insserv_prereq %description Monit is a utility for managing and monitoring processes, files, @@ -57,6 +57,7 @@ + Authors: -------- Jan-Henrik Haukeland <hauk at tildeslash dot com> @@ -64,68 +65,109 @@ Rory Toma <rory at digeo dot com> Christian Hopp <chopp at iei dot tu-clausthal dot de> +%package doc +License: GNU General Public License (GPL) +Summary: Service Manager and Monitor System (Documentation and Examples) +Group: System/Monitoring +%if 0%{?suse_version} >= 1120 +BuildArch: noarch +%endif + +%description doc +Monit is a utility for managing and monitoring processes, files, +directories, and devices on a Unix system. Monit conducts automatic +maintenance and repair and can execute meaningful causal actions in +error situations. For example, monit can start a process if it does +not run, restart a process if it does not respond, and stop a process +if it uses too many resources. You can use monit to monitor files, +directories, and devices for changes, such as time stamp changes, +checksum changes, or size changes. You can even use monit to monitor +remote hosts: monit can ping a remote host and check port connections. + +This package only contains the documentation and examples. +You must also install the package %{name} to actually use monit. + %prep -%setup -a1 -%patch -p1 +%setup -q -a1 %patch1 -%patch2 + +find doc/ -type f -size 0 -exec %__rm {} \; %build -%{?suse_update_config:%{suse_update_config -f}} -autoreconf --force --install -export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" -%{configure} \ - --prefix=%{_prefix} \ - --sysconfdir=%{_sysconfdir} \ - --with-ssl-lib-dir=%{_libdir} -%{__make} +#autoreconf -fiv +export CFLAGS="%{optflags} -fno-strict-aliasing" +%configure \ + --with-ssl-lib-dir="%{_libdir}" + +%__make %{?jobs:-j%{jobs}} %install -make \ - BINDIR=${RPM_BUILD_ROOT}/%{_bindir} \ - MANDIR=${RPM_BUILD_ROOT}/%{_mandir}/man1 \ +%__make \ + BINDIR="%{buildroot}%{_bindir}" \ + MANDIR="%{buildroot}%{_mandir}/man1" \ install -mkdir -p \ - ${RPM_BUILD_ROOT}/%{_sysconfdir}/init.d \ - ${RPM_BUILD_ROOT}/%{_sysconfdir}/monit.d \ - ${RPM_BUILD_ROOT}/%{_sbindir} \ - ${RPM_BUILD_ROOT}/%{_datadir}/monit \ - ${RPM_BUILD_ROOT}/%{_var}/adm/fillup-templates \ - ${RPM_BUILD_ROOT}/%{_var}/lib/monit \ - ${RPM_BUILD_ROOT}/%{_var}/run/monit + +%__install -d \ + "%{buildroot}/etc/init.d" \ + "%{buildroot}%{_sysconfdir}/monit.d" \ + "%{buildroot}%{_sbindir}" \ + "%{buildroot}%{_datadir}/monit" \ + "%{buildroot}%{_var}/adm/fillup-templates" \ + "%{buildroot}%{_var}/run/monit" \ + "%{buildroot}%{_var}/lib/monit" + . vendor-files/sysconfig/monit.tmpl -MONIT_BIN="/usr/bin/monit" -MONIT_MODIFY_INITTAB="/usr/share/monit/monit-modifyinittab" -MONIT_PID_FILE="/var/run/monit/monit.pid" +MONIT_BIN="%{_bindir}/monit" +MONIT_MODIFY_INITTAB="%{_datadir}/monit/monit-modifyinittab" +MONIT_PID_FILE="%{_var}/run/monit/monit.pid" MONIT_SYSCONFIG_FILE="/etc/sysconfig/monit" -MONIT_INITTAB_STATE_FILE="/var/lib/monit/monit-inittab.state" -MONIT_ARGS="-p ${MONIT_PID_FILE} -s /var/run/monit/monit.state" -MONIT_EVENTQUE_DIR="/var/lib/monit" -sed -e "s%/var/monit%${MONIT_EVENTQUE_DIR}%g" \ - monitrc > \ - ${RPM_BUILD_ROOT}/%{_sysconfdir}/monitrc +MONIT_INITTAB_STATE_FILE="%{_var}/lib/monit/monit-inittab.state" +MONIT_ARGS="-p ${MONIT_PID_FILE} -s %{_var}/run/monit/monit.state" +MONIT_EVENTQUE_DIR="%{_var}/lib/monit" +%__sed -e "s|%{_var}/monit|${MONIT_EVENTQUE_DIR}|g" \ + < monitrc > "%{buildroot}%{_sysconfdir}/monitrc" + pushd vendor-files for templatefile in docu/README tools/monit-modifyinittab init/monit sysconfig/monit; do - sed -e "s%__MONIT_RC_FILE__%${MONIT_RC_FILE}%g" \ - -e "s%__MONIT_INITTAB_BASE__%${MONIT_INITTAB_BASE}%g" \ - -e "s%__MONIT_INITTAB_COMMENT__%${MONIT_INITTAB_COMMENT}%g" \ - -e "s%__MONIT_INITTAB_STATE_FILE__%${MONIT_INITTAB_STATE_FILE}%g" \ - -e "s%__MONIT_ARGS__%${MONIT_ARGS}%g" \ - -e "s%__MONIT_BIN__%${MONIT_BIN}%g" \ - -e "s%__MONIT_MODIFY_INITTAB__%${MONIT_MODIFY_INITTAB}%g" \ - -e "s%__MONIT_PID_FILE__%${MONIT_PID_FILE}%g" \ - -e "s%__MONIT_SYSCONFIG_FILE__%${MONIT_SYSCONFIG_FILE}%g" \ - ${templatefile}.tmpl > \ - ${templatefile} + %__sed \ + -e "s|__MONIT_RC_FILE__|${MONIT_RC_FILE}|g" \ + -e "s|__MONIT_INITTAB_BASE__|${MONIT_INITTAB_BASE}|g" \ + -e "s|__MONIT_INITTAB_COMMENT__|${MONIT_INITTAB_COMMENT}|g" \ + -e "s|__MONIT_INITTAB_STATE_FILE__|${MONIT_INITTAB_STATE_FILE}|g" \ + -e "s|__MONIT_ARGS__|${MONIT_ARGS}|g" \ + -e "s|__MONIT_BIN__|${MONIT_BIN}|g" \ + -e "s|__MONIT_MODIFY_INITTAB__|${MONIT_MODIFY_INITTAB}|g" \ + -e "s|__MONIT_PID_FILE__|${MONIT_PID_FILE}|g" \ + -e "s|__MONIT_SYSCONFIG_FILE__|${MONIT_SYSCONFIG_FILE}|g" \ + < "${templatefile}.tmpl" \ + > "${templatefile}" +done +popd # vendor-files + +%__install -m0754 vendor-files/init/monit "%{buildroot}/etc/init.d/monit" +%__ln_s ../../etc/init.d/monit "%{buildroot}/usr/sbin/rcmonit" +%__install -m0754 vendor-files/tools/monit-modifyinittab "%{buildroot}%{_datadir}/monit" +%__install -m0644 vendor-files/sysconfig/monit "%{buildroot}%{_var}/adm/fillup-templates/sysconfig.monit" +touch "%{buildroot}%{_var}/lib/monit/monit-inittab.state" +touch "%{buildroot}%{_var}/run/monit"/monit.{pid,state} +%__install -m0644 vendor-files/docu/README README.SUSE + +for f in COPYING LICENSE; do + h=/usr/share/doc/licenses/md5/$(md5sum "$f"|cut -f1 -d" ") + test -e "$h" && %__ln_s -f "$h" "$f" +done + +%__install -d "%{buildroot}%{_docdir}/%{name}" +>doc.main.lst +for f in COPYING LICENSE; do + %__install -m0644 "$f" "%{buildroot}%{_docdir}/%{name}/$f" + echo "%doc %{_docdir}/%{name}/$f" >>doc.main.lst +done +>doc.doc.lst +for f in CHANGES.txt PLATFORMS README* doc; do + %__cp -a "$f" "%{buildroot}%{_docdir}/%{name}/" + echo "%doc %{_docdir}/%{name}/$(basename $f)" >>doc.doc.lst done -popd -install -m 0754 vendor-files/init/monit ${RPM_BUILD_ROOT}/etc/init.d/monit -ln -s ../../etc/init.d/monit ${RPM_BUILD_ROOT}/%{_sbindir}/rcmonit -install -m 0754 vendor-files/tools/monit-modifyinittab ${RPM_BUILD_ROOT}/%{_datadir}/monit -install -m 0644 vendor-files/sysconfig/monit ${RPM_BUILD_ROOT}/%{_var}/adm/fillup-templates/sysconfig.monit -touch ${RPM_BUILD_ROOT}/%{_var}/lib/monit/monit-inittab.state -touch ${RPM_BUILD_ROOT}/%{_var}/run/monit/monit.{pid,state} -install -m 0644 vendor-files/docu/README ${RPM_BUILD_DIR}/%{name}-%{version}/README.%{VENDOR} %post %{fillup_and_insserv} @@ -138,24 +180,27 @@ %{insserv_cleanup} %clean -[ "${RPM_BUILD_ROOT}" != "/" -a -d ${RPM_BUILD_ROOT} ] && rm -rf ${RPM_BUILD_ROOT} +%__rm -rf "%{buildroot}" -%files +%files -f doc.main.lst %defattr(-,root,root) -%doc CHANGES.txt CONTRIBUTORS COPYING FAQ.txt LICENSE PLATFORMS README* STATUS UPGRADE.txt doc -%attr(0600, root, root) %config(noreplace) %{_sysconfdir}/monitrc +%doc %dir %{_docdir}/%{name} +%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/monitrc %dir %{_sysconfdir}/monit.d -%attr(0754, root, root) %config %{_sysconfdir}/init.d/monit -%{_sbindir}/rcmonit +%attr(0754,root,root) %config /etc/init.d/monit +/usr/sbin/rcmonit %{_bindir}/monit -%{_mandir}/man1/monit.1.gz %dir %{_datadir}/monit %{_datadir}/monit/monit-modifyinittab %{_var}/adm/fillup-templates/sysconfig.monit %dir %{_var}/lib/monit %ghost %{_var}/lib/monit/monit-inittab.state -%dir %{_var}/run/monit +%ghost %dir %{_var}/run/monit %ghost %{_var}/run/monit/monit.pid %ghost %{_var}/run/monit/monit.state +%doc %{_mandir}/man1/monit.1%{ext_man} +%files doc -f doc.doc.lst +%defattr(-,root,root) +%doc %dir %{_docdir}/%{name} %changelog ++++++ monit-4.10.1.tar.bz2 -> monit-5.2.tar.bz2 ++++++ ++++ 52049 lines of diff (skipped) ++++++ monit-page_shift.patch ++++++ --- process/sysdep_LINUX.c.orig 2010-09-24 00:18:10.000000000 +0200 +++ process/sysdep_LINUX.c 2010-09-24 00:18:41.000000000 +0200 @@ -279,10 +279,7 @@ if (stat_item_state == 'Z') pt[i].status_flag |= PROCESS_ZOMBIE; - if (page_shift_to_kb < 0) - pt[i].mem_kbyte = (stat_item_rss >> abs(page_shift_to_kb)); - else - pt[i].mem_kbyte = (stat_item_rss << abs(page_shift_to_kb)); + pt[i].mem_kbyte = stat_item_rss * getpagesize() / 1024; if (! read_proc_file(buf, sizeof(buf), "cmdline", pt[i].pid, &bytes)) { DEBUG("system statistic error -- cannot read /proc/%d/cmdline\n", pt[i].pid); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org