From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Jun 5 10:30:40 2004 Return-Path: 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 86D5D16A4CE for ; Sat, 5 Jun 2004 10:30:40 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6A65743D58 for ; Sat, 5 Jun 2004 10:30:40 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i55HUOST046184 for ; Sat, 5 Jun 2004 10:30:24 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.11/8.12.11/Submit) id i55HUOJN046177; Sat, 5 Jun 2004 10:30:24 -0700 (PDT) (envelope-from gnats) Resent-Date: Sat, 5 Jun 2004 10:30:24 -0700 (PDT) Resent-Message-Id: <200406051730.i55HUOJN046177@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, Renato Botelho Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DB85616A4CE for ; Sat, 5 Jun 2004 10:24:26 -0700 (PDT) Received: from srv1.galle.com.br (srv1.galle.com.br [200.246.25.2]) by mx1.FreeBSD.org (Postfix) with SMTP id B96A043D49 for ; Sat, 5 Jun 2004 10:24:25 -0700 (PDT) (envelope-from renato@srv1.galle.com.br) Received: (qmail 27936 invoked by uid 1001); 5 Jun 2004 14:24:09 -0300 Message-Id: <20040605172409.27935.qmail@srv1.galle.com.br> Date: 5 Jun 2004 14:24:09 -0300 From: Renato Botelho To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 cc: Alex Perel Subject: ports/67610: Update rinetd to use rcNg startup X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Renato Botelho List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Jun 2004 17:30:40 -0000 >Number: 67610 >Category: ports >Synopsis: Update rinetd to use rcNg startup >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: Sat Jun 05 10:30:23 PDT 2004 >Closed-Date: >Last-Modified: >Originator: Renato Botelho >Release: FreeBSD 5.2.1-RELEASE-p8 i386 >Organization: Galle Folheados >Environment: System: FreeBSD srv1.galle.com.br 5.2.1-RELEASE-p8 FreeBSD 5.2.1-RELEASE-p8 #27: Wed May 26 10:21:14 BRT 2004 root@srv1.galle.com.br:/usr/obj/usr/src/sys/GALLE i386 >Description: Update rinetd to use rcNg startup files >How-To-Repeat: >Fix: diff -Nur rinetd.bkp/Makefile rinetd/Makefile --- rinetd.bkp/Makefile Thu May 13 10:51:54 2004 +++ rinetd/Makefile Sat Jun 5 14:12:07 2004 @@ -7,6 +7,7 @@ PORTNAME= rinetd PORTVERSION= 0.62 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://www.boutell.com/rinetd/http/ DISTNAME= rinetd @@ -18,12 +19,24 @@ MAN8= rinetd.8 PORTDOCS= index.html README -PLIST_FILES= sbin/rinetd + +USE_RC_SUBR= yes +RC_SCRIPTS_SUB= PREFIX=${PREFIX} RC_SUBR=${RC_SUBR} + +post-patch: + @${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ + ${FILESDIR}/rinetd.sh > ${WRKDIR}/rinetd.sh post-install: .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} cd ${WRKSRC} ; ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} .endif + + @if [ ! -f ${PREFIX}/etc/rc.d/rinetd.sh ]; then \ + ${ECHO} "Installing ${PREFIX}/etc/rc.d/rinetd.sh startup file."; \ + ${INSTALL_SCRIPT} -m 751 ${WRKDIR}/rinetd.sh ${PREFIX}/etc/rc.d/rinetd.sh; \ + fi + @${CAT} ${PKGMESSAGE} .include diff -Nur rinetd.bkp/files/rinetd.sh rinetd/files/rinetd.sh --- rinetd.bkp/files/rinetd.sh Wed Dec 31 21:00:00 1969 +++ rinetd/files/rinetd.sh Sat Jun 5 09:55:58 2004 @@ -0,0 +1,28 @@ +#!/bin/sh + +# PROVIDE: rinetd +# REQUIRE: DAEMON +# BEFORE: LOGIN +# KEYWORD: FreeBSD shutdown + +# +# Add the following lines to /etc/rc.conf to enable rinetd: +# rinetd_enable (bool): Set to "NO" by default. +# Set it to "YES" to enable rinetd +# rinetd_flags (str): Set to "" by default. +# Extra flags passed to start command +# +. %%RC_SUBR%% + +name="rinetd" +rcvar=`set_rcvar` + +command="%%PREFIX%%/sbin/rinetd" +pidfile="/var/run/rinetd.pid" + +[ -z "$rinetd_enable" ] && rinetd_enable="NO" +[ -z "$rinetd_flags" ] && rinetd_flags="" + +load_rc_config $name + +run_rc_command "$1" diff -Nur rinetd.bkp/pkg-message rinetd/pkg-message --- rinetd.bkp/pkg-message Wed Dec 31 21:00:00 1969 +++ rinetd/pkg-message Sat Jun 5 13:14:21 2004 @@ -0,0 +1,10 @@ + *********************************** + * !!!!!!!!!!! WARNING !!!!!!!!!!! * + *********************************** +Since 0.62_1, rinetd startup script is now enabled/disabled via +rc.subr. +Available variables: +# rinetd_enable (bool): Set to "NO" by default. +# Set it to "YES" to enable rinetd +# rinetd_flags (str): Set to "" by default. +# Extra flags passed to start command diff -Nur rinetd.bkp/pkg-plist rinetd/pkg-plist --- rinetd.bkp/pkg-plist Wed Dec 31 21:00:00 1969 +++ rinetd/pkg-plist Sat Jun 5 14:03:33 2004 @@ -0,0 +1,2 @@ +etc/rc.d/rinetd.sh +sbin/rinetd >Release-Note: >Audit-Trail: >Unformatted: