ports/74108: GNU-Raidus port update

Fri Nov 19 09:40:30 UTC 2004

>Number:         74108
>Category:       ports
>Synopsis:       GNU-Raidus port update
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Nov 19 09:40:30 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Andrey Pavlenko
>Release:        FreeBSD 4.10-RELEASE-p3 i386
>Organization:
ISP Merlin-Telecom
>Environment:
System: FreeBSD mig.merlin.net.ua 4.10-RELEASE-p3 FreeBSD 4.10-RELEASE-p3 #5: Mon Sep 27 12:34:38 EEST 2004 root at mig.merlin.net.ua:/var/obj/usr/src/sys/MIG i386


	
>Description:

GNU-Radius update for latest version

>How-To-Repeat:
	
>Fix:

--- gnu-radius.port begins here ---
diff -ruN /home/lance/gnu-radius-old/Makefile /usr/ports/net/gnu-radius/Makefile
--- /home/lance/gnu-radius-old/Makefile	Tue Nov 16 11:39:10 2004
+++ /usr/ports/net/gnu-radius/Makefile	Fri Nov 19 11:06:03 2004
@@ -5,11 +5,12 @@
 # $FreeBSD: ports/net/gnu-radius/Makefile,v 1.17 2004/02/04 05:08:06 marcus Exp $
 
 PORTNAME=	gnu-radius
-PORTVERSION=	1.2
+PORTVERSION=	1.2.95
 PORTREVISION=	2
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	radius
+#MASTER_SITES=	${MASTER_SITE_GNU}
+#MASTER_SITE_SUBDIR=	radius
+MASTER_SITES=	ftp://alpha.gnu.org/pub/gnu/radius/
 DISTNAME=       radius-${PORTVERSION}
 
 MAINTAINER=	lance at merlin.net.ua
@@ -18,6 +19,7 @@
 #MAKEFILE=	Makefile
 
 CONFLICTS=	freeradius-0.* openradius-0.* radiusd-cistron-1.*
+USE_RC_SUBR=    yes
 USE_SUBMAKE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
@@ -31,7 +33,7 @@
 		CURDIR="${.CURDIR}" \
 		MKDIR="${MKDIR}"
 
-STARTUP_FILE=	${PREFIX}/etc/rc.d/gnu-radius.sh
+STARTUP_FILE=	${PREFIX}/etc/rc.d/radiusd.sh
 
 .if defined(BATCH)
 CONFIGURE_ARGS+=--with-include-path="${LOCALBASE}/include/" \
@@ -45,11 +47,12 @@
 .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
 .endif
 
+post-patch:
+	@${SED} -e "s|%%PREFIX%%|${PREFIX}|g" -e "s|%%RC_SUBR%%|${RC_SUBR}|g" \
+		< ${FILESDIR}/radiusd.sh > ${WRKDIR}/radiusd.sh
+
 post-install:
