Attachment 84704 Details for Bug 120755 – munin-main-1.2.5_1.patch

[patch] munin-main-1.2.5_1.patch

munin-main-1.2.5_1.patch (text/plain), 1.72 KB, created by gslin on 2008-02-17 13:20:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: gslin

Created: 2008-02-17 13:20:06 UTC

Size: 1.72 KB

patch

obsolete

>diff -ruN --exclude=CVS /usr/ports/sysutils/munin-main/Makefile /home/staff/gslin/work/ports/munin-main/Makefile
>--- /usr/ports/sysutils/munin-main/Makefile	2008-02-07 18:41:12.000000000 +0800
>+++ /home/staff/gslin/work/ports/munin-main/Makefile	2008-02-17 21:18:22.000000000 +0800
>@@ -7,6 +7,7 @@
> 
> PORTNAME=	munin
> PORTVERSION=	1.2.5
>+PORTREVISION=	1
> CATEGORIES=	sysutils perl5
> MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
> MASTER_SITE_SUBDIR=	munin
>diff -ruN --exclude=CVS /usr/ports/sysutils/munin-main/pkg-install /home/staff/gslin/work/ports/munin-main/pkg-install
>--- /usr/ports/sysutils/munin-main/pkg-install	2006-11-07 06:52:45.000000000 +0800
>+++ /home/staff/gslin/work/ports/munin-main/pkg-install	2008-02-17 21:18:10.000000000 +0800
>@@ -33,15 +33,17 @@
>     local u g gcos
> 
>     u=$1
>-    g=$2
>-    gcos=$3
>+    uid=$2
>+    g=$3
>+    gid=$4
>+    gcos=$5
> 
>     if pw group show "${g}" >/dev/null 2>&1; then
> 	echo "You already have a group \"${g}\", so I will use it."
>     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 ${gid} ${g} || 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} -g ${g} -h -u ${uid} - \
> 		-s /bin/sh -c "${gcos}" || exit
> 	    echo "Done."
> 	else
>@@ -109,7 +111,7 @@
> 
> case $2 in
>     PRE-INSTALL)
>-	make_account munin munin "Munin owner"
>+	make_account munin 842 munin 842 "Munin owner"
> 	move_www_dir # at some point in the installation, the www dir is created
> 	;;      
>     POST-INSTALL)

Actions: View | Diff

Attachments on bug 120755: 84704