ports/98065: [patch] update net/freeradius to 1.1.2

[David Wood]

>Number:         98065
>Category:       ports
>Synopsis:       [patch] update net/freeradius to 1.1.2
>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:   Sun May 28 22:30:15 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     David Wood
>Release:        FreeBSD 6.1-RELEASE i386
>Organization:
David Wood
>Environment:
FreeBSD titanium.wood2.org.uk 6.1-RELEASE FreeBSD 6.1-RELEASE #0: Thu May 18 22:31:12 BST 2006     david at titanium.wood2.org.uk:/usr/obj/usr/src/sys/TITANIUM  i386
>Description:
The attached patch upgrades the maintainer-less FreeRADIUS port to 1.1.2. It has been tested so far as being built and installed in my EAP-TLS wireless LAN environment, where it works OK, but I'd appreciate review and further testing from anyone more experienced.


I've added support for Net-SNMP as well as UCD-SNMP, as Net-SNMP is supposedly supported in this version of FreeRADIUS. The previous way the Makefile was coded didn't allow installation with SNMP support in FreeRADIUS on a box with Net-SNMP.

I chose to add this support using a new option to switch the SNMP dependency to the Net-SNMP library, and made this flag default to off - that way, I shouldn't break existing installations where UCD-SNMP is in use. Nevertheless, this feels like something of a kludge. If anyone can think of a more elegant fix to detect Net-SNMP or UCD-SNMP programatically in the Makefile, that would be a good thing.

FreeRADIUS 1.1.2 builds without errors on my box with Net-SNMP installed (both the existing SNMP and my new Net-SNMP options were configured on), but I haven't tested SNMP functionality in FreeRADIUS.
>How-To-Repeat:

>Fix:
--- Patch begins ---
diff -ruN /usr/ports/net/freeradius/Makefile /usr/ports_updated/net/freeradius/Makefile
--- /usr/ports/net/freeradius/Makefile  Tue Mar 28 21:30:51 2006
+++ /usr/ports_updated/net/freeradius/Makefile  Sun May 28 22:44:56 2006
@@ -2,11 +2,11 @@
 # Date created:         May 9 2002
 # Whom:                 Brian Somers <brian at FreeBSD.org>
 #
-# $FreeBSD: ports/net/freeradius/Makefile,v 1.44 2006/03/28 20:30:51 sem Exp $
+# $FreeBSD: ports/net/freeradius/Makefile,v 1.45 2006/05/28 22:44:00 sem Exp $
 #
 
 PORTNAME=      freeradius
-PORTVERSION=   1.1.1
+PORTVERSION=   1.1.2
 PORTREVISION=  0
 CATEGORIES=    net
 MASTER_SITES=  ftp://ftp.freeradius.org/pub/radius/ \
@@ -44,6 +44,7 @@
                MYSQL           "With MySQL user database" off \
                PGSQL           "With PostgreSQL use database" off \
                SNMP            "With SNMP support" off \
+               NETSNMP         "Use Net-SNMP rather than UCD-SNMP" off \
                EXPERIMENTAL    "Build experimental modules" off
 
 .include <bsd.port.pre.mk>
@@ -96,7 +97,11 @@
 .endif
 
 .ifdef(WITH_SNMP)
+.ifdef(WITH_NETSNMP)
+LIB_DEPENDS+=  netsnmp.9:${PORTSDIR}/net-mgmt/net-snmp
+.else
 LIB_DEPENDS+=  snmp.4:${PORTSDIR}/net-mgmt/net-snmp4
+.endif
 .else
 CONFIGURE_ARGS+=--without-snmp
 .endif
@@ -144,16 +149,16 @@
                dictionary.cablelabs dictionary.cabletron dictionary.cisco \
                dictionary.cisco.bbsm dictionary.cisco.vpn3000 dictionary.cisco.vpn5000 \
                dictionary.colubris dictionary.columbia_university dictionary.compat \
-               dictionary.cosine dictionary.digest dictionary.epygi \
+               dictionary.cosine dictionary.digest dictionary.digium dictionary.epygi \
                dictionary.ericsson dictionary.erx dictionary.extreme \
                dictionary.fortinet dictionary.foundry dictionary.freeradius \
                dictionary.freeradius.internal dictionary.gandalf dictionary.garderos \
-               dictionary.gemtek dictionary.ipunplugged dictionary.issanni \
+               dictionary.gemtek dictionary.hp dictionary.ipunplugged dictionary.issanni \
                dictionary.itk dictionary.juniper dictionary.karlnet \
                dictionary.livingston dictionary.localweb dictionary.lucent \
                dictionary.merit dictionary.microsoft dictionary.mikrotik \
                dictionary.motorola dictionary.navini dictionary.netscreen \
-               dictionary.nokia dictionary.nomadix dictionary.ntua \
+               dictionary.nokia dictionary.nomadix dictionary.nortel dictionary.ntua \
                dictionary.packeteer dictionary.propel dictionary.quintum \
                dictionary.redback dictionary.redcreek dictionary.rfc2865 \
                dictionary.rfc2866 dictionary.rfc2867 dictionary.rfc2868 \
diff -ruN /usr/ports/net/freeradius/distinfo /usr/ports_updated/net/freeradius/distinfo
--- /usr/ports/net/freeradius/distinfo  Tue Mar 28 21:30:51 2006
+++ /usr/ports_updated/net/freeradius/distinfo  Sun May 28 21:25:28 2006
@@ -1,2 +1,3 @@
-MD5 (freeradius-1.1.1.tar.gz) = b38b24f6352090fdb571b9e8da52e12e
-SIZE (freeradius-1.1.1.tar.gz) = 2358196
+SHA256 (freeradius-1.1.2.tar.gz) = 5bc1b7fcb2d37fcce402e7baf9e8508b6fb62b94afead3b6da4718cd9a5762bf
+MD5 (freeradius-1.1.2.tar.gz) = 6649ac5f9666b4a8cd55a837068ca61e
+SIZE (freeradius-1.1.2.tar.gz) = 2389227
diff -ruN /usr/ports/net/freeradius/pkg-plist /usr/ports_updated/net/freeradius/pkg-plist
--- /usr/ports/net/freeradius/pkg-plist Fri May 12 15:28:17 2006
+++ /usr/ports_updated/net/freeradius/pkg-plist Sun May 28 22:12:50 2006
@@ -55,6 +55,7 @@
 etc/raddb/realms.sample
 etc/raddb/snmp.conf.sample
 etc/raddb/sql.conf.sample
+etc/raddb/sqlippool.conf.sample
 etc/raddb/users.sample
 lib/libeap-%%PORTVERSION%%.la
 lib/libeap-%%PORTVERSION%%.so
@@ -423,6 +424,7 @@
 %%DATADIR%%/dictionary.compat
 %%DATADIR%%/dictionary.cosine
 %%DATADIR%%/dictionary.digest
+%%DATADIR%%/dictionary.digium
 %%DATADIR%%/dictionary.epygi
 %%DATADIR%%/dictionary.ericsson
 %%DATADIR%%/dictionary.erx
--- Patch ends ---
>Release-Note:
>Audit-Trail:
>Unformatted: