Hello community, here is the log from the commit of package monit for openSUSE:Factory checked in at 2016-03-26 15:23:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2016-02-11 12:37:53.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.monit.new/monit.changes 2016-03-26 15:24:02.000000000 +0100 @@ -1,0 +2,7 @@ +Fri Mar 18 11:20:16 UTC 2016 - jgleiss...@suse.com + +- monit-rundir.patch: use /run/monit for pid file (bnc#971647) +- updated monit-better_default_monitrc.patch to set pid file + correctly in /etc/monitrc + +------------------------------------------------------------------- New: ---- monit-rundir.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ monit.spec ++++++ --- /var/tmp/diff_new_pack.xYvUrb/_old 2016-03-26 15:24:03.000000000 +0100 +++ /var/tmp/diff_new_pack.xYvUrb/_new 2016-03-26 15:24:03.000000000 +0100 @@ -27,6 +27,7 @@ Source2: http://mmonit.com/monit/dist/monit-%{version}.tar.gz.sha256 Source1: monit-vendor-files.tar.gz Patch1: monit-better_default_monitrc.patch +Patch2: monit-rundir.patch Source99: monit-rpmlintrc Url: https://mmonit.com/monit/#download BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -83,13 +84,7 @@ %prep %setup -q -a1 %patch1 -p1 -%__perl -n -e 'print $1,"\n" if /^\+{3}\s+(\S+)/' <"%PATCH3" \ -| while read f; do - %__perl -i -p -e ' -s,\Q@@PIDDIR@@\E,/run/monit,g; -s,\Q@@EVENTDIR@@\E,/run/monit/events,g; -' "$f" -done +%patch2 -p1 find doc/ -type f -size 0 -exec %__rm {} \; ++++++ monit-better_default_monitrc.patch ++++++ --- /var/tmp/diff_new_pack.xYvUrb/_old 2016-03-26 15:24:03.000000000 +0100 +++ /var/tmp/diff_new_pack.xYvUrb/_new 2016-03-26 15:24:03.000000000 +0100 @@ -13,7 +13,7 @@ ## running Monit instance. By default this file is stored in $HOME/.monit.pid # -# set pidfile /var/run/monit.pid -+set pidfile /var/run/monit.pid ++set pidfile /run/monit/monit.pid # ## 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 ++++++ monit-rundir.patch ++++++ Index: monit-5.16/src/monit.h =================================================================== --- monit-5.16.orig/src/monit.h 2016-02-04 09:11:03.000000000 +0100 +++ monit-5.16/src/monit.h 2016-03-18 11:56:44.328774407 +0100 @@ -137,11 +137,11 @@ #define USEC_PER_MSEC 1000L #define ARGMAX 64 -#define MYPIDDIR PIDDIR +#define MYPIDDIR "/run/monit" #define MYPIDFILE "monit.pid" #define MYSTATEFILE "monit.state" #define MYIDFILE "monit.id" -#define MYEVENTLISTBASE "/var/monit" +#define MYEVENTLISTBASE "/run/monit/events" #define LOCALHOST "localhost"
