munin: update to 2.0.44

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: munin: update to 2.0.44
From: Sebastian Wiedenroth <wiedi%frubar.net@localhost>
Date: Thu, 17 Jan 2019 12:49:04 +0000
Module Name:	pkgsrc-wip
Committed By:	Sebastian Wiedenroth <wiedi%frubar.net@localhost>
Pushed By:	drscream
Date:		Thu Jan 17 12:49:04 2019 +0000
Changeset:	cd9dc2f490e7abd5219158f053412eeeef3e3c92

Modified Files:
	munin-common/Makefile.common
	munin-common/distinfo
	munin-common/patches/patch-Makefile
	munin-common/patches/patch-Makefile.config
Added Files:
	munin-common/patches/patch-common_Build.PL
Removed Files:
	munin-common/patches/patch-Build.PL

Log Message:
munin: update to 2.0.44

munin-2.0.44, 2018-12-19
 Bugfix release.
munin-2.0.43, 2018-11-16
 Bugfix release.
munin-2.0.42, 2018-09-21
 Bugfix release.
munin-2.0.41, 2018-09-19
 Bugfix release.
munin-2.0.40, 2018-08-15
 Bugfix release.
munin-2.0.39, 2018-07-24
 Bugfix release.
munin-2.0.38, 2018-06-29
 Bugfix release.
munin-2.0.37, 2018-03-28
 Bugfix release.
munin-2.0.36, 2018-03-25
 Bugfix release.
munin-2.0.35, 2018-03-21
 Bugfix release.
munin-2.0.34, 2017-10-20
 Bugfix release.
munin-2.0.33, 2017-03-02
 Bugfix release.
munin-2.0.32, 2017-03-01
 Bugfix release.
munin-2.0.31, 2017-02-25
 Bugfix release.
munin-2.0.30.1, 2017-02-25
 Security release.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=cd9dc2f490e7abd5219158f053412eeeef3e3c92

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 munin-common/Makefile.common               |  2 +-
 munin-common/distinfo                      | 14 +++----
 munin-common/patches/patch-Build.PL        | 14 -------
 munin-common/patches/patch-Makefile        | 20 ++++-----
 munin-common/patches/patch-Makefile.config | 66 +++++++++++++++++++-----------
 munin-common/patches/patch-common_Build.PL | 14 +++++++
 6 files changed, 75 insertions(+), 55 deletions(-)

diffs:
diff --git a/munin-common/Makefile.common b/munin-common/Makefile.common
index a4d8026d70..908059d29e 100644
--- a/munin-common/Makefile.common
+++ b/munin-common/Makefile.common
@@ -4,7 +4,7 @@
 # used by wip/munin-master/Makefile
 # used by wip/munin-node/Makefile
 
-VERSION=	2.0.30
+VERSION=	2.0.44
 DISTNAME=	munin-${VERSION}
 CATEGORIES=	sysutils
 MASTER_SITES=	http://downloads.munin-monitoring.org/munin/stable/${VERSION}/
diff --git a/munin-common/distinfo b/munin-common/distinfo
index 00eaf5d91f..c875b90ec5 100644
--- a/munin-common/distinfo
+++ b/munin-common/distinfo
@@ -1,11 +1,11 @@
 $NetBSD: distinfo,v 1.7 2015/01/14 15:22:22 fhajny Exp $
 
