ports/126430: [PATCH] sysutils/munin-main: update to 1.2.6

Sun Aug 10 18:10:05 UTC 2008

>Number:         126430
>Category:       ports
>Synopsis:       [PATCH] sysutils/munin-main: update to 1.2.6
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Aug 10 18:10:04 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Gea-Suan Lin
>Release:        FreeBSD 7.0-STABLE amd64
>Organization:
>Environment:
System: FreeBSD host-1.pixnet.tw 7.0-STABLE FreeBSD 7.0-STABLE #1: Wed Jul 16 13:00:27 CST 2008
>Description:
- Update to 1.2.6
- Use fixed UID/GID (494), from port 4949.

Port maintainer (des at FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- munin-main-1.2.6.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/sysutils/munin-main/Makefile /usr/home/admin/gslin/work/ports/munin-main/Makefile
--- /usr/ports/sysutils/munin-main/Makefile	2008-06-24 20:34:56.000000000 +0800
+++ /usr/home/admin/gslin/work/ports/munin-main/Makefile	2008-08-11 01:48:15.000000000 +0800
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	munin
-PORTVERSION=	1.2.5
-PORTREVISION=	1
+PORTVERSION=	1.2.6
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	munin
diff -ruN --exclude=CVS /usr/ports/sysutils/munin-main/distinfo /usr/home/admin/gslin/work/ports/munin-main/distinfo
--- /usr/ports/sysutils/munin-main/distinfo	2006-11-07 06:52:45.000000000 +0800
+++ /usr/home/admin/gslin/work/ports/munin-main/distinfo	2008-08-11 01:49:36.000000000 +0800
@@ -1,3 +1,3 @@
-MD5 (munin_1.2.5.tar.gz) = e863d11693c02bde1c593a6c701e64fd
-SHA256 (munin_1.2.5.tar.gz) = 2d1ea4aa3f0eaf11a5beb0b90f9bbee63e184249e06274fcc9d4c17b70b47a5e
-SIZE (munin_1.2.5.tar.gz) = 353005
+MD5 (munin_1.2.6.tar.gz) = 45f84d58f80642ce914f147232f0d396
+SHA256 (munin_1.2.6.tar.gz) = 3b04d72810317a91225c78652277079ec3cc5791ef8991326da219a05d2477d8
+SIZE (munin_1.2.6.tar.gz) = 360694
diff -ruN --exclude=CVS /usr/ports/sysutils/munin-main/files/patch-Makefile /usr/home/admin/gslin/work/ports/munin-main/files/patch-Makefile
--- /usr/ports/sysutils/munin-main/files/patch-Makefile	2004-06-04 06:38:35.000000000 +0800
+++ /usr/home/admin/gslin/work/ports/munin-main/files/patch-Makefile	2008-08-11 01:50:56.000000000 +0800
@@ -1,11 +1,11 @@
---- Makefile.orig	Tue May 11 22:23:06 2004
-+++ Makefile	Fri Jun  4 00:25:54 2004
-@@ -26,7 +26,7 @@
- 	mkdir -p $(HTMLDIR)
+--- Makefile.orig	2008-08-11 01:50:40.000000000 +0800
++++ Makefile	2008-08-11 01:50:46.000000000 +0800
+@@ -28,7 +28,7 @@
  	mkdir -p $(DBDIR)
+ 	mkdir -p $(CGIDIR)
  
 -	$(CHOWN) $(USER) $(LOGDIR) $(STATEDIR) $(RUNDIR) $(HTMLDIR) $(DBDIR)
 +	$(CHOWN) $(USER) $(STATEDIR) $(RUNDIR) $(HTMLDIR) $(DBDIR)
  
- 	for p in server/*.tmpl; do    		              \
+ 	for p in build/server/*.tmpl; do    		              \
  		$(INSTALL) -m 0644 "$$p" $(CONFDIR)/templates/ ; \
diff -ruN --exclude=CVS /usr/ports/sysutils/munin-main/files/patch-Makefile.config /usr/home/admin/gslin/work/ports/munin-main/files/patch-Makefile.config
--- /usr/ports/sysutils/munin-main/files/patch-Makefile.config	2006-11-07 06:52:45.000000000 +0800
+++ /usr/home/admin/gslin/work/ports/munin-main/files/patch-Makefile.config	2008-08-11 01:56:27.000000000 +0800
@@ -1,6 +1,6 @@
---- munin-1.2.5.orig/Makefile.config	Tue Oct 17 14:27:35 2006
-+++ munin-1.2.5/Makefile.config	Thu Nov  2 12:09:09 2006
-@@ -7,52 +7,56 @@
+--- Makefile.config.orig	2008-08-11 01:52:03.000000000 +0800
++++ Makefile.config	2008-08-11 01:56:15.000000000 +0800
+@@ -7,46 +7,50 @@
  #
  # the base of the Munin installation.
  # 
@@ -64,14 +64,16 @@
  
  # The python interpreter to use (used by some plugins)
  PYTHON     = /usr/bin/env python
+@@ -65,7 +69,7 @@
+ BASH       = /bin/bash
  
  # Server only - Where to install the perl libraries
--PERLLIB    = $(DESTDIR)$(shell $(PERL) -V:sitelib | cut -d= -f2 | sed "s/[\';]//g")
+-PERLLIB    = $(DESTDIR)$(shell $(PERL) -V:sitelib | cut -d"'" -f2)
 +PERLLIB    = $(PREFIX)/$(SITE_PERL_REL)
  
  # Client only - Install plugins for this architecture
  OSTYPE     = $(shell uname | tr '[A-Z]' '[a-z]')
-@@ -77,9 +81,8 @@
+@@ -90,9 +94,8 @@
  PLUGINUSER = nobody
  
  # Which command to use to check if the USER and GROUP to run Munin as, exists.
@@ -81,5 +83,5 @@
 +CHECKUSER:= $(shell /usr/sbin/pw user show $(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistant. Create the user and retry; exit 2"))
 +CHECKGROUP:= $(shell /usr/sbin/pw group show $(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistant. Create the group and retry; exit 2"))
  
- CHOWN      = chown
- CHMOD      = chmod
+ # For OSX, comment out the previous two lines and comment in these 
+ #CHECKUSER  = $(shell nicl . -read /users/$(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistant. Create the user and retry; exit 2")) 
diff -ruN --exclude=CVS /usr/ports/sysutils/munin-main/pkg-install /usr/home/admin/gslin/work/ports/munin-main/pkg-install
--- /usr/ports/sysutils/munin-main/pkg-install	2006-11-07 06:52:45.000000000 +0800
+++ /usr/home/admin/gslin/work/ports/munin-main/pkg-install	2008-08-11 01:47:40.000000000 +0800
@@ -33,7 +33,9 @@
     local u g gcos
 
     u=$1
+    uid=494
     g=$2
+    gid=494
     gcos=$3
 
     if pw group show "${g}" >/dev/null 2>&1; then
@@ -41,7 +43,7 @@
     else
 	echo "You need a group \"${g}\"."
 	if which -s pw && yesno "Would you like me to create it" y; then
-	    pw groupadd ${g} || exit
+	    pw groupadd ${g} -g ${gid} || exit
 	    echo "Done."
 	else
 	    echo "Please create it, and try again."
@@ -58,7 +60,7 @@
     else
 	echo "You need a user \"${u}\"."
 	if which -s pw && yesno "Would you like me to create it" y; then
-	    pw useradd ${u} -g ${g} -h - \
+	    pw useradd ${u} -u ${uid} -g ${g} -h - \
 		-s /bin/sh -c "${gcos}" || exit
 	    echo "Done."
 	else
--- munin-main-1.2.6.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:

