diff options
Diffstat (limited to 'package/freeradius-server')
| -rw-r--r-- | package/freeradius-server/Makefile | 57 | ||||
| -rw-r--r-- | package/freeradius-server/files/freeradius-server.conffiles (renamed from package/freeradius-server/files/freeradius.conffiles) | 0 | ||||
| -rw-r--r-- | package/freeradius-server/files/freeradius-server.postinst (renamed from package/freeradius-server/files/freeradius.postinst) | 0 | ||||
| -rw-r--r-- | package/freeradius-server/patches/patch-share_dictionary | 440 | ||||
| -rw-r--r-- | package/freeradius-server/patches/patch-src_main_event_c | 10 | ||||
| -rw-r--r-- | package/freeradius-server/patches/patch-src_main_modules_c | 11 | ||||
| -rw-r--r-- | package/freeradius-server/patches/patch-src_modules_rlm_eap_Makefile_in | 4 |
7 files changed, 44 insertions, 478 deletions
diff --git a/package/freeradius-server/Makefile b/package/freeradius-server/Makefile index 69f19397c..b202f44fd 100644 --- a/package/freeradius-server/Makefile +++ b/package/freeradius-server/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= freeradius-server -PKG_VERSION:= 2.1.7 +PKG_VERSION:= 2.1.8 PKG_RELEASE:= 1 -PKG_MD5SUM:= b1f77c5e3116bcb0ac0aa9080a06ebf1 +PKG_MD5SUM:= aa2ae711387af144df7c351b28b8789c PKG_DESCR:= a flexible RADIUS server PKG_SECTION:= net PKG_MULTI:= 1 @@ -25,9 +25,7 @@ PKG_BUILDDEP+= postgresql PKG_DEPENDS_PGSQL:= libpq endif PKG_URL:= http://www.freeradius.org -PKG_SITES:= ftp://ftp.freeradius.org/pub/radius/ \ - http://freeradius.portal-to-web.de/ \ - ftp://ftp.uk.freeradius.org/pub/radius/ +PKG_SITES:= ftp://ftp.freeradius.org/pub/radius/ PKG_HOST_DEPENDS:= !cygwin @@ -46,34 +44,31 @@ PKG_DESCR_MYSQL:= MySQL module PKG_DESCR_PGSQL:= PostgreSQL module PKG_DESCR_UTILS:= Misc. client utilities -PKG_CONFIGURE_OPTIONS:= +PKG_CONFIGURE_OPTS:= ifneq (${ADK_PACKAGE_FREERADIUS_MOD_LDAP},) -PKG_CONFIGURE_LIBS+= -lcrypto -lssl -PKG_CONFIGURE_OPTIONS+= \ - --with-rlm_ldap-include-dir="${STAGING_DIR}/usr/include" \ - --with-rlm_ldap-lib-dir="${STAGING_DIR}/usr/lib" +PKG_CONFIGURE_LIBS+= -lcrypto -lssl +PKG_CONFIGURE_OPTS+= --with-rlm_ldap-include-dir="${STAGING_DIR}/usr/include" \ + --with-rlm_ldap-lib-dir="${STAGING_DIR}/usr/lib" else -PKG_CONFIGURE_OPTIONS+= --without-rlm_ldap +PKG_CONFIGURE_OPTS+= --without-rlm_ldap endif ifneq (${ADK_PACKAGE_FREERADIUS_MOD_SQL_MYSQL},) PKG_CONFIGURE_LIBS+= -lz -PKG_CONFIGURE_OPTIONS+= \ - --with-mysql-include-dir="${STAGING_DIR}/usr/include" \ - --with-mysql-lib-dir="${STAGING_DIR}/usr/lib/mysql" \ - --without-threads \ - --with-rlm_sql +PKG_CONFIGURE_OPTS+= --with-mysql-include-dir="${STAGING_DIR}/usr/include" \ + --with-mysql-lib-dir="${STAGING_DIR}/usr/lib/mysql" \ + --without-threads \ + --with-rlm_sql else -PKG_CONFIGURE_OPTIONS+= --without-rlm_sql_mysql +PKG_CONFIGURE_OPTS+= --without-rlm_sql_mysql endif ifneq (${ADK_PACKAGE_FREERADIUS_MOD_SQL_PGSQL},) -PKG_CONFIGURE_OPTIONS+= \ - --with-rlm_sql_postgresql-include-dir="${STAGING_DIR}/usr/include" \ - --with-rlm_sql_postgresql-lib-dir="${STAGING_DIR}/usr/lib" \ - --with-rlm_sql +PKG_CONFIGURE_OPTS+= --with-rlm_sql_postgresql-include-dir="${STAGING_DIR}/usr/include" \ + --with-rlm_sql_postgresql-lib-dir="${STAGING_DIR}/usr/lib" \ + --with-rlm_sql else -PKG_CONFIGURE_OPTIONS+= --without-rlm_sql_postgresql +PKG_CONFIGURE_OPTS+= --without-rlm_sql_postgresql endif include ${TOPDIR}/mk/package.mk @@ -124,16 +119,15 @@ $(eval $(call PKG_mod_template,FREERADIUS_MOD_SQL,rlm_sql,sql.conf)) $(eval $(call PKG_mod_template,FREERADIUS_MOD_SQL_MYSQL,rlm_sql_mysql,)) $(eval $(call PKG_mod_template,FREERADIUS_MOD_SQL_PGSQL,rlm_sql_postgresql,)) -CONFIGURE_STYLE:= gnu -CONFIGURE_ENV+= ac_cv_lib_nsl_inet_ntoa=no -CONFIGURE_ARGS+= ${PKG_CONFIGURE_OPTIONS} \ +CONFIGURE_ARGS+= ${PKG_CONFIGURE_OPTS} \ --with-openssl-includes=${STAGING_DIR}/usr/include \ --with-openssl-libraries=${STAGING_DIR}/usr/lib \ + --with-system-libltld \ --enable-strict-dependencies \ --with-raddbdir=/etc/freeradius \ --without-edir \ --without-snmp \ - --with-experimental-modules \ + --without-experimental-modules \ --without-rlm_attr-rewrite \ --without-rlm_checkval \ --without-rlm_counter \ @@ -168,16 +162,16 @@ CONFIGURE_ARGS+= ${PKG_CONFIGURE_OPTIONS} \ --without-rlm_sql_sqlite \ --libdir=/usr/lib/freeradius \ --libexecdir=/usr/lib/freeradius -BUILD_STYLE:= auto -INSTALL_STYLE:= auto FAKE_FLAGS+= R="${WRKINST}" \ INSTALLSTRIP="" post-install: ${INSTALL_MODS_y} ${INSTALL_MODS_m} ${INSTALL_DIR} ${IDIR_FREERADIUS_SERVER}/etc/freeradius ${CP} ./files/users ${IDIR_FREERADIUS_SERVER}/etc/freeradius/ - ${INSTALL_DATA} ./files/radiusd.conf ${IDIR_FREERADIUS_SERVER}/etc/freeradius - ${INSTALL_DATA} ./files/clients.conf ${IDIR_FREERADIUS_SERVER}/etc/freeradius + ${INSTALL_DATA} ./files/radiusd.conf \ + ${IDIR_FREERADIUS_SERVER}/etc/freeradius + ${INSTALL_DATA} ./files/clients.conf \ + ${IDIR_FREERADIUS_SERVER}/etc/freeradius for f in dictionary; do \ ${CP} ${WRKINST}/etc/freeradius/$${f} \ ${IDIR_FREERADIUS_SERVER}/etc/freeradius/ ; \ @@ -203,6 +197,7 @@ post-install: ${INSTALL_MODS_y} ${INSTALL_MODS_m} rm -rf ${IDIR_FREERADIUS_DEMOCERTS}/etc/freeradius/certs/demoCA/index* rm -rf ${IDIR_FREERADIUS_DEMOCERTS}/etc/freeradius/certs/demoCA/serial* ${INSTALL_DIR} ${IDIR_FREERADIUS_UTILS}/usr/bin - ${INSTALL_BIN} ${WRKINST}/usr/bin/radclient ${IDIR_FREERADIUS_UTILS}/usr/bin + ${INSTALL_BIN} ${WRKINST}/usr/bin/radclient \ + ${IDIR_FREERADIUS_UTILS}/usr/bin include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/freeradius-server/files/freeradius.conffiles b/package/freeradius-server/files/freeradius-server.conffiles index 56552e6c1..56552e6c1 100644 --- a/package/freeradius-server/files/freeradius.conffiles +++ b/package/freeradius-server/files/freeradius-server.conffiles diff --git a/package/freeradius-server/files/freeradius.postinst b/package/freeradius-server/files/freeradius-server.postinst index c65fa195f..c65fa195f 100644 --- a/package/freeradius-server/files/freeradius.postinst +++ b/package/freeradius-server/files/freeradius-server.postinst diff --git a/package/freeradius-server/patches/patch-share_dictionary b/package/freeradius-server/patches/patch-share_dictionary deleted file mode 100644 index 075c19c71..000000000 --- a/package/freeradius-server/patches/patch-share_dictionary +++ /dev/null @@ -1,440 +0,0 @@ ---- freeradius-server-2.1.7.orig/share/dictionary 2009-09-14 16:43:29.000000000 +0200 -+++ freeradius-server-2.1.7/share/dictionary 2009-11-19 22:39:16.000000000 +0100 -@@ -1,224 +1,224 @@ --# -*- text -*- --# --# Version $Id$ --# --# DO NOT EDIT THE FILES IN THIS DIRECTORY --# --# The files in this directory are maintained and updated by --# the FreeRADIUS project. Newer releases of software may update --# or change these files. --# --# Use the main dictionary file (usually /etc/raddb/dictionary) --# for local system attributes and $INCLUDEs. --# --# --# --# This file contains dictionary translations for parsing --# requests and generating responses. All transactions are --# composed of Attribute/Value Pairs. The value of each attribute --# is specified as one of 4 data types. Valid data types are: --# --# text - printable, generally UTF-8 encoded (subset of 'string') --# string - 0-253 octets --# ipaddr - 4 octets in network byte order --# integer - 32 bit value in big endian order (high byte first) --# date - 32 bit value in big endian order - seconds since --# 00:00:00 GMT, Jan. 1, 1970 --# ifid - 8 octets in network byte order --# ipv6addr - 16 octets in network byte order --# ipv6prefix - 18 octets in network byte order --# ether - 6 octets of hh:hh:hh:hh:hh:hh --# where 'h' is hex digits, upper or lowercase. --# --# FreeRADIUS includes extended data types which are not defined --# in the RFC's. These data types are: --# --# abinary - Ascend's binary filter format. --# octets - raw octets, printed and input as hex strings. --# e.g.: 0x123456789abcdef --# --# --# Enumerated values are stored in the user file with dictionary --# VALUE translations for easy administration. --# --# Example: --# --# ATTRIBUTE VALUE --# --------------- ----- --# Framed-Protocol = PPP --# 7 = 1 (integer encoding) --# -- --# --# Include compatibility dictionary for older users file. Move --# this directive to the end of this file if you want to see the --# old names in the logfiles, INSTEAD OF the new names. --# --$INCLUDE dictionary.compat -- --# --# Include the RFC dictionaries next. --# --# For a complete list of the standard attributes and values, --# see: --# http://www.iana.org/assignments/radius-types --# --$INCLUDE dictionary.rfc2865 --$INCLUDE dictionary.rfc2866 --$INCLUDE dictionary.rfc2867 --$INCLUDE dictionary.rfc2868 --$INCLUDE dictionary.rfc2869 --$INCLUDE dictionary.rfc3162 --$INCLUDE dictionary.rfc3576 --$INCLUDE dictionary.rfc3580 --$INCLUDE dictionary.rfc4072 --$INCLUDE dictionary.rfc4372 --$INCLUDE dictionary.rfc4675 --$INCLUDE dictionary.rfc4679 --$INCLUDE dictionary.rfc4818 --$INCLUDE dictionary.rfc4849 --$INCLUDE dictionary.rfc5176 --$INCLUDE dictionary.rfc5580 -- --# --# Include vendor dictionaries after the standard ones. -+## -*- text -*- -+## -+## Version $Id$ -+## -+## DO NOT EDIT THE FILES IN THIS DIRECTORY -+## -+## The files in this directory are maintained and updated by -+## the FreeRADIUS project. Newer releases of software may update -+## or change these files. -+## -+## Use the main dictionary file (usually /etc/raddb/dictionary) -+## for local system attributes and $INCLUDEs. -+## -+## -+## -+## This file contains dictionary translations for parsing -+## requests and generating responses. All transactions are -+## composed of Attribute/Value Pairs. The value of each attribute -+## is specified as one of 4 data types. Valid data types are: -+## -+## text - printable, generally UTF-8 encoded (subset of 'string') -+## string - 0-253 octets -+## ipaddr - 4 octets in network byte order -+## integer - 32 bit value in big endian order (high byte first) -+## date - 32 bit value in big endian order - seconds since -+## 00:00:00 GMT, Jan. 1, 1970 -+## ifid - 8 octets in network byte order -+## ipv6addr - 16 octets in network byte order -+## ipv6prefix - 18 octets in network byte order -+## ether - 6 octets of hh:hh:hh:hh:hh:hh -+## where 'h' is hex digits, upper or lowercase. -+## -+## FreeRADIUS includes extended data types which are not defined -+## in the RFC's. These data types are: -+## -+## abinary - Ascend's binary filter format. -+## octets - raw octets, printed and input as hex strings. -+## e.g.: 0x123456789abcdef -+## -+## -+## Enumerated values are stored in the user file with dictionary -+## VALUE translations for easy administration. -+## -+## Example: -+## -+## ATTRIBUTE VALUE -+## --------------- ----- -+## Framed-Protocol = PPP -+## 7 = 1 (integer encoding) -+## - # --$INCLUDE dictionary.3com --$INCLUDE dictionary.3gpp --$INCLUDE dictionary.3gpp2 --$INCLUDE dictionary.acc --$INCLUDE dictionary.airespace --$INCLUDE dictionary.alcatel --$INCLUDE dictionary.alteon --$INCLUDE dictionary.alvarion --$INCLUDE dictionary.apc --$INCLUDE dictionary.aruba --$INCLUDE dictionary.azaire --$INCLUDE dictionary.ascend --$INCLUDE dictionary.bay --$INCLUDE dictionary.bintec --$INCLUDE dictionary.cablelabs --$INCLUDE dictionary.cabletron --$INCLUDE dictionary.chillispot --$INCLUDE dictionary.cisco -+## -+## Include compatibility dictionary for older users file. Move -+## this directive to the end of this file if you want to see the -+## old names in the logfiles, INSTEAD OF the new names. -+## -+##$INCLUDE dictionary.compat - # --# The Cisco VPN300 dictionary is the same as the altiga one. --# You shouldn't use both at the same time. -+## -+## Include the RFC dictionaries next. -+## -+## For a complete list of the standard attributes and values, -+## see: -+## http://www.iana.org/assignments/radius-types -+## -+#$INCLUDE dictionary.rfc2865 -+#$INCLUDE dictionary.rfc2866 -+#$INCLUDE dictionary.rfc2867 -+#$INCLUDE dictionary.rfc2868 -+#$INCLUDE dictionary.rfc2869 -+#$INCLUDE dictionary.rfc3162 -+#$INCLUDE dictionary.rfc3576 -+#$INCLUDE dictionary.rfc3580 -+#$INCLUDE dictionary.rfc4072 -+#$INCLUDE dictionary.rfc4372 -+#$INCLUDE dictionary.rfc4675 -+#$INCLUDE dictionary.rfc4679 -+#$INCLUDE dictionary.rfc4818 -+#$INCLUDE dictionary.rfc4849 -+#$INCLUDE dictionary.rfc5176 -+#$INCLUDE dictionary.rfc5580 - # --#$INCLUDE dictionary.cisco.vpn3000 --$INCLUDE dictionary.cisco.vpn5000 --$INCLUDE dictionary.cisco.bbsm --$INCLUDE dictionary.clavister --$INCLUDE dictionary.colubris --$INCLUDE dictionary.cosine --#$INCLUDE dictionary.dhcp --$INCLUDE dictionary.digium --$INCLUDE dictionary.epygi --$INCLUDE dictionary.erx --$INCLUDE dictionary.ericsson --$INCLUDE dictionary.extreme -+## -+## Include vendor dictionaries after the standard ones. -+## -+#$INCLUDE dictionary.3com -+#$INCLUDE dictionary.3gpp -+#$INCLUDE dictionary.3gpp2 -+#$INCLUDE dictionary.acc -+#$INCLUDE dictionary.airespace -+#$INCLUDE dictionary.alcatel -+#$INCLUDE dictionary.alteon -+#$INCLUDE dictionary.alvarion -+#$INCLUDE dictionary.apc -+#$INCLUDE dictionary.aruba -+#$INCLUDE dictionary.azaire -+#$INCLUDE dictionary.ascend -+#$INCLUDE dictionary.bay -+#$INCLUDE dictionary.bintec -+#$INCLUDE dictionary.cablelabs -+#$INCLUDE dictionary.cabletron -+#$INCLUDE dictionary.chillispot -+#$INCLUDE dictionary.cisco -+## -+## The Cisco VPN300 dictionary is the same as the altiga one. -+## You shouldn't use both at the same time. -+## -+##$INCLUDE dictionary.cisco.vpn3000 -+#$INCLUDE dictionary.cisco.vpn5000 -+#$INCLUDE dictionary.cisco.bbsm -+#$INCLUDE dictionary.clavister -+#$INCLUDE dictionary.colubris -+#$INCLUDE dictionary.cosine -+##$INCLUDE dictionary.dhcp -+#$INCLUDE dictionary.digium -+#$INCLUDE dictionary.epygi -+#$INCLUDE dictionary.erx -+#$INCLUDE dictionary.ericsson -+#$INCLUDE dictionary.extreme - $INCLUDE dictionary.freeradius --$INCLUDE dictionary.freeswitch --$INCLUDE dictionary.fortinet --$INCLUDE dictionary.foundry --$INCLUDE dictionary.gandalf --$INCLUDE dictionary.gemtek --$INCLUDE dictionary.h3c --$INCLUDE dictionary.hp --$INCLUDE dictionary.huawei --$INCLUDE dictionary.iea --$INCLUDE dictionary.infonet --$INCLUDE dictionary.issanni --$INCLUDE dictionary.itk --$INCLUDE dictionary.ipunplugged --$INCLUDE dictionary.juniper --$INCLUDE dictionary.jradius --$INCLUDE dictionary.karlnet --$INCLUDE dictionary.lancom --$INCLUDE dictionary.livingston --$INCLUDE dictionary.localweb --$INCLUDE dictionary.lucent --$INCLUDE dictionary.manzara --$INCLUDE dictionary.merit --$INCLUDE dictionary.microsoft --$INCLUDE dictionary.mikrotik --$INCLUDE dictionary.navini --$INCLUDE dictionary.netscreen --$INCLUDE dictionary.networkphysics --$INCLUDE dictionary.nexans --$INCLUDE dictionary.ntua --$INCLUDE dictionary.nokia --# --# Commented out because of attribute conflicts. --# --#$INCLUDE dictionary.nokia.conflict --$INCLUDE dictionary.nomadix --$INCLUDE dictionary.nortel --# --# Commented out because of attribute conflicts. -+#$INCLUDE dictionary.freeswitch -+#$INCLUDE dictionary.fortinet -+#$INCLUDE dictionary.foundry -+#$INCLUDE dictionary.gandalf -+#$INCLUDE dictionary.gemtek -+#$INCLUDE dictionary.h3c -+#$INCLUDE dictionary.hp -+#$INCLUDE dictionary.huawei -+#$INCLUDE dictionary.iea -+#$INCLUDE dictionary.infonet -+#$INCLUDE dictionary.issanni -+#$INCLUDE dictionary.itk -+#$INCLUDE dictionary.ipunplugged -+#$INCLUDE dictionary.juniper -+#$INCLUDE dictionary.jradius -+#$INCLUDE dictionary.karlnet -+#$INCLUDE dictionary.lancom -+#$INCLUDE dictionary.livingston -+#$INCLUDE dictionary.localweb -+#$INCLUDE dictionary.lucent -+#$INCLUDE dictionary.manzara -+#$INCLUDE dictionary.merit -+#$INCLUDE dictionary.microsoft -+#$INCLUDE dictionary.mikrotik -+#$INCLUDE dictionary.navini -+#$INCLUDE dictionary.netscreen -+#$INCLUDE dictionary.networkphysics -+#$INCLUDE dictionary.nexans -+#$INCLUDE dictionary.ntua -+#$INCLUDE dictionary.nokia -+## -+## Commented out because of attribute conflicts. -+## -+##$INCLUDE dictionary.nokia.conflict -+#$INCLUDE dictionary.nomadix -+#$INCLUDE dictionary.nortel -+## -+## Commented out because of attribute conflicts. -+## -+##$INCLUDE dictionary.openser -+#$INCLUDE dictionary.packeteer -+#$INCLUDE dictionary.patton -+#$INCLUDE dictionary.propel -+#$INCLUDE dictionary.prosoft -+#$INCLUDE dictionary.quiconnect -+#$INCLUDE dictionary.quintum -+#$INCLUDE dictionary.redback -+#$INCLUDE dictionary.redcreek -+#$INCLUDE dictionary.riverstone -+#$INCLUDE dictionary.roaringpenguin -+#$INCLUDE dictionary.shasta -+#$INCLUDE dictionary.shiva -+#$INCLUDE dictionary.slipstream -+#$INCLUDE dictionary.sonicwall -+#$INCLUDE dictionary.springtide -+#$INCLUDE dictionary.starent -+#$INCLUDE dictionary.telebit -+#$INCLUDE dictionary.trapeze -+#$INCLUDE dictionary.tropos -+#$INCLUDE dictionary.t_systems_nova -+#$INCLUDE dictionary.usr -+#$INCLUDE dictionary.utstarcom -+#$INCLUDE dictionary.valemount -+#$INCLUDE dictionary.versanet -+#$INCLUDE dictionary.vqp -+#$INCLUDE dictionary.waverider -+#$INCLUDE dictionary.walabi -+#$INCLUDE dictionary.wimax -+#$INCLUDE dictionary.wispr -+#$INCLUDE dictionary.xedia -+#$INCLUDE dictionary.xylan - # --#$INCLUDE dictionary.openser --$INCLUDE dictionary.packeteer --$INCLUDE dictionary.patton --$INCLUDE dictionary.propel --$INCLUDE dictionary.prosoft --$INCLUDE dictionary.quiconnect --$INCLUDE dictionary.quintum --$INCLUDE dictionary.redback --$INCLUDE dictionary.redcreek --$INCLUDE dictionary.riverstone --$INCLUDE dictionary.roaringpenguin --$INCLUDE dictionary.shasta --$INCLUDE dictionary.shiva --$INCLUDE dictionary.slipstream --$INCLUDE dictionary.sonicwall --$INCLUDE dictionary.springtide --$INCLUDE dictionary.starent --$INCLUDE dictionary.telebit --$INCLUDE dictionary.trapeze --$INCLUDE dictionary.tropos --$INCLUDE dictionary.t_systems_nova --$INCLUDE dictionary.usr --$INCLUDE dictionary.utstarcom --$INCLUDE dictionary.valemount --$INCLUDE dictionary.versanet --$INCLUDE dictionary.vqp --$INCLUDE dictionary.waverider --$INCLUDE dictionary.walabi --$INCLUDE dictionary.wimax --$INCLUDE dictionary.wispr --$INCLUDE dictionary.xedia --$INCLUDE dictionary.xylan -- -+## -+## And finally the server internal attributes. -+## -+#$INCLUDE dictionary.freeradius.internal - # --# And finally the server internal attributes. -+## -+## Miscellaneous attributes defined in weird places that -+## don't really belong anywhere else... -+## -+#ATTRIBUTE Originating-Line-Info 94 string - # --$INCLUDE dictionary.freeradius.internal -- -+## As defined in draft-sterman-aaa-sip-00.txt -+#ATTRIBUTE Digest-Response 206 string -+#ATTRIBUTE Digest-Attributes 207 octets # stupid format - # --# Miscellaneous attributes defined in weird places that --# don't really belong anywhere else... -+## -+## Integer Translations -+## -+#VALUE Service-Type Voice 12 -+#VALUE Service-Type Fax 13 -+#VALUE Service-Type Modem-Relay 14 -+#VALUE Service-Type IAPP-Register 15 -+#VALUE Service-Type IAPP-AP-Check 16 - # --ATTRIBUTE Originating-Line-Info 94 string -- --# As defined in draft-sterman-aaa-sip-00.txt --ATTRIBUTE Digest-Response 206 string --ATTRIBUTE Digest-Attributes 207 octets # stupid format -- -+#VALUE Framed-Protocol GPRS-PDP-Context 7 - # --# Integer Translations -+#VALUE NAS-Port-Type Wireless-CDMA2000 22 -+#VALUE NAS-Port-Type Wireless-UMTS 23 -+#VALUE NAS-Port-Type Wireless-1X-EV 24 -+#VALUE NAS-Port-Type IAPP 25 - # --VALUE Service-Type Voice 12 --VALUE Service-Type Fax 13 --VALUE Service-Type Modem-Relay 14 --VALUE Service-Type IAPP-Register 15 --VALUE Service-Type IAPP-AP-Check 16 -- --VALUE Framed-Protocol GPRS-PDP-Context 7 -- --VALUE NAS-Port-Type Wireless-CDMA2000 22 --VALUE NAS-Port-Type Wireless-UMTS 23 --VALUE NAS-Port-Type Wireless-1X-EV 24 --VALUE NAS-Port-Type IAPP 25 -- --VALUE Framed-Protocol PPTP 9 -+#VALUE Framed-Protocol PPTP 9 diff --git a/package/freeradius-server/patches/patch-src_main_event_c b/package/freeradius-server/patches/patch-src_main_event_c index 8dbcddf99..1750f53d5 100644 --- a/package/freeradius-server/patches/patch-src_main_event_c +++ b/package/freeradius-server/patches/patch-src_main_event_c @@ -1,15 +1,15 @@ ---- freeradius-server-2.1.7.orig/src/main/event.c 2009-09-14 16:43:29.000000000 +0200 -+++ freeradius-server-2.1.7/src/main/event.c 2009-11-19 22:55:03.000000000 +0100 -@@ -1143,7 +1143,7 @@ static void wait_a_bit(void *ctx) - break; +--- freeradius-server-2.1.8.orig/src/main/event.c 2009-12-30 16:44:35.000000000 +0100 ++++ freeradius-server-2.1.8/src/main/event.c 2010-02-05 19:43:55.803074411 +0100 +@@ -1177,7 +1177,7 @@ static void wait_a_bit(void *ctx) } + stop_processing: -#if defined(HAVE_PTHREAD_H) || defined(WITH_PROXY) +#if defined(HAVE_PTHREAD_H) /* * A child thread MAY still be running on the * request. Ask the thread to stop working on -@@ -1617,7 +1617,9 @@ static int originated_coa_request(REQUES +@@ -1646,7 +1646,9 @@ static int originated_coa_request(REQUES */ request->num_proxied_requests = 1; request->num_proxied_responses = 0; diff --git a/package/freeradius-server/patches/patch-src_main_modules_c b/package/freeradius-server/patches/patch-src_main_modules_c new file mode 100644 index 000000000..c72807f5c --- /dev/null +++ b/package/freeradius-server/patches/patch-src_main_modules_c @@ -0,0 +1,11 @@ +--- freeradius-server-2.1.8.orig/src/main/modules.c 2009-12-30 16:44:35.000000000 +0100 ++++ freeradius-server-2.1.8/src/main/modules.c 2010-02-05 20:05:22.174324929 +0100 +@@ -22,6 +22,8 @@ + * Copyright 2000 Alan Curry <pacman@world.std.com> + */ + ++#define lt__PROGRAM__LTX_preloaded_symbols lt_libltdl_LTX_preloaded_symbols ++ + #include <freeradius-devel/ident.h> + RCSID("$Id$") + diff --git a/package/freeradius-server/patches/patch-src_modules_rlm_eap_Makefile_in b/package/freeradius-server/patches/patch-src_modules_rlm_eap_Makefile_in index 17bbf64c2..da95c44c1 100644 --- a/package/freeradius-server/patches/patch-src_modules_rlm_eap_Makefile_in +++ b/package/freeradius-server/patches/patch-src_modules_rlm_eap_Makefile_in @@ -1,5 +1,5 @@ ---- freeradius-server-2.1.7.orig/src/modules/rlm_eap/Makefile.in 2009-09-14 16:43:29.000000000 +0200 -+++ freeradius-server-2.1.7/src/modules/rlm_eap/Makefile.in 2009-11-19 22:37:45.000000000 +0100 +--- freeradius-server-2.1.8.orig/src/modules/rlm_eap/Makefile.in 2009-12-30 16:44:35.000000000 +0100 ++++ freeradius-server-2.1.8/src/modules/rlm_eap/Makefile.in 2010-02-05 20:33:01.401922559 +0100 @@ -37,7 +37,7 @@ radeapclient.lo: radeapclient.c $(HEADER install-subdirs: |