From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Sep 21 08:10:53 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D396216A4AB for ; Thu, 21 Sep 2006 08:10:53 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 194F643D86 for ; Thu, 21 Sep 2006 08:10:36 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k8L8ARAs041367 for ; Thu, 21 Sep 2006 08:10:27 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k8L8ARXG041366; Thu, 21 Sep 2006 08:10:27 GMT (envelope-from gnats) Resent-Date: Thu, 21 Sep 2006 08:10:27 GMT Resent-Message-Id: <200609210810.k8L8ARXG041366@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Lupe Christoph Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 38E5116A4C2 for ; Thu, 21 Sep 2006 08:08:20 +0000 (UTC) (envelope-from lupe@lupe-christoph.de) Received: from buexe.b-5.de (buexe.b-5.de [84.19.0.30]) by mx1.FreeBSD.org (Postfix) with ESMTP id 75DC543D5F for ; Thu, 21 Sep 2006 08:08:16 +0000 (GMT) (envelope-from lupe@lupe-christoph.de) Received: from antalya.lupe-christoph.de (antalya.lupe-christoph.de [172.17.0.9]) by buexe.b-5.de (8.13.4/8.13.4/b-5/buexe-3.5) with ESMTP id k8L88FBe001088 for ; Thu, 21 Sep 2006 10:08:15 +0200 Received: from localhost (localhost [127.0.0.1]) by antalya.lupe-christoph.de (Postfix) with ESMTP id 5649934530 for ; Thu, 21 Sep 2006 10:08:10 +0200 (CEST) Received: from antalya.lupe-christoph.de ([127.0.0.1]) by localhost (antalya.lupe-christoph.de [127.0.0.1]) (amavisd-new, port 10024) with LMTP id OUtF9VIii8wB for ; Thu, 21 Sep 2006 10:08:05 +0200 (CEST) Received: from vmw-freebsd5.lupe-christoph.de (vmw-freebsd5.lupe-christoph.de [172.17.2.15]) by antalya.lupe-christoph.de (Postfix) with ESMTP id 3A74E34529 for ; Thu, 21 Sep 2006 10:08:05 +0200 (CEST) Received: by vmw-freebsd5.lupe-christoph.de (Postfix, from userid 1000) id 13F8D8031; Thu, 21 Sep 2006 10:08:03 +0200 (CEST) Message-Id: <20060921080804.13F8D8031@vmw-freebsd5.lupe-christoph.de> Date: Thu, 21 Sep 2006 10:08:03 +0200 (CEST) From: Lupe Christoph To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/103450: [maintainer update] sysutils/munin-main fix for PR 103436 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Lupe Christoph List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Sep 2006 08:10:53 -0000 >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@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: