View | Details | Raw Unified | Return to bug 233767 | Differences between
and this patch

Collapse All | Expand All

(-)./files/patch-Makefile (-13 / +22 lines)
Lines 1-6 Link Here
1
--- Makefile.orig	2019-02-28 14:43:36 UTC
1
--- Makefile.orig	2019-05-09 03:45:43 UTC
2
+++ Makefile
2
+++ Makefile
3
@@ -95,60 +95,47 @@ install: install-master-prime install-common-prime ins
3
@@ -34,7 +34,7 @@ PODMAN8          := build/master/doc/mun
4
 PODMAN5          := build/master/doc/munin.conf node/doc/munin-node.conf
5
 PYTHON_LINT_CALL ?= python3 -m flake8
6
 CONFVAR_SUBSTITUTION_FILES = \
7
-	master/blib/libdoc/Munin\:\:Master\:\:HTMLOld.3pm \
8
+	master/blib/libdoc/Munin\:\:Master\:\:HTMLOld.3 \
9
 	master/blib/lib/Munin/Master/HTMLOld.pm \
10
 	node/blib/sbin/munin-node-configure \
11
 	node/blib/sbin/munin-node \
12
@@ -95,60 +95,47 @@ install: install-master-prime install-co
4
 
13
 
5
 install-pre: $(MAKEFILES)
14
 install-pre: $(MAKEFILES)
6
 	@$(CHECKUSER)
15
 	@$(CHECKUSER)
Lines 24-29 Link Here
24
-	mkdir -p $(DBDIR)
33
-	mkdir -p $(DBDIR)
25
-	mkdir -p $(DBDIR)/cgi-tmp
34
-	mkdir -p $(DBDIR)/cgi-tmp
26
-	mkdir -p $(CGIDIR)
35
-	mkdir -p $(CGIDIR)
36
-
37
-	$(CHOWN) $(USER) $(HTMLDIR) $(DBDIR)
38
-	$(CHMOD) 0755 $(DBDIR)
39
-
40
-	$(CHOWN) $(CGIUSER) $(DBDIR)/cgi-tmp
41
-	$(CHMOD) 0755 $(DBDIR)/cgi-tmp
27
+	mkdir -p $(DESTDIR)$(CONFDIR)/templates
42
+	mkdir -p $(DESTDIR)$(CONFDIR)/templates
28
+	mkdir -p $(DESTDIR)$(CONFDIR)/static
43
+	mkdir -p $(DESTDIR)$(CONFDIR)/static
29
+	mkdir -p $(DESTDIR)$(CONFDIR)/templates/partial
44
+	mkdir -p $(DESTDIR)$(CONFDIR)/templates/partial
Lines 34-45 Link Here
34
+	mkdir -p $(DESTDIR)$(DBDIR)/cgi-tmp
49
+	mkdir -p $(DESTDIR)$(DBDIR)/cgi-tmp
35
+	mkdir -p $(DESTDIR)$(CGIDIR)
50
+	mkdir -p $(DESTDIR)$(CGIDIR)
36
 
51
 
37
-	$(CHOWN) $(USER) $(HTMLDIR) $(DBDIR)
38
-	$(CHMOD) 0755 $(DBDIR)
39
-
40
-	$(CHOWN) $(CGIUSER) $(DBDIR)/cgi-tmp
41
-	$(CHMOD) 0755 $(DBDIR)/cgi-tmp
42
-
43
 	for p in master/www/*.tmpl ;  do \
52
 	for p in master/www/*.tmpl ;  do \
44
-		$(INSTALL) -m 0644 "$$p" $(CONFDIR)/templates/ ; \
53
-		$(INSTALL) -m 0644 "$$p" $(CONFDIR)/templates/ ; \
45
+		$(INSTALL) -m 0644 "$$p" $(DESTDIR)$(CONFDIR)/templates/ ; \
54
+		$(INSTALL) -m 0644 "$$p" $(DESTDIR)$(CONFDIR)/templates/ ; \
Lines 88-94 Link Here
88
 
97
 
89
 # Not ready to be installed yet
98
 # Not ready to be installed yet
90
 # $(INSTALL) -m 0755 build/master/_bin/munin-gather $(LIBDIR)/
99
 # $(INSTALL) -m 0755 build/master/_bin/munin-gather $(LIBDIR)/
91
@@ -158,36 +145,30 @@ install-node-plugins: install-plugins-prime
100
@@ -158,36 +145,30 @@ install-node-plugins: install-plugins-pr
92
 install-plugins-prime: install-plugins build $(PLUGINS) $(MAKEFILES)
101
 install-plugins-prime: install-plugins build $(PLUGINS) $(MAKEFILES)
93
 	@$(CHECKGROUP)
102
 	@$(CHECKGROUP)
94
 
103
 
Lines 96-110 Link Here
96
-	mkdir -p $(CONFDIR)/plugin-conf.d
105
-	mkdir -p $(CONFDIR)/plugin-conf.d
97
-	mkdir -p $(LIBDIR)/plugins
106
-	mkdir -p $(LIBDIR)/plugins
98
-	mkdir -p $(PLUGSTATE)
107
-	mkdir -p $(PLUGSTATE)
108
-
109
-	$(CHOWN) root:root $(PLUGSTATE)
110
-	$(CHMOD) 0755 $(PLUGSTATE)
111
-	$(CHMOD) 0755 $(CONFDIR)/plugin-conf.d
99
+	mkdir -p $(DESTDIR)$(CONFDIR)/plugins
112
+	mkdir -p $(DESTDIR)$(CONFDIR)/plugins
100
+	mkdir -p $(DESTDIR)$(CONFDIR)/plugin-conf.d
113
+	mkdir -p $(DESTDIR)$(CONFDIR)/plugin-conf.d
101
+	mkdir -p $(DESTDIR)$(LIBDIR)/plugins
114
+	mkdir -p $(DESTDIR)$(LIBDIR)/plugins
102
+	mkdir -p $(DESTDIR)$(PLUGSTATE)
115
+	mkdir -p $(DESTDIR)$(PLUGSTATE)
103
 
116
 
104
-	$(CHOWN) root:root $(PLUGSTATE)
105
-	$(CHMOD) 0755 $(PLUGSTATE)
106
-	$(CHMOD) 0755 $(CONFDIR)/plugin-conf.d
107
-
108
 	@# Process the OS specific plugins at the end. Otherwise they would be overridden by the
117
 	@# Process the OS specific plugins at the end. Otherwise they would be overridden by the
109
 	@# generic ones.
118
 	@# generic ones.
110
 	for p in build/plugins/node.d/* build/plugins/node.d.$(OSTYPE)/* ; do \
119
 	for p in build/plugins/node.d/* build/plugins/node.d.$(OSTYPE)/* ; do \
(-)./files/patch-plugins_node.d_amavis (+11 lines)
Line 0 Link Here
1
--- plugins/node.d/amavis.in.orig	2019-05-09 03:45:43 UTC
2
+++ plugins/node.d/amavis.in
3
@@ -119,7 +119,7 @@ spams=U
4
 
5
 TEMP_FILE=$(@@MKTEMP@@ munin-amavis.XXXXXX)
6
 
7
-if [ -n "$TEMP_FILE" ] && [ -f "$TEMP_FILE" ]; then
8
+if [ -z "$TEMP_FILE" ] || [ -f "$TEMP_FILE" ]; then
9
 	if [ "$ARGS" != 0 ]; then
10
 	    "$LOGTAIL" -f "${AMAVIS_LOG}" -o "${STATEFILE}" | grep 'amavis\[.*\]:' > "${TEMP_FILE}"
11
 	else
(-)./files/patch-plugins_node.d_mbmon_.in (+56 lines)
Line 0 Link Here
1
--- plugins/node.d/mbmon_.in.orig	2019-05-09 03:45:43 UTC
2
+++ plugins/node.d/mbmon_.in
3
@@ -18,13 +18,23 @@
4
 # purpose.
5
 #
6
 
7
+# Needs following minimal configuration in plugin-conf.d/munin-node:
8
+#   [mbmon_*]
9
+#   env.mbmonpath /usr/local/bin/mbmon
10
+#   env.mbmonargs -I -pit87
11
+#
12
+# Parameters
13
+#       mbmonpath     - Specify path to smartctl program
14
+#       mbmonargs     - Added argument passed to mbmon with '-c 1 -r '+mbmonargs
15
+#
16
+# If it is not automatically recognized, the individual parameters are appended.
17
+
18
 #%# family=contrib
19
 #%# capabilities=autoconf suggest
20
 
21
 what=$(basename "$0" | sed 's/^mbmon_//g')
22
-mbmon=${mbmon:-$(which mbmon)}
23
+mbmon="${mbmonpath:-$(which mbmon)} -c1 -r ${mbmonargs}"
24
 
25
-
26
 if [ "$1" = "suggest" ]; then
27
 	echo 'TEMP'
28
 	echo 'FAN'
29
@@ -43,8 +53,6 @@
30
 	exit 0
31
 fi
32
 
33
-
34
-
35
 if [ "$1" = "config" ]; then
36
 case $what in
37
 	TEMP)
38
@@ -88,15 +96,15 @@
39
 
40
 case $what in
41
 	TEMP)
42
-		$mbmon -c 1 -r | sed -e "s/ *: */.value /"  |grep TEMP
43
+		$mbmon | sed -e "s/ *: */.value /" | grep TEMP
44
 		exit 0
45
 		;;
46
 	Voltage)
47
-		$mbmon -c 1 -r | sed -e "s/ *: */.value /"  |grep V
48
+		$mbmon | sed -e "s/ *: */.value /" | grep V
49
 		exit 0
50
 		;;
51
 	FAN)
52
-		$mbmon -c 1 -r | sed -e "s/ *: */.value /"  |grep FAN
53
+		$mbmon | sed -e "s/ *: */.value /" | grep FAN
54
 		exit 0
55
 		;;
56
 esac
(-)./files/patch-test-mktemp (+20 lines)
Line 0 Link Here
1
--- test-mktemp.orig	2019-05-09 03:45:43 UTC
2
+++ test-mktemp
3
@@ -37,7 +37,7 @@
4
 
5
 
6
 testfun () {
7
-	TEMP_FILE=`eval $MKTEMP 2>/dev/null`
8
+	TEMP_FILE=`eval $MKTEMP $1 2>/dev/null`
9
 	STATUS=$?
10
 	if [ $STATUS = 0 -a -n "$TEMP_FILE" -a -f "$TEMP_FILE" ]; then
11
 		rm -f $TEMP_FILE
12
@@ -53,7 +53,7 @@
13
 testfun temp.XXXXXX
14
 
15
 # FreeBSD way
16
-MKTEMP="mktemp -t /tmp"
17
+MKTEMP="mktemp -t $1"
18
 testfun temp.XXXXXX
19
 
20
 # Plain mktemp
(-)./Makefile (+1 lines)
Lines 3-8 Link Here
3
3
4
PORTNAME=	munin
4
PORTNAME=	munin
5
PORTVERSION=	${MUNIN_VERSION}
5
PORTVERSION=	${MUNIN_VERSION}
6
PORTREVISION=	1
6
CATEGORIES=	sysutils perl5
7
CATEGORIES=	sysutils perl5
7
MASTER_SITES=	${MUNIN_SITES}
8
MASTER_SITES=	${MUNIN_SITES}
8
PKGNAMESUFFIX=	-common
9
PKGNAMESUFFIX=	-common

Return to bug 233767