From 311ac2dde740f49b86d1b3232194529739695dad Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Fri, 12 Oct 2018 11:47:17 +0000 Subject: [PATCH] - fixed patches --- munin-separate-configs.patch | 24 ----------- munin-templatedir.patch | 82 ++++++++++++++++++------------------ munin.spec | 2 +- 3 files changed, 43 insertions(+), 65 deletions(-) diff --git a/munin-separate-configs.patch b/munin-separate-configs.patch index 8e17281..212090c 100644 --- a/munin-separate-configs.patch +++ b/munin-separate-configs.patch @@ -163,30 +163,6 @@ diff -urNpa munin-2.0.42.orig/Makefile.config munin-2.0.42/Makefile.config # Server only - where to put munin-cron BINDIR = $(PREFIX)/bin -diff -urNpa munin-2.0.42.orig/Makefile.rej munin-2.0.42/Makefile.rej ---- munin-2.0.42.orig/Makefile.rej 2018-10-11 15:24:44.282033000 +0000 -+++ munin-2.0.42/Makefile.rej 1970-01-01 00:00:00.000000000 +0000 -@@ -1,20 +0,0 @@ ----- Makefile 2015-09-08 10:02:24.000000000 +0000 --+++ Makefile 2015-09-08 10:12:45.899593251 +0000 --@@ -249,6 +249,7 @@ build/%: %.in -- -e 's|@@GOODSH@@|$(GOODSH)|g' \ -- -e 's|@@BASH@@|$(BASH)|g' \ -- -e 's|@@HASSETR@@|$(HASSETR)|g' \ --+ -e 's|@@TEMPLATEDIR@@|$(TEMPLATEDIR)|g' \ -- $< > $@; -- -- --@@ -326,7 +327,8 @@ common/blib/lib/Munin/Common/Defaults.pm -- s{(PLUGINUSER \s+=\s).*}{\1q{$(PLUGINUSER)};}x; \ -- s{(GOODSH \s+=\s).*}{\1q{$(GOODSH)};}x; \ -- s{(BASH \s+=\s).*}{\1q{$(BASH)};}x; \ --- s{(HASSETR \s+=\s).*}{\1q{$(HASSETR)};}x;' \ --+ s{(HASSETR \s+=\s).*}{\1q{$(HASSETR)};}x; \ --+ s{(TEMPLATEDIR \s+=\s).*}{\1q{$(TEMPLATEDIR)};}x;'\ -- $< > $@ -- -- build-doc: build-doc-stamp Makefile Makefile.config diff -urNpa munin-2.0.42.orig/master/_bin/munin-cgi-graph.in munin-2.0.42/master/_bin/munin-cgi-graph.in --- munin-2.0.42.orig/master/_bin/munin-cgi-graph.in 2018-10-11 15:24:44.285033000 +0000 +++ munin-2.0.42/master/_bin/munin-cgi-graph.in 2018-10-11 15:25:02.396033000 +0000 diff --git a/munin-templatedir.patch b/munin-templatedir.patch index d0aa37b..fbab79e 100644 --- a/munin-templatedir.patch +++ b/munin-templatedir.patch @@ -1,6 +1,6 @@ diff -urNpa munin-2.0.42.orig/common/lib/Munin/Common/Defaults.pm munin-2.0.42/common/lib/Munin/Common/Defaults.pm ---- munin-2.0.42.orig/common/lib/Munin/Common/Defaults.pm 2018-10-11 15:23:51.538033000 +0000 -+++ munin-2.0.42/common/lib/Munin/Common/Defaults.pm 2018-10-11 15:24:16.385033000 +0000 +--- munin-2.0.42.orig/common/lib/Munin/Common/Defaults.pm 2018-09-21 02:11:11.000000000 +0000 ++++ munin-2.0.42/common/lib/Munin/Common/Defaults.pm 2018-10-12 11:46:23.059033000 +0000 @@ -32,6 +32,7 @@ our $MUNIN_SPOOLDIR = ''; our $MUNIN_MANDIR = ''; our $MUNIN_LOGDIR = "$COMPONENT_ROOT/log/"; @@ -10,8 +10,8 @@ diff -urNpa munin-2.0.42.orig/common/lib/Munin/Common/Defaults.pm munin-2.0.42/c our $MUNIN_GROUP = getgrgid $GID; our $MUNIN_PLUGINUSER = getpwuid $UID; diff -urNpa munin-2.0.42.orig/contrib/munin-every-services-all-boxes-build-html.in munin-2.0.42/contrib/munin-every-services-all-boxes-build-html.in ---- munin-2.0.42.orig/contrib/munin-every-services-all-boxes-build-html.in 2018-10-11 15:23:51.545033000 +0000 -+++ munin-2.0.42/contrib/munin-every-services-all-boxes-build-html.in 2018-10-11 15:24:16.386033000 +0000 +--- munin-2.0.42.orig/contrib/munin-every-services-all-boxes-build-html.in 2018-09-21 02:11:11.000000000 +0000 ++++ munin-2.0.42/contrib/munin-every-services-all-boxes-build-html.in 2018-10-12 11:46:23.059033000 +0000 @@ -23,7 +23,7 @@ optional for find : -mtime -30 ; will ig chown @@USER@@.@@GROUP@@ @@HTMLDIR@@/every-services-all-boxes @@ -22,8 +22,8 @@ diff -urNpa munin-2.0.42.orig/contrib/munin-every-services-all-boxes-build-html.
every services on all boxes diff -urNpa munin-2.0.42.orig/Makefile munin-2.0.42/Makefile ---- munin-2.0.42.orig/Makefile 2018-10-11 15:23:51.545033000 +0000 -+++ munin-2.0.42/Makefile 2018-10-11 15:24:16.386033000 +0000 +--- munin-2.0.42.orig/Makefile 2018-10-12 11:45:59.366033000 +0000 ++++ munin-2.0.42/Makefile 2018-10-12 11:46:35.187033000 +0000 @@ -100,9 +100,9 @@ install-pre: Makefile Makefile.config $(CHOWN) $(USER) $(LOGDIR) $(STATEDIR) $(SPOOLDIR) @@ -56,9 +56,35 @@ diff -urNpa munin-2.0.42.orig/Makefile munin-2.0.42/Makefile done $(INSTALL) -m 0644 master/DejaVuSansMono.ttf $(LIBDIR)/ +@@ -270,6 +270,7 @@ build/%: %.in + -e 's|@@GOODSH@@|$(GOODSH)|g' \ + -e 's|@@BASH@@|$(BASH)|g' \ + -e 's|@@HASSETR@@|$(HASSETR)|g' \ ++ -e 's|@@TEMPLATEDIR@@|$(TEMPLATEDIR)|g' \ + $< > $@; + + +@@ -312,6 +313,7 @@ substitute-confvar-inline: + -e 's|\@\@GOODSH\@\@|$(GOODSH)|g;' \ + -e 's|\@\@BASH\@\@|$(BASH)|g;' \ + -e 's|\@\@HASSETR\@\@|$(HASSETR)|g;' \ ++ -e 's|\@\@TEMPLATEDIR\@\@|$(TEMPLATEDIR)|g;' \ + $(CONFVAR_SUBSTITUTION_FILES) + + +@@ -365,7 +367,8 @@ substitute-build-defaults-inline: + s{(PLUGINUSER\s+=\s).*}{\1q{$(PLUGINUSER)};}x; \ + s{(GOODSH\s+=\s).*}{\1q{$(GOODSH)};}x; \ + s{(BASH\s+=\s).*}{\1q{$(BASH)};}x; \ +- s{(HASSETR\s+=\s).*}{\1q{$(HASSETR)};}x;' \ ++ s{(HASSETR\s+=\s).*}{\1q{$(HASSETR)};}x; \ ++ s{(TEMPLATEDIR\s+=\s).*}{\1q{$(TEMPLATEDIR)};}x;' \ + common/lib/Munin/Common/Defaults.pm >common/blib/lib/Munin/Common/Defaults.pm + + diff -urNpa munin-2.0.42.orig/Makefile.config munin-2.0.42/Makefile.config ---- munin-2.0.42.orig/Makefile.config 2018-10-11 15:23:51.545033000 +0000 -+++ munin-2.0.42/Makefile.config 2018-10-11 15:24:16.386033000 +0000 +--- munin-2.0.42.orig/Makefile.config 2018-10-12 11:45:59.366033000 +0000 ++++ munin-2.0.42/Makefile.config 2018-10-12 11:46:23.060033000 +0000 @@ -40,6 +40,7 @@ LIBDIR = $(PREFIX)/share/munin # Server only - Output directory HTMLDIR = $(DESTDIR)/var/lib/munin/html @@ -67,33 +93,9 @@ diff -urNpa munin-2.0.42.orig/Makefile.config munin-2.0.42/Makefile.config # Where to put internal data for master (RRD, internal files, ...) DBDIR = $(DESTDIR)/var/lib/munin/db -diff -urNpa munin-2.0.42.orig/Makefile.rej munin-2.0.42/Makefile.rej ---- munin-2.0.42.orig/Makefile.rej 1970-01-01 00:00:00.000000000 +0000 -+++ munin-2.0.42/Makefile.rej 2018-10-11 15:24:16.386033000 +0000 -@@ -0,0 +1,20 @@ -+--- Makefile 2015-09-08 10:02:24.000000000 +0000 -++++ Makefile 2015-09-08 10:12:45.899593251 +0000 -+@@ -249,6 +249,7 @@ build/%: %.in -+ -e 's|@@GOODSH@@|$(GOODSH)|g' \ -+ -e 's|@@BASH@@|$(BASH)|g' \ -+ -e 's|@@HASSETR@@|$(HASSETR)|g' \ -++ -e 's|@@TEMPLATEDIR@@|$(TEMPLATEDIR)|g' \ -+ $< > $@; -+ -+ -+@@ -326,7 +327,8 @@ common/blib/lib/Munin/Common/Defaults.pm -+ s{(PLUGINUSER \s+=\s).*}{\1q{$(PLUGINUSER)};}x; \ -+ s{(GOODSH \s+=\s).*}{\1q{$(GOODSH)};}x; \ -+ s{(BASH \s+=\s).*}{\1q{$(BASH)};}x; \ -+- s{(HASSETR \s+=\s).*}{\1q{$(HASSETR)};}x;' \ -++ s{(HASSETR \s+=\s).*}{\1q{$(HASSETR)};}x; \ -++ s{(TEMPLATEDIR \s+=\s).*}{\1q{$(TEMPLATEDIR)};}x;'\ -+ $< > $@ -+ -+ build-doc: build-doc-stamp Makefile Makefile.config diff -urNpa munin-2.0.42.orig/master/doc/munin.conf.pod.in munin-2.0.42/master/doc/munin.conf.pod.in ---- munin-2.0.42.orig/master/doc/munin.conf.pod.in 2018-10-11 15:23:51.547033000 +0000 -+++ munin-2.0.42/master/doc/munin.conf.pod.in 2018-10-11 15:24:16.387033000 +0000 +--- munin-2.0.42.orig/master/doc/munin.conf.pod.in 2018-09-21 02:11:11.000000000 +0000 ++++ munin-2.0.42/master/doc/munin.conf.pod.in 2018-10-12 11:46:23.060033000 +0000 @@ -70,7 +70,7 @@ Directory for HTML pages and graphs. Re Directory for files tracking munin's current running state. Required. @@ -104,8 +106,8 @@ diff -urNpa munin-2.0.42.orig/master/doc/munin.conf.pod.in munin-2.0.42/master/d Directory for templates used to generate HTML pages. Required. diff -urNpa munin-2.0.42.orig/master/lib/Munin/Master/Config.pm munin-2.0.42/master/lib/Munin/Master/Config.pm ---- munin-2.0.42.orig/master/lib/Munin/Master/Config.pm 2018-10-11 15:23:51.547033000 +0000 -+++ munin-2.0.42/master/lib/Munin/Master/Config.pm 2018-10-11 15:24:16.387033000 +0000 +--- munin-2.0.42.orig/master/lib/Munin/Master/Config.pm 2018-09-21 02:11:11.000000000 +0000 ++++ munin-2.0.42/master/lib/Munin/Master/Config.pm 2018-10-12 11:46:23.060033000 +0000 @@ -159,8 +159,8 @@ my %booleans = map {$_ => 1} qw( tls_private_key => "$Munin::Common::Defaults::MUNIN_CONFDIR/munin.pem", tls_verify_certificate => 0, @@ -118,8 +120,8 @@ diff -urNpa munin-2.0.42.orig/master/lib/Munin/Master/Config.pm munin-2.0.42/mas ssh_command => "ssh", ssh_options => "-o ChallengeResponseAuthentication=no -o StrictHostKeyChecking=no", diff -urNpa munin-2.0.42.orig/master/lib/Munin/Master/Utils.pm munin-2.0.42/master/lib/Munin/Master/Utils.pm ---- munin-2.0.42.orig/master/lib/Munin/Master/Utils.pm 2018-10-11 15:23:51.547033000 +0000 -+++ munin-2.0.42/master/lib/Munin/Master/Utils.pm 2018-10-11 15:24:16.387033000 +0000 +--- munin-2.0.42.orig/master/lib/Munin/Master/Utils.pm 2018-09-21 02:11:11.000000000 +0000 ++++ munin-2.0.42/master/lib/Munin/Master/Utils.pm 2018-10-12 11:46:23.060033000 +0000 @@ -1001,8 +1001,8 @@ sub munin_readconfig_base { $config->{'rundir'} ||= $Munin::Common::Defaults::MUNIN_STATEDIR; $config->{'dbdir'} ||= $Munin::Common::Defaults::MUNIN_DBDIR; @@ -132,8 +134,8 @@ diff -urNpa munin-2.0.42.orig/master/lib/Munin/Master/Utils.pm munin-2.0.42/mast $config->{'spooldir'} ||= $Munin::Common::Defaults::MUNIN_SPOOLDIR; $config->{'#%#parent'} = undef; diff -urNpa munin-2.0.42.orig/master/munin.conf.in munin-2.0.42/master/munin.conf.in ---- munin-2.0.42.orig/master/munin.conf.in 2018-10-11 15:23:51.548033000 +0000 -+++ munin-2.0.42/master/munin.conf.in 2018-10-11 15:24:16.387033000 +0000 +--- munin-2.0.42.orig/master/munin.conf.in 2018-09-21 02:11:11.000000000 +0000 ++++ munin-2.0.42/master/munin.conf.in 2018-10-12 11:46:23.060033000 +0000 @@ -12,11 +12,11 @@ # Where to look for the HTML templates diff --git a/munin.spec b/munin.spec index 91e9c58..7af8634 100644 --- a/munin.spec +++ b/munin.spec @@ -6,7 +6,7 @@ Summary: Munin - the Linpro RRD data agent Summary(pl.UTF-8): Munin - agent danych RRD Linpro Name: munin Version: 2.0.42 -Release: 1 +Release: 2 License: GPL Group: Applications/WWW Source0: https://github.com/munin-monitoring/munin/archive/%{version}.tar.gz -- 2.37.3