Date: Sun, 28 Dec 2008 16:54:23 GMT From: David Wood <david@wood2.org.uk> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/129996: [maintainer update] update net/freeradius2 to 2.1.3, unbreak by working round autoconf 2.62 regression Message-ID: <200812281654.mBSGsN3r020758@www.freebsd.org> Resent-Message-ID: <200812281700.mBSH036d045748@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 129996
>Category: ports
>Synopsis: [maintainer update] update net/freeradius2 to 2.1.3, unbreak by working round autoconf 2.62 regression
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sun Dec 28 17:00:03 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator: David Wood
>Release: 6.3-RELEASE i386
>Organization:
>Environment:
FreeBSD titanium.wood2.org.uk 6.3-RELEASE-p3 FreeBSD 6.3-RELEASE-p3 #0: Mon Jul 14 06:27:42 BST 2008 david@titanium.wood2.org.uk:/usr/obj/usr/src/sys/TITANIUM i386
>Description:
Note: The port does not install dialup-admin, so
CVE-2008-4474, which is mentioned in the 2.1.2 release notes,
does not apply.
FreeBSD notes
=============
Unbreak - whilst marked as broken only on 6.x, the port was
broken on all supported versions following the autoconf
2.61->2.62 upgrade.
autoconf is used for the main program and for many of the
modules via AC_CONFIG_SUBDIRS. The autoconf 2.61->2.62 upgrade
caused a regression with AC_CONFIG_SUBDIRS - $host is not set
when running configure in a subdirectory, as seen in
config.log, though $build is set.
s/$host/$build/g in files/patch-pthread works round this
problem and unbreaks the port. However, I regard this as a
bodge; $host is about the target system whilst $build is about
the (possibly unrelated) build system. Until the root cause of
the problem with autoconf is understood and fixed (I'm unclear
whether it is to do with the changes in autoconf 2.62 or the
FreeBSD autoconf 2.62 port), at least this makes the port
work.
Now that radmin and the other 2.1.x changes have had time to
stabilise, it is time to upgrade the port to 2.1.x. The
obsolete and rather broken (especially on 64 bit machines)
SNMP support has been removed; radmin(8) takes its place.
There is experimental support for SNMP via a Perl program that
uses the radmin interface, but this program is not yet able to
daemonise. When daemon support is added, I will add an rc.d
script for the SNMP program.
The port no longer installs an unnecessary
${PREFIX}/sbin/rc.radiusd.
Release notes
=============
2.1.0:
Feature improvements
* Clients may now be defined dynamically, based on IP address.
See raddb/sites-available/dynamic-clients.
* SNMP support is now available through an experimental Perl
script. See scripts/snmp-proxy/README
* SNMP statistics are available through Status-Server packets.
See raddb/sites-available/status
* Added more Microsoft attributes from bug #568.
* The "linelog" module has more functionality and flexibility.
See raddb/modules/linelog.
* The debugging output has been sanitized. It should be much
more readable.
* Debug logs can now be turned on/off while the server is
running, for a user, group, realm, etc. See the "log" section
of radiusd.conf.
* Added support for WiMAX Forum attributes. The dynamic keys
are not yet calculated. See share/dictionary.wimax
* Added session resumption for PEAP and TTLS.
See raddb/eap.conf, "cache" sub-section.
* Added "radmin" command-line tool for administering a running
server.
See "man radmin" and raddb/sites-available/control-socket.
Bug fixes
* Double escaping of '\\' in the "users" (and some other) files
has been fixed. If you have '\\' in the "users" file, your
configuration WILL NEED TO BE CHECKED, AND FIXED!
* Parse "security" section in radiusd.conf. This was
accidentally deleted in 2.0.5. Closes bug #566.
* Bind to interface before IP, which allows DHCP sockets to
listen on "*" for multiple interfaces.
* Fix handling of giaddr in DHCP responses.
* Corrected parsing of status_check in home_server so that it
works.
* Fix hints so that "Puser" works again.
* Removed length restrictions on attribute names in the
dictionaries.
* Update socket code to avoid C compiler optimizations.
2.1.1:
Feature improvements
* Many more options and features in radmin. See "man radmin" and
raddb/sites-available/control-socket
* Many more commands available via the control socket. Connect
via "radmin", and type "help" for more information.
* Added dictionary.networkphysics and dictionary.lancom.
* Calculate WiMAX MIP keys, and added sample WiMAX SQL tables.
Bug fixes
* Fixed bug that made radmin not work
* Fixed Suse && Debian package scripts
* Fixed issues with dynamic clients
* Fixed configure checks for -lreadline
* rlm_sqlippool no longer needs to be linked to rlm_sql.
* Add statistics for detail file listeners. This closes bug #593.
* Fixed printing of some WiMAX attributes.
* Fix double free on exit() in rlm_attr_filter
* Fixed build issues on Solaris.
* Fixed fast session resumption for EAP-TLS
2.1.2:
Feature Improvements:
* Allow running with "user=radiusd" and binding to secure sockets.
* Start sending Status-Server "are you alive" messages earlier, which
helps with proxying multiple realms to a home server.
* Removed thread pool code from rlm_perl. It's not necessary.
* Added example Perl configuration to raddb/modules/perl
* Force OpenSSL to support certificates with SHA256. This seems to be
necessary for WiMAX certs.
Bug fixes:
* Fix Debian patch to allow it to build.
* Fix potential NULL dereference in debugging mode on certain
platforms for TTLS and PEAP inner tunnels.
* Fix uninitialized memory in handling of vendor definitions
* Fix parsing of quoted (but non-string) attributes in the "users" file.
* Initialize uknown NAS IP to 255.255.255.255, rather than 0.0.0.0
* use SUN_LEN in control socket, to avoid truncation on some platforms.
* Correct internal handling of "debug condition" to prevent it from
being over-written.
* Check return code of regcomp in "unlang", so that invalid regular
expressions are caught rather than mishandled.
* Make rlm_sql use <ltdl.h>. Addresses bug #610.
* Document list "type = status" better. Closes bug #580.
* Set "default days" for certificates, because OpenSSL won't do it.
This closes bug #615.
* Reference correct list in example raddb/modules/ldap. Closes #596.
* Increase default schema size for Acct-Session-Id to 64. Closes #540.
* Fix use of temporary files in dialup-admin. Closes #605 and
addresses CVE-2008-4474.
* Addressed a number of minor issues found by Coverity.
* Added DHCP option 150 to the dictionary. Closes #618.
2.1.3
2.1.3 is a repackaging of 2.1.2 with no other changes.
INSTRUCTIONS
============
files/patch-config-security has been deleted.
No files have been added.
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
Index: distinfo
===================================================================
--- distinfo (.../branches/FreeBSD-ports-tree/freeradius2) (revision 230)
+++ distinfo (.../trunk/freeradius2) (revision 230)
@@ -1,3 +1,3 @@
-MD5 (freeradius-server-2.0.5.tar.bz2) = 3f7f3491d619542baa72746cbd6a7ed2
-SHA256 (freeradius-server-2.0.5.tar.bz2) = 9eab7d8bfa89196a28ed65a76f647edd5e666dd9edc6e29384381d72139ed6e2
-SIZE (freeradius-server-2.0.5.tar.bz2) = 2323968
+MD5 (freeradius-server-2.1.3.tar.bz2) = df7a23ec6303a89d014fcc43418ce5e5
+SHA256 (freeradius-server-2.1.3.tar.bz2) = 984cf7f3418de8f2abe1e599827264495cef1d234cce4abe05a06a4b6419db1a
+SIZE (freeradius-server-2.1.3.tar.bz2) = 2380451
Index: files/patch-config-security
===================================================================
--- files/patch-config-security (.../branches/FreeBSD-ports-tree/freeradius2) (revision 230)
+++ files/patch-config-security (.../trunk/freeradius2) (revision 230)
@@ -1,11 +0,0 @@
---- src/main/mainconfig.c 2008-06-05 10:48:22.000000000 +0100
-+++ src/main/mainconfig.c 2008-07-02 22:18:16.000000000 +0100
-@@ -229,6 +229,8 @@
- { "log_auth_goodpass", PW_TYPE_BOOLEAN, 0, &mainconfig.log_auth_goodpass, NULL },
- { "log_stripped_names", PW_TYPE_BOOLEAN, 0, &log_stripped_names, NULL },
-
-+ { "security", PW_TYPE_SUBSECTION, 0, NULL, (const void *) security_config },
-+
- { NULL, -1, 0, NULL, NULL }
- };
-
Index: files/patch-pthread
===================================================================
--- files/patch-pthread (.../branches/FreeBSD-ports-tree/freeradius2) (revision 230)
+++ files/patch-pthread (.../trunk/freeradius2) (revision 230)
@@ -1,5 +1,5 @@
--- configure.in Mon Aug 6 00:38:46 2007
-+++ configure.in Wed Aug 29 20:06:05 2007
++++ configure.in Thu Sep 18 18:30:00 2008
@@ -470,14 +470,25 @@
dnl # On Some systems, we need extra pre-processor flags, to get them to
dnl # to do the threading properly.
@@ -15,7 +15,7 @@
+dnl # On FreeBSD, check the pthread_create function with -pthread in $CFLAGS
+dnl # but WITHOUT -lpthread (see FreeBSD Porter's Handbook, section 12.12
+dnl # at http://tinyurl.com/34cya8 )
-+ case "$host" in
++ case "$build" in
+ *-freebsd*)
+ CFLAGS="$CFLAGS -pthread"
+ AC_CHECK_FUNC(pthread_create, , [ WITH_THREADS="no" ])
@@ -35,7 +35,7 @@
dnl #
--- src/modules/rlm_ldap/configure.in Fri Jul 27 17:51:33 2007
-+++ src/modules/rlm_ldap/configure.in Fri Jul 27 18:10:51 2007
++++ src/modules/rlm_ldap/configure.in Thu Sep 18 18:30:00 2008
@@ -77,14 +77,27 @@
dnl pthread stuff is usually in -lpthread
@@ -49,7 +49,7 @@
- [ rlm_ldap_with_threads="no" ]
- )
- )
-+ case "$host" in
++ case "$build" in
+ *-freebsd*)
+ old_CFLAGS=$CFLAGS
+ CFLAGS="$CFLAGS -pthread"
@@ -72,7 +72,7 @@
dnl Try only "-lldap_r" or "-lldap"
--- src/modules/rlm_sql/drivers/rlm_sql_mysql/configure.in Fri Nov 25 20:31:54 2005
-+++ src/modules/rlm_sql/drivers/rlm_sql_mysql/configure.in Fri Jul 27 19:11:33 2007
++++ src/modules/rlm_sql/drivers/rlm_sql_mysql/configure.in Thu Sep 18 18:30:00 2008
@@ -61,14 +61,27 @@
dnl pthread stuff is usually in -lpthread
@@ -86,7 +86,7 @@
- [ mysql_with_threads=no ]
- )
- )
-+ case "$host" in
++ case "$build" in
+ *-freebsd*)
+ old_CFLAGS=$CFLAGS
+ CFLAGS="$CFLAGS -pthread"
@@ -109,7 +109,7 @@
if test "x$mysql_with_threads" = "xyes"; then
--- src/modules/rlm_python/configure.in Mon May 14 23:27:21 2007
-+++ src/modules/rlm_python/configure.in Tue Mar 18 13:52:32 2008
++++ src/modules/rlm_python/configure.in Thu Sep 18 18:30:00 2008
@@ -85,6 +85,34 @@
FR_SMART_CHECK_LIB(python${PY_VERSION}, Py_Initialize)
LIBS=$old_LIBS
@@ -120,7 +120,7 @@
+ if test "x$smart_lib" = "x"; then
+ AC_MSG_NOTICE([Checking to see if libpython needs -pthread.])
+ libpython_with_threads="yes"
-+ case "$host" in
++ case "$build" in
+ *-freebsd*)
+ old_CFLAGS=$CFLAGS
+ CFLAGS="$CFLAGS -pthread"
Index: pkg-plist
===================================================================
--- pkg-plist (.../branches/FreeBSD-ports-tree/freeradius2) (revision 230)
+++ pkg-plist (.../trunk/freeradius2) (revision 230)
@@ -1,5 +1,6 @@
@stopdaemon radiusd
bin/radclient
+bin/radconf2xml
bin/radeapclient
bin/radlast
bin/radsniff
@@ -41,6 +42,7 @@
%%EXAMPLESDIR%%/raddb/modules/checkval
%%EXAMPLESDIR%%/raddb/modules/counter
%%EXAMPLESDIR%%/raddb/modules/detail
+%%EXAMPLESDIR%%/raddb/modules/detail.example.com
%%EXAMPLESDIR%%/raddb/modules/detail.log
%%EXAMPLESDIR%%/raddb/modules/digest
%%EXAMPLESDIR%%/raddb/modules/echo
@@ -49,9 +51,11 @@
%%EXAMPLESDIR%%/raddb/modules/expiration
%%EXAMPLESDIR%%/raddb/modules/expr
%%EXAMPLESDIR%%/raddb/modules/files
+%%EXAMPLESDIR%%/raddb/modules/inner-eap
%%EXAMPLESDIR%%/raddb/modules/ippool
%%EXAMPLESDIR%%/raddb/modules/krb5
%%EXAMPLESDIR%%/raddb/modules/ldap
+%%EXAMPLESDIR%%/raddb/modules/linelog
%%EXAMPLESDIR%%/raddb/modules/logintime
%%EXAMPLESDIR%%/raddb/modules/mac2ip
%%EXAMPLESDIR%%/raddb/modules/mac2vlan
@@ -59,14 +63,17 @@
%%EXAMPLESDIR%%/raddb/modules/pam
%%EXAMPLESDIR%%/raddb/modules/pap
%%EXAMPLESDIR%%/raddb/modules/passwd
+%%EXAMPLESDIR%%/raddb/modules/perl
%%EXAMPLESDIR%%/raddb/modules/policy
%%EXAMPLESDIR%%/raddb/modules/preprocess
%%EXAMPLESDIR%%/raddb/modules/radutmp
%%EXAMPLESDIR%%/raddb/modules/realm
%%EXAMPLESDIR%%/raddb/modules/smbpasswd
%%EXAMPLESDIR%%/raddb/modules/sql_log
+%%EXAMPLESDIR%%/raddb/modules/sqlcounter_expire_on_login
%%EXAMPLESDIR%%/raddb/modules/sradutmp
%%EXAMPLESDIR%%/raddb/modules/unix
+%%EXAMPLESDIR%%/raddb/modules/wimax
%%EXAMPLESDIR%%/raddb/otp.conf
%%EXAMPLESDIR%%/raddb/policy.conf
%%EXAMPLESDIR%%/raddb/policy.txt
@@ -75,18 +82,21 @@
%%EXAMPLESDIR%%/raddb/radiusd.conf
%%EXAMPLESDIR%%/raddb/sites-available/README
%%EXAMPLESDIR%%/raddb/sites-available/buffered-sql
+%%EXAMPLESDIR%%/raddb/sites-available/control-socket
%%EXAMPLESDIR%%/raddb/sites-available/copy-acct-to-home-server
+%%EXAMPLESDIR%%/raddb/sites-available/decoupled-accounting
%%EXAMPLESDIR%%/raddb/sites-available/default
%%EXAMPLESDIR%%/raddb/sites-available/dhcp
+%%EXAMPLESDIR%%/raddb/sites-available/dynamic-clients
%%EXAMPLESDIR%%/raddb/sites-available/example
%%EXAMPLESDIR%%/raddb/sites-available/inner-tunnel
%%EXAMPLESDIR%%/raddb/sites-available/proxy-inner-tunnel
%%EXAMPLESDIR%%/raddb/sites-available/robust-proxy-accounting
+%%EXAMPLESDIR%%/raddb/sites-available/status
%%EXAMPLESDIR%%/raddb/sites-available/virtual.example.com
%%EXAMPLESDIR%%/raddb/sites-available/vmps
%%EXAMPLESDIR%%/raddb/sites-enabled/default
%%EXAMPLESDIR%%/raddb/sites-enabled/inner-tunnel
-%%EXAMPLESDIR%%/raddb/snmp.conf
%%EXAMPLESDIR%%/raddb/sql.conf
%%EXAMPLESDIR%%/raddb/sql/mssql/dialup.conf
%%EXAMPLESDIR%%/raddb/sql/mssql/schema.sql
@@ -97,6 +107,8 @@
%%EXAMPLESDIR%%/raddb/sql/mysql/ippool.sql
%%EXAMPLESDIR%%/raddb/sql/mysql/nas.sql
%%EXAMPLESDIR%%/raddb/sql/mysql/schema.sql
+%%EXAMPLESDIR%%/raddb/sql/mysql/wimax.conf
+%%EXAMPLESDIR%%/raddb/sql/mysql/wimax.sql
%%EXAMPLESDIR%%/raddb/sql/oracle/dialup.conf
%%EXAMPLESDIR%%/raddb/sql/oracle/ippool.conf
%%EXAMPLESDIR%%/raddb/sql/oracle/ippool.sql
@@ -204,6 +216,11 @@
%%LIBDIR%%/rlm_digest.a
%%LIBDIR%%/rlm_digest.la
%%LIBDIR%%/rlm_digest.so
+%%LIBDIR%%/rlm_dynamic_clients-%%PORTVERSION%%.la
+%%LIBDIR%%/rlm_dynamic_clients-%%PORTVERSION%%.so
+%%LIBDIR%%/rlm_dynamic_clients.a
+%%LIBDIR%%/rlm_dynamic_clients.la
+%%LIBDIR%%/rlm_dynamic_clients.so
%%LIBDIR%%/rlm_eap-%%PORTVERSION%%.la
%%LIBDIR%%/rlm_eap-%%PORTVERSION%%.so
%%LIBDIR%%/rlm_eap.a
@@ -299,11 +316,11 @@
%%LDAP%%%%LIBDIR%%/rlm_ldap.a
%%LDAP%%%%LIBDIR%%/rlm_ldap.la
%%LDAP%%%%LIBDIR%%/rlm_ldap.so
-%%EXPM%%%%LIBDIR%%/rlm_linelog-%%PORTVERSION%%.la
-%%EXPM%%%%LIBDIR%%/rlm_linelog-%%PORTVERSION%%.so
-%%EXPM%%%%LIBDIR%%/rlm_linelog.a
-%%EXPM%%%%LIBDIR%%/rlm_linelog.la
-%%EXPM%%%%LIBDIR%%/rlm_linelog.so
+%%LIBDIR%%/rlm_linelog-%%PORTVERSION%%.la
+%%LIBDIR%%/rlm_linelog-%%PORTVERSION%%.so
+%%LIBDIR%%/rlm_linelog.a
+%%LIBDIR%%/rlm_linelog.la
+%%LIBDIR%%/rlm_linelog.so
%%LIBDIR%%/rlm_logintime-%%PORTVERSION%%.la
%%LIBDIR%%/rlm_logintime-%%PORTVERSION%%.so
%%LIBDIR%%/rlm_logintime.a
@@ -374,21 +391,21 @@
%%EXPM%%%%LIBDIR%%/rlm_sim_files.a
%%EXPM%%%%LIBDIR%%/rlm_sim_files.la
%%EXPM%%%%LIBDIR%%/rlm_sim_files.so
-%%EXPM%%%%LIBDIR%%/rlm_smb-%%PORTVERSION%%.la
-%%EXPM%%%%LIBDIR%%/rlm_smb-%%PORTVERSION%%.so
-%%EXPM%%%%LIBDIR%%/rlm_smb.a
-%%EXPM%%%%LIBDIR%%/rlm_smb.la
-%%EXPM%%%%LIBDIR%%/rlm_smb.so
+%%EXPM%%%%SMB%%%%LIBDIR%%/rlm_smb-%%PORTVERSION%%.la
+%%EXPM%%%%SMB%%%%LIBDIR%%/rlm_smb-%%PORTVERSION%%.so
+%%EXPM%%%%SMB%%%%LIBDIR%%/rlm_smb.a
+%%EXPM%%%%SMB%%%%LIBDIR%%/rlm_smb.la
+%%EXPM%%%%SMB%%%%LIBDIR%%/rlm_smb.so
%%LIBDIR%%/rlm_sql-%%PORTVERSION%%.la
%%LIBDIR%%/rlm_sql-%%PORTVERSION%%.so
%%LIBDIR%%/rlm_sql.a
%%LIBDIR%%/rlm_sql.la
%%LIBDIR%%/rlm_sql.so
-%%FIREBIRD%%%%LIBDIR%%/rlm_sql_firebird-%%PORTVERSION%%.la
-%%FIREBIRD%%%%LIBDIR%%/rlm_sql_firebird-%%PORTVERSION%%.so
-%%FIREBIRD%%%%LIBDIR%%/rlm_sql_firebird.a
-%%FIREBIRD%%%%LIBDIR%%/rlm_sql_firebird.la
-%%FIREBIRD%%%%LIBDIR%%/rlm_sql_firebird.so
+%%EXPM%%%%FIREBIRD%%%%LIBDIR%%/rlm_sql_firebird-%%PORTVERSION%%.la
+%%EXPM%%%%FIREBIRD%%%%LIBDIR%%/rlm_sql_firebird-%%PORTVERSION%%.so
+%%EXPM%%%%FIREBIRD%%%%LIBDIR%%/rlm_sql_firebird.a
+%%EXPM%%%%FIREBIRD%%%%LIBDIR%%/rlm_sql_firebird.la
+%%EXPM%%%%FIREBIRD%%%%LIBDIR%%/rlm_sql_firebird.so
%%LIBDIR%%/rlm_sql_log-%%PORTVERSION%%.la
%%LIBDIR%%/rlm_sql_log-%%PORTVERSION%%.so
%%LIBDIR%%/rlm_sql_log.a
@@ -424,11 +441,16 @@
%%LIBDIR%%/rlm_unix.a
%%LIBDIR%%/rlm_unix.la
%%LIBDIR%%/rlm_unix.so
+%%EXPM%%%%LIBDIR%%/rlm_wimax-%%PORTVERSION%%.la
+%%EXPM%%%%LIBDIR%%/rlm_wimax-%%PORTVERSION%%.so
+%%EXPM%%%%LIBDIR%%/rlm_wimax.a
+%%EXPM%%%%LIBDIR%%/rlm_wimax.la
+%%EXPM%%%%LIBDIR%%/rlm_wimax.so
@dirrm %%LIBDIR%%
sbin/checkrad
sbin/radiusd
+sbin/radmin
sbin/radwatch
-sbin/rc.radiusd
include/freeradius/hash.h
include/freeradius/ident.h
include/freeradius/libradius.h
@@ -487,6 +509,7 @@
%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc1901.txt
%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc1905.txt
%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2243.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2284.txt
%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2289.txt
%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2433.txt
%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2548.txt
@@ -513,12 +536,21 @@
%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc3748.txt
%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc4372.txt
%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc4590.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc4668.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc4669.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc4670.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc4671.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc4672.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc4673.txt
%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc4675.txt
%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc4679.txt
%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc4818.txt
%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc4849.txt
%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc5080.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc5090.txt
%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc5176.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc5247.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc5281.txt
%%PORTDOCS%%%%DOCSDIR%%/rlm_dbm
%%PORTDOCS%%%%DOCSDIR%%/rlm_eap
%%PORTDOCS%%%%DOCSDIR%%/rlm_expiration
@@ -537,8 +569,8 @@
%%PORTDOCS%%%%DOCSDIR%%/supervise-radiusd.txt
%%PORTDOCS%%%%DOCSDIR%%/tuning_guide
%%PORTDOCS%%%%DOCSDIR%%/variables.txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/examples
%%PORTDOCS%%@dirrm %%DOCSDIR%%/rfc
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/examples
%%PORTDOCS%%@dirrm %%DOCSDIR%%
%%DATADIR%%/dictionary
%%DATADIR%%/dictionary.3com
@@ -550,6 +582,7 @@
%%DATADIR%%/dictionary.alteon
%%DATADIR%%/dictionary.altiga
%%DATADIR%%/dictionary.alvarion
+%%DATADIR%%/dictionary.apc
%%DATADIR%%/dictionary.aptis
%%DATADIR%%/dictionary.aruba
%%DATADIR%%/dictionary.ascend
@@ -593,6 +626,7 @@
%%DATADIR%%/dictionary.jradius
%%DATADIR%%/dictionary.juniper
%%DATADIR%%/dictionary.karlnet
+%%DATADIR%%/dictionary.lancom
%%DATADIR%%/dictionary.livingston
%%DATADIR%%/dictionary.localweb
%%DATADIR%%/dictionary.lucent
@@ -603,6 +637,7 @@
%%DATADIR%%/dictionary.motorola
%%DATADIR%%/dictionary.navini
%%DATADIR%%/dictionary.netscreen
+%%DATADIR%%/dictionary.networkphysics
%%DATADIR%%/dictionary.nexans
%%DATADIR%%/dictionary.nokia
%%DATADIR%%/dictionary.nokia.conflict
@@ -632,6 +667,7 @@
%%DATADIR%%/dictionary.rfc4679
%%DATADIR%%/dictionary.rfc4818
%%DATADIR%%/dictionary.rfc4849
+%%DATADIR%%/dictionary.rfc5090
%%DATADIR%%/dictionary.rfc5176
%%DATADIR%%/dictionary.riverstone
%%DATADIR%%/dictionary.roaringpenguin
@@ -649,11 +685,13 @@
%%DATADIR%%/dictionary.tropos
%%DATADIR%%/dictionary.unix
%%DATADIR%%/dictionary.usr
+%%DATADIR%%/dictionary.utstarcom
%%DATADIR%%/dictionary.valemount
%%DATADIR%%/dictionary.versanet
%%DATADIR%%/dictionary.vqp
%%DATADIR%%/dictionary.walabi
%%DATADIR%%/dictionary.waverider
+%%DATADIR%%/dictionary.wimax
%%DATADIR%%/dictionary.wispr
%%DATADIR%%/dictionary.xedia
%%DATADIR%%/dictionary.xylan
Index: Makefile
===================================================================
--- Makefile (.../branches/FreeBSD-ports-tree/freeradius2) (revision 230)
+++ Makefile (.../trunk/freeradius2) (revision 230)
@@ -6,7 +6,7 @@
#
PORTNAME= freeradius
-DISTVERSION= 2.0.5
+DISTVERSION= 2.1.3
CATEGORIES= net
MASTER_SITES= ftp://ftp.freeradius.org/pub/freeradius/%SUBDIR%/ \
ftp://ftp.ntua.gr/pub/net/radius/freeradius/%SUBDIR%/ \
@@ -47,15 +47,10 @@
MYSQL "With MySQL database support" off \
PGSQL "With PostgreSQL database support" off \
FIREBIRD "With Firebird database support (EXPERIMENTAL)" off \
- SNMP "With SNMP support" off \
EXPERIMENTAL "Build experimental modules (including DHCP)" off
.include <bsd.port.pre.mk>
-.if ${OSVERSION} < 700000
-BROKEN= fails to build python rlm module
-.endif
-
# Default requirements for rc script
_REQUIRE= NETWORKING SERVERS
@@ -153,6 +148,7 @@
.else
LIB_DEPENDS+= krb5.3:${PORTSDIR}/security/krb5
.endif
+CONFIGURE_ARGS+=--with-rlm_krb5
CONFIGURE_ARGS+=--with-rlm-krb5-lib-dir=${LOCALBASE}/lib
CONFIGURE_ARGS+=--with-rlm-krb5-include-dir=${LOCALBASE}/include
PLIST_SUB+= KRB5=""
@@ -163,6 +159,7 @@
.ifdef(WITH_LDAP)
USE_OPENLDAP= YES
+CONFIGURE_ARGS+=--with-rlm_ldap
PLIST_SUB+= LDAP=""
_REQUIRE+= slapd
.else
@@ -204,12 +201,23 @@
WITH_EXPERIMENTAL= yes
.endif
-.ifdef(WITH_SNMP)
-LIB_DEPENDS+= snmp.4:${PORTSDIR}/net-mgmt/net-snmp4
+# No SMB option yet; rlm_smb is still unbuildable
+.ifdef(WITH_SMB)
+LIB_DEPENDS= smbclient.0:${PORTSDIR}/net/samba-libsmbclient
+CONFIGURE_ARGS+=--with-rlm_smb
+CONFIGURE_ARGS+=--with-rlm-smb-lib-dir=${LOCALBASE}/lib
+CONFIGURE_ARGS+=--with-rlm-smb-include-dir=${LOCALBASE}/include
+PLIST_SUB+= SMB=""
.else
-CONFIGURE_ARGS+=--without-snmp
+CONFIGURE_ARGS+=--without-rlm_smb
+PLIST_SUB+= SMB="@comment "
.endif
+# SMB module is still experimental
+.if defined(WITH_SMB) && !defined(WITH_EXPERIMENTAL)
+WITH_EXPERIMENTAL= yes
+.endif
+
.ifdef(WITH_EXPERIMENTAL)
CONFIGURE_ARGS+=--with-experimental-modules --with-dhcp
PLIST_SUB+= EXPM=""
@@ -248,7 +256,7 @@
rlm_detail.5 rlm_digest.5 rlm_expr.5 rlm_files.5 rlm_mschap.5 \
rlm_pap.5 rlm_passwd.5 rlm_policy.5 rlm_realm.5 rlm_sql.5 \
rlm_sql_log.5 rlm_unix.5 unlang.5 users.5
-MAN8= radiusd.8 radrelay.8 radsqlrelay.8 radwatch.8 \
+MAN8= radiusd.8 radmin.8 radrelay.8 radsqlrelay.8 radwatch.8 \
rlm_ippool_tool.8
SUB_LIST+= REQUIRE="${_REQUIRE}"
@@ -266,6 +274,14 @@
# Clean up after the last operation (so as not to get unwanted files in raddb)
@${FIND} -E ${WRKSRC}/raddb/certs -regex '.*/bootstrap\.(orig|bak)$$' \
-delete
+# If EXPERIMENTAL (and therefore DHCP) is enabled, enable the DHCP dictionary
+.ifdef(WITH_EXPERIMENTAL)
+ @${REINPLACE_CMD} -Ee 's:^#(.+ dictionary\.dhcp)$$:\1:g' \
+ ${WRKSRC}/share/dictionary
+.endif
+# Patch scripts/Makefile not to install (unnecessary) rc.radiusd
+ @${REINPLACE_CMD} -Ee 's:^(.+rc\.radiusd.+)$$:#\1:g' \
+ ${WRKSRC}/scripts/Makefile
pre-configure:
# Replace -pthread with ${PTHREAD_LIBS} in configure(.in) files
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200812281654.mBSGsN3r020758>