ports/103450: [maintainer update] sysutils/munin-main fix for PR 103436

Lupe Christoph lupe at lupe-christoph.de
Thu Sep 21 08:10:53 UTC 2006


>Number:         103450
>Category:       ports
>Synopsis:       [maintainer update] sysutils/munin-main fix for PR 103436
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Sep 21 08:10:26 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Lupe Christoph
>Release:        FreeBSD 6.1-RELEASE i386
>Organization:
>Environment:
System: FreeBSD vmw-freebsd6.lupe-christoph.de 6.1-RELEASE FreeBSD 6.1-RELEASE #0: Sun May 7 04:32:43 UTC 2006 root at opus.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC i386

	
>Description:
        Johan Strom found a problem in both Munin ports with the
        way a pre-existing user "munin" is detected. He proposed a
        patch to the patch that adapts the Makefile.config in the
        Munin distribution. This PR adopts his patch for the
        munin-main port, modifies pkg-install in a similar way, and
        bumps the port revision to 1.

        A similar patch for munin-node will follow.
>How-To-Repeat:
	
>Fix:

	

--- munin-main.patch begins here ---
diff -ruN munin-main-1.2.4/Makefile munin-main-1.2.4_1/Makefile
--- munin-main-1.2.4/Makefile	Thu Nov  3 17:59:30 2005
+++ munin-main-1.2.4_1/Makefile	Thu Sep 21 09:16:14 2006
@@ -7,6 +7,7 @@
 
 PORTNAME=	munin
 PORTVERSION=	1.2.4
+PORTREVISION=	1
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	munin
diff -ruN munin-main-1.2.4/files/patch-Makefile.config munin-main-1.2.4_1/files/patch-Makefile.config
--- munin-main-1.2.4/files/patch-Makefile.config	Fri Mar  4 18:45:10 2005
+++ munin-main-1.2.4_1/files/patch-Makefile.config	Thu Sep 21 09:19:27 2006
@@ -78,8 +78,8 @@
 -GETENT = $(shell which getent || which true 2>/dev/null)
 -CHECKUSER  = $(shell $(GETENT) passwd $(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistant. Create the user and retry; exit 2"))
 -CHECKGROUP = $(shell $(GETENT) group $(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistant. Create the group and retry; exit 2"))
-+CHECKUSER:= $(shell grep $(USER) /etc/passwd >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistant. Create the user and retry; exit 2"))
-+CHECKGROUP:= $(shell grep $(GROUP) /etc/group >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistant. Create the group and retry; exit 2"))
++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
diff -ruN munin-main-1.2.4/pkg-install munin-main-1.2.4_1/pkg-install
--- munin-main-1.2.4/pkg-install	Fri Mar  4 18:45:10 2005
+++ munin-main-1.2.4_1/pkg-install	Thu Sep 21 09:17:49 2006
@@ -45,7 +45,7 @@
 	    echo "Done."
 	else
 	    echo "Please create it, and try again."
-	    if ! grep -q "^${u}:" /etc/passwd; then
+	    if ! /usr/sbin/pw user show ${u} >/dev/null 2>/dev/null; then
 		echo "While you're at it, please create a user \"${u}\" too,"
 		echo "with a default group of \"${g}\"."
 	    fi
--- munin-main.patch ends here ---


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



More information about the freebsd-ports-bugs mailing list