-SHA1 (munin-2.0.30.tar.gz) = 49bb46fa775d6492e60c8d9cd300778051424787
-RMD160 (munin-2.0.30.tar.gz) = 964f2d49602261fceb6f092f367af88aa070bf67
-SHA512 (munin-2.0.30.tar.gz) = 9ee8dedf8f335ed7aff2c9996f2be8626112ab2a59ddca70160426cefd7f395935d605fd735781b3cab444a488bcd91d47ff931663bfd67c6dc6bb18f68d4ca6
-Size (munin-2.0.30.tar.gz) = 1342168 bytes
-SHA1 (patch-Build.PL) = c1ad9928e4015e4c19ad01977a911e4de33ba0a8
+SHA1 (munin-2.0.44.tar.gz) = fd0ea55c6f26ea957955c8acaa0b3affb4565d1a
+RMD160 (munin-2.0.44.tar.gz) = 764c9bbd28081f298830f214d63cb513cdfa896c
+SHA512 (munin-2.0.44.tar.gz) = 9196068f12a0cf3c65c875d98baef1c84c7846d373362db47ee31d35377ecda1fcdf806fe7fc24b5af60fd8f036cb87e8dcb5ccdd038952c229af3be5726e4ec
+Size (munin-2.0.44.tar.gz) = 2258278 bytes
 SHA1 (patch-MANIFEST) = 538cec30723a6d41b732c9dc4a175472fb821609
-SHA1 (patch-Makefile) = 4842edf46fd96a3a97d3d6ed2cce13283cfb46c9
-SHA1 (patch-Makefile.config) = ea260f07ec966a9aecf427d145b817cd13d915f1
+SHA1 (patch-Makefile) = dc69e017d2c5de06234179c80e1a5d6b21b06fff
+SHA1 (patch-Makefile.config) = a59ef54e27b88ff578eb3a2d2885ef89afcd86fb
+SHA1 (patch-common_Build.PL) = 532e4d824e47ca4baeaec81fc78c8a151729f339
 SHA1 (patch-lib_Munin_Common_Defaults.pm) = 2f6ffe9fe1b91361e35b9bfcac239252ba789482
diff --git a/munin-common/patches/patch-Build.PL b/munin-common/patches/patch-Build.PL
deleted file mode 100644
index 138caba111..0000000000
--- a/munin-common/patches/patch-Build.PL
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-Build.PL,v 1.1 2015/01/13 15:36:02 fhajny Exp $
-
-Add missing module_name so that Munin::Common becomes a valid Perl Module.
-
---- common/Build.PL.orig	2014-11-24 21:46:24.000000000 +0000
-+++ common/Build.PL
-@@ -1,6 +1,7 @@
- use Module::Build;
- 
- my $build = Module::Build->new(
-+    module_name    => 'Munin::Common',
-     dist_name      => 'Munin::Common',
-     dist_version   => '0.0.0',
-     dist_author    => 'The Munin Team <fix%example.com@localhost>',
diff --git a/munin-common/patches/patch-Makefile b/munin-common/patches/patch-Makefile
index 24a65e76c8..71350ea69c 100644
--- a/munin-common/patches/patch-Makefile
+++ b/munin-common/patches/patch-Makefile
@@ -1,14 +1,14 @@
-$NetBSD: patch-Makefile,v 1.2 2015/01/14 15:22:23 fhajny Exp $
+$NetBSD$
 
 Installation fixed to use all essential files, populate
 PKG_SYSCONFDIR as expected by the Munin scripts.
 
---- Makefile.orig	2014-11-24 21:46:24.000000000 +0000
+--- Makefile.orig	2018-12-19 20:56:49.000000000 +0000
 +++ Makefile
-@@ -67,50 +67,37 @@ tags:
+@@ -95,50 +95,37 @@ tags:
  install: install-master-prime install-common-prime install-node-prime install-plugins-prime $(JAVA_INSTALL) install-man install-async-prime
  
- install-pre: Makefile Makefile.config
+ install-pre: $(MAKEFILES)
 -	@$(CHECKUSER)
 -	mkdir -p $(LOGDIR)
 -	mkdir -p $(STATEDIR)
@@ -66,10 +66,10 @@ PKG_SYSCONFDIR as expected by the Munin scripts.
  
  	$(INSTALL) -m 0755 build/master/_bin/munin-cron $(BINDIR)/
  	$(INSTALL) -m 0755 build/master/_bin/munin-check $(BINDIR)/
-@@ -137,16 +124,7 @@ HPUXONLY=true ||
- endif
+@@ -157,16 +144,7 @@ install-master-prime: $(INFILES_MASTER)
+ install-node-plugins: install-plugins-prime
  
- install-plugins-prime: install-plugins build $(PLUGINS) Makefile Makefile.config
+ install-plugins-prime: install-plugins build $(PLUGINS) $(MAKEFILES)
 -	@$(CHECKGROUP)
 -
 -	mkdir -p $(CONFDIR)/plugins
@@ -81,9 +81,9 @@ PKG_SYSCONFDIR as expected by the Munin scripts.
 -	$(CHMOD) 0755 $(PLUGSTATE)
 -	$(CHMOD) 0755 $(CONFDIR)/plugin-conf.d
  
- 	for p in build/plugins/node.d/* build/plugins/node.d.$(OSTYPE)/* ; do \
- 	    if test -f "$$p" ; then                            \
-@@ -183,7 +161,7 @@ install-async:
+	@# Process the OS specific plugins at the end. Otherwise they would be overridden by the
+	@# generic ones.
+@@ -206,7 +184,7 @@ install-async:
  install-node-prime: install-node-pre install-node
  
  install-node-pre: build/node/munin-node.conf install-pre
diff --git a/munin-common/patches/patch-Makefile.config b/munin-common/patches/patch-Makefile.config
index 823003aa40..7104a02de6 100644
--- a/munin-common/patches/patch-Makefile.config
+++ b/munin-common/patches/patch-Makefile.config
@@ -1,9 +1,9 @@
-$NetBSD: patch-Makefile.config,v 1.1 2015/01/13 15:36:04 fhajny Exp $
+$NetBSD$
 
 Define proper default locations and tools. Really need Bash for plugins
 despite what upstream says.
 
---- Makefile.config.orig	2014-11-24 21:46:24.000000000 +0000
+--- Makefile.config.orig	2019-01-17 12:20:47.528006286 +0000
 +++ Makefile.config
 @@ -17,35 +17,38 @@
  #
@@ -72,7 +72,7 @@ despite what upstream says.
 +PERL       := $(PERL5)
  
  # The python interpreter to use (used by some plugins)
--PYTHON     := /usr/bin/env python
+-PYTHON     := /usr/bin/env python3
 +PYTHON     := $(PYTHONBIN)
  
  # The ruby interpreter to use (used by some plugins)
@@ -85,7 +85,7 @@ despite what upstream says.
  
  # The java library dir to use (used by some plugins)
  # this is needed in order to be able to install
-@@ -89,14 +92,14 @@ JAVALIBDIR = $(LIBDIR)
+@@ -89,13 +92,14 @@ JAVALIBDIR = $(LIBDIR)
  # On Linux /bin/sh, SunOS/Solaris /usr/xpg4/bin/sh or /bin/ksh
  # In general: bash or ksh will work
  #
@@ -97,14 +97,13 @@ despite what upstream says.
 +BASH       := $(BASH)
  
  # Server only - Where to install the perl libraries
--PERLSITELIB := $(shell $(PERL) -V:sitelib | cut -d"'" -f2)
--PERLLIB    = $(DESTDIR)$(PERLSITELIB)
+-PERLLIB    = $(DESTDIR)$(shell $(PERL) -V:sitelib | cut -d"'" -f2)
 +PERLVENDORLIB := $(shell $(PERL) -V:vendorlib | cut -d"'" -f2)
 +PERLLIB    = $(DESTDIR)$(PERLVENDORLIB)
  
  # Client only - Install plugins for this architecture
  # the LANG=C makes tr work as expected, not regarding any locale it
-@@ -117,8 +120,8 @@ MKTEMP     := $(shell ./test-mktemp)
+@@ -116,8 +120,8 @@ MKTEMP     := $(shell ./test-mktemp)
  VERSION    := $(shell ./getversion)
  
  # User to run munin as
@@ -115,26 +114,47 @@ despite what upstream says.
  
  # Default user to run the plugins as
  PLUGINUSER := nobody
-@@ -129,9 +132,10 @@ CGIUSER := nobody
- # Which command to use to check if the USER and GROUP to run Munin as, exists.
- # These will work on most modern OSes:
- #
--GETENT     := $(shell which getent || which true 2>/dev/null)
--CHECKUSER  := $(shell $(GETENT) passwd $(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistent. Create the user and retry; exit 2"))
--CHECKGROUP := $(shell $(GETENT) group $(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistent. Create the group and retry; exit 2"))
-+CHECKUSER  = $(shell grep $(USER) /etc/passwd >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistent. Create the user and retry; exit 2"))
-+CHECKGROUP = $(shell grep $(GROUP) /etc/group >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistent. Create the group and retry; exit 2"))
-+
-+
- 
- # For OSX, comment out the previous two lines and comment in these
- #
-@@ -158,7 +162,7 @@ CHMOD      := chmod
+@@ -125,32 +129,8 @@ PLUGINUSER := nobody
+ # Default user to run the cgi as
+ CGIUSER := nobody
+
+-# Which command to use to check if the USER and GROUP to run Munin as, exists.
+-ifneq ($(shell which getent),)
+-    # "getent" works on most modern OS
+-    CHECKUSER_COMMAND := getent passwd $(USER)
+-    CHECKGROUP_COMMAND := getent group $(GROUP)
+-else
+-    ifeq ($(OSTYPE),darwin)
+-        # This should work for OSX 10.5 (Leopard) or later
+-        CHECKUSER_COMMAND := dscl . -read /Users/$(USER)
+-        CHECKGROUP_COMMAND := dscl . -read /Groups/$(GROUP)
+-    else
+-        ifeq ($(OSTYPE),cygwin)
+-            CHECKUSER_COMMAND := id $(USER)
+-            CHECKGROUP_COMMAND := grep ^$(GROUP): /etc/group
+-        else
+-            ifeq ($(OSTYPE),hp-ux)
+-                CHECKUSER_COMMAND := pwget -n $(USER)
+-                CHECKGROUP_COMMAND := grget -n $(GROUP)
+-            else
+-                $(warning Missing test for user existence on this platform. Skipping this check and hoping for the best ...)
+-                CHECKUSER_COMMAND := true
+-                CHECKGROUP_COMMAND := true
+-            endif
+-        endif
+-    endif
+-endif
++CHECKUSER_COMMAND := true
++CHECKGROUP_COMMAND := true
+ CHECKUSER  := $(shell $(CHECKUSER_COMMAND) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistent. Create the user and retry; exit 2"))
+ CHECKGROUP := $(shell $(CHECKGROUP_COMMAND) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistent. Create the group and retry; exit 2"))
+
+@@ -159,7 +139,7 @@ CHMOD      := chmod
  CHGRP      := chgrp
  
  # Java compiler stuff - only needed on the buildhost
 -JC         := javac
 +JC         := $(JAVA_HOME)/bin/javac
- JFLAGS     := -g -source 1.5 -target 1.5 -Xlint
+ JFLAGS     := -g -source 1.7 -target 1.7 -Xlint
  JAR        := jar
  
diff --git a/munin-common/patches/patch-common_Build.PL b/munin-common/patches/patch-common_Build.PL
new file mode 100644
index 0000000000..3889d177e6
--- /dev/null
+++ b/munin-common/patches/patch-common_Build.PL
@@ -0,0 +1,14 @@
+$NetBSD$
+
+Add missing module_name so that Munin::Common becomes a valid Perl Module.
+
+--- common/Build.PL.orig	2019-01-17 12:03:08.506724040 +0000
++++ common/Build.PL
+@@ -4,6 +4,7 @@ my $version = `../getversion`;
+ chomp($version);
+
+ my $build = Module::Build->new(
++    module_name    => 'Munin::Common',
+     dist_name      => 'Munin::Common',
+     dist_version   => $version,
+     dist_author    => 'The Munin Team <munin-users%lists.sourceforge.net@localhost>',
Prev by Date: joomla: Add reference to CVE-2019-15028
Next by Date: munin: update to 2.0.49
Previous by Thread: joomla: Add reference to CVE-2019-15028
Next by Thread: munin: update to 2.0.49
Indexes:
Home | Main Index | Thread Index | Old Index