Hello community, here is the log from the commit of package monit for openSUSE:Factory checked in at 2014-07-31 21:50:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/monit (Old) and /work/SRC/openSUSE:Factory/.monit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "monit" Changes: -------- --- /work/SRC/openSUSE:Factory/monit/monit.changes 2013-09-27 17:46:59.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.monit.new/monit.changes 2014-07-31 21:50:50.000000000 +0200 @@ -1,0 +2,10 @@ +Wed Jul 30 00:26:49 UTC 2014 - [email protected] + +- update to 5.8.1: + * Changed all /var/run to /run to fix rpmlint check failure in Factory + * Added: monit-5.8.1.tar.gz + * Deleted: monit-5.6.tar.gz + monit-page_shift.patch as new version deprecates it + * Updated: monit-better_default_monitrc.patch + +------------------------------------------------------------------- Old: ---- monit-5.6.tar.gz monit-page_shift.patch New: ---- monit-5.8.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ monit.spec ++++++ --- /var/tmp/diff_new_pack.9hF4mV/_old 2014-07-31 21:50:52.000000000 +0200 +++ /var/tmp/diff_new_pack.9hF4mV/_new 2014-07-31 21:50:52.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package monit # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # Pascal Bleser <[email protected]> # # All modifications and additions to the file contributed by third parties @@ -18,16 +18,15 @@ Name: monit -Version: 5.6 +Version: 5.8.1 Release: 0 Summary: Service Manager and Monitor System License: AGPL-3.0 Group: System/Monitoring Source: http://mmonit.com/monit/dist/monit-%{version}.tar.gz Source1: monit-vendor-files.tar.gz -Patch1: monit-page_shift.patch -Patch2: monit-better_default_monitrc.patch -Patch3: monit-dirs.patch +Patch1: monit-better_default_monitrc.patch +Patch2: monit-dirs.patch Source99: monit-rpmlintrc Url: http://mmonit.com/monit/download/ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -83,14 +82,13 @@ %prep %setup -q -a1 -%patch1 +%patch1 -p1 %patch2 -%patch3 %__perl -n -e 'print $1,"\n" if /^\+{3}\s+(\S+)/' <"%PATCH3" \ | while read f; do %__perl -i -p -e ' -s,\Q@@PIDDIR@@\E,%{_var}/run/monit,g; -s,\Q@@EVENTDIR@@\E,%{_var}/run/monit/events,g; +s,\Q@@PIDDIR@@\E,/run/monit,g; +s,\Q@@EVENTDIR@@\E,/run/monit/events,g; ' "$f" done @@ -112,19 +110,19 @@ "%{buildroot}%{_sbindir}" \ "%{buildroot}%{_datadir}/monit" \ "%{buildroot}%{_var}/adm/fillup-templates" \ - "%{buildroot}%{_var}/run/monit" \ - "%{buildroot}%{_var}/run/monit/events" \ + "%{buildroot}/run/monit" \ + "%{buildroot}/run/monit/events" \ "%{buildroot}%{_var}/lib/monit" -touch "%{buildroot}%{_var}/run/monit/.monit.id" +touch "%{buildroot}/run/monit/.monit.id" . vendor-files/sysconfig/monit.tmpl MONIT_BIN="%{_bindir}/monit" MONIT_MODIFY_INITTAB="%{_datadir}/monit/monit-modifyinittab" -MONIT_PID_FILE="%{_var}/run/monit/monit.pid" +MONIT_PID_FILE="/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_ARGS="-p ${MONIT_PID_FILE} -s /run/monit/monit.state" MONIT_EVENTQUE_DIR="%{_var}/lib/monit" %__sed -e "s|%{_var}/monit|${MONIT_EVENTQUE_DIR}|g" \ < monitrc > "%{buildroot}%{_sysconfdir}/monitrc" @@ -151,7 +149,7 @@ %__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} +touch "%{buildroot}/run/monit"/monit.{pid,state} %__install -m0644 vendor-files/docu/README README.SUSE %__install -d "%{buildroot}%{_docdir}/%{name}" @@ -161,15 +159,15 @@ echo "%doc %{_docdir}/%{name}/$f" >>doc.main.lst done >doc.doc.lst -for f in CHANGES README* doc; do +for f in README* doc; do %__cp -a "$f" "%{buildroot}%{_docdir}/%{name}/" echo "%doc %{_docdir}/%{name}/$(basename $f)" >>doc.doc.lst done %post %{fillup_and_insserv} -%__install -d -m0700 -o root -g root %{_var}/run/monit -%__install -d -m0700 -o root -g root %{_var}/run/monit/events +%__install -d -m0700 -o root -g root /run/monit +%__install -d -m0700 -o root -g root /run/monit/events %preun %{stop_on_removal monit} @@ -194,11 +192,11 @@ %{_var}/adm/fillup-templates/sysconfig.monit %dir %{_var}/lib/monit %ghost %{_var}/lib/monit/monit-inittab.state -%ghost %dir %{_var}/run/monit -%ghost %{_var}/run/monit/monit.pid -%ghost %{_var}/run/monit/monit.state -%ghost %{_var}/run/monit/.monit.id -%ghost %dir %{_var}/run/monit/events +%ghost %dir /run/monit +%ghost /run/monit/monit.pid +%ghost /run/monit/monit.state +%ghost /run/monit/.monit.id +%ghost %dir /run/monit/events %doc %{_mandir}/man1/monit.1%{ext_man} %files doc -f doc.doc.lst ++++++ monit-5.6.tar.gz -> monit-5.8.1.tar.gz ++++++ ++++ 52285 lines of diff (skipped) ++++++ monit-better_default_monitrc.patch ++++++ --- /var/tmp/diff_new_pack.9hF4mV/_old 2014-07-31 21:50:52.000000000 +0200 +++ /var/tmp/diff_new_pack.9hF4mV/_new 2014-07-31 21:50:52.000000000 +0200 @@ -1,8 +1,7 @@ -Index: monitrc -=================================================================== ---- monitrc.orig -+++ monitrc -@@ -24,24 +24,24 @@ set daemon 60 # check serv +diff -rupN monit-5.8.1.old/monitrc monit-5.8.1/monitrc +--- monit-5.8.1.old/monitrc 2014-05-12 08:51:19.000000000 -0700 ++++ monit-5.8.1/monitrc 2014-07-29 17:17:04.747629705 -0700 +@@ -24,9 +24,9 @@ set daemon 60 # check serv ## Set syslog logging with the 'daemon' facility. If the FACILITY option is ## omitted, Monit will use 'user' facility by default. If you want to log to ## a standalone log file instead, specify the full path to the log file @@ -13,6 +12,9 @@ +set logfile syslog facility log_daemon + # + ## Set the location of the Monit lock file which stores the process id of the + ## running Monit instance. By default this file is stored in $HOME/.monit.pid +@@ -36,17 +36,17 @@ set daemon 60 # check serv ## Set the location of the Monit id file which stores the unique id for the ## Monit instance. The id is generated and stored on first Monit start. By ## default the file is placed in $HOME/.monit.id. @@ -20,7 +22,7 @@ -# set idfile /var/.monit.id -# + -+set idfile /var/run/monit/.monit.id ++set idfile /run/monit/.monit.id + ## Set the location of the Monit state file which saves monitoring states ## on each cycle. By default the file is placed in $HOME/.monit.state. If @@ -31,12 +33,12 @@ -# set statefile /var/.monit.state -# + -+set statefile /var/run/monit/monit.state ++set statefile /run/monit/monit.state + ## Set the list of mail servers for alert delivery. Multiple servers may be ## specified using a comma separator. If the first mail server fails, Monit # will use the second mail server in the list and so on. By default Monit uses -@@ -50,7 +50,9 @@ set daemon 60 # check serv +@@ -55,7 +55,9 @@ set daemon 60 # check serv # set mailserver mail.bar.baz, # primary mailserver # backup.bar.baz port 10025, # backup mailserver on port 10025 # localhost # fallback relay @@ -47,23 +49,25 @@ # ## By default Monit will drop alert events if no mail servers are available. ## If you want to keep the alerts for later delivery retry, you can use the -@@ -62,7 +64,11 @@ set daemon 60 # check serv +@@ -67,7 +69,11 @@ set daemon 60 # check serv # set eventqueue # basedir /var/monit # set the base directory where events will be stored # slots 100 # optionally limit the queue size -# + +set eventqueue -+ basedir /var/run/monit/events ++ basedir /run/monit/events + slots 100 + # ## Send status and events to M/Monit (for more informations about M/Monit ## see http://mmonit.com/). By default Monit registers credentials with -@@ -98,7 +104,9 @@ set daemon 60 # check serv +@@ -101,16 +107,16 @@ set daemon 60 # check serv + ## You can override this message format or parts of it, such as subject + ## or sender using the MAIL-FORMAT statement. Macros such as $DATE, etc. ## are expanded at runtime. For example, to override the sender, use: - # - # set mail-format { from: [email protected] } +-# +-# set mail-format { from: [email protected] } -# + +set mail-format { from: monit@localhost } @@ -71,13 +75,13 @@ # ## You can set alert recipients whom will receive alerts if/when a ## service defined in this file has errors. Alerts may be restricted on -@@ -108,6 +116,9 @@ set daemon 60 # check serv - ## Do not alert when Monit start,stop or perform a user initiated action - # set alert [email protected] not on { instance, action } - # + ## events by using a filter as in the second example below. +-# +-# set alert [email protected] # receive all alerts +-# + -+set alert root@localhost ++set alert root@localhost # receive all alerts + + ## Do not alert when Monit starts, stops or performs a user initiated action. + ## This filter is recommended to avoid getting alerts for trivial cases. # - ## Monit has an embedded web server which can be used to view status of - ## services monitored and manage services from a web interface. See the -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