-	@${SED} -e "s=!!PREFIX!!=${PREFIX}=g" ${FILESDIR}/gnu-radius.sh.tmpl \
-		> ${PREFIX}/etc/rc.d/gnu-radius.sh
-	@${CHMOD} 550 ${PREFIX}/etc/rc.d/gnu-radius.sh
-	@${CHOWN} root:wheel ${PREFIX}/etc/rc.d/gnu-radius.sh
+	${INSTALL_SCRIPT} ${WRKDIR}/radiusd.sh ${PREFIX}/etc/rc.d/radiusd.sh
 
 post-clean:
 	@${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
diff -ruN /home/lance/gnu-radius-old/distinfo /usr/ports/net/gnu-radius/distinfo
--- /home/lance/gnu-radius-old/distinfo	Tue Nov 16 11:39:10 2004
+++ /usr/ports/net/gnu-radius/distinfo	Fri Nov 19 09:50:54 2004
@@ -1,2 +1,2 @@
-MD5 (radius-1.2.tar.gz) = 41efba1332ff563e1f88f2aba04d9d24
-SIZE (radius-1.2.tar.gz) = 1784097
+MD5 (radius-1.2.95.tar.gz) = b2647149f012b02f65e9a2f45fafcb59
+SIZE (radius-1.2.95.tar.gz) = 2027511
diff -ruN /home/lance/gnu-radius-old/files/gnu-radius.sh.tmpl /usr/ports/net/gnu-radius/files/gnu-radius.sh.tmpl
--- /home/lance/gnu-radius-old/files/gnu-radius.sh.tmpl	Tue Nov 16 11:39:09 2004
+++ /usr/ports/net/gnu-radius/files/gnu-radius.sh.tmpl	Thu Jan  1 03:00:00 1970
@@ -1,11 +0,0 @@
-#!/bin/sh
-case "$1" in
-stop)
-	killall radiusd
-	;;
-*)
-	if [ -x !!PREFIX!!/sbin/radiusd ]; then
-		!!PREFIX!!/sbin/radiusd -y && echo -n ' radiusd'
-	fi
-	;;
-esac
diff -ruN /home/lance/gnu-radius-old/files/radiusd.sh /usr/ports/net/gnu-radius/files/radiusd.sh
--- /home/lance/gnu-radius-old/files/radiusd.sh	Thu Jan  1 03:00:00 1970
+++ /usr/ports/net/gnu-radius/files/radiusd.sh	Fri Nov 19 10:52:07 2004
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+# PROVIDE radiusd
+# REQUIRE: NETWORKING SERVERS
+# BEFORE: DAEMON
+# KEYWORD: FreeBSD shutdown
+
+#
+# Add the following lines to /etc/rc.conf to enable radiusd:
+#
+# radiusd_enable="YES"
+#
+
+. %%RC_SUBR%%
+
+name=radiusd
+rcvar=`set_rcvar`
+
+command=%%PREFIX%%/sbin/radiusd
+radiusd_config=${radiusd_config:-"%%PREFIX%%/etc/raddb/config"}
+required_files=${radiusd_config}
+pidfile=/var/run/radiusd.pid
+
+radiusd_enable=${radiusd_enable:-"NO"}
+
+load_rc_config $name
+run_rc_command "$1"
diff -ruN /home/lance/gnu-radius-old/pkg-plist /usr/ports/net/gnu-radius/pkg-plist
--- /home/lance/gnu-radius-old/pkg-plist	Tue Nov 16 11:39:10 2004
+++ /usr/ports/net/gnu-radius/pkg-plist	Fri Nov 19 10:58:11 2004
@@ -1,3 +1,4 @@
+ at unexec %D/etc/rc.d/radiusd.sh forcestop 2>/dev/null || true
 bin/builddbm
 bin/radgrep
 bin/radlast
@@ -5,6 +6,9 @@
 bin/radtest
 bin/radwho
 bin/radzap
+sbin/radauth
+sbin/radctl
+sbin/radiusd
 etc/raddb/access.deny
 etc/raddb/client.conf
 etc/raddb/clients
@@ -14,6 +18,7 @@
 etc/raddb/dict/cisco
 etc/raddb/dict/compat
 etc/raddb/dict/livingston
+etc/raddb/dict/microsoft
 etc/raddb/dict/standard
 etc/raddb/dict/tunnel
 etc/raddb/dict/usr
@@ -21,36 +26,25 @@
 etc/raddb/dictionary
 etc/raddb/hints
 etc/raddb/huntgroups
+etc/raddb/nas.rc
 etc/raddb/naslist
 etc/raddb/nastypes
-etc/raddb/nas.rc
 etc/raddb/realms
 etc/raddb/sqlserver
 etc/raddb/users
-etc/rc.d/gnu-radius.sh
+etc/rc.d/radiusd.sh
+ at dirrm etc/raddb/dict
+ at dirrm etc/raddb
 @unexec install-info --delete %D/info/radius.info %D/info/dir
 info/radius.info
 info/radius.info-1
 info/radius.info-2
-info/radius.info-3
-info/radius.info-4
-info/radius.info-5
-info/radius.info-6
-info/radius.info-7
 @exec install-info %D/info/radius.info %D/info/dir
-sbin/radauth
-sbin/radctl
-sbin/radiusd
 share/locale/es/LC_MESSAGES/radius.mo
 share/locale/pl/LC_MESSAGES/radius.mo
 share/locale/ru/LC_MESSAGES/radius.mo
 %%GUILE%%share/radius/guile-procedures.txt
-share/radius/1.2/scheme/boot.scm
-share/radius/1.2/scheme/ttl.scm
-share/radius/1.2/rewrite/checknas.rw
-share/radius/1.2/rewrite/log-hook.rw
- at dirrm etc/raddb/dict
- at dirrm etc/raddb
 @unexec rm -f /var/run/radiusd.pid
 @unexec rm -rf /var/log/radius
+ at unexec rm -rf share/radius
 @unexec echo "Leaving /var/run/radutmp, /var/log/radwtmp and /var/log/radstat alone."
--- gnu-radius.port ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:

