update: net/freeradius

classic Classic list List threaded Threaded
5 messages Options
Reply | Threaded
Open this post in threaded view
|

update: net/freeradius

Rui Reis-2
here's a major update to freeradius version 2.0.0.

I'm also taking maintainership since Tim Kornau doesn't run
freeradius anymore and I've been doing all the previous updates.

comments/oks?

cheers,
rui


Index: Makefile
===================================================================
RCS file: /cvs/ports/net/freeradius/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- Makefile 16 Sep 2007 22:11:31 -0000 1.10
+++ Makefile 19 Jan 2008 14:48:52 -0000
@@ -8,23 +8,24 @@
 COMMENT-pgsql= freeradius pgsql rlm addon
 COMMENT-ldap= freeradius ldap rlm addon
 
-V= 1.1.7
-DISTNAME= freeradius-$V
-PKGNAME-main= ${DISTNAME}
+V= 2.0.0
+DISTNAME= freeradius-server-$V
+PKGNAME-main= ${DISTNAME:S/-server//}
 PKGNAME-iodbc= freeradius-iodbc-$V
 PKGNAME-mysql= freeradius-mysql-$V
 PKGNAME-pgsql= freeradius-pgsql-$V
 PKGNAME-ldap= freeradius-ldap-$V
-SHARED_LIBS= eap 3.0 \
- radius 3.0
+SHARED_LIBS= freeradius-eap 0.0 \
+ freeradius-radius 0.0
 
 CATEGORIES= net
 MASTER_SITES= ftp://ftp.freeradius.org/pub/radius/ \
  ftp://ftp.freeradius.org/pub/radius/old/
+EXTRACT_SUFX= .tar.bz2
 
 HOMEPAGE= http://www.freeradius.org/
 
-MAINTAINER= Tim Kornau <[hidden email]>
+MAINTAINER= Rui Reis <[hidden email]>
 
 # GPL
 PERMIT_PACKAGE_CDROM= Yes
@@ -39,6 +40,7 @@
  --with-snmp \
  --with-pic \
  --without-rlm-perl \
+ --without-rlm-python \
  --without-rlm_pam \
  --without-rlm_sql_oracle \
  --without-rlm_sql_db2 \
@@ -72,6 +74,7 @@
 CONFIGURE_ARGS+=--with-rlm_sql_iodbc \
  --with-iodbc-include-dir='${LOCALBASE}/include' \
  --with-iodbc-lib-dir='${LOCALBASE}/lib'
+CFLAGS+= -lpthread
 .endif
 
 .if ${FLAVOR:L:Mno_ldap}
@@ -102,16 +105,15 @@
 
 LIB_DEPENDS-iodbc= iodbc.>=2::databases/iodbc
 RUN_DEPENDS-iodbc= ::net/freeradius
-WANTLIB-iodbc= pthread
 LIB_DEPENDS-ldap= lber.>=8,ldap_r.>=8:openldap-client-*:databases/openldap \
- radius.>=1::net/freeradius
+ freeradius-radius.>=0::net/freeradius
 WANTLIB-ldap= crypto pthread sasl2 ssl asn1 com_err gssapi krb5
 LIB_DEPENDS-mysql= mysqlclient_r.>=16:mysql-client-*:databases/mysql
 RUN_DEPENDS-mysql= ::net/freeradius
 WANTLIB-mysql= crypto m pthread ssl z
 LIB_DEPENDS-pgsql= pq.>=2:postgresql-client-*:databases/postgresql
 RUN_DEPENDS-pgsql= ::net/freeradius
-WANTLIB-main= c com_err crypto krb5 pthread ssl
+WANTLIB-main= c com_err crypto krb5 pcap pthread ssl
 
 post-configure:
  @perl -pi -e 's,/etc/raddb,${SYSCONFDIR}/raddb,g' ${WRKSRC}/man/*/*
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/freeradius/distinfo,v
retrieving revision 1.4
diff -u -r1.4 distinfo
--- distinfo 16 Sep 2007 22:11:31 -0000 1.4
+++ distinfo 19 Jan 2008 14:48:52 -0000
@@ -1,5 +1,5 @@
-MD5 (freeradius-1.1.7.tar.gz) = XBJsshIrjiupeEtRH779lg==
-RMD160 (freeradius-1.1.7.tar.gz) = nTOksB/HkVVxU7N1pB49kF/I7+U=
-SHA1 (freeradius-1.1.7.tar.gz) = ToUV+CJgR474ge17h7fKJY4ZzLo=
-SHA256 (freeradius-1.1.7.tar.gz) = imSXtBjQN6s6eYAekbs8Lkwtay7bbzZ3u5PnMKQrVPg=
-SIZE (freeradius-1.1.7.tar.gz) = 3156228
+MD5 (freeradius-server-2.0.0.tar.bz2) = llvxhZJGgCP+yAJ5JG+h3w==
+RMD160 (freeradius-server-2.0.0.tar.bz2) = B02/oS2PHFqHB6eADuSh43f+Jio=
+SHA1 (freeradius-server-2.0.0.tar.bz2) = bbqGSKy+A3uJpdZ9sJtUjVtBBio=
+SHA256 (freeradius-server-2.0.0.tar.bz2) = WTjCBHCvOpcP50q601LjDPfdbhKjJIRGpC65Xi8ZkxE=
+SIZE (freeradius-server-2.0.0.tar.bz2) = 2270574
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/net/freeradius/patches/patch-configure,v
retrieving revision 1.3
diff -u -r1.3 patch-configure
--- patches/patch-configure 16 Sep 2007 22:11:31 -0000 1.3
+++ patches/patch-configure 19 Jan 2008 14:48:52 -0000
@@ -1,7 +1,7 @@
-$OpenBSD: patch-configure,v 1.3 2007/09/16 22:11:31 rui Exp $
---- configure.orig Sat Jul 21 15:01:34 2007
-+++ configure Sat Sep 15 09:46:18 2007
-@@ -4159,7 +4159,7 @@ fi
+$OpenBSD$
+--- configure.orig Thu Jan 10 10:38:42 2008
++++ configure Wed Jan 16 14:06:18 2008
+@@ -4864,7 +4864,7 @@ fi
      LTDLINCL='-I${top_srcdir}/''libltdl'
    else
      ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
@@ -10,7 +10,7 @@
      LTDLINCL=
    fi
    # For backwards non-gettext consistent compatibility...
-@@ -8535,7 +8535,6 @@ bsdi[45]*)
+@@ -8876,7 +8876,6 @@ bsdi[45]*)
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
@@ -18,7 +18,7 @@
    shlibpath_var=LD_LIBRARY_PATH
    sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
    sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-@@ -20335,7 +20334,6 @@ if test "${ac_cv_lib_resolv_inet_aton+set}" = set; the
+@@ -20654,7 +20653,6 @@ if test "${ac_cv_lib_resolv_inet_aton+set}" = set; the
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -26,7 +26,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -20395,8 +20393,6 @@ if test $ac_cv_lib_resolv_inet_aton = yes; then
+@@ -20714,8 +20712,6 @@ if test $ac_cv_lib_resolv_inet_aton = yes; then
  #define HAVE_LIBRESOLV 1
  _ACEOF
 
@@ -35,7 +35,7 @@
  fi
 
 
-@@ -20552,7 +20548,7 @@ if test "${ac_cv_lib_ssl_SSL_new+set}" = set; then
+@@ -20872,7 +20868,7 @@ if test "${ac_cv_lib_ssl_SSL_new+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -44,3 +44,21 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
+@@ -22968,7 +22964,7 @@ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+-
++#include <unistd.h>
+ #ifdef HAVE_NETINET_IN_H
+ #include <netinet/in.h>
+ #endif
+@@ -23035,7 +23031,7 @@ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+-
++#include <unistd.h>
+ #ifdef HAVE_NETINET_IN_H
+ #include <netinet/in.h>
+ #endif
Index: patches/patch-raddb_radiusd_conf_in
===================================================================
RCS file: /cvs/ports/net/freeradius/patches/patch-raddb_radiusd_conf_in,v
retrieving revision 1.3
diff -u -r1.3 patch-raddb_radiusd_conf_in
--- patches/patch-raddb_radiusd_conf_in 16 Sep 2007 22:11:31 -0000 1.3
+++ patches/patch-raddb_radiusd_conf_in 19 Jan 2008 14:48:52 -0000
@@ -1,61 +1,112 @@
-$OpenBSD: patch-raddb_radiusd_conf_in,v 1.3 2007/09/16 22:11:31 rui Exp $
---- raddb/radiusd.conf.in.orig Mon Jul 16 11:53:13 2007
-+++ raddb/radiusd.conf.in Sat Sep 15 09:46:18 2007
-@@ -23,7 +23,7 @@
+$OpenBSD$
+--- raddb/radiusd.conf.in.orig Wed Jan 16 10:44:17 2008
++++ raddb/radiusd.conf.in Wed Jan 16 10:52:50 2008
+@@ -26,7 +26,7 @@
  prefix = @prefix@
  exec_prefix = @exec_prefix@
  sysconfdir = @sysconfdir@
 -localstatedir = @localstatedir@
-+localstatedir = /var
++localstatedir = /var
  sbindir = @sbindir@
  logdir = @logdir@
  raddbdir = @raddbdir@
-@@ -71,7 +71,7 @@ log_file = ${logdir}/radius.log
+@@ -81,7 +81,7 @@ log_destination = files
  # make
  # make install
  #
 -libdir = @libdir@
-+libdir = @prefix@/lib/freeradius
++libdir = @prefix@/lib/freeradius
 
  #  pidfile: Where to place the PID of the RADIUS server.
  #
-@@ -106,8 +106,8 @@ pidfile = ${run_dir}/radiusd.pid
+@@ -116,8 +116,8 @@ pidfile = ${run_dir}/radiusd.pid
  #  that the debugging mode server is running as a user that can read the
  #  shadow info, and the user listed below can not.
  #
 -#user = nobody
 -#group = nobody
-+user = _freeradius
-+group = _freeradius
++user = _freeradius
++group = _freeradius
 
  #  max_request_time: The maximum time (in seconds) to handle a request.
  #
-@@ -425,8 +425,8 @@ security {
+@@ -408,8 +408,8 @@ security {
  #
  #  allowed values: {no, yes}
  #
 -proxy_requests  = yes
--$INCLUDE  ${confdir}/proxy.conf
-+proxy_requests  = no
-+# $INCLUDE  ${confdir}/proxy.conf
+-$INCLUDE proxy.conf
++proxy_requests  = no
++#$INCLUDE ${confdir}/proxy.conf
 
 
  # CLIENTS CONFIGURATION
-@@ -665,7 +665,7 @@ modules {
+@@ -425,7 +425,7 @@ $INCLUDE proxy.conf
+ #  Anything listed in 'clients.conf' will take precedence over the
+ #  information from the old-style configuration files.
+ #
+-$INCLUDE clients.conf
++$INCLUDE ${confdir}/clients.conf
+
+
+ # SNMP CONFIGURATION
+@@ -437,7 +437,7 @@ $INCLUDE clients.conf
+ #  'snmp' attribute to 'yes'
+ #
+ snmp = no
+-$INCLUDE snmp.conf
++$INCLUDE ${confdir}/snmp.conf
+
+
+ # THREAD POOL CONFIGURATION
+@@ -609,7 +609,7 @@ modules {
  #  For all EAP related authentications.
  #  Now in another file, because it is very large.
  #
--$INCLUDE ${confdir}/eap.conf
+-$INCLUDE eap.conf
 + $INCLUDE ${confdir}/eap.conf
 
  # Microsoft CHAP authentication
  #
-@@ -1253,7 +1253,7 @@ $INCLUDE ${confdir}/eap.conf
- #  For MS-SQL, use: ${confdir}/mssql.conf
- #  For Oracle, use: ${confdir}/oraclesql.conf
+@@ -1246,7 +1246,7 @@ $INCLUDE eap.conf
+ #  Include another file that has the SQL-related configuration.
+ #  This is another file only because it tends to be big.
  #
-- $INCLUDE  ${confdir}/sql.conf
-+ # $INCLUDE  ${confdir}/sql.conf
+- $INCLUDE sql.conf
++ $INCLUDE ${confdir}/sql.conf
 
 
  #  For Cisco VoIP specific accounting with Postgresql,
+@@ -1440,8 +1440,8 @@ $INCLUDE eap.conf
+ #  totally dependent on the SQL module to process Accounting
+ #  packets.
+ #
+- $INCLUDE sql/mysql/counter.conf
+- #$INCLUDE sql/postgresql/counter.conf
++ $INCLUDE ${confdir}/sql/mysql/counter.conf
++ #$INCLUDE ${confdir}/sql/postgresql/counter.conf
+
+ #
+ # The "always" module is here for debugging purposes. Each
+@@ -1744,10 +1744,10 @@ $INCLUDE eap.conf
+ #key = "%{NAS-IP-Address} %{NAS-Port}"
+ }
+
+- # $INCLUDE sqlippool.conf
++ # $INCLUDE ${confdir}/sqlippool.conf
+
+ # OTP token support.  Not included by default.
+- # $INCLUDE otp.conf
++ # $INCLUDE ${confdir}/otp.conf
+
+ #
+ #  Kerberos.  See doc/rlm_krb5 for minimal docs.
+@@ -1842,7 +1842,7 @@ instantiate {
+ # to multiple times.
+ #
+ ######################################################################
+-$INCLUDE policy.conf
++$INCLUDE ${confdir}/policy.conf
+
+ ######################################################################
+ #
Index: patches/patch-src_lib_Makefile
===================================================================
RCS file: /cvs/ports/net/freeradius/patches/patch-src_lib_Makefile,v
retrieving revision 1.3
diff -u -r1.3 patch-src_lib_Makefile
--- patches/patch-src_lib_Makefile 16 Sep 2007 22:11:31 -0000 1.3
+++ patches/patch-src_lib_Makefile 19 Jan 2008 14:48:52 -0000
@@ -1,16 +1,16 @@
-$OpenBSD: patch-src_lib_Makefile,v 1.3 2007/09/16 22:11:31 rui Exp $
---- src/lib/Makefile.orig Wed Apr 12 21:45:20 2006
-+++ src/lib/Makefile Sat Sep 15 09:46:18 2007
-@@ -38,7 +38,7 @@ TARGET = $(LIBPREFIX)radius
+$OpenBSD$
+--- src/lib/Makefile.orig Wed Jan 16 10:54:01 2008
++++ src/lib/Makefile Wed Jan 16 10:54:53 2008
+@@ -39,7 +39,7 @@ TARGET = $(LIBPREFIX)freeradius-radius
  all: $(TARGET).la
 
  $(TARGET).la: $(LT_OBJS)
 - $(LIBTOOL) --mode=link $(CC) -release $(RADIUSD_VERSION) \
 + $(LIBTOOL) --mode=link $(CC) \
- $(LDFLAGS) $(LINK_MODE) -o $@ -rpath $(libdir) $^ $(LCRYPT)
+ $(LDFLAGS) $(LINK_MODE) -o $@ -rpath $(libdir) $^
 
  $(LT_OBJS): $(INCLUDES)
-@@ -51,5 +51,3 @@ install: all
+@@ -52,5 +52,3 @@ install: all
  $(INSTALL) -d -m 755 $(R)$(libdir)
  $(LIBTOOL) --mode=install $(INSTALL) -c $(TARGET).la \
  $(R)$(libdir)/$(TARGET).la
Index: patches/patch-src_modules_rlm_eap_types_rlm_eap_peap_Makefile_in
===================================================================
RCS file: /cvs/ports/net/freeradius/patches/patch-src_modules_rlm_eap_types_rlm_eap_peap_Makefile_in,v
retrieving revision 1.2
diff -u -r1.2 patch-src_modules_rlm_eap_types_rlm_eap_peap_Makefile_in
--- patches/patch-src_modules_rlm_eap_types_rlm_eap_peap_Makefile_in 16 Sep 2007 22:11:31 -0000 1.2
+++ patches/patch-src_modules_rlm_eap_types_rlm_eap_peap_Makefile_in 19 Jan 2008 14:48:52 -0000
@@ -1,14 +1,14 @@
-$OpenBSD: patch-src_modules_rlm_eap_types_rlm_eap_peap_Makefile_in,v 1.2 2007/09/16 22:11:31 rui Exp $
---- src/modules/rlm_eap/types/rlm_eap_peap/Makefile.in.orig Fri Feb 10 19:47:12 2006
-+++ src/modules/rlm_eap/types/rlm_eap_peap/Makefile.in Sat Sep 15 09:46:18 2007
+$OpenBSD$
+--- src/modules/rlm_eap/types/rlm_eap_peap/Makefile.in.orig Wed Jan 16 12:38:39 2008
++++ src/modules/rlm_eap/types/rlm_eap_peap/Makefile.in Wed Jan 16 12:39:41 2008
 @@ -5,8 +5,8 @@
  TARGET      = @targetname@
  SRCS        = rlm_eap_peap.c peap.c
  HEADERS     = eap_peap.h ../../eap.h ../../rlm_eap.h
 -RLM_CFLAGS  = -I../.. -I../../libeap $(INCLTDL) $(OPENSSL_INCLUDE) @eap_peap_cflags@
--RLM_LIBS    = @eap_peap_ldflags@ ../../libeap/libeap.la $(OPENSSL_LIBS)
+-RLM_LIBS    = @eap_peap_ldflags@ ../../libeap/$(LIBPREFIX)freeradius-eap.la $(OPENSSL_LIBS)
 +RLM_CFLAGS  = -I../.. -I../../libeap $(INCLTDL) @eap_peap_cflags@
-+RLM_LIBS    = @eap_peap_ldflags@ ../../libeap/libeap.la
++RLM_LIBS    = @eap_peap_ldflags@ ../../libeap/$(LIBPREFIX)freeradius-eap.la
  RLM_INSTALL =
 
  RLM_DIR=../../
Index: patches/patch-src_modules_rlm_eap_types_rlm_eap_tls_Makefile_in
===================================================================
RCS file: /cvs/ports/net/freeradius/patches/patch-src_modules_rlm_eap_types_rlm_eap_tls_Makefile_in,v
retrieving revision 1.2
diff -u -r1.2 patch-src_modules_rlm_eap_types_rlm_eap_tls_Makefile_in
--- patches/patch-src_modules_rlm_eap_types_rlm_eap_tls_Makefile_in 16 Sep 2007 22:11:31 -0000 1.2
+++ patches/patch-src_modules_rlm_eap_types_rlm_eap_tls_Makefile_in 19 Jan 2008 14:48:53 -0000
@@ -1,14 +1,14 @@
-$OpenBSD: patch-src_modules_rlm_eap_types_rlm_eap_tls_Makefile_in,v 1.2 2007/09/16 22:11:31 rui Exp $
---- src/modules/rlm_eap/types/rlm_eap_tls/Makefile.in.orig Fri Feb 10 19:47:13 2006
-+++ src/modules/rlm_eap/types/rlm_eap_tls/Makefile.in Sat Sep 15 09:46:18 2007
+$OpenBSD$
+--- src/modules/rlm_eap/types/rlm_eap_tls/Makefile.in.orig Wed Jan 16 12:40:46 2008
++++ src/modules/rlm_eap/types/rlm_eap_tls/Makefile.in Wed Jan 16 12:41:01 2008
 @@ -5,8 +5,8 @@
  TARGET      = @targetname@
  SRCS        = rlm_eap_tls.c
  HEADERS     = rlm_eap_tls.h ../../eap.h ../../rlm_eap.h
 -RLM_CFLAGS  = -I../.. -I../../libeap $(INCLTDL) $(OPENSSL_INCLUDE) @eap_tls_cflags@
--RLM_LIBS    = @eap_tls_ldflags@ ../../libeap/libeap.la $(OPENSSL_LIBS)
+-RLM_LIBS    = @eap_tls_ldflags@ ../../libeap/$(LIBPREFIX)freeradius-eap.la $(OPENSSL_LIBS)
 +RLM_CFLAGS  = -I../.. -I../../libeap $(INCLTDL) @eap_tls_cflags@
-+RLM_LIBS    = @eap_tls_ldflags@ ../../libeap/libeap.la
++RLM_LIBS    = @eap_tls_ldflags@ ../../libeap/$(LIBPREFIX)freeradius-eap.la
  RLM_INSTALL =
 
  RLM_DIR=../../
Index: patches/patch-src_modules_rlm_eap_types_rlm_eap_ttls_Makefile_in
===================================================================
RCS file: /cvs/ports/net/freeradius/patches/patch-src_modules_rlm_eap_types_rlm_eap_ttls_Makefile_in,v
retrieving revision 1.2
diff -u -r1.2 patch-src_modules_rlm_eap_types_rlm_eap_ttls_Makefile_in
--- patches/patch-src_modules_rlm_eap_types_rlm_eap_ttls_Makefile_in 16 Sep 2007 22:11:31 -0000 1.2
+++ patches/patch-src_modules_rlm_eap_types_rlm_eap_ttls_Makefile_in 19 Jan 2008 14:48:53 -0000
@@ -1,14 +1,14 @@
-$OpenBSD: patch-src_modules_rlm_eap_types_rlm_eap_ttls_Makefile_in,v 1.2 2007/09/16 22:11:31 rui Exp $
---- src/modules/rlm_eap/types/rlm_eap_ttls/Makefile.in.orig Fri Feb 10 19:47:14 2006
-+++ src/modules/rlm_eap/types/rlm_eap_ttls/Makefile.in Sat Sep 15 09:46:18 2007
+$OpenBSD$
+--- src/modules/rlm_eap/types/rlm_eap_ttls/Makefile.in.orig Wed Jan 16 12:41:29 2008
++++ src/modules/rlm_eap/types/rlm_eap_ttls/Makefile.in Wed Jan 16 12:41:43 2008
 @@ -5,8 +5,8 @@
  TARGET      = @targetname@
  SRCS        = rlm_eap_ttls.c ttls.c
  HEADERS     = eap_ttls.h ../../eap.h ../../rlm_eap.h
 -RLM_CFLAGS  = -I../.. -I../../libeap $(INCLTDL) $(OPENSSL_INCLUDE) @eap_ttls_cflags@
--RLM_LIBS    = @eap_ttls_ldflags@ ../../libeap/libeap.la $(OPENSSL_LIBS)
+-RLM_LIBS    = @eap_ttls_ldflags@ ../../libeap/$(LIBPREFIX)freeradius-eap.la $(OPENSSL_LIBS)
 +RLM_CFLAGS  = -I../.. -I../../libeap $(INCLTDL) @eap_ttls_cflags@
-+RLM_LIBS    = @eap_ttls_ldflags@ ../../libeap/libeap.la
++RLM_LIBS    = @eap_ttls_ldflags@ ../../libeap/$(LIBPREFIX)freeradius-eap.la
  RLM_INSTALL =
 
  RLM_DIR=../../
Index: patches/patch-src_modules_rlm_otp_configure
===================================================================
RCS file: patches/patch-src_modules_rlm_otp_configure
diff -N patches/patch-src_modules_rlm_otp_configure
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_modules_rlm_otp_configure 19 Jan 2008 14:48:53 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- src/modules/rlm_otp/configure.orig Fri Jan 18 17:17:16 2008
++++ src/modules/rlm_otp/configure Fri Jan 18 17:17:52 2008
+@@ -2905,7 +2905,7 @@ if test "${ac_cv_lib_ssl_SSL_new+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lssl  $LIBS"
++LIBS="-lcrypt -lssl  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
Index: patches/patch-src_modules_rlm_sql_drivers_rules_mak
===================================================================
RCS file: /cvs/ports/net/freeradius/patches/patch-src_modules_rlm_sql_drivers_rules_mak,v
retrieving revision 1.3
diff -u -r1.3 patch-src_modules_rlm_sql_drivers_rules_mak
--- patches/patch-src_modules_rlm_sql_drivers_rules_mak 16 Sep 2007 22:11:31 -0000 1.3
+++ patches/patch-src_modules_rlm_sql_drivers_rules_mak 19 Jan 2008 14:48:53 -0000
@@ -1,6 +1,6 @@
-$OpenBSD: patch-src_modules_rlm_sql_drivers_rules_mak,v 1.3 2007/09/16 22:11:31 rui Exp $
---- src/modules/rlm_sql/drivers/rules.mak.orig Thu Jul  6 17:54:34 2006
-+++ src/modules/rlm_sql/drivers/rules.mak Sat Sep 15 09:46:18 2007
+$OpenBSD$
+--- src/modules/rlm_sql/drivers/rules.mak.orig Wed Jan 16 15:58:27 2008
++++ src/modules/rlm_sql/drivers/rules.mak Wed Jan 16 16:01:18 2008
 @@ -99,9 +99,9 @@ build-module: $(TARGET).la
  @cp $< ../lib
 
@@ -13,9 +13,12 @@
 
  #######################################################################
  #
-@@ -142,4 +142,4 @@ reconfig:
- #  Otherwise, install the libraries into $(libdir)
- #
+@@ -144,7 +144,5 @@ reconfig:
  install:
-- [ "x$(TARGET)" = "x" ] || $(LIBTOOL) --mode=install $(INSTALL) -c $(TARGET).la $(R)$(libdir)/$(TARGET).la
-+ [ "x$(TARGET)" = "x" ] || $(LIBTOOL) --mode=install $(INSTALL) -c $(TARGET).la $(R)$(libdir)/freeradius/$(TARGET).la
+ if [ "x$(TARGET)" != "x" ]; then \
+    $(LIBTOOL) --mode=install $(INSTALL) -c \
+- $(TARGET).la $(R)$(libdir)/$(TARGET).la || exit $$?; \
+-    rm -f $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la; \
+-    ln -s $(TARGET).la $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la || exit $$?; \
++ $(TARGET).la $(R)$(libdir)/freeradius/$(TARGET).la || exit $$?; \
+ fi
Index: patches/patch-src_modules_rules_mak
===================================================================
RCS file: /cvs/ports/net/freeradius/patches/patch-src_modules_rules_mak,v
retrieving revision 1.3
diff -u -r1.3 patch-src_modules_rules_mak
--- patches/patch-src_modules_rules_mak 16 Sep 2007 22:11:31 -0000 1.3
+++ patches/patch-src_modules_rules_mak 19 Jan 2008 14:48:53 -0000
@@ -1,19 +1,19 @@
-$OpenBSD: patch-src_modules_rules_mak,v 1.3 2007/09/16 22:11:31 rui Exp $
---- src/modules/rules.mak.orig Thu Jul  6 17:42:57 2006
-+++ src/modules/rules.mak Sat Sep 15 09:46:18 2007
-@@ -111,9 +111,9 @@ build-module: $(TARGET).la $(RLM_UTILS)
+$OpenBSD$
+--- src/modules/rules.mak.orig Thu Jan 10 10:12:01 2008
++++ src/modules/rules.mak Wed Jan 16 11:02:57 2008
+@@ -113,9 +113,9 @@ build-module: $(TARGET).la $(RLM_UTILS)
  @cp $< $(top_builddir)/src/modules/lib
 
  $(TARGET).la: $(LT_OBJS)
 - $(LIBTOOL) --mode=link $(CC) -release $(RADIUSD_VERSION) \
 + $(LIBTOOL) --mode=link $(CC) -avoid-version \
  -module $(LINK_MODE) $(LDFLAGS) $(RLM_LDFLAGS) -o $@     \
-- -rpath $(libdir) $^ $(top_builddir)/src/lib/libradius.la \
-+ -rpath $(libdir)/freeradius $^ $(top_builddir)/src/lib/libradius.la \
- $(RLM_LIBS) $(LIBS)
+- -rpath $(libdir) $^ $(LIBRADIUS) $(RLM_LIBS) $(LIBS)
++ -rpath $(libdir)/freeradius $^ $(LIBRADIUS) $(RLM_LIBS) $(LIBS)
 
  #######################################################################
-@@ -161,7 +161,5 @@ install:
+ #
+@@ -162,7 +162,5 @@ install:
  @[ "x$(RLM_INSTALL)" = "x" ] || $(MAKE) $(MFLAGS) $(RLM_INSTALL)
  if [ "x$(TARGET)" != "x" ]; then \
     $(LIBTOOL) --mode=install $(INSTALL) -c \
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/net/freeradius/pkg/PLIST-main,v
retrieving revision 1.3
diff -u -r1.3 PLIST-main
--- pkg/PLIST-main 16 Sep 2007 22:11:31 -0000 1.3
+++ pkg/PLIST-main 19 Jan 2008 14:48:53 -0000
@@ -7,7 +7,7 @@
 bin/radclient
 bin/radeapclient
 bin/radlast
-bin/radrelay
+bin/radsniff
 bin/radsqlrelay
 bin/radtest
 bin/radwho
@@ -16,10 +16,27 @@
 bin/rlm_dbm_parser
 bin/rlm_ippool_tool
 bin/smbencrypt
+include/freeradius/
+include/freeradius/hash.h
+include/freeradius/ident.h
+include/freeradius/libradius.h
+include/freeradius/md4.h
+include/freeradius/md5.h
+include/freeradius/missing.h
+include/freeradius/packet.h
+include/freeradius/radius.h
+include/freeradius/radpaths.h
+include/freeradius/sha1.h
+include/freeradius/token.h
+include/freeradius/udpfromto.h
+include/freeradius/vqp.h
 lib/freeradius/
 lib/freeradius/rlm_acct_unique.a
 lib/freeradius/rlm_acct_unique.la
 lib/freeradius/rlm_acct_unique.so
+lib/freeradius/rlm_acctlog.a
+lib/freeradius/rlm_acctlog.la
+lib/freeradius/rlm_acctlog.so
 lib/freeradius/rlm_always.a
 lib/freeradius/rlm_always.la
 lib/freeradius/rlm_always.so
@@ -35,6 +52,9 @@
 lib/freeradius/rlm_checkval.a
 lib/freeradius/rlm_checkval.la
 lib/freeradius/rlm_checkval.so
+lib/freeradius/rlm_copy_packet.a
+lib/freeradius/rlm_copy_packet.la
+lib/freeradius/rlm_copy_packet.so
 lib/freeradius/rlm_counter.a
 lib/freeradius/rlm_counter.la
 lib/freeradius/rlm_counter.so
@@ -71,12 +91,18 @@
 lib/freeradius/rlm_eap_tls.a
 lib/freeradius/rlm_eap_tls.la
 lib/freeradius/rlm_eap_tls.so
+lib/freeradius/rlm_eap_tnc.a
+lib/freeradius/rlm_eap_tnc.la
+lib/freeradius/rlm_eap_tnc.so
 lib/freeradius/rlm_eap_ttls.a
 lib/freeradius/rlm_eap_ttls.la
 lib/freeradius/rlm_eap_ttls.so
 lib/freeradius/rlm_exec.a
 lib/freeradius/rlm_exec.la
 lib/freeradius/rlm_exec.so
+lib/freeradius/rlm_expiration.a
+lib/freeradius/rlm_expiration.la
+lib/freeradius/rlm_expiration.so
 lib/freeradius/rlm_expr.a
 lib/freeradius/rlm_expr.la
 lib/freeradius/rlm_expr.so
@@ -92,18 +118,21 @@
 lib/freeradius/rlm_krb5.a
 lib/freeradius/rlm_krb5.la
 lib/freeradius/rlm_krb5.so
+lib/freeradius/rlm_logintime.a
+lib/freeradius/rlm_logintime.la
+lib/freeradius/rlm_logintime.so
 lib/freeradius/rlm_mschap.a
 lib/freeradius/rlm_mschap.la
 lib/freeradius/rlm_mschap.so
-lib/freeradius/rlm_ns_mta_md5.a
-lib/freeradius/rlm_ns_mta_md5.la
-lib/freeradius/rlm_ns_mta_md5.so
 lib/freeradius/rlm_pap.a
 lib/freeradius/rlm_pap.la
 lib/freeradius/rlm_pap.so
 lib/freeradius/rlm_passwd.a
 lib/freeradius/rlm_passwd.la
 lib/freeradius/rlm_passwd.so
+lib/freeradius/rlm_policy.a
+lib/freeradius/rlm_policy.la
+lib/freeradius/rlm_policy.so
 lib/freeradius/rlm_preprocess.a
 lib/freeradius/rlm_preprocess.la
 lib/freeradius/rlm_preprocess.so
@@ -128,12 +157,12 @@
 lib/freeradius/rlm_unix.a
 lib/freeradius/rlm_unix.la
 lib/freeradius/rlm_unix.so
-lib/libeap.a
-lib/libeap.la
-@lib lib/libeap.so.${LIBeap_VERSION}
-lib/libradius.a
-lib/libradius.la
-@lib lib/libradius.so.${LIBradius_VERSION}
+lib/libfreeradius-eap.a
+lib/libfreeradius-eap.la
+@lib lib/libfreeradius-eap.so.${LIBfreeradius-eap_VERSION}
+lib/libfreeradius-radius.a
+lib/libfreeradius-radius.la
+@lib lib/libfreeradius-radius.so.${LIBfreeradius-radius_VERSION}
 @man man/man1/radclient.1
 @man man/man1/radeapclient.1
 @man man/man1/radlast.1
@@ -141,11 +170,10 @@
 @man man/man1/radwho.1
 @man man/man1/radzap.1
 @man man/man5/acct_users.5
-@man man/man5/clients.5
 @man man/man5/clients.conf.5
 @man man/man5/dictionary.5
-@man man/man5/naslist.5
 @man man/man5/radiusd.conf.5
+@man man/man5/radrelay.conf.5
 @man man/man5/rlm_acct_unique.5
 @man man/man5/rlm_always.5
 @man man/man5/rlm_attr_filter.5
@@ -153,15 +181,18 @@
 @man man/man5/rlm_chap.5
 @man man/man5/rlm_counter.5
 @man man/man5/rlm_detail.5
+@man man/man5/rlm_digest.5
 @man man/man5/rlm_expr.5
 @man man/man5/rlm_files.5
 @man man/man5/rlm_mschap.5
 @man man/man5/rlm_pap.5
 @man man/man5/rlm_passwd.5
+@man man/man5/rlm_policy.5
 @man man/man5/rlm_realm.5
 @man man/man5/rlm_sql.5
 @man man/man5/rlm_sql_log.5
 @man man/man5/rlm_unix.5
+@man man/man5/unlang.5
 @man man/man5/users.5
 @man man/man8/radiusd.8
 @man man/man8/radrelay.8
@@ -194,16 +225,11 @@
 share/doc/freeradius/cisco
 share/doc/freeradius/coding-methods.txt
 share/doc/freeradius/configurable_failover
-share/doc/freeradius/duplicate-users
 share/doc/freeradius/examples/
 share/doc/freeradius/examples/iplanet.ldif
 share/doc/freeradius/examples/iplanet.schema
-share/doc/freeradius/examples/mssql.sql
-share/doc/freeradius/examples/mysql.sql
 share/doc/freeradius/examples/openldap.schema
-share/doc/freeradius/examples/oracle.sql
-share/doc/freeradius/examples/postgresql.sql
-share/doc/freeradius/examples/postgresql.sql.extra
+share/doc/freeradius/examples/postgresql_update_radacct_group_trigger.sql
 share/doc/freeradius/ldap_howto.txt
 share/doc/freeradius/load-balance.txt
 share/doc/freeradius/misc-nas
@@ -212,7 +238,6 @@
 share/doc/freeradius/performance-testing
 share/doc/freeradius/processing_users_file
 share/doc/freeradius/proxy
-share/doc/freeradius/radrelay
 share/doc/freeradius/release-method.txt
 share/doc/freeradius/rfc/
 share/doc/freeradius/rfc/attributes.html
@@ -225,14 +250,11 @@
 share/doc/freeradius/rfc/rfc1448.txt
 share/doc/freeradius/rfc/rfc1901.txt
 share/doc/freeradius/rfc/rfc1905.txt
-share/doc/freeradius/rfc/rfc2058.txt
-share/doc/freeradius/rfc/rfc2059.txt
-share/doc/freeradius/rfc/rfc2138.txt
-share/doc/freeradius/rfc/rfc2139.txt
 share/doc/freeradius/rfc/rfc2243.txt
 share/doc/freeradius/rfc/rfc2289.txt
 share/doc/freeradius/rfc/rfc2433.txt
 share/doc/freeradius/rfc/rfc2548.txt
+share/doc/freeradius/rfc/rfc2607.txt
 share/doc/freeradius/rfc/rfc2618.txt
 share/doc/freeradius/rfc/rfc2619.txt
 share/doc/freeradius/rfc/rfc2620.txt
@@ -252,11 +274,19 @@
 share/doc/freeradius/rfc/rfc3576.txt
 share/doc/freeradius/rfc/rfc3579.txt
 share/doc/freeradius/rfc/rfc3580.txt
-share/doc/freeradius/rlm_attr_filter
+share/doc/freeradius/rfc/rfc3748.txt
+share/doc/freeradius/rfc/rfc4372.txt
+share/doc/freeradius/rfc/rfc4590.txt
+share/doc/freeradius/rfc/rfc4675.txt
+share/doc/freeradius/rfc/rfc4679.txt
+share/doc/freeradius/rfc/rfc4818.txt
+share/doc/freeradius/rfc/rfc4849.txt
+share/doc/freeradius/rfc/rfc5080.txt
 share/doc/freeradius/rlm_dbm
-share/doc/freeradius/rlm_digest
 share/doc/freeradius/rlm_eap
+share/doc/freeradius/rlm_expiration
 share/doc/freeradius/rlm_fastusers
+share/doc/freeradius/rlm_jradius
 share/doc/freeradius/rlm_krb5
 share/doc/freeradius/rlm_ldap
 share/doc/freeradius/rlm_pam
@@ -266,6 +296,7 @@
 share/doc/freeradius/rlm_sql
 share/doc/freeradius/rlm_sqlcounter
 share/doc/freeradius/rlm_sqlippool
+share/doc/freeradius/snmp
 share/doc/freeradius/supervise-radiusd.txt
 share/doc/freeradius/tuning_guide
 share/doc/freeradius/variables.txt
@@ -278,28 +309,17 @@
 share/examples/freeradius/acct_users
 @sample ${SYSCONFDIR}/raddb/acct_users
 share/examples/freeradius/attrs
+share/examples/freeradius/attrs.access_reject
+share/examples/freeradius/attrs.accounting_response
+share/examples/freeradius/attrs.pre-proxy
 share/examples/freeradius/certs/
+share/examples/freeradius/certs/Makefile
 share/examples/freeradius/certs/README
-share/examples/freeradius/certs/cert-clt.der
-share/examples/freeradius/certs/cert-clt.p12
-share/examples/freeradius/certs/cert-clt.pem
-share/examples/freeradius/certs/cert-srv.der
-share/examples/freeradius/certs/cert-srv.p12
-share/examples/freeradius/certs/cert-srv.pem
-share/examples/freeradius/certs/demoCA/
-share/examples/freeradius/certs/demoCA/cacert.pem
-share/examples/freeradius/certs/demoCA/index.txt
-share/examples/freeradius/certs/demoCA/index.txt.old
-share/examples/freeradius/certs/demoCA/serial
-share/examples/freeradius/certs/demoCA/serial.old
-share/examples/freeradius/certs/dh
-share/examples/freeradius/certs/newcert.pem
-share/examples/freeradius/certs/newreq.pem
-share/examples/freeradius/certs/random
-share/examples/freeradius/certs/root.der
-share/examples/freeradius/certs/root.p12
-share/examples/freeradius/certs/root.pem
-share/examples/freeradius/clients
+share/examples/freeradius/certs/bootstrap
+share/examples/freeradius/certs/ca.cnf
+share/examples/freeradius/certs/client.cnf
+share/examples/freeradius/certs/server.cnf
+share/examples/freeradius/certs/xpextensions
 share/examples/freeradius/clients.conf
 @sample ${SYSCONFDIR}/raddb/clients.conf
 share/examples/freeradius/dictionary
@@ -307,28 +327,76 @@
 share/examples/freeradius/eap.conf
 @sample ${SYSCONFDIR}/raddb/eap.conf
 share/examples/freeradius/experimental.conf
+@sample ${SYSCONFDIR}/raddb/experimental.conf
 share/examples/freeradius/hints
 @sample ${SYSCONFDIR}/raddb/hints
 share/examples/freeradius/huntgroups
 @sample ${SYSCONFDIR}/raddb/huntgroups
 share/examples/freeradius/ldap.attrmap
-share/examples/freeradius/mssql.conf
-share/examples/freeradius/naslist
-share/examples/freeradius/naspasswd
-share/examples/freeradius/oraclesql.conf
+@sample ${SYSCONFDIR}/raddb/ldap.attrmap
 share/examples/freeradius/otp.conf
-share/examples/freeradius/postgresql.conf
-share/examples/freeradius/postgresqlippool.conf
+@sample ${SYSCONFDIR}/raddb/otp.conf
+share/examples/freeradius/policy.conf
+@sample ${SYSCONFDIR}/raddb/policy.conf
+share/examples/freeradius/policy.txt
 share/examples/freeradius/preproxy_users
 @sample ${SYSCONFDIR}/raddb/preproxy_users
 share/examples/freeradius/proxy.conf
+@sample ${SYSCONFDIR}/raddb/proxy.conf
 share/examples/freeradius/radiusd.conf
 @sample ${SYSCONFDIR}/raddb/radiusd.conf
-share/examples/freeradius/realms
+share/examples/freeradius/sites-available/
+@sample ${SYSCONFDIR}/raddb/sites-available/
+share/examples/freeradius/sites-available/README
+share/examples/freeradius/sites-available/default
+share/examples/freeradius/sites-available/example
+share/examples/freeradius/sites-enabled/
+@sample ${SYSCONFDIR}/raddb/sites-enabled/
+share/examples/freeradius/sites-enabled/default
 share/examples/freeradius/snmp.conf
 @sample ${SYSCONFDIR}/raddb/snmp.conf
+share/examples/freeradius/sql/
+@sample ${SYSCONFDIR}/raddb/sql/
 share/examples/freeradius/sql.conf
+@sample ${SYSCONFDIR}/raddb/sql.conf
+share/examples/freeradius/sql/mssql/
+share/examples/freeradius/sql/mssql/dialup.conf
+share/examples/freeradius/sql/mssql/schema.sql
+share/examples/freeradius/sql/mysql/
+@sample ${SYSCONFDIR}/raddb/sql/mysql/
+share/examples/freeradius/sql/mysql/counter.conf
+@sample ${SYSCONFDIR}/raddb/sql/mysql/counter.conf
+share/examples/freeradius/sql/mysql/dialup.conf
+@sample ${SYSCONFDIR}/raddb/sql/mysql/dialup.conf
+share/examples/freeradius/sql/mysql/ippool.conf
+@sample ${SYSCONFDIR}/raddb/sql/mysql/ippool.conf
+share/examples/freeradius/sql/mysql/ippool.sql
+share/examples/freeradius/sql/mysql/nas.sql
+share/examples/freeradius/sql/mysql/schema.sql
+share/examples/freeradius/sql/oracle/
+share/examples/freeradius/sql/oracle/dialup.conf
+share/examples/freeradius/sql/oracle/ippool.sql
+share/examples/freeradius/sql/oracle/nas.sql
+share/examples/freeradius/sql/oracle/schema.sql
+share/examples/freeradius/sql/postgresql/
+@sample ${SYSCONFDIR}/raddb/sql/postgresql/
+share/examples/freeradius/sql/postgresql/cisco_h323_db_schema.sql
+share/examples/freeradius/sql/postgresql/counter.conf
+@sample ${SYSCONFDIR}/raddb/sql/postgresql/counter.conf
+share/examples/freeradius/sql/postgresql/dialup.conf
+@sample ${SYSCONFDIR}/raddb/sql/postgresql/dialup.conf
+share/examples/freeradius/sql/postgresql/ippool.conf
+@sample ${SYSCONFDIR}/raddb/sql/postgresql/ippool.conf
+share/examples/freeradius/sql/postgresql/ippool.sql
+share/examples/freeradius/sql/postgresql/nas.sql
+share/examples/freeradius/sql/postgresql/schema.sql
+share/examples/freeradius/sql/postgresql/update_radacct_group_trigger.sql
+share/examples/freeradius/sql/postgresql/voip-postpaid.conf
+@sample ${SYSCONFDIR}/raddb/sql/postgresql/voip-postpaid.conf
 share/examples/freeradius/sqlippool.conf
+@sample ${SYSCONFDIR}/raddb/sqlippool.conf
+share/examples/freeradius/templates.conf
+@sample ${SYSCONFDIR}/raddb/templates.conf
 share/examples/freeradius/users
 @sample ${SYSCONFDIR}/raddb/users
 share/freeradius/
@@ -347,11 +415,13 @@
 share/freeradius/dictionary.ascend
 share/freeradius/dictionary.asn
 share/freeradius/dictionary.avaya
+share/freeradius/dictionary.azaire
 share/freeradius/dictionary.bay
 share/freeradius/dictionary.bintec
 share/freeradius/dictionary.bristol
 share/freeradius/dictionary.cablelabs
 share/freeradius/dictionary.cabletron
+share/freeradius/dictionary.chillispot
 share/freeradius/dictionary.cisco
 share/freeradius/dictionary.cisco.bbsm
 share/freeradius/dictionary.cisco.vpn3000
@@ -372,28 +442,37 @@
 share/freeradius/dictionary.gandalf
 share/freeradius/dictionary.garderos
 share/freeradius/dictionary.gemtek
+share/freeradius/dictionary.h3c
 share/freeradius/dictionary.hp
+share/freeradius/dictionary.huawei
 share/freeradius/dictionary.ipunplugged
 share/freeradius/dictionary.issanni
 share/freeradius/dictionary.itk
+share/freeradius/dictionary.jradius
 share/freeradius/dictionary.juniper
 share/freeradius/dictionary.karlnet
 share/freeradius/dictionary.livingston
 share/freeradius/dictionary.localweb
 share/freeradius/dictionary.lucent
+share/freeradius/dictionary.manzara
 share/freeradius/dictionary.merit
 share/freeradius/dictionary.microsoft
 share/freeradius/dictionary.mikrotik
 share/freeradius/dictionary.motorola
 share/freeradius/dictionary.navini
 share/freeradius/dictionary.netscreen
+share/freeradius/dictionary.nexans
 share/freeradius/dictionary.nokia
+share/freeradius/dictionary.nokia.conflict
 share/freeradius/dictionary.nomadix
 share/freeradius/dictionary.nortel
 share/freeradius/dictionary.ntua
+share/freeradius/dictionary.openser
 share/freeradius/dictionary.packeteer
 share/freeradius/dictionary.patton
 share/freeradius/dictionary.propel
+share/freeradius/dictionary.prosoft
+share/freeradius/dictionary.quiconnect
 share/freeradius/dictionary.quintum
 share/freeradius/dictionary.redback
 share/freeradius/dictionary.redcreek
@@ -405,27 +484,31 @@
 share/freeradius/dictionary.rfc3162
 share/freeradius/dictionary.rfc3576
 share/freeradius/dictionary.rfc3580
+share/freeradius/dictionary.rfc4072
 share/freeradius/dictionary.rfc4372
-share/freeradius/dictionary.rfc4590
 share/freeradius/dictionary.rfc4675
 share/freeradius/dictionary.rfc4679
+share/freeradius/dictionary.rfc4818
+share/freeradius/dictionary.rfc4849
 share/freeradius/dictionary.riverstone
 share/freeradius/dictionary.roaringpenguin
-share/freeradius/dictionary.schulzrinne-sipping
 share/freeradius/dictionary.shasta
 share/freeradius/dictionary.shiva
+share/freeradius/dictionary.slipstream
 share/freeradius/dictionary.sofaware
 share/freeradius/dictionary.sonicwall
 share/freeradius/dictionary.springtide
 share/freeradius/dictionary.starent
 share/freeradius/dictionary.t_systems_nova
 share/freeradius/dictionary.telebit
+share/freeradius/dictionary.telkom
 share/freeradius/dictionary.trapeze
 share/freeradius/dictionary.tropos
 share/freeradius/dictionary.unix
 share/freeradius/dictionary.usr
 share/freeradius/dictionary.valemount
 share/freeradius/dictionary.versanet
+share/freeradius/dictionary.vqp
 share/freeradius/dictionary.walabi
 share/freeradius/dictionary.waverider
 share/freeradius/dictionary.wispr
@@ -436,7 +519,6 @@
 @sample /var/log/radius/
 @sample /var/log/radius/radacct/
 @sample /var/run/radiusd/
-@owner
 @extra /var/log/radius/radwtmp
 @extraunexec rm -f ${SYSCONFDIR}/raddb/*
 @extraunexec rm -rf /var/log/radius/radacct/*

Reply | Threaded
Open this post in threaded view
|

Re: update: net/freeradius

Kenneth R Westerback
On Sat, Jan 19, 2008 at 04:15:45PM +0000, Rui Reis wrote:
> here's a major update to freeradius version 2.0.0.
>
> I'm also taking maintainership since Tim Kornau doesn't run
> freeradius anymore and I've been doing all the previous updates.
>
> comments/oks?
>

I'd love to see this go in, since I'm trying to convince people to
use OpenBSD/FreeRADIUS at work, but I have no test setup to exercise
it at this time.

.... Ken

> cheers,
> rui
>
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/net/freeradius/Makefile,v
> retrieving revision 1.10
> diff -u -r1.10 Makefile
> --- Makefile 16 Sep 2007 22:11:31 -0000 1.10
> +++ Makefile 19 Jan 2008 14:48:52 -0000
> @@ -8,23 +8,24 @@
>  COMMENT-pgsql= freeradius pgsql rlm addon
>  COMMENT-ldap= freeradius ldap rlm addon
>  
> -V= 1.1.7
> -DISTNAME= freeradius-$V
> -PKGNAME-main= ${DISTNAME}
> +V= 2.0.0
> +DISTNAME= freeradius-server-$V
> +PKGNAME-main= ${DISTNAME:S/-server//}
>  PKGNAME-iodbc= freeradius-iodbc-$V
>  PKGNAME-mysql= freeradius-mysql-$V
>  PKGNAME-pgsql= freeradius-pgsql-$V
>  PKGNAME-ldap= freeradius-ldap-$V
> -SHARED_LIBS= eap 3.0 \
> - radius 3.0
> +SHARED_LIBS= freeradius-eap 0.0 \
> + freeradius-radius 0.0
>  
>  CATEGORIES= net
>  MASTER_SITES= ftp://ftp.freeradius.org/pub/radius/ \
>   ftp://ftp.freeradius.org/pub/radius/old/
> +EXTRACT_SUFX= .tar.bz2
>  
>  HOMEPAGE= http://www.freeradius.org/
>  
> -MAINTAINER= Tim Kornau <[hidden email]>
> +MAINTAINER= Rui Reis <[hidden email]>
>  
>  # GPL
>  PERMIT_PACKAGE_CDROM= Yes
> @@ -39,6 +40,7 @@
>   --with-snmp \
>   --with-pic \
>   --without-rlm-perl \
> + --without-rlm-python \
>   --without-rlm_pam \
>   --without-rlm_sql_oracle \
>   --without-rlm_sql_db2 \
> @@ -72,6 +74,7 @@
>  CONFIGURE_ARGS+=--with-rlm_sql_iodbc \
>   --with-iodbc-include-dir='${LOCALBASE}/include' \
>   --with-iodbc-lib-dir='${LOCALBASE}/lib'
> +CFLAGS+= -lpthread
>  .endif
>  
>  .if ${FLAVOR:L:Mno_ldap}
> @@ -102,16 +105,15 @@
>  
>  LIB_DEPENDS-iodbc= iodbc.>=2::databases/iodbc
>  RUN_DEPENDS-iodbc= ::net/freeradius
> -WANTLIB-iodbc= pthread
>  LIB_DEPENDS-ldap= lber.>=8,ldap_r.>=8:openldap-client-*:databases/openldap \
> - radius.>=1::net/freeradius
> + freeradius-radius.>=0::net/freeradius
>  WANTLIB-ldap= crypto pthread sasl2 ssl asn1 com_err gssapi krb5
>  LIB_DEPENDS-mysql= mysqlclient_r.>=16:mysql-client-*:databases/mysql
>  RUN_DEPENDS-mysql= ::net/freeradius
>  WANTLIB-mysql= crypto m pthread ssl z
>  LIB_DEPENDS-pgsql= pq.>=2:postgresql-client-*:databases/postgresql
>  RUN_DEPENDS-pgsql= ::net/freeradius
> -WANTLIB-main= c com_err crypto krb5 pthread ssl
> +WANTLIB-main= c com_err crypto krb5 pcap pthread ssl
>  
>  post-configure:
>   @perl -pi -e 's,/etc/raddb,${SYSCONFDIR}/raddb,g' ${WRKSRC}/man/*/*
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/net/freeradius/distinfo,v
> retrieving revision 1.4
> diff -u -r1.4 distinfo
> --- distinfo 16 Sep 2007 22:11:31 -0000 1.4
> +++ distinfo 19 Jan 2008 14:48:52 -0000
> @@ -1,5 +1,5 @@
> -MD5 (freeradius-1.1.7.tar.gz) = XBJsshIrjiupeEtRH779lg==
> -RMD160 (freeradius-1.1.7.tar.gz) = nTOksB/HkVVxU7N1pB49kF/I7+U=
> -SHA1 (freeradius-1.1.7.tar.gz) = ToUV+CJgR474ge17h7fKJY4ZzLo=
> -SHA256 (freeradius-1.1.7.tar.gz) = imSXtBjQN6s6eYAekbs8Lkwtay7bbzZ3u5PnMKQrVPg=
> -SIZE (freeradius-1.1.7.tar.gz) = 3156228
> +MD5 (freeradius-server-2.0.0.tar.bz2) = llvxhZJGgCP+yAJ5JG+h3w==
> +RMD160 (freeradius-server-2.0.0.tar.bz2) = B02/oS2PHFqHB6eADuSh43f+Jio=
> +SHA1 (freeradius-server-2.0.0.tar.bz2) = bbqGSKy+A3uJpdZ9sJtUjVtBBio=
> +SHA256 (freeradius-server-2.0.0.tar.bz2) = WTjCBHCvOpcP50q601LjDPfdbhKjJIRGpC65Xi8ZkxE=
> +SIZE (freeradius-server-2.0.0.tar.bz2) = 2270574
> Index: patches/patch-configure
> ===================================================================
> RCS file: /cvs/ports/net/freeradius/patches/patch-configure,v
> retrieving revision 1.3
> diff -u -r1.3 patch-configure
> --- patches/patch-configure 16 Sep 2007 22:11:31 -0000 1.3
> +++ patches/patch-configure 19 Jan 2008 14:48:52 -0000
> @@ -1,7 +1,7 @@
> -$OpenBSD: patch-configure,v 1.3 2007/09/16 22:11:31 rui Exp $
> ---- configure.orig Sat Jul 21 15:01:34 2007
> -+++ configure Sat Sep 15 09:46:18 2007
> -@@ -4159,7 +4159,7 @@ fi
> +$OpenBSD$
> +--- configure.orig Thu Jan 10 10:38:42 2008
> ++++ configure Wed Jan 16 14:06:18 2008
> +@@ -4864,7 +4864,7 @@ fi
>       LTDLINCL='-I${top_srcdir}/''libltdl'
>     else
>       ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
> @@ -10,7 +10,7 @@
>       LTDLINCL=
>     fi
>     # For backwards non-gettext consistent compatibility...
> -@@ -8535,7 +8535,6 @@ bsdi[45]*)
> +@@ -8876,7 +8876,6 @@ bsdi[45]*)
>     need_version=no
>     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
>     soname_spec='${libname}${release}${shared_ext}$major'
> @@ -18,7 +18,7 @@
>     shlibpath_var=LD_LIBRARY_PATH
>     sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
>     sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
> -@@ -20335,7 +20334,6 @@ if test "${ac_cv_lib_resolv_inet_aton+set}" = set; the
> +@@ -20654,7 +20653,6 @@ if test "${ac_cv_lib_resolv_inet_aton+set}" = set; the
>     echo $ECHO_N "(cached) $ECHO_C" >&6
>   else
>     ac_check_lib_save_LIBS=$LIBS
> @@ -26,7 +26,7 @@
>   cat >conftest.$ac_ext <<_ACEOF
>   /* confdefs.h.  */
>   _ACEOF
> -@@ -20395,8 +20393,6 @@ if test $ac_cv_lib_resolv_inet_aton = yes; then
> +@@ -20714,8 +20712,6 @@ if test $ac_cv_lib_resolv_inet_aton = yes; then
>   #define HAVE_LIBRESOLV 1
>   _ACEOF
>  
> @@ -35,7 +35,7 @@
>   fi
>  
>  
> -@@ -20552,7 +20548,7 @@ if test "${ac_cv_lib_ssl_SSL_new+set}" = set; then
> +@@ -20872,7 +20868,7 @@ if test "${ac_cv_lib_ssl_SSL_new+set}" = set; then
>     echo $ECHO_N "(cached) $ECHO_C" >&6
>   else
>     ac_check_lib_save_LIBS=$LIBS
> @@ -44,3 +44,21 @@
>   cat >conftest.$ac_ext <<_ACEOF
>   /* confdefs.h.  */
>   _ACEOF
> +@@ -22968,7 +22964,7 @@ _ACEOF
> + cat confdefs.h >>conftest.$ac_ext
> + cat >>conftest.$ac_ext <<_ACEOF
> + /* end confdefs.h.  */
> +-
> ++#include <unistd.h>
> + #ifdef HAVE_NETINET_IN_H
> + #include <netinet/in.h>
> + #endif
> +@@ -23035,7 +23031,7 @@ _ACEOF
> + cat confdefs.h >>conftest.$ac_ext
> + cat >>conftest.$ac_ext <<_ACEOF
> + /* end confdefs.h.  */
> +-
> ++#include <unistd.h>
> + #ifdef HAVE_NETINET_IN_H
> + #include <netinet/in.h>
> + #endif
> Index: patches/patch-raddb_radiusd_conf_in
> ===================================================================
> RCS file: /cvs/ports/net/freeradius/patches/patch-raddb_radiusd_conf_in,v
> retrieving revision 1.3
> diff -u -r1.3 patch-raddb_radiusd_conf_in
> --- patches/patch-raddb_radiusd_conf_in 16 Sep 2007 22:11:31 -0000 1.3
> +++ patches/patch-raddb_radiusd_conf_in 19 Jan 2008 14:48:52 -0000
> @@ -1,61 +1,112 @@
> -$OpenBSD: patch-raddb_radiusd_conf_in,v 1.3 2007/09/16 22:11:31 rui Exp $
> ---- raddb/radiusd.conf.in.orig Mon Jul 16 11:53:13 2007
> -+++ raddb/radiusd.conf.in Sat Sep 15 09:46:18 2007
> -@@ -23,7 +23,7 @@
> +$OpenBSD$
> +--- raddb/radiusd.conf.in.orig Wed Jan 16 10:44:17 2008
> ++++ raddb/radiusd.conf.in Wed Jan 16 10:52:50 2008
> +@@ -26,7 +26,7 @@
>   prefix = @prefix@
>   exec_prefix = @exec_prefix@
>   sysconfdir = @sysconfdir@
>  -localstatedir = @localstatedir@
> -+localstatedir = /var
> ++localstatedir = /var
>   sbindir = @sbindir@
>   logdir = @logdir@
>   raddbdir = @raddbdir@
> -@@ -71,7 +71,7 @@ log_file = ${logdir}/radius.log
> +@@ -81,7 +81,7 @@ log_destination = files
>   # make
>   # make install
>   #
>  -libdir = @libdir@
> -+libdir = @prefix@/lib/freeradius
> ++libdir = @prefix@/lib/freeradius
>  
>   #  pidfile: Where to place the PID of the RADIUS server.
>   #
> -@@ -106,8 +106,8 @@ pidfile = ${run_dir}/radiusd.pid
> +@@ -116,8 +116,8 @@ pidfile = ${run_dir}/radiusd.pid
>   #  that the debugging mode server is running as a user that can read the
>   #  shadow info, and the user listed below can not.
>   #
>  -#user = nobody
>  -#group = nobody
> -+user = _freeradius
> -+group = _freeradius
> ++user = _freeradius
> ++group = _freeradius
>  
>   #  max_request_time: The maximum time (in seconds) to handle a request.
>   #
> -@@ -425,8 +425,8 @@ security {
> +@@ -408,8 +408,8 @@ security {
>   #
>   #  allowed values: {no, yes}
>   #
>  -proxy_requests  = yes
> --$INCLUDE  ${confdir}/proxy.conf
> -+proxy_requests  = no
> -+# $INCLUDE  ${confdir}/proxy.conf
> +-$INCLUDE proxy.conf
> ++proxy_requests  = no
> ++#$INCLUDE ${confdir}/proxy.conf
>  
>  
>   # CLIENTS CONFIGURATION
> -@@ -665,7 +665,7 @@ modules {
> +@@ -425,7 +425,7 @@ $INCLUDE proxy.conf
> + #  Anything listed in 'clients.conf' will take precedence over the
> + #  information from the old-style configuration files.
> + #
> +-$INCLUDE clients.conf
> ++$INCLUDE ${confdir}/clients.conf
> +
> +
> + # SNMP CONFIGURATION
> +@@ -437,7 +437,7 @@ $INCLUDE clients.conf
> + #  'snmp' attribute to 'yes'
> + #
> + snmp = no
> +-$INCLUDE snmp.conf
> ++$INCLUDE ${confdir}/snmp.conf
> +
> +
> + # THREAD POOL CONFIGURATION
> +@@ -609,7 +609,7 @@ modules {
>   #  For all EAP related authentications.
>   #  Now in another file, because it is very large.
>   #
> --$INCLUDE ${confdir}/eap.conf
> +-$INCLUDE eap.conf
>  + $INCLUDE ${confdir}/eap.conf
>  
>   # Microsoft CHAP authentication
>   #
> -@@ -1253,7 +1253,7 @@ $INCLUDE ${confdir}/eap.conf
> - #  For MS-SQL, use: ${confdir}/mssql.conf
> - #  For Oracle, use: ${confdir}/oraclesql.conf
> +@@ -1246,7 +1246,7 @@ $INCLUDE eap.conf
> + #  Include another file that has the SQL-related configuration.
> + #  This is another file only because it tends to be big.
>   #
> -- $INCLUDE  ${confdir}/sql.conf
> -+ # $INCLUDE  ${confdir}/sql.conf
> +- $INCLUDE sql.conf
> ++ $INCLUDE ${confdir}/sql.conf
>  
>  
>   #  For Cisco VoIP specific accounting with Postgresql,
> +@@ -1440,8 +1440,8 @@ $INCLUDE eap.conf
> + #  totally dependent on the SQL module to process Accounting
> + #  packets.
> + #
> +- $INCLUDE sql/mysql/counter.conf
> +- #$INCLUDE sql/postgresql/counter.conf
> ++ $INCLUDE ${confdir}/sql/mysql/counter.conf
> ++ #$INCLUDE ${confdir}/sql/postgresql/counter.conf
> +
> + #
> + # The "always" module is here for debugging purposes. Each
> +@@ -1744,10 +1744,10 @@ $INCLUDE eap.conf
> + #key = "%{NAS-IP-Address} %{NAS-Port}"
> + }
> +
> +- # $INCLUDE sqlippool.conf
> ++ # $INCLUDE ${confdir}/sqlippool.conf
> +
> + # OTP token support.  Not included by default.
> +- # $INCLUDE otp.conf
> ++ # $INCLUDE ${confdir}/otp.conf
> +
> + #
> + #  Kerberos.  See doc/rlm_krb5 for minimal docs.
> +@@ -1842,7 +1842,7 @@ instantiate {
> + # to multiple times.
> + #
> + ######################################################################
> +-$INCLUDE policy.conf
> ++$INCLUDE ${confdir}/policy.conf
> +
> + ######################################################################
> + #
> Index: patches/patch-src_lib_Makefile
> ===================================================================
> RCS file: /cvs/ports/net/freeradius/patches/patch-src_lib_Makefile,v
> retrieving revision 1.3
> diff -u -r1.3 patch-src_lib_Makefile
> --- patches/patch-src_lib_Makefile 16 Sep 2007 22:11:31 -0000 1.3
> +++ patches/patch-src_lib_Makefile 19 Jan 2008 14:48:52 -0000
> @@ -1,16 +1,16 @@
> -$OpenBSD: patch-src_lib_Makefile,v 1.3 2007/09/16 22:11:31 rui Exp $
> ---- src/lib/Makefile.orig Wed Apr 12 21:45:20 2006
> -+++ src/lib/Makefile Sat Sep 15 09:46:18 2007
> -@@ -38,7 +38,7 @@ TARGET = $(LIBPREFIX)radius
> +$OpenBSD$
> +--- src/lib/Makefile.orig Wed Jan 16 10:54:01 2008
> ++++ src/lib/Makefile Wed Jan 16 10:54:53 2008
> +@@ -39,7 +39,7 @@ TARGET = $(LIBPREFIX)freeradius-radius
>   all: $(TARGET).la
>  
>   $(TARGET).la: $(LT_OBJS)
>  - $(LIBTOOL) --mode=link $(CC) -release $(RADIUSD_VERSION) \
>  + $(LIBTOOL) --mode=link $(CC) \
> - $(LDFLAGS) $(LINK_MODE) -o $@ -rpath $(libdir) $^ $(LCRYPT)
> + $(LDFLAGS) $(LINK_MODE) -o $@ -rpath $(libdir) $^
>  
>   $(LT_OBJS): $(INCLUDES)
> -@@ -51,5 +51,3 @@ install: all
> +@@ -52,5 +52,3 @@ install: all
>   $(INSTALL) -d -m 755 $(R)$(libdir)
>   $(LIBTOOL) --mode=install $(INSTALL) -c $(TARGET).la \
>   $(R)$(libdir)/$(TARGET).la
> Index: patches/patch-src_modules_rlm_eap_types_rlm_eap_peap_Makefile_in
> ===================================================================
> RCS file: /cvs/ports/net/freeradius/patches/patch-src_modules_rlm_eap_types_rlm_eap_peap_Makefile_in,v
> retrieving revision 1.2
> diff -u -r1.2 patch-src_modules_rlm_eap_types_rlm_eap_peap_Makefile_in
> --- patches/patch-src_modules_rlm_eap_types_rlm_eap_peap_Makefile_in 16 Sep 2007 22:11:31 -0000 1.2
> +++ patches/patch-src_modules_rlm_eap_types_rlm_eap_peap_Makefile_in 19 Jan 2008 14:48:52 -0000
> @@ -1,14 +1,14 @@
> -$OpenBSD: patch-src_modules_rlm_eap_types_rlm_eap_peap_Makefile_in,v 1.2 2007/09/16 22:11:31 rui Exp $
> ---- src/modules/rlm_eap/types/rlm_eap_peap/Makefile.in.orig Fri Feb 10 19:47:12 2006
> -+++ src/modules/rlm_eap/types/rlm_eap_peap/Makefile.in Sat Sep 15 09:46:18 2007
> +$OpenBSD$
> +--- src/modules/rlm_eap/types/rlm_eap_peap/Makefile.in.orig Wed Jan 16 12:38:39 2008
> ++++ src/modules/rlm_eap/types/rlm_eap_peap/Makefile.in Wed Jan 16 12:39:41 2008
>  @@ -5,8 +5,8 @@
>   TARGET      = @targetname@
>   SRCS        = rlm_eap_peap.c peap.c
>   HEADERS     = eap_peap.h ../../eap.h ../../rlm_eap.h
>  -RLM_CFLAGS  = -I../.. -I../../libeap $(INCLTDL) $(OPENSSL_INCLUDE) @eap_peap_cflags@
> --RLM_LIBS    = @eap_peap_ldflags@ ../../libeap/libeap.la $(OPENSSL_LIBS)
> +-RLM_LIBS    = @eap_peap_ldflags@ ../../libeap/$(LIBPREFIX)freeradius-eap.la $(OPENSSL_LIBS)
>  +RLM_CFLAGS  = -I../.. -I../../libeap $(INCLTDL) @eap_peap_cflags@
> -+RLM_LIBS    = @eap_peap_ldflags@ ../../libeap/libeap.la
> ++RLM_LIBS    = @eap_peap_ldflags@ ../../libeap/$(LIBPREFIX)freeradius-eap.la
>   RLM_INSTALL =
>  
>   RLM_DIR=../../
> Index: patches/patch-src_modules_rlm_eap_types_rlm_eap_tls_Makefile_in
> ===================================================================
> RCS file: /cvs/ports/net/freeradius/patches/patch-src_modules_rlm_eap_types_rlm_eap_tls_Makefile_in,v
> retrieving revision 1.2
> diff -u -r1.2 patch-src_modules_rlm_eap_types_rlm_eap_tls_Makefile_in
> --- patches/patch-src_modules_rlm_eap_types_rlm_eap_tls_Makefile_in 16 Sep 2007 22:11:31 -0000 1.2
> +++ patches/patch-src_modules_rlm_eap_types_rlm_eap_tls_Makefile_in 19 Jan 2008 14:48:53 -0000
> @@ -1,14 +1,14 @@
> -$OpenBSD: patch-src_modules_rlm_eap_types_rlm_eap_tls_Makefile_in,v 1.2 2007/09/16 22:11:31 rui Exp $
> ---- src/modules/rlm_eap/types/rlm_eap_tls/Makefile.in.orig Fri Feb 10 19:47:13 2006
> -+++ src/modules/rlm_eap/types/rlm_eap_tls/Makefile.in Sat Sep 15 09:46:18 2007
> +$OpenBSD$
> +--- src/modules/rlm_eap/types/rlm_eap_tls/Makefile.in.orig Wed Jan 16 12:40:46 2008
> ++++ src/modules/rlm_eap/types/rlm_eap_tls/Makefile.in Wed Jan 16 12:41:01 2008
>  @@ -5,8 +5,8 @@
>   TARGET      = @targetname@
>   SRCS        = rlm_eap_tls.c
>   HEADERS     = rlm_eap_tls.h ../../eap.h ../../rlm_eap.h
>  -RLM_CFLAGS  = -I../.. -I../../libeap $(INCLTDL) $(OPENSSL_INCLUDE) @eap_tls_cflags@
> --RLM_LIBS    = @eap_tls_ldflags@ ../../libeap/libeap.la $(OPENSSL_LIBS)
> +-RLM_LIBS    = @eap_tls_ldflags@ ../../libeap/$(LIBPREFIX)freeradius-eap.la $(OPENSSL_LIBS)
>  +RLM_CFLAGS  = -I../.. -I../../libeap $(INCLTDL) @eap_tls_cflags@
> -+RLM_LIBS    = @eap_tls_ldflags@ ../../libeap/libeap.la
> ++RLM_LIBS    = @eap_tls_ldflags@ ../../libeap/$(LIBPREFIX)freeradius-eap.la
>   RLM_INSTALL =
>  
>   RLM_DIR=../../
> Index: patches/patch-src_modules_rlm_eap_types_rlm_eap_ttls_Makefile_in
> ===================================================================
> RCS file: /cvs/ports/net/freeradius/patches/patch-src_modules_rlm_eap_types_rlm_eap_ttls_Makefile_in,v
> retrieving revision 1.2
> diff -u -r1.2 patch-src_modules_rlm_eap_types_rlm_eap_ttls_Makefile_in
> --- patches/patch-src_modules_rlm_eap_types_rlm_eap_ttls_Makefile_in 16 Sep 2007 22:11:31 -0000 1.2
> +++ patches/patch-src_modules_rlm_eap_types_rlm_eap_ttls_Makefile_in 19 Jan 2008 14:48:53 -0000
> @@ -1,14 +1,14 @@
> -$OpenBSD: patch-src_modules_rlm_eap_types_rlm_eap_ttls_Makefile_in,v 1.2 2007/09/16 22:11:31 rui Exp $
> ---- src/modules/rlm_eap/types/rlm_eap_ttls/Makefile.in.orig Fri Feb 10 19:47:14 2006
> -+++ src/modules/rlm_eap/types/rlm_eap_ttls/Makefile.in Sat Sep 15 09:46:18 2007
> +$OpenBSD$
> +--- src/modules/rlm_eap/types/rlm_eap_ttls/Makefile.in.orig Wed Jan 16 12:41:29 2008
> ++++ src/modules/rlm_eap/types/rlm_eap_ttls/Makefile.in Wed Jan 16 12:41:43 2008
>  @@ -5,8 +5,8 @@
>   TARGET      = @targetname@
>   SRCS        = rlm_eap_ttls.c ttls.c
>   HEADERS     = eap_ttls.h ../../eap.h ../../rlm_eap.h
>  -RLM_CFLAGS  = -I../.. -I../../libeap $(INCLTDL) $(OPENSSL_INCLUDE) @eap_ttls_cflags@
> --RLM_LIBS    = @eap_ttls_ldflags@ ../../libeap/libeap.la $(OPENSSL_LIBS)
> +-RLM_LIBS    = @eap_ttls_ldflags@ ../../libeap/$(LIBPREFIX)freeradius-eap.la $(OPENSSL_LIBS)
>  +RLM_CFLAGS  = -I../.. -I../../libeap $(INCLTDL) @eap_ttls_cflags@
> -+RLM_LIBS    = @eap_ttls_ldflags@ ../../libeap/libeap.la
> ++RLM_LIBS    = @eap_ttls_ldflags@ ../../libeap/$(LIBPREFIX)freeradius-eap.la
>   RLM_INSTALL =
>  
>   RLM_DIR=../../
> Index: patches/patch-src_modules_rlm_otp_configure
> ===================================================================
> RCS file: patches/patch-src_modules_rlm_otp_configure
> diff -N patches/patch-src_modules_rlm_otp_configure
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-src_modules_rlm_otp_configure 19 Jan 2008 14:48:53 -0000
> @@ -0,0 +1,12 @@
> +$OpenBSD$
> +--- src/modules/rlm_otp/configure.orig Fri Jan 18 17:17:16 2008
> ++++ src/modules/rlm_otp/configure Fri Jan 18 17:17:52 2008
> +@@ -2905,7 +2905,7 @@ if test "${ac_cv_lib_ssl_SSL_new+set}" = set; then
> +   echo $ECHO_N "(cached) $ECHO_C" >&6
> + else
> +   ac_check_lib_save_LIBS=$LIBS
> +-LIBS="-lssl  $LIBS"
> ++LIBS="-lcrypt -lssl  $LIBS"
> + cat >conftest.$ac_ext <<_ACEOF
> + /* confdefs.h.  */
> + _ACEOF
> Index: patches/patch-src_modules_rlm_sql_drivers_rules_mak
> ===================================================================
> RCS file: /cvs/ports/net/freeradius/patches/patch-src_modules_rlm_sql_drivers_rules_mak,v
> retrieving revision 1.3
> diff -u -r1.3 patch-src_modules_rlm_sql_drivers_rules_mak
> --- patches/patch-src_modules_rlm_sql_drivers_rules_mak 16 Sep 2007 22:11:31 -0000 1.3
> +++ patches/patch-src_modules_rlm_sql_drivers_rules_mak 19 Jan 2008 14:48:53 -0000
> @@ -1,6 +1,6 @@
> -$OpenBSD: patch-src_modules_rlm_sql_drivers_rules_mak,v 1.3 2007/09/16 22:11:31 rui Exp $
> ---- src/modules/rlm_sql/drivers/rules.mak.orig Thu Jul  6 17:54:34 2006
> -+++ src/modules/rlm_sql/drivers/rules.mak Sat Sep 15 09:46:18 2007
> +$OpenBSD$
> +--- src/modules/rlm_sql/drivers/rules.mak.orig Wed Jan 16 15:58:27 2008
> ++++ src/modules/rlm_sql/drivers/rules.mak Wed Jan 16 16:01:18 2008
>  @@ -99,9 +99,9 @@ build-module: $(TARGET).la
>   @cp $< ../lib
>  
> @@ -13,9 +13,12 @@
>  
>   #######################################################################
>   #
> -@@ -142,4 +142,4 @@ reconfig:
> - #  Otherwise, install the libraries into $(libdir)
> - #
> +@@ -144,7 +144,5 @@ reconfig:
>   install:
> -- [ "x$(TARGET)" = "x" ] || $(LIBTOOL) --mode=install $(INSTALL) -c $(TARGET).la $(R)$(libdir)/$(TARGET).la
> -+ [ "x$(TARGET)" = "x" ] || $(LIBTOOL) --mode=install $(INSTALL) -c $(TARGET).la $(R)$(libdir)/freeradius/$(TARGET).la
> + if [ "x$(TARGET)" != "x" ]; then \
> +    $(LIBTOOL) --mode=install $(INSTALL) -c \
> +- $(TARGET).la $(R)$(libdir)/$(TARGET).la || exit $$?; \
> +-    rm -f $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la; \
> +-    ln -s $(TARGET).la $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la || exit $$?; \
> ++ $(TARGET).la $(R)$(libdir)/freeradius/$(TARGET).la || exit $$?; \
> + fi
> Index: patches/patch-src_modules_rules_mak
> ===================================================================
> RCS file: /cvs/ports/net/freeradius/patches/patch-src_modules_rules_mak,v
> retrieving revision 1.3
> diff -u -r1.3 patch-src_modules_rules_mak
> --- patches/patch-src_modules_rules_mak 16 Sep 2007 22:11:31 -0000 1.3
> +++ patches/patch-src_modules_rules_mak 19 Jan 2008 14:48:53 -0000
> @@ -1,19 +1,19 @@
> -$OpenBSD: patch-src_modules_rules_mak,v 1.3 2007/09/16 22:11:31 rui Exp $
> ---- src/modules/rules.mak.orig Thu Jul  6 17:42:57 2006
> -+++ src/modules/rules.mak Sat Sep 15 09:46:18 2007
> -@@ -111,9 +111,9 @@ build-module: $(TARGET).la $(RLM_UTILS)
> +$OpenBSD$
> +--- src/modules/rules.mak.orig Thu Jan 10 10:12:01 2008
> ++++ src/modules/rules.mak Wed Jan 16 11:02:57 2008
> +@@ -113,9 +113,9 @@ build-module: $(TARGET).la $(RLM_UTILS)
>   @cp $< $(top_builddir)/src/modules/lib
>  
>   $(TARGET).la: $(LT_OBJS)
>  - $(LIBTOOL) --mode=link $(CC) -release $(RADIUSD_VERSION) \
>  + $(LIBTOOL) --mode=link $(CC) -avoid-version \
>   -module $(LINK_MODE) $(LDFLAGS) $(RLM_LDFLAGS) -o $@     \
> -- -rpath $(libdir) $^ $(top_builddir)/src/lib/libradius.la \
> -+ -rpath $(libdir)/freeradius $^ $(top_builddir)/src/lib/libradius.la \
> - $(RLM_LIBS) $(LIBS)
> +- -rpath $(libdir) $^ $(LIBRADIUS) $(RLM_LIBS) $(LIBS)
> ++ -rpath $(libdir)/freeradius $^ $(LIBRADIUS) $(RLM_LIBS) $(LIBS)
>  
>   #######################################################################
> -@@ -161,7 +161,5 @@ install:
> + #
> +@@ -162,7 +162,5 @@ install:
>   @[ "x$(RLM_INSTALL)" = "x" ] || $(MAKE) $(MFLAGS) $(RLM_INSTALL)
>   if [ "x$(TARGET)" != "x" ]; then \
>      $(LIBTOOL) --mode=install $(INSTALL) -c \
> Index: pkg/PLIST-main
> ===================================================================
> RCS file: /cvs/ports/net/freeradius/pkg/PLIST-main,v
> retrieving revision 1.3
> diff -u -r1.3 PLIST-main
> --- pkg/PLIST-main 16 Sep 2007 22:11:31 -0000 1.3
> +++ pkg/PLIST-main 19 Jan 2008 14:48:53 -0000
> @@ -7,7 +7,7 @@
>  bin/radclient
>  bin/radeapclient
>  bin/radlast
> -bin/radrelay
> +bin/radsniff
>  bin/radsqlrelay
>  bin/radtest
>  bin/radwho
> @@ -16,10 +16,27 @@
>  bin/rlm_dbm_parser
>  bin/rlm_ippool_tool
>  bin/smbencrypt
> +include/freeradius/
> +include/freeradius/hash.h
> +include/freeradius/ident.h
> +include/freeradius/libradius.h
> +include/freeradius/md4.h
> +include/freeradius/md5.h
> +include/freeradius/missing.h
> +include/freeradius/packet.h
> +include/freeradius/radius.h
> +include/freeradius/radpaths.h
> +include/freeradius/sha1.h
> +include/freeradius/token.h
> +include/freeradius/udpfromto.h
> +include/freeradius/vqp.h
>  lib/freeradius/
>  lib/freeradius/rlm_acct_unique.a
>  lib/freeradius/rlm_acct_unique.la
>  lib/freeradius/rlm_acct_unique.so
> +lib/freeradius/rlm_acctlog.a
> +lib/freeradius/rlm_acctlog.la
> +lib/freeradius/rlm_acctlog.so
>  lib/freeradius/rlm_always.a
>  lib/freeradius/rlm_always.la
>  lib/freeradius/rlm_always.so
> @@ -35,6 +52,9 @@
>  lib/freeradius/rlm_checkval.a
>  lib/freeradius/rlm_checkval.la
>  lib/freeradius/rlm_checkval.so
> +lib/freeradius/rlm_copy_packet.a
> +lib/freeradius/rlm_copy_packet.la
> +lib/freeradius/rlm_copy_packet.so
>  lib/freeradius/rlm_counter.a
>  lib/freeradius/rlm_counter.la
>  lib/freeradius/rlm_counter.so
> @@ -71,12 +91,18 @@
>  lib/freeradius/rlm_eap_tls.a
>  lib/freeradius/rlm_eap_tls.la
>  lib/freeradius/rlm_eap_tls.so
> +lib/freeradius/rlm_eap_tnc.a
> +lib/freeradius/rlm_eap_tnc.la
> +lib/freeradius/rlm_eap_tnc.so
>  lib/freeradius/rlm_eap_ttls.a
>  lib/freeradius/rlm_eap_ttls.la
>  lib/freeradius/rlm_eap_ttls.so
>  lib/freeradius/rlm_exec.a
>  lib/freeradius/rlm_exec.la
>  lib/freeradius/rlm_exec.so
> +lib/freeradius/rlm_expiration.a
> +lib/freeradius/rlm_expiration.la
> +lib/freeradius/rlm_expiration.so
>  lib/freeradius/rlm_expr.a
>  lib/freeradius/rlm_expr.la
>  lib/freeradius/rlm_expr.so
> @@ -92,18 +118,21 @@
>  lib/freeradius/rlm_krb5.a
>  lib/freeradius/rlm_krb5.la
>  lib/freeradius/rlm_krb5.so
> +lib/freeradius/rlm_logintime.a
> +lib/freeradius/rlm_logintime.la
> +lib/freeradius/rlm_logintime.so
>  lib/freeradius/rlm_mschap.a
>  lib/freeradius/rlm_mschap.la
>  lib/freeradius/rlm_mschap.so
> -lib/freeradius/rlm_ns_mta_md5.a
> -lib/freeradius/rlm_ns_mta_md5.la
> -lib/freeradius/rlm_ns_mta_md5.so
>  lib/freeradius/rlm_pap.a
>  lib/freeradius/rlm_pap.la
>  lib/freeradius/rlm_pap.so
>  lib/freeradius/rlm_passwd.a
>  lib/freeradius/rlm_passwd.la
>  lib/freeradius/rlm_passwd.so
> +lib/freeradius/rlm_policy.a
> +lib/freeradius/rlm_policy.la
> +lib/freeradius/rlm_policy.so
>  lib/freeradius/rlm_preprocess.a
>  lib/freeradius/rlm_preprocess.la
>  lib/freeradius/rlm_preprocess.so
> @@ -128,12 +157,12 @@
>  lib/freeradius/rlm_unix.a
>  lib/freeradius/rlm_unix.la
>  lib/freeradius/rlm_unix.so
> -lib/libeap.a
> -lib/libeap.la
> -@lib lib/libeap.so.${LIBeap_VERSION}
> -lib/libradius.a
> -lib/libradius.la
> -@lib lib/libradius.so.${LIBradius_VERSION}
> +lib/libfreeradius-eap.a
> +lib/libfreeradius-eap.la
> +@lib lib/libfreeradius-eap.so.${LIBfreeradius-eap_VERSION}
> +lib/libfreeradius-radius.a
> +lib/libfreeradius-radius.la
> +@lib lib/libfreeradius-radius.so.${LIBfreeradius-radius_VERSION}
>  @man man/man1/radclient.1
>  @man man/man1/radeapclient.1
>  @man man/man1/radlast.1
> @@ -141,11 +170,10 @@
>  @man man/man1/radwho.1
>  @man man/man1/radzap.1
>  @man man/man5/acct_users.5
> -@man man/man5/clients.5
>  @man man/man5/clients.conf.5
>  @man man/man5/dictionary.5
> -@man man/man5/naslist.5
>  @man man/man5/radiusd.conf.5
> +@man man/man5/radrelay.conf.5
>  @man man/man5/rlm_acct_unique.5
>  @man man/man5/rlm_always.5
>  @man man/man5/rlm_attr_filter.5
> @@ -153,15 +181,18 @@
>  @man man/man5/rlm_chap.5
>  @man man/man5/rlm_counter.5
>  @man man/man5/rlm_detail.5
> +@man man/man5/rlm_digest.5
>  @man man/man5/rlm_expr.5
>  @man man/man5/rlm_files.5
>  @man man/man5/rlm_mschap.5
>  @man man/man5/rlm_pap.5
>  @man man/man5/rlm_passwd.5
> +@man man/man5/rlm_policy.5
>  @man man/man5/rlm_realm.5
>  @man man/man5/rlm_sql.5
>  @man man/man5/rlm_sql_log.5
>  @man man/man5/rlm_unix.5
> +@man man/man5/unlang.5
>  @man man/man5/users.5
>  @man man/man8/radiusd.8
>  @man man/man8/radrelay.8
> @@ -194,16 +225,11 @@
>  share/doc/freeradius/cisco
>  share/doc/freeradius/coding-methods.txt
>  share/doc/freeradius/configurable_failover
> -share/doc/freeradius/duplicate-users
>  share/doc/freeradius/examples/
>  share/doc/freeradius/examples/iplanet.ldif
>  share/doc/freeradius/examples/iplanet.schema
> -share/doc/freeradius/examples/mssql.sql
> -share/doc/freeradius/examples/mysql.sql
>  share/doc/freeradius/examples/openldap.schema
> -share/doc/freeradius/examples/oracle.sql
> -share/doc/freeradius/examples/postgresql.sql
> -share/doc/freeradius/examples/postgresql.sql.extra
> +share/doc/freeradius/examples/postgresql_update_radacct_group_trigger.sql
>  share/doc/freeradius/ldap_howto.txt
>  share/doc/freeradius/load-balance.txt
>  share/doc/freeradius/misc-nas
> @@ -212,7 +238,6 @@
>  share/doc/freeradius/performance-testing
>  share/doc/freeradius/processing_users_file
>  share/doc/freeradius/proxy
> -share/doc/freeradius/radrelay
>  share/doc/freeradius/release-method.txt
>  share/doc/freeradius/rfc/
>  share/doc/freeradius/rfc/attributes.html
> @@ -225,14 +250,11 @@
>  share/doc/freeradius/rfc/rfc1448.txt
>  share/doc/freeradius/rfc/rfc1901.txt
>  share/doc/freeradius/rfc/rfc1905.txt
> -share/doc/freeradius/rfc/rfc2058.txt
> -share/doc/freeradius/rfc/rfc2059.txt
> -share/doc/freeradius/rfc/rfc2138.txt
> -share/doc/freeradius/rfc/rfc2139.txt
>  share/doc/freeradius/rfc/rfc2243.txt
>  share/doc/freeradius/rfc/rfc2289.txt
>  share/doc/freeradius/rfc/rfc2433.txt
>  share/doc/freeradius/rfc/rfc2548.txt
> +share/doc/freeradius/rfc/rfc2607.txt
>  share/doc/freeradius/rfc/rfc2618.txt
>  share/doc/freeradius/rfc/rfc2619.txt
>  share/doc/freeradius/rfc/rfc2620.txt
> @@ -252,11 +274,19 @@
>  share/doc/freeradius/rfc/rfc3576.txt
>  share/doc/freeradius/rfc/rfc3579.txt
>  share/doc/freeradius/rfc/rfc3580.txt
> -share/doc/freeradius/rlm_attr_filter
> +share/doc/freeradius/rfc/rfc3748.txt
> +share/doc/freeradius/rfc/rfc4372.txt
> +share/doc/freeradius/rfc/rfc4590.txt
> +share/doc/freeradius/rfc/rfc4675.txt
> +share/doc/freeradius/rfc/rfc4679.txt
> +share/doc/freeradius/rfc/rfc4818.txt
> +share/doc/freeradius/rfc/rfc4849.txt
> +share/doc/freeradius/rfc/rfc5080.txt
>  share/doc/freeradius/rlm_dbm
> -share/doc/freeradius/rlm_digest
>  share/doc/freeradius/rlm_eap
> +share/doc/freeradius/rlm_expiration
>  share/doc/freeradius/rlm_fastusers
> +share/doc/freeradius/rlm_jradius
>  share/doc/freeradius/rlm_krb5
>  share/doc/freeradius/rlm_ldap
>  share/doc/freeradius/rlm_pam
> @@ -266,6 +296,7 @@
>  share/doc/freeradius/rlm_sql
>  share/doc/freeradius/rlm_sqlcounter
>  share/doc/freeradius/rlm_sqlippool
> +share/doc/freeradius/snmp
>  share/doc/freeradius/supervise-radiusd.txt
>  share/doc/freeradius/tuning_guide
>  share/doc/freeradius/variables.txt
> @@ -278,28 +309,17 @@
>  share/examples/freeradius/acct_users
>  @sample ${SYSCONFDIR}/raddb/acct_users
>  share/examples/freeradius/attrs
> +share/examples/freeradius/attrs.access_reject
> +share/examples/freeradius/attrs.accounting_response
> +share/examples/freeradius/attrs.pre-proxy
>  share/examples/freeradius/certs/
> +share/examples/freeradius/certs/Makefile
>  share/examples/freeradius/certs/README
> -share/examples/freeradius/certs/cert-clt.der
> -share/examples/freeradius/certs/cert-clt.p12
> -share/examples/freeradius/certs/cert-clt.pem
> -share/examples/freeradius/certs/cert-srv.der
> -share/examples/freeradius/certs/cert-srv.p12
> -share/examples/freeradius/certs/cert-srv.pem
> -share/examples/freeradius/certs/demoCA/
> -share/examples/freeradius/certs/demoCA/cacert.pem
> -share/examples/freeradius/certs/demoCA/index.txt
> -share/examples/freeradius/certs/demoCA/index.txt.old
> -share/examples/freeradius/certs/demoCA/serial
> -share/examples/freeradius/certs/demoCA/serial.old
> -share/examples/freeradius/certs/dh
> -share/examples/freeradius/certs/newcert.pem
> -share/examples/freeradius/certs/newreq.pem
> -share/examples/freeradius/certs/random
> -share/examples/freeradius/certs/root.der
> -share/examples/freeradius/certs/root.p12
> -share/examples/freeradius/certs/root.pem
> -share/examples/freeradius/clients
> +share/examples/freeradius/certs/bootstrap
> +share/examples/freeradius/certs/ca.cnf
> +share/examples/freeradius/certs/client.cnf
> +share/examples/freeradius/certs/server.cnf
> +share/examples/freeradius/certs/xpextensions
>  share/examples/freeradius/clients.conf
>  @sample ${SYSCONFDIR}/raddb/clients.conf
>  share/examples/freeradius/dictionary
> @@ -307,28 +327,76 @@
>  share/examples/freeradius/eap.conf
>  @sample ${SYSCONFDIR}/raddb/eap.conf
>  share/examples/freeradius/experimental.conf
> +@sample ${SYSCONFDIR}/raddb/experimental.conf
>  share/examples/freeradius/hints
>  @sample ${SYSCONFDIR}/raddb/hints
>  share/examples/freeradius/huntgroups
>  @sample ${SYSCONFDIR}/raddb/huntgroups
>  share/examples/freeradius/ldap.attrmap
> -share/examples/freeradius/mssql.conf
> -share/examples/freeradius/naslist
> -share/examples/freeradius/naspasswd
> -share/examples/freeradius/oraclesql.conf
> +@sample ${SYSCONFDIR}/raddb/ldap.attrmap
>  share/examples/freeradius/otp.conf
> -share/examples/freeradius/postgresql.conf
> -share/examples/freeradius/postgresqlippool.conf
> +@sample ${SYSCONFDIR}/raddb/otp.conf
> +share/examples/freeradius/policy.conf
> +@sample ${SYSCONFDIR}/raddb/policy.conf
> +share/examples/freeradius/policy.txt
>  share/examples/freeradius/preproxy_users
>  @sample ${SYSCONFDIR}/raddb/preproxy_users
>  share/examples/freeradius/proxy.conf
> +@sample ${SYSCONFDIR}/raddb/proxy.conf
>  share/examples/freeradius/radiusd.conf
>  @sample ${SYSCONFDIR}/raddb/radiusd.conf
> -share/examples/freeradius/realms
> +share/examples/freeradius/sites-available/
> +@sample ${SYSCONFDIR}/raddb/sites-available/
> +share/examples/freeradius/sites-available/README
> +share/examples/freeradius/sites-available/default
> +share/examples/freeradius/sites-available/example
> +share/examples/freeradius/sites-enabled/
> +@sample ${SYSCONFDIR}/raddb/sites-enabled/
> +share/examples/freeradius/sites-enabled/default
>  share/examples/freeradius/snmp.conf
>  @sample ${SYSCONFDIR}/raddb/snmp.conf
> +share/examples/freeradius/sql/
> +@sample ${SYSCONFDIR}/raddb/sql/
>  share/examples/freeradius/sql.conf
> +@sample ${SYSCONFDIR}/raddb/sql.conf
> +share/examples/freeradius/sql/mssql/
> +share/examples/freeradius/sql/mssql/dialup.conf
> +share/examples/freeradius/sql/mssql/schema.sql
> +share/examples/freeradius/sql/mysql/
> +@sample ${SYSCONFDIR}/raddb/sql/mysql/
> +share/examples/freeradius/sql/mysql/counter.conf
> +@sample ${SYSCONFDIR}/raddb/sql/mysql/counter.conf
> +share/examples/freeradius/sql/mysql/dialup.conf
> +@sample ${SYSCONFDIR}/raddb/sql/mysql/dialup.conf
> +share/examples/freeradius/sql/mysql/ippool.conf
> +@sample ${SYSCONFDIR}/raddb/sql/mysql/ippool.conf
> +share/examples/freeradius/sql/mysql/ippool.sql
> +share/examples/freeradius/sql/mysql/nas.sql
> +share/examples/freeradius/sql/mysql/schema.sql
> +share/examples/freeradius/sql/oracle/
> +share/examples/freeradius/sql/oracle/dialup.conf
> +share/examples/freeradius/sql/oracle/ippool.sql
> +share/examples/freeradius/sql/oracle/nas.sql
> +share/examples/freeradius/sql/oracle/schema.sql
> +share/examples/freeradius/sql/postgresql/
> +@sample ${SYSCONFDIR}/raddb/sql/postgresql/
> +share/examples/freeradius/sql/postgresql/cisco_h323_db_schema.sql
> +share/examples/freeradius/sql/postgresql/counter.conf
> +@sample ${SYSCONFDIR}/raddb/sql/postgresql/counter.conf
> +share/examples/freeradius/sql/postgresql/dialup.conf
> +@sample ${SYSCONFDIR}/raddb/sql/postgresql/dialup.conf
> +share/examples/freeradius/sql/postgresql/ippool.conf
> +@sample ${SYSCONFDIR}/raddb/sql/postgresql/ippool.conf
> +share/examples/freeradius/sql/postgresql/ippool.sql
> +share/examples/freeradius/sql/postgresql/nas.sql
> +share/examples/freeradius/sql/postgresql/schema.sql
> +share/examples/freeradius/sql/postgresql/update_radacct_group_trigger.sql
> +share/examples/freeradius/sql/postgresql/voip-postpaid.conf
> +@sample ${SYSCONFDIR}/raddb/sql/postgresql/voip-postpaid.conf
>  share/examples/freeradius/sqlippool.conf
> +@sample ${SYSCONFDIR}/raddb/sqlippool.conf
> +share/examples/freeradius/templates.conf
> +@sample ${SYSCONFDIR}/raddb/templates.conf
>  share/examples/freeradius/users
>  @sample ${SYSCONFDIR}/raddb/users
>  share/freeradius/
> @@ -347,11 +415,13 @@
>  share/freeradius/dictionary.ascend
>  share/freeradius/dictionary.asn
>  share/freeradius/dictionary.avaya
> +share/freeradius/dictionary.azaire
>  share/freeradius/dictionary.bay
>  share/freeradius/dictionary.bintec
>  share/freeradius/dictionary.bristol
>  share/freeradius/dictionary.cablelabs
>  share/freeradius/dictionary.cabletron
> +share/freeradius/dictionary.chillispot
>  share/freeradius/dictionary.cisco
>  share/freeradius/dictionary.cisco.bbsm
>  share/freeradius/dictionary.cisco.vpn3000
> @@ -372,28 +442,37 @@
>  share/freeradius/dictionary.gandalf
>  share/freeradius/dictionary.garderos
>  share/freeradius/dictionary.gemtek
> +share/freeradius/dictionary.h3c
>  share/freeradius/dictionary.hp
> +share/freeradius/dictionary.huawei
>  share/freeradius/dictionary.ipunplugged
>  share/freeradius/dictionary.issanni
>  share/freeradius/dictionary.itk
> +share/freeradius/dictionary.jradius
>  share/freeradius/dictionary.juniper
>  share/freeradius/dictionary.karlnet
>  share/freeradius/dictionary.livingston
>  share/freeradius/dictionary.localweb
>  share/freeradius/dictionary.lucent
> +share/freeradius/dictionary.manzara
>  share/freeradius/dictionary.merit
>  share/freeradius/dictionary.microsoft
>  share/freeradius/dictionary.mikrotik
>  share/freeradius/dictionary.motorola
>  share/freeradius/dictionary.navini
>  share/freeradius/dictionary.netscreen
> +share/freeradius/dictionary.nexans
>  share/freeradius/dictionary.nokia
> +share/freeradius/dictionary.nokia.conflict
>  share/freeradius/dictionary.nomadix
>  share/freeradius/dictionary.nortel
>  share/freeradius/dictionary.ntua
> +share/freeradius/dictionary.openser
>  share/freeradius/dictionary.packeteer
>  share/freeradius/dictionary.patton
>  share/freeradius/dictionary.propel
> +share/freeradius/dictionary.prosoft
> +share/freeradius/dictionary.quiconnect
>  share/freeradius/dictionary.quintum
>  share/freeradius/dictionary.redback
>  share/freeradius/dictionary.redcreek
> @@ -405,27 +484,31 @@
>  share/freeradius/dictionary.rfc3162
>  share/freeradius/dictionary.rfc3576
>  share/freeradius/dictionary.rfc3580
> +share/freeradius/dictionary.rfc4072
>  share/freeradius/dictionary.rfc4372
> -share/freeradius/dictionary.rfc4590
>  share/freeradius/dictionary.rfc4675
>  share/freeradius/dictionary.rfc4679
> +share/freeradius/dictionary.rfc4818
> +share/freeradius/dictionary.rfc4849
>  share/freeradius/dictionary.riverstone
>  share/freeradius/dictionary.roaringpenguin
> -share/freeradius/dictionary.schulzrinne-sipping
>  share/freeradius/dictionary.shasta
>  share/freeradius/dictionary.shiva
> +share/freeradius/dictionary.slipstream
>  share/freeradius/dictionary.sofaware
>  share/freeradius/dictionary.sonicwall
>  share/freeradius/dictionary.springtide
>  share/freeradius/dictionary.starent
>  share/freeradius/dictionary.t_systems_nova
>  share/freeradius/dictionary.telebit
> +share/freeradius/dictionary.telkom
>  share/freeradius/dictionary.trapeze
>  share/freeradius/dictionary.tropos
>  share/freeradius/dictionary.unix
>  share/freeradius/dictionary.usr
>  share/freeradius/dictionary.valemount
>  share/freeradius/dictionary.versanet
> +share/freeradius/dictionary.vqp
>  share/freeradius/dictionary.walabi
>  share/freeradius/dictionary.waverider
>  share/freeradius/dictionary.wispr
> @@ -436,7 +519,6 @@
>  @sample /var/log/radius/
>  @sample /var/log/radius/radacct/
>  @sample /var/run/radiusd/
> -@owner
>  @extra /var/log/radius/radwtmp
>  @extraunexec rm -f ${SYSCONFDIR}/raddb/*
>  @extraunexec rm -rf /var/log/radius/radacct/*
>

Reply | Threaded
Open this post in threaded view
|

Re: update: net/freeradius

Antoine Jacoutot
On Mon, 21 Jan 2008, Kenneth R Westerback wrote:
> I'd love to see this go in, since I'm trying to convince people to
> use OpenBSD/FreeRADIUS at work, but I have no test setup to exercise
> it at this time.

Don't worry, it will go in.
Rui's working on it, aren't you Rui ;)

By the way Kenneth, the freeradius version we have in tree works just
fine.

--
Antoine

Reply | Threaded
Open this post in threaded view
|

Re: update: net/freeradius

Kenneth R Westerback
On Mon, Jan 21, 2008 at 05:47:47PM +0100, Antoine Jacoutot wrote:

> On Mon, 21 Jan 2008, Kenneth R Westerback wrote:
>> I'd love to see this go in, since I'm trying to convince people to
>> use OpenBSD/FreeRADIUS at work, but I have no test setup to exercise
>> it at this time.
>
> Don't worry, it will go in.
> Rui's working on it, aren't you Rui ;)
>
> By the way Kenneth, the freeradius version we have in tree works just fine.
>
> --
> Antoine

I know the one in the tree works fine, I've tested it. I'm trying to
convince people that OpenBSD keeps up with the times. :-).

.... Ken

Reply | Threaded
Open this post in threaded view
|

Re: update: net/freeradius

Rui Reis-2
In reply to this post by Antoine Jacoutot
On Mon, Jan 21, 2008 at 05:47:47PM +0100, Antoine Jacoutot wrote:
> On Mon, 21 Jan 2008, Kenneth R Westerback wrote:
> >I'd love to see this go in, since I'm trying to convince people to
> >use OpenBSD/FreeRADIUS at work, but I have no test setup to exercise
> >it at this time.
>
> Don't worry, it will go in.
> Rui's working on it, aren't you Rui ;)

yup, and it will be in... in a few minutes ;)

cheers,
rui

 
> By the way Kenneth, the freeradius version we have in tree works just
> fine.
>
> --
> Antoine