diff options
Diffstat (limited to 'package/freeradius-server/patches')
3 files changed, 353 insertions, 30 deletions
diff --git a/package/freeradius-server/patches/patch-share_dictionary b/package/freeradius-server/patches/patch-share_dictionary index 6027a7810..075c19c71 100644 --- a/package/freeradius-server/patches/patch-share_dictionary +++ b/package/freeradius-server/patches/patch-share_dictionary @@ -1,18 +1,140 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- freeradius-server-2.1.6.orig/share/dictionary 2009-05-18 13:13:55.000000000 +0200 -+++ freeradius-server-2.1.6/share/dictionary 2009-06-01 16:15:56.702126337 +0200 -@@ -54,7 +54,7 @@ - # this directive to the end of this file if you want to see the - # old names in the logfiles, INSTEAD OF the new names. - # +--- 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 dictionary.compat - - # - # Include the RFC dictionaries next. -@@ -82,110 +82,12 @@ $INCLUDE dictionary.rfc5176 - # - # Include vendor dictionaries after the standard ones. +- +-# +-# 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 @@ -30,10 +152,40 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ -$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. +-# 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 @@ -47,6 +199,43 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ -$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 @@ -56,6 +245,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ -$INCLUDE dictionary.h3c -$INCLUDE dictionary.hp -$INCLUDE dictionary.huawei +-$INCLUDE dictionary.iea -$INCLUDE dictionary.infonet -$INCLUDE dictionary.issanni -$INCLUDE dictionary.itk @@ -77,7 +267,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ -$INCLUDE dictionary.nexans -$INCLUDE dictionary.ntua -$INCLUDE dictionary.nokia - # +-# -# Commented out because of attribute conflicts. -# -#$INCLUDE dictionary.nokia.conflict @@ -85,7 +275,78 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ -$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 @@ -118,6 +379,62 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ -$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 # - # And finally the server internal attributes. +-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 99184d09a..8dbcddf99 100644 --- a/package/freeradius-server/patches/patch-src_main_event_c +++ b/package/freeradius-server/patches/patch-src_main_event_c @@ -1,14 +1,21 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- freeradius-server-2.1.6.orig/src/main/event.c 2009-05-18 13:13:55.000000000 +0200 -+++ freeradius-server-2.1.6/src/main/event.c 2009-06-01 17:06:44.356592479 +0200 -@@ -1667,8 +1667,9 @@ static int originated_coa_request(REQUES +--- 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; + } + +-#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 */ request->num_proxied_requests = 1; request->num_proxied_responses = 0; -+#if defined(HAVE_PTHREAD_H) ++#ifdef HAVE_PTHREAD_H request->child_pid = NO_SUCH_CHILD_PID; -- +#endif + update_event_timestamp(request->proxy, request->proxy_when.tv_sec); - request->child_state = REQUEST_PROXIED; 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 13cbb8215..17bbf64c2 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,6 +1,5 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- freeradius-server-2.1.6.orig/src/modules/rlm_eap/Makefile.in 2009-05-18 13:13:55.000000000 +0200 -+++ freeradius-server-2.1.6/src/modules/rlm_eap/Makefile.in 2009-06-01 17:23:33.047631797 +0200 +--- 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 @@ -37,7 +37,7 @@ radeapclient.lo: radeapclient.c $(HEADER install-subdirs: |