X-Git-Url: https://git.tld-linux.org/?p=packages%2Fmunin.git;a=blobdiff_plain;f=munin-separate-configs.patch;h=212090c778fed6659ece4d2e25ba21f956229da3;hp=8e17281db15a7aaf568c31256c1aed60e00df761;hb=311ac2dde740f49b86d1b3232194529739695dad;hpb=d5910e0aa4a37928e95746cb73d3090e1dcce56e

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