From 40d89e54a843482bf59d14e3b22dcb992367d1b8 Mon Sep 17 00:00:00 2001 From: "d. johnson" Date: Sun, 14 Sep 2014 12:15:04 -0500 Subject: [PATCH 1/6] Add amavis plugin config defaults --- munin-2.0.9-amavis-config | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 munin-2.0.9-amavis-config diff --git a/munin-2.0.9-amavis-config b/munin-2.0.9-amavis-config new file mode 100644 index 0000000..0a7f0ba --- /dev/null +++ b/munin-2.0.9-amavis-config @@ -0,0 +1,4 @@ +[amavis] +group adm +env.MUNIN_MKTEMP /bin/mktemp -p /tmp/ $1 +env.amavislog /var/log/mail.info From 69bc0d876f20cd19d4ef283c6b7cb562a95a1fab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Mon, 15 Sep 2014 15:27:38 +0200 Subject: [PATCH 2/6] Build against perl 5.20 --- munin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/munin.spec b/munin.spec index 6ca5daf..0d8c6ec 100644 --- a/munin.spec +++ b/munin.spec @@ -1,6 +1,6 @@ Name: munin Version: 2.0.21 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Network-wide graphing framework (grapher/gatherer) Group: System Environment/Daemons @@ -819,6 +819,9 @@ exit 0 %changelog +* Mon Sep 15 2014 Petr Pisar - 2.0.21-6 +- Build against perl 5.20 + * Sun Sep 07 2014 "D. Johnson" - 2.0.21-5 - BZ# 1114857 - munin-2.0.21-2.fc21 FTBFS: No Package found for java-1.7.0-devel - re-merge earlier commit for epel7 From ddb1fef30a4a36adc46f609f70eae10419150012 Mon Sep 17 00:00:00 2001 From: "d. johnson" Date: Mon, 15 Sep 2014 08:37:01 -0500 Subject: [PATCH 3/6] add amavis plugin config defaults --- munin.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/munin.spec b/munin.spec index 6ca5daf..3d70dd3 100644 --- a/munin.spec +++ b/munin.spec @@ -1,6 +1,6 @@ Name: munin Version: 2.0.21 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Network-wide graphing framework (grapher/gatherer) Group: System Environment/Daemons @@ -31,6 +31,7 @@ Source20: Makefile.config-dist Source21: nginx_munin.conf Source22: munin-fcgi-html.rc Source23: munin-fcgi-graph.rc +Source24: munin-2.0.9-amavis-config #Patch1: munin-1.4.6-restorecon.patch #Patch2: munin-1.4.2-fontfix.patch @@ -474,6 +475,9 @@ install -m 0644 %{SOURCE6} %{buildroot}/etc/munin/plugin-conf.d/postfix # install df config to exclude fses we shouldn't try and monitor install -m 0644 %{SOURCE7} %{buildroot}/etc/munin/plugin-conf.d/df +# Install amavis config file to set MUNIN_MKTEMP env +install -m 0644 %{SOURCE24} %{buildroot}/etc/munin/plugin-conf.d/amavis + # Append for BZ# 746083 cat - >> %{buildroot}/etc/munin/plugin-conf.d/munin-node < - 2.0.21-6 +- Add amavis plugin config defaults + * Sun Sep 07 2014 "D. Johnson" - 2.0.21-5 - BZ# 1114857 - munin-2.0.21-2.fc21 FTBFS: No Package found for java-1.7.0-devel - re-merge earlier commit for epel7 From 97061fb9ff8a4f461d2774f472ed21d599b29d50 Mon Sep 17 00:00:00 2001 From: "d. johnson" Date: Mon, 6 Oct 2014 22:01:41 -0500 Subject: [PATCH 4/6] BZ# 1149948 - munin-async pid file in /var/run rather than /var/run/munin --- linux-init.d_munin-asyncd.in | 2 +- munin.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/linux-init.d_munin-asyncd.in b/linux-init.d_munin-asyncd.in index a164d4a..239cea7 100644 --- a/linux-init.d_munin-asyncd.in +++ b/linux-init.d_munin-asyncd.in @@ -18,7 +18,7 @@ ASYNC_BIN=munin-asyncd PATH=/sbin:/bin:/usr/sbin:/usr/bin DAEMON=/usr/sbin/${ASYNC_BIN} -PIDFILE=/var/run/${ASYNC_BIN}.pid +PIDFILE=/var/run/munin/${ASYNC_BIN}.pid is_running () { if [ ! -e "$PIDFILE" ]; then diff --git a/munin.spec b/munin.spec index 69f6106..5d17967 100644 --- a/munin.spec +++ b/munin.spec @@ -1,6 +1,6 @@ Name: munin Version: 2.0.21 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Network-wide graphing framework (grapher/gatherer) Group: System Environment/Daemons @@ -824,6 +824,9 @@ exit 0 %changelog +* Tue Oct 07 2014 "D. Johnson" - 2.0.21-8 +- BZ# 1149948 - munin-async pid file in /var/run rather than /var/run/munin + * Mon Sep 15 2014 Petr Pisar - 2.0.21-6 - Build against perl 5.20 From b93fe8587aedb32e870008ab09ef404a859673f1 Mon Sep 17 00:00:00 2001 From: "d. johnson" Date: Thu, 16 Oct 2014 20:05:34 -0500 Subject: [PATCH 5/6] Upstream released 2.0.22 --- munin.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/munin.spec b/munin.spec index 5d17967..99fc216 100644 --- a/munin.spec +++ b/munin.spec @@ -1,6 +1,6 @@ Name: munin -Version: 2.0.21 -Release: 8%{?dist} +Version: 2.0.22 +Release: 1%{?dist} Summary: Network-wide graphing framework (grapher/gatherer) Group: System Environment/Daemons @@ -824,6 +824,9 @@ exit 0 %changelog +* Fri Oct 17 2014 "D. Johnson" - 2.0.22-1 +- Upstream released 2.0.22 + * Tue Oct 07 2014 "D. Johnson" - 2.0.21-8 - BZ# 1149948 - munin-async pid file in /var/run rather than /var/run/munin From fc5b1d508e1d083e0685979af65879cec1994e5b Mon Sep 17 00:00:00 2001 From: "d. johnson" Date: Thu, 16 Oct 2014 20:06:25 -0500 Subject: [PATCH 6/6] Upstream released 2.0.22 --- .gitignore | 1 + munin-2.0.21.tar.gz.sha256sum | 1 - munin-2.0.22.tar.gz.sha256sum | 1 + sources | 2 +- 4 files changed, 3 insertions(+), 2 deletions(-) delete mode 100644 munin-2.0.21.tar.gz.sha256sum create mode 100644 munin-2.0.22.tar.gz.sha256sum diff --git a/.gitignore b/.gitignore index 9df3d87..b3f2ec3 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ munin-1.4.5.tar.gz /munin-2.0.19.tar.gz /munin-2.0.20.tar.gz /munin-2.0.21.tar.gz +/munin-2.0.22.tar.gz diff --git a/munin-2.0.21.tar.gz.sha256sum b/munin-2.0.21.tar.gz.sha256sum deleted file mode 100644 index 38302d8..0000000 --- a/munin-2.0.21.tar.gz.sha256sum +++ /dev/null @@ -1 +0,0 @@ -76ad6602706f3449e727adbfc35014e9b4193b3691a5ca032d5a8d78e9ed259b munin-2.0.21.tar.gz diff --git a/munin-2.0.22.tar.gz.sha256sum b/munin-2.0.22.tar.gz.sha256sum new file mode 100644 index 0000000..7b4ea96 --- /dev/null +++ b/munin-2.0.22.tar.gz.sha256sum @@ -0,0 +1 @@ +31072cdd844788642576dd81983fecd42699e030d8c0128ee506948dda0c43e7 munin-2.0.22.tar.gz diff --git a/sources b/sources index 94751f9..ff27f93 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3bf802b0910d930a93351746aa717d3f munin-2.0.21.tar.gz +f9f5cecea33714c57b523896c0a905dd munin-2.0.22.tar.gz