[pkgsrc/pkgsrc-2004Q4]: pkgsrc/net/freeradius Pullup ticket 175 - requested b...

[salo <salo%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3c739364b680
branches:  pkgsrc-2004Q4
changeset: 485762:3c739364b680
user:      salo <salo%pkgsrc.org@localhost>
date:      Wed Dec 22 10:49:10 2004 +0000

description:
Pullup ticket 175 - requested by Adrian Portelli
usability fixes for freeradius

        Module Name:    pkgsrc
        Committed By:   adrianp
        Date:           Tue Dec 21 22:16:01 UTC 2004

        Modified Files:
                pkgsrc/net/freeradius: Makefile
                pkgsrc/net/freeradius/files: radiusd.sh

        Log Message:
        - Fix freeradius not starting because of missing directory cleaned
          out at reboot.
        - Issue spotted and patch sent to me from kbrand (at) dplanet.ch,
          thanks.
        - Bumped PKGREVISION
---
        Module Name:    pkgsrc
        Committed By:   adrianp
        Date:           Wed Dec 22 10:07:21 UTC 2004

        Modified Files:
                pkgsrc/net/freeradius: Makefile
                pkgsrc/net/freeradius/files: radiusd.sh

        Log Message:
        - Portability fix, use @ROOT_USER@:@ROOT_GROUP@ as opposed to
          hardcoding root:wheel in the startup script.
        - Again thanks to kbrand (at) dplanet.ch for the suggestion.

diffstat:

 net/freeradius/Makefile         |   6 ++++--
 net/freeradius/files/radiusd.sh |  12 +++++++++++-
 2 files changed, 15 insertions(+), 3 deletions(-)

diffs (50 lines):

diff -r 25fffe642658 -r 3c739364b680 net/freeradius/Makefile
--- a/net/freeradius/Makefile   Wed Dec 22 08:31:54 2004 +0000
+++ b/net/freeradius/Makefile   Wed Dec 22 10:49:10 2004 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2004/12/19 18:59:12 jlam Exp $
+# $NetBSD: Makefile,v 1.19.2.1 2004/12/22 10:49:10 salo Exp $
 
 DISTNAME=      freeradius-1.0.1
-PKGREVISION=   4
+PKGREVISION=   5
 CATEGORIES=    net
 MASTER_SITES=  ftp://ftp.freeradius.org/pub/radius/ \
                ftp://ftp.Awfulhak.org/pub/radius/
@@ -20,6 +20,8 @@
 USE_PERL5=             YES
 LIBTOOLIZE_PLIST=      NO
 PLIST_SRC=             ${WRKDIR}/.PLIST_SRC
+FILES_SUBST+=          ROOT_USER=${ROOT_USER}
+FILES_SUBST+=          ROOT_GROUP=${ROOT_GROUP}
 
 # This package currently breaks using our libtool.  It does not appear to use
 # libtool properly/fully and as a result the daemon does not compile correctly.
diff -r 25fffe642658 -r 3c739364b680 net/freeradius/files/radiusd.sh
--- a/net/freeradius/files/radiusd.sh   Wed Dec 22 08:31:54 2004 +0000
+++ b/net/freeradius/files/radiusd.sh   Wed Dec 22 10:49:10 2004 +0000
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: radiusd.sh,v 1.2 2004/09/23 19:51:22 adrianp Exp $
+# $NetBSD: radiusd.sh,v 1.2.2.1 2004/12/22 10:49:10 salo Exp $
 #
 # PROVIDE: radiusd
 # REQUIRE: network
@@ -14,6 +14,16 @@
 name="radiusd"
 command="@PREFIX@/sbin/radiusd"
 pidfile="@VARBASE@/run/radiusd/radiusd.pid"
+start_precmd="radiusd_precmd"
+
+radiusd_precmd()
+{
+       if [ ! -d @VARBASE@/run/radiusd ]; then
+               @MKDIR@ @VARBASE@/run/radiusd
+               @CHMOD@ 0750 @VARBASE@/run/radiusd
+               @CHOWN@ @ROOT_USER@:@ROOT_GROUP@ @VARBASE@/run/radiusd
+       fi
+}
 
 if [ -f /etc/rc.subr ]
 then