X-Git-Url: https://git.tld-linux.org/?p=packages%2Fmunin.git;a=blobdiff_plain;f=munin-templatedir.patch;fp=munin-templatedir.patch;h=e2d08741d393c6aa3989798375a5e07e3876b7d4;hp=cfac96430c65c431d8378545ed45920bd3123640;hb=07fe06d737e4de10ee16544aecfa6e79622123d9;hpb=1342d283cc5c3ac190405acb3b922cdd17141ec3

diff --git a/munin-templatedir.patch b/munin-templatedir.patch
index cfac964..e2d0874 100644
--- a/munin-templatedir.patch
+++ b/munin-templatedir.patch
@@ -1,6 +1,6 @@
-diff -ur munin-2.0.65.orig/common/lib/Munin/Common/Defaults.pm munin-2.0.65/common/lib/Munin/Common/Defaults.pm
---- munin-2.0.65.orig/common/lib/Munin/Common/Defaults.pm	2020-10-28 22:36:02.000000000 +0100
-+++ munin-2.0.65/common/lib/Munin/Common/Defaults.pm	2021-01-04 18:03:15.208803396 +0100
+diff -ur munin-2.0.69.orig/common/lib/Munin/Common/Defaults.pm munin-2.0.69/common/lib/Munin/Common/Defaults.pm
+--- munin-2.0.69.orig/common/lib/Munin/Common/Defaults.pm	2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/common/lib/Munin/Common/Defaults.pm	2022-08-27 15:17:33.865403125 +0200
 @@ -30,6 +30,7 @@
  our $MUNIN_MANDIR     = '';
  our $MUNIN_LOGDIR     = "$COMPONENT_ROOT/log/";
@@ -9,9 +9,9 @@ diff -ur munin-2.0.65.orig/common/lib/Munin/Common/Defaults.pm munin-2.0.65/comm
  our $MUNIN_USER       = getpwuid $UID;
  our $MUNIN_GROUP      = getgrgid $GID;
  our $MUNIN_PLUGINUSER = getpwuid $UID;
-diff -ur munin-2.0.65.orig/contrib/munin-every-services-all-boxes-build-html.in munin-2.0.65/contrib/munin-every-services-all-boxes-build-html.in
---- munin-2.0.65.orig/contrib/munin-every-services-all-boxes-build-html.in	2020-10-28 22:36:02.000000000 +0100
-+++ munin-2.0.65/contrib/munin-every-services-all-boxes-build-html.in	2021-01-04 18:03:15.208803396 +0100
+diff -ur munin-2.0.69.orig/contrib/munin-every-services-all-boxes-build-html.in munin-2.0.69/contrib/munin-every-services-all-boxes-build-html.in
+--- munin-2.0.69.orig/contrib/munin-every-services-all-boxes-build-html.in	2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/contrib/munin-every-services-all-boxes-build-html.in	2022-08-27 15:17:33.865403125 +0200
 @@ -23,7 +23,7 @@
  
    chown @@USER@@.@@GROUP@@ @@HTMLDIR@@/every-services-all-boxes
@@ -21,9 +21,9 @@ diff -ur munin-2.0.65.orig/contrib/munin-every-services-all-boxes-build-html.in
  
   <div class="box">
      <a href=every-services-all-boxes>every services on all boxes</a>
-diff -ur munin-2.0.65.orig/Makefile munin-2.0.65/Makefile
---- munin-2.0.65.orig/Makefile	2021-01-04 17:51:54.921969144 +0100
-+++ munin-2.0.65/Makefile	2021-01-04 18:03:15.209803396 +0100
+diff -ur munin-2.0.69.orig/Makefile munin-2.0.69/Makefile
+--- munin-2.0.69.orig/Makefile	2022-08-27 15:12:18.268799133 +0200
++++ munin-2.0.69/Makefile	2022-08-27 15:17:33.866403127 +0200
 @@ -101,9 +101,9 @@
  	$(CHOWN) $(USER) $(LOGDIR) $(STATEDIR) $(SPOOLDIR)
  
@@ -82,9 +82,9 @@ diff -ur munin-2.0.65.orig/Makefile munin-2.0.65/Makefile
  		common/lib/Munin/Common/Defaults.pm >common/blib/lib/Munin/Common/Defaults.pm
  
  
-diff -ur munin-2.0.65.orig/Makefile.config munin-2.0.65/Makefile.config
---- munin-2.0.65.orig/Makefile.config	2021-01-04 17:51:54.921969144 +0100
-+++ munin-2.0.65/Makefile.config	2021-01-04 18:03:15.209803396 +0100
+diff -ur munin-2.0.69.orig/Makefile.config munin-2.0.69/Makefile.config
+--- munin-2.0.69.orig/Makefile.config	2022-08-27 15:12:18.268799133 +0200
++++ munin-2.0.69/Makefile.config	2022-08-27 15:17:33.866403127 +0200
 @@ -40,6 +40,7 @@
  # Server only - Output directory
  HTMLDIR    = $(DESTDIR)/var/lib/munin/html
@@ -93,9 +93,9 @@ diff -ur munin-2.0.65.orig/Makefile.config munin-2.0.65/Makefile.config
  
  # Where to put internal data for master (RRD, internal files, ...)
  DBDIR      = $(DESTDIR)/var/lib/munin/db
-diff -ur munin-2.0.65.orig/master/doc/munin.conf.pod.in munin-2.0.65/master/doc/munin.conf.pod.in
---- munin-2.0.65.orig/master/doc/munin.conf.pod.in	2020-10-28 22:36:02.000000000 +0100
-+++ munin-2.0.65/master/doc/munin.conf.pod.in	2021-01-04 18:03:15.209803396 +0100
+diff -ur munin-2.0.69.orig/master/doc/munin.conf.pod.in munin-2.0.69/master/doc/munin.conf.pod.in
+--- munin-2.0.69.orig/master/doc/munin.conf.pod.in	2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/master/doc/munin.conf.pod.in	2022-08-27 15:17:33.866403127 +0200
 @@ -70,7 +70,7 @@
  
  Directory for files tracking munin's current running state.  Required.
@@ -105,10 +105,10 @@ diff -ur munin-2.0.65.orig/master/doc/munin.conf.pod.in munin-2.0.65/master/doc/
  
  Directory for templates used to generate HTML pages.  Required.
  
-diff -ur munin-2.0.65.orig/master/lib/Munin/Master/Config.pm munin-2.0.65/master/lib/Munin/Master/Config.pm
---- munin-2.0.65.orig/master/lib/Munin/Master/Config.pm	2020-10-28 22:36:02.000000000 +0100
-+++ munin-2.0.65/master/lib/Munin/Master/Config.pm	2021-01-04 18:03:15.210803396 +0100
-@@ -157,8 +157,8 @@
+diff -ur munin-2.0.69.orig/master/lib/Munin/Master/Config.pm munin-2.0.69/master/lib/Munin/Master/Config.pm
+--- munin-2.0.69.orig/master/lib/Munin/Master/Config.pm	2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/master/lib/Munin/Master/Config.pm	2022-08-27 15:17:33.866403127 +0200
+@@ -159,8 +159,8 @@
  		tls_private_key  => "$Munin::Common::Defaults::MUNIN_CONFDIR/munin.pem",
  		tls_verify_certificate => 0,
  		tls_verify_depth => 5,
@@ -119,9 +119,9 @@ diff -ur munin-2.0.65.orig/master/lib/Munin/Master/Config.pm munin-2.0.65/master
  	        cgitmpdir        => "$Munin::Common::Defaults::MUNIN_DBDIR/cgi-tmp",
  		ssh_command      => "ssh",
  		ssh_options      => "-o ChallengeResponseAuthentication=no -o StrictHostKeyChecking=no",
-diff -ur munin-2.0.65.orig/master/lib/Munin/Master/Utils.pm munin-2.0.65/master/lib/Munin/Master/Utils.pm
---- munin-2.0.65.orig/master/lib/Munin/Master/Utils.pm	2020-10-28 22:36:02.000000000 +0100
-+++ munin-2.0.65/master/lib/Munin/Master/Utils.pm	2021-01-04 18:03:15.210803396 +0100
+diff -ur munin-2.0.69.orig/master/lib/Munin/Master/Utils.pm munin-2.0.69/master/lib/Munin/Master/Utils.pm
+--- munin-2.0.69.orig/master/lib/Munin/Master/Utils.pm	2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/master/lib/Munin/Master/Utils.pm	2022-08-27 15:17:33.867403129 +0200
 @@ -999,8 +999,8 @@
      $config->{'rundir'}        ||= $Munin::Common::Defaults::MUNIN_STATEDIR;
      $config->{'dbdir'}         ||= $Munin::Common::Defaults::MUNIN_DBDIR;
@@ -133,9 +133,9 @@ diff -ur munin-2.0.65.orig/master/lib/Munin/Master/Utils.pm munin-2.0.65/master/
      $config->{'htmldir'}       ||= $Munin::Common::Defaults::MUNIN_HTMLDIR;
      $config->{'spooldir'}      ||= $Munin::Common::Defaults::MUNIN_SPOOLDIR;
      $config->{'#%#parent'}     = undef;
-diff -ur munin-2.0.65.orig/master/munin.conf.in munin-2.0.65/master/munin.conf.in
---- munin-2.0.65.orig/master/munin.conf.in	2020-10-28 22:36:02.000000000 +0100
-+++ munin-2.0.65/master/munin.conf.in	2021-01-04 18:03:15.210803396 +0100
+diff -ur munin-2.0.69.orig/master/munin.conf.in munin-2.0.69/master/munin.conf.in
+--- munin-2.0.69.orig/master/munin.conf.in	2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/master/munin.conf.in	2022-08-27 15:17:33.867403129 +0200
 @@ -12,11 +12,11 @@
  
  # Where to look for the HTML templates