From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Apr 25 10:00:36 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 4A16016A402 for ; Tue, 25 Apr 2006 10:00:36 +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 F17A343D90 for ; Tue, 25 Apr 2006 10:00:31 +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 k3PA0VAu030692 for ; Tue, 25 Apr 2006 10:00:31 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k3PA0VFt030691; Tue, 25 Apr 2006 10:00:31 GMT (envelope-from gnats) Resent-Date: Tue, 25 Apr 2006 10:00:31 GMT Resent-Message-Id: <200604251000.k3PA0VFt030691@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, Gea-Suan Lin Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 57F2616A400; Tue, 25 Apr 2006 09:52:29 +0000 (UTC) (envelope-from gslin@netnews.NCTU.edu.tw) Received: from netnews.NCTU.edu.tw (ccreader.nctu.edu.tw [140.113.54.119]) by mx1.FreeBSD.org (Postfix) with ESMTP id 017A343D48; Tue, 25 Apr 2006 09:52:28 +0000 (GMT) (envelope-from gslin@netnews.NCTU.edu.tw) Received: by netnews.NCTU.edu.tw (Postfix, from userid 1000) id EEB1D1AC; Tue, 25 Apr 2006 17:52:24 +0800 (CST) Message-Id: <20060425095224.EEB1D1AC@netnews.NCTU.edu.tw> Date: Tue, 25 Apr 2006 17:52:24 +0800 (CST) From: Gea-Suan Lin To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: lth@FreeBSD.org Subject: ports/96310: [PATCH] net/smokeping: Use fixed uid/gid X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Apr 2006 10:00:36 -0000 >Number: 96310 >Category: ports >Synopsis: [PATCH] net/smokeping: Use fixed uid/gid >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue Apr 25 10:00:30 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Gea-Suan Lin >Release: FreeBSD 6.0-RELEASE-p2 i386 >Organization: >Environment: System: FreeBSD netnews.NCTU.edu.tw 6.0-RELEASE-p2 FreeBSD 6.0-RELEASE-p2 #4: Sun Jan 15 20:44:38 CST 2006 >Description: * Use fixed uid/gid for smokeping:smokeping. Please update porters-handbook at same time. * Remove www detecting and add uid/gid code. * Change Homepage URL. * Bump PORTREVISION. Port maintainer (lth@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.63 >How-To-Repeat: >Fix: --- smokeping-2.0.8_1.patch begins here --- diff -ruN --exclude=CVS /usr/ports/net/smokeping/Makefile /home/staff/gslin/work/smokeping/Makefile --- /usr/ports/net/smokeping/Makefile Sat Apr 15 03:18:04 2006 +++ /home/staff/gslin/work/smokeping/Makefile Tue Apr 25 17:51:08 2006 @@ -7,6 +7,7 @@ PORTNAME= smokeping PORTVERSION= 2.0.8 +PORTREVISION= 1 CATEGORIES= net www MASTER_SITES= http://people.ee.ethz.ch/~oetiker/webtools/smokeping/pub/ @@ -119,15 +120,12 @@ PKGDEINSTALL= ${WRKDIR}/pkg-deinstall USER= smokeping +SMOKEPING_UID= 116 GROUP= smokeping -WWW_USER= www -WWW_UID= 80 -WWW_GROUP= www -WWW_GID= 80 - -FILES_SUB= USER=${USER} GROUP=${GROUP} \ - WWW_USER=${WWW_USER} WWW_UID=${WWW_UID} \ - WWW_GROUP=${WWW_GROUP} WWW_GID=${WWW_GID} \ +SMOKEPING_GID= 116 + +FILES_SUB= USER=${USER} UID=${SMOKEPING_UID} \ + GROUP=${GROUP} GID=${SMOKEPING_GID} \ PERL=${PERL} PREFIX=${PREFIX} DOC1= CHANGES CONTRIBUTORS COPYING COPYRIGHT README TODO diff -ruN --exclude=CVS /usr/ports/net/smokeping/pkg-descr /home/staff/gslin/work/smokeping/pkg-descr --- /usr/ports/net/smokeping/pkg-descr Thu Oct 13 14:38:45 2005 +++ /home/staff/gslin/work/smokeping/pkg-descr Tue Apr 25 17:35:47 2006 @@ -2,7 +2,7 @@ daemon process which organizes the latency measurements and a CGI which presents the graphs. -WWW: http://people.ee.ethz.ch/~oetiker/webtools/smokeping/ +WWW: http://oss.oetiker.ch/smokeping/ --lars lars@thegler.dk diff -ruN --exclude=CVS /usr/ports/net/smokeping/pkg-install /home/staff/gslin/work/smokeping/pkg-install --- /usr/ports/net/smokeping/pkg-install Tue May 18 21:23:20 2004 +++ /home/staff/gslin/work/smokeping/pkg-install Tue Apr 25 17:27:33 2006 @@ -5,29 +5,8 @@ case $2 in PRE-INSTALL) - if ! pw groupshow %%WWW_GROUP%% 2>/dev/null 1>&2; then - if pw groupadd %%WWW_GROUP%% -g %%WWW_GID%%; then - echo 'Added group "%%WWW_GROUP%%".' - else - echo 'Adding group "%%WWW_GROUP%%" failed...' - exit 1 - fi - fi - - if ! pw usershow %%WWW_USER%% 2>/dev/null 1>&2; then - if pw useradd %%WWW_USER%% -u %%WWW_UID%% -g %%WWW_GROUP%% -h - \ - -s /sbin/nologin -d /nonexistent \ - -c "World Wide Web Owner"; \ - then - echo 'Added user "%%WWW_USER%%".' - else - echo 'Adding user "%%WWW_USER%%" failed...' - exit 1 - fi - fi - if ! pw groupshow %%GROUP%% 2>/dev/null 1>&2; then - if pw groupadd %%GROUP%%; then + if pw groupadd %%GROUP%% -g %%GID%% ; then echo 'Added group "%%GROUP%%".' else echo 'Adding group "%%GROUP%%" failed...' @@ -36,7 +15,7 @@ fi if ! pw usershow %%USER%% 2>/dev/null 1>&2; then - if pw useradd %%USER%% -g %%GROUP%% -h - \ + if pw useradd %%USER%% -u %%UID%% -g %%GROUP%% -h - \ -s /nonexistent -c "SmokePing Daemon"; \ then echo 'Added user "%%USER%%".' --- smokeping-2.0.8_1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: