Date: Wed, 19 Oct 2011 01:41:40 GMT From: Kan Sasaki <sasaki@fcc.ad.jp> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/161792: [PATCH] net/radiusd-cistron: add rc script Message-ID: <201110190141.p9J1feXA006062@red.freebsd.org> Resent-Message-ID: <201110190150.p9J1oBeR020737@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 161792
>Category: ports
>Synopsis: [PATCH] net/radiusd-cistron: add rc script
>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: Wed Oct 19 01:50:11 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: Kan Sasaki
>Release:
>Organization:
>Environment:
>Description:
Add rc script for radrelay.
Fix output of radwho in raw format.
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
# This is a shell archive. Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file". Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
# Makefile.diff
# patch-radwho.c.diff
# radiusd-cistron.in
#
echo x - Makefile.diff
sed 's/^X//' >Makefile.diff << 'ad2ded6500d2f53baa2cfd8297bb8250'
X--- Makefile.orig 2011-10-19 10:09:21.000000000 +0900
X+++ Makefile 2011-10-19 10:10:47.000000000 +0900
X@@ -22,7 +22,7 @@
X WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
X PAMBASE?= etc
X
X-USE_RC_SUBR= radiusd-cistron
X+USE_RC_SUBR= radiusd-cistron radrelay-cistron
X MAN1= radclient.1 radlast.1 radtest.1 radwho.1 radzap.1
X MAN5= clients.5rad naslist.5rad
X MAN8= radiusd.8 radrelay.8 radwatch.8
ad2ded6500d2f53baa2cfd8297bb8250
echo x - patch-radwho.c.diff
sed 's/^X//' >patch-radwho.c.diff << '6996be074d822e0fa79138db077f1bdb'
X--- files/patch-radwho.c.orig 2011-10-19 10:18:37.000000000 +0900
X+++ files/patch-radwho.c 2011-10-19 10:24:18.000000000 +0900
X@@ -1,5 +1,5 @@
X---- src/radwho.c.orig 2003-12-08 17:10:24.000000000 +0100
X-+++ src/radwho.c 2010-01-27 07:51:39.000000000 +0100
X+--- src/radwho.c.orig 2003-12-09 01:10:24.000000000 +0900
X++++ src/radwho.c 2011-10-19 10:22:04.000000000 +0900
X @@ -20,6 +20,7 @@
X #include <errno.h>
X #include <sys/stat.h>
X@@ -19,9 +19,9 @@
X -char *rfmt1r = "%s,%s,%s,%s%u,%s,%s,%s%s";
X +"Login Name What TTY When From Location";
X +char *ufmt1 = "%-16.16s %-17.17s %-5.5s %-4.4s %-9.9s %-9.9s %-.*s%s";
X-+char *ufmt1r = "%s,%s,%s,%s,%s,%s,%u%s";
X++char *ufmt1r = "%s,%s,%s,%s,%s,%s,%*s%s";
X +char *rfmt1 = "%-16.16s %-17.17s %-5.5s %s%-3d %-9.9s %-9.9s %-.*s%s";
X-+char *rfmt1r = "%s,%s,%s,%s%u,%s,%s,%u%s";
X++char *rfmt1r = "%s,%s,%s,%s%u,%s,%s,%*s%s";
X +#define FMT1_HOST_SIZE 13
X
X char *hdr2 =
X@@ -32,9 +32,9 @@
X -char *rfmt2r = "%s,%s%u,%s,%s,%s,%s%s";
X +"Login Port What When From Location";
X +char *ufmt2 = "%-16.16s %-6.6d %-7.7s %-13.13s %-10.10s %-.*s%s";
X-+char *ufmt2r = "%s,%u,%s,%s,%s,%u%s";
X++char *ufmt2r = "%s,%u,%s,%s,%s,%*s%s";
X +char *rfmt2 = "%-16.16s %s%-5d %-6.6s %-13.13s %-10.10s %-.*s%s";
X-+char *rfmt2r = "%s,%s%u,%s,%s,%s,%u%s";
X++char *rfmt2r = "%s,%s%u,%s,%s,%s,%*s%s";
X +#define FMT2_HOST_SIZE 19
X
X char *eol = "\n";
X@@ -106,7 +106,7 @@
X + ttyshort(utx->ut_line),
X + dotime(utx->ut_tv.tv_sec),
X + utx->ut_host,
X-+ FMT1_HOST_SIZE + extra_width,
X++ (rawoutput == 0 ? FMT1_HOST_SIZE + extra_width : 0),
X + myname, eol);
X + else
X + printf((rawoutput==0? ufmt2:ufmt2r),
X@@ -115,7 +115,7 @@
X + "shell",
X + dotime(utx->ut_tv.tv_sec),
X + utx->ut_host,
X-+ FMT2_HOST_SIZE + extra_width,
X++ (rawoutput == 0 ? FMT2_HOST_SIZE + extra_width : 0),
X + myname, eol);
X + }
X +
X@@ -153,7 +153,7 @@
X dotime(ut.ut_time),
X #endif
X ut.ut_host,
X-+ FMT1_HOST_SIZE + extra_width,
X++ (rawoutput == 0 ? FMT1_HOST_SIZE + extra_width : 0),
X myname, eol);
X else
X printf((rawoutput==0? ufmt2:ufmt2r),
X@@ -166,7 +166,7 @@
X dotime(ut.ut_time),
X #endif
X ut.ut_host,
X-+ FMT2_HOST_SIZE + extra_width,
X++ (rawoutput == 0 ? FMT2_HOST_SIZE + extra_width : 0),
X myname, eol);
X }
X }
X@@ -180,7 +180,7 @@
X portind, portno,
X dotime(rt.time),
X nasname(ntohl(rt.nas_address)),
X-+ FMT1_HOST_SIZE + extra_width,
X++ (rawoutput == 0 ? FMT1_HOST_SIZE + extra_width : 0),
X hostname(rt.framed_address), eol);
X else
X printf((rawoutput == 0? rfmt2: rfmt2r),
X@@ -188,7 +188,7 @@
X proto(rt.proto, rt.porttype),
X dotime(rt.time),
X nasname(ntohl(rt.nas_address)),
X-+ FMT2_HOST_SIZE + extra_width,
X++ (rawoutput == 0 ? FMT2_HOST_SIZE + extra_width : 0),
X hostname(rt.framed_address), eol);
X }
X }
6996be074d822e0fa79138db077f1bdb
echo x - radiusd-cistron.in
sed 's/^X//' >radiusd-cistron.in << '0325d1cf478c9890cd7b1d5e407b741f'
X#!/bin/sh
X
X# $FreeBSD: ports/net/radiusd-cistron/files/radiusd-cistron.in,v 1.1 2010/01/24 15:14:04 dinoex Exp $
X#
X# PROVIDE: radiusd-cistron
X# REQUIRE: LOGIN
X# KEYWORD: shutdown
X#
X# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
X# to enable this service:
X#
X# radiusd_enable (bool): Set to NO by default.
X# Set it to YES to enable radiusd-cistron.
X#
X
X. /etc/rc.subr
X
Xname="radiusd"
Xrcvar=${name}_enable
X
Xcommand=%%PREFIX%%/sbin/${name}
Xpidfile=/var/run/${name}.pid
X
Xload_rc_config $name
X
X: ${radiusd_enable="NO"}
X
Xcommand_args="-y"
X
Xrun_rc_command "$1"
0325d1cf478c9890cd7b1d5e407b741f
exit
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201110190141.p9J1feXA006062>