From b289db8925f82e83048caa34332ccd654d12f62d Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 20 Nov 2009 09:31:11 +0100
Subject: package updates and compile fixes

- update ctorrent, cups, gnutls and freeradius-server
- compile kerberos (heimdal,krb5) with com_err library from
  e2fsprogs to allow both to be build without installing local
  copys of libcom_err
- cleanup lynx package add zlib dependency
---
 package/freeradius-server/Makefile                 |   4 +-
 .../patches/patch-share_dictionary                 | 357 +++++++++++++++++++--
 .../patches/patch-src_main_event_c                 |  21 +-
 .../patches/patch-src_modules_rlm_eap_Makefile_in  |   5 +-
 4 files changed, 355 insertions(+), 32 deletions(-)

(limited to 'package/freeradius-server')

diff --git a/package/freeradius-server/Makefile b/package/freeradius-server/Makefile
index 895ae527b..1e5304103 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.6
+PKG_VERSION:=		2.1.7
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		078f7d29b4d2d34f7c992abf772c28a0
+PKG_MD5SUM:=		b1f77c5e3116bcb0ac0aa9080a06ebf1
 PKG_DESCR:=		a flexible RADIUS server
 PKG_SECTION:=		net
 PKG_DEPENDS:=		libltdl libopenssl libpthread
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:
-- 
cgit v1.2.3


From 02e9bb0970ba681f228dc642b1e5026cc97047c7 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 25 Nov 2009 21:13:21 +0100
Subject: simplify buildsystem

- remove ADK_IPV6, ADK_CXX and ADK_X11
- enable ipv6 by default in uclibc
- enable build of c++ compiler by default
---
 package/freeradius-server/Config.in | 1 -
 1 file changed, 1 deletion(-)

(limited to 'package/freeradius-server')

diff --git a/package/freeradius-server/Config.in b/package/freeradius-server/Config.in
index d7dc0cb03..fe119c0a3 100644
--- a/package/freeradius-server/Config.in
+++ b/package/freeradius-server/Config.in
@@ -80,7 +80,6 @@ config ADK_PACKAGE_FREERADIUS_MOD_SQL_MYSQL
 	prompt     "freeradius-mod-sql-mysql.... MySQL module"
 	tristate
 	default n
-	depends on ADK_CXX
 	depends on ADK_PACKAGE_FREERADIUS_MOD_SQL
 	select ADK_PACKAGE_LIBMYSQLCLIENT
 
-- 
cgit v1.2.3


From eb10ac0e97c1e5e98ce73a1966c97a7cedb9d086 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Tue, 1 Dec 2009 19:40:13 +0100
Subject: use pkill for startup scripts

- seems to solve the issue, that the same init script
 get killed otherwise
- fine tune dansguardian, squid and iptables package
- add default firewall config file (from freewrt)
- add an example for transparent proxy via an ethernet bridge
---
 package/freeradius-server/files/radiusd.init | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'package/freeradius-server')

diff --git a/package/freeradius-server/files/radiusd.init b/package/freeradius-server/files/radiusd.init
index 818f803ff..e43c5f94e 100644
--- a/package/freeradius-server/files/radiusd.init
+++ b/package/freeradius-server/files/radiusd.init
@@ -14,7 +14,7 @@ start)
 	radiusd
 	;;
 stop)
-	killall radiusd
+	pkill radiusd
 	;;
 restart)
 	sh $0 stop
-- 
cgit v1.2.3


From 1c8d49e1ee453e44af6c57f10e8b929d5ccdd3a2 Mon Sep 17 00:00:00 2001
From: Thorsten Glaser <tg@mirbsd.org>
Date: Sat, 19 Dec 2009 22:53:46 +0059
Subject: create package/Depends.mk dynamically; add PKG_BUILDDEP to all
 Makefiles

Signed-off-by: Thorsten Glaser <tg@mirbsd.org>
---
 package/freeradius-server/Makefile | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'package/freeradius-server')

diff --git a/package/freeradius-server/Makefile b/package/freeradius-server/Makefile
index 1e5304103..2a6b5404f 100644
--- a/package/freeradius-server/Makefile
+++ b/package/freeradius-server/Makefile
@@ -6,6 +6,16 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		freeradius-server
 PKG_VERSION:=		2.1.7
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		libtool openssl
+ifneq ($(ADK_PACKAGE_FREERADIUS_MOD_LDAP),)
+PKG_BUILDDEP+=		openldap
+endif
+ifneq ($(ADK_PACKAGE_FREERADIUS_MOD_SQL_MYSQL),)
+PKG_BUILDDEP+=		mysql
+endif
+ifneq ($(ADK_PACKAGE_FREERADIUS_MOD_SQL_PGSQL),)
+PKG_BUILDDEP+=		postgresql
+endif
 PKG_MD5SUM:=		b1f77c5e3116bcb0ac0aa9080a06ebf1
 PKG_DESCR:=		a flexible RADIUS server
 PKG_SECTION:=		net
-- 
cgit v1.2.3


From 2c3389799c46724a4922179ff70d1230ccbe5b59 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 23 Dec 2009 11:34:44 +0100
Subject: fixes for new pkgmaker generated menu

---
 package/freeradius-server/Makefile | 60 +++++++++++++++++++++++++-------------
 1 file changed, 39 insertions(+), 21 deletions(-)

(limited to 'package/freeradius-server')

diff --git a/package/freeradius-server/Makefile b/package/freeradius-server/Makefile
index 2a6b5404f..f8f769da5 100644
--- a/package/freeradius-server/Makefile
+++ b/package/freeradius-server/Makefile
@@ -6,25 +6,43 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		freeradius-server
 PKG_VERSION:=		2.1.7
 PKG_RELEASE:=		1
+PKG_MD5SUM:=		b1f77c5e3116bcb0ac0aa9080a06ebf1
+PKG_DESCR:=		a flexible RADIUS server
+PKG_SECTION:=		net
+PKG_DEPENDS:=		libltdl libopenssl libpthread
 PKG_BUILDDEP+=		libtool openssl
 ifneq ($(ADK_PACKAGE_FREERADIUS_MOD_LDAP),)
 PKG_BUILDDEP+=		openldap
+PKG_DEPENDS_LDAP:=	libopenldap
 endif
 ifneq ($(ADK_PACKAGE_FREERADIUS_MOD_SQL_MYSQL),)
 PKG_BUILDDEP+=		mysql
+PKG_DEPENDS_MYSQL:=	libmysqlclient
 endif
 ifneq ($(ADK_PACKAGE_FREERADIUS_MOD_SQL_PGSQL),)
 PKG_BUILDDEP+=		postgresql
+PKG_DEPENDS_PGSQL:=	libpq
 endif
-PKG_MD5SUM:=		b1f77c5e3116bcb0ac0aa9080a06ebf1
-PKG_DESCR:=		a flexible RADIUS server
-PKG_SECTION:=		net
-PKG_DEPENDS:=		libltdl libopenssl libpthread
 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_DESCR_DEMOCERTS:=	Demo certificates to test the server
+PKG_DESCR_CHAP:=	CHAP authentication module
+PKG_DESCR_DETAIL:=	Detailed accounting module
+PKG_DESCR_DIGEST:=	Digest authentication module
+PKG_DESCR_FILES:=	Module using local files for authorization
+PKG_DESCR_LDAP:=	LDAP module
+PKG_DESCR_MSCHAP:=	MS-CHAP and MS-CHAPv2 module
+PKG_DESCR_PAP:=		PAP authentication module
+PKG_DESCR_PREPROCESS:=	Request pre-processing module
+PKG_DESCR_REALM:=	Realms handling module
+PKG_DESCR_SQL:=		Base SQL module
+PKG_DESCR_MYSQL:=	MySQL module
+PKG_DESCR_PGSQL:=	PostgreSQL module
+PKG_DESCR_UTILS:=	Misc. client utilities
+
 PKG_CONFIGURE_OPTIONS:=
 
 ifneq (${ADK_PACKAGE_FREERADIUS_MOD_LDAP},)
@@ -75,20 +93,20 @@ ${2}-install:
 endef
 
 $(eval $(call PKG_template,FREERADIUS_SERVER,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,FREERADIUS_DEMOCERTS,freeradius-democerts,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,FREERADIUS_MOD_CHAP,freeradius-mod-chap,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,FREERADIUS_MOD_DETAIL,freeradius-mod-detail,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,FREERADIUS_MOD_DIGEST,freeradius-mod-digest,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,FREERADIUS_MOD_FILES,freeradius-mod-files,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,FREERADIUS_MOD_LDAP,freeradius-mod-ldap,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,FREERADIUS_MOD_MSCHAP,freeradius-mod-mschap,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,FREERADIUS_MOD_PAP,freeradius-mod-pap,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,FREERADIUS_MOD_PREPROCESS,freeradius-mod-preprocess,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,FREERADIUS_MOD_REALM,freeradius-mod-realm,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,FREERADIUS_MOD_SQL,freeradius-mod-sql,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,FREERADIUS_MOD_SQL_MYSQL,freeradius-mod-sql-mysql,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,FREERADIUS_MOD_SQL_PGSQL,freeradius-mod-sql-pgsql,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,FREERADIUS_UTILS,freeradius-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,FREERADIUS_DEMOCERTS,freeradius-democerts,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_DEMOCERTS},${PKG_SECTION}))
+$(eval $(call PKG_template,FREERADIUS_MOD_CHAP,freeradius-mod-chap,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_CHAP},${PKG_SECTION}))
+$(eval $(call PKG_template,FREERADIUS_MOD_DETAIL,freeradius-mod-detail,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_DETAIL},${PKG_SECTION}))
+$(eval $(call PKG_template,FREERADIUS_MOD_DIGEST,freeradius-mod-digest,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_DIGEST},${PKG_SECTION}))
+$(eval $(call PKG_template,FREERADIUS_MOD_FILES,freeradius-mod-files,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_FILES},${PKG_SECTION}))
+$(eval $(call PKG_template,FREERADIUS_MOD_LDAP,freeradius-mod-ldap,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_LDAP},${PKG_DESCR_LDAP},${PKG_SECTION}))
+$(eval $(call PKG_template,FREERADIUS_MOD_MSCHAP,freeradius-mod-mschap,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_MSCHAP},${PKG_SECTION}))
+$(eval $(call PKG_template,FREERADIUS_MOD_PAP,freeradius-mod-pap,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_PAP},${PKG_SECTION}))
+$(eval $(call PKG_template,FREERADIUS_MOD_PREPROCESS,freeradius-mod-preprocess,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_PREPROCESS},${PKG_SECTION}))
+$(eval $(call PKG_template,FREERADIUS_MOD_REALM,freeradius-mod-realm,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_REALM},${PKG_SECTION}))
+$(eval $(call PKG_template,FREERADIUS_MOD_SQL,freeradius-mod-sql,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_SQL},${PKG_SECTION}))
+$(eval $(call PKG_template,FREERADIUS_MOD_SQL_MYSQL,freeradius-mod-sql-mysql,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_MYSQL},${PKG_DESCR_MYSQL},${PKG_SECTION}))
+$(eval $(call PKG_template,FREERADIUS_MOD_SQL_PGSQL,freeradius-mod-sql-pgsql,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_PGSQL},${PKG_DESCR_PGSQL},${PKG_SECTION}))
+$(eval $(call PKG_template,FREERADIUS_UTILS,freeradius-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_UTILS},${PKG_SECTION}))
 
 $(eval $(call PKG_mod_template,FREERADIUS_MOD_CHAP,rlm_chap,))
 $(eval $(call PKG_mod_template,FREERADIUS_MOD_DETAIL,rlm_detail,))
@@ -103,7 +121,7 @@ $(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_STYLE:=	gnu
 CONFIGURE_ENV+=		ac_cv_lib_nsl_inet_ntoa=no
 CONFIGURE_ARGS+=	${PKG_CONFIGURE_OPTIONS} \
 			--with-openssl-includes=${STAGING_DIR}/usr/include \
@@ -147,8 +165,8 @@ CONFIGURE_ARGS+=	${PKG_CONFIGURE_OPTIONS} \
 			--without-rlm_sql_sqlite \
 			--libdir=/usr/lib/freeradius \
 			--libexecdir=/usr/lib/freeradius
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
+BUILD_STYLE:=		auto
+INSTALL_STYLE:=		auto
 FAKE_FLAGS+=		R="${WRKINST}" \
 			INSTALLSTRIP=""
 
-- 
cgit v1.2.3


From ce621815fecece2b4d8a4cb7115eb82c1cb7ed44 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 23 Dec 2009 11:37:42 +0100
Subject: remove and ignore autogenerated Config.in files

---
 package/freeradius-server/Config.in | 97 -------------------------------------
 1 file changed, 97 deletions(-)
 delete mode 100644 package/freeradius-server/Config.in

(limited to 'package/freeradius-server')

diff --git a/package/freeradius-server/Config.in b/package/freeradius-server/Config.in
deleted file mode 100644
index fe119c0a3..000000000
--- a/package/freeradius-server/Config.in
+++ /dev/null
@@ -1,97 +0,0 @@
-config ADK_PACKAGE_FREERADIUS_SERVER
-	prompt "freeradius-server................. Flexible RADIUS server"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBLTDL
-	select ADK_PACKAGE_LIBOPENSSL
-	select ADK_PACKAGE_LIBPTHREAD
-	help
-	  A flexible RADIUS server
-	  http://www.freeradius.org/
-
-config ADK_PACKAGE_FREERADIUS_DEMOCERTS
-	prompt   "freeradius-democerts.......... Demo certificates to test the server"
-	tristate
-	default n
-	depends on ADK_PACKAGE_FREERADIUS_SERVER
-
-config ADK_PACKAGE_FREERADIUS_MOD_CHAP
-	prompt   "freeradius-mod-chap........... CHAP module"
-	tristate
-	default n
-	depends on ADK_PACKAGE_FREERADIUS_SERVER
-
-config ADK_PACKAGE_FREERADIUS_MOD_DETAIL
-	prompt   "freeradius-mod-detail......... Detailed accounting module"
-	tristate
-	default n
-	depends on ADK_PACKAGE_FREERADIUS_SERVER
-
-config ADK_PACKAGE_FREERADIUS_MOD_DIGEST
-	prompt   "freeradius-mod-digest......... Digest authentication"
-	tristate
-	default n
-	depends on ADK_PACKAGE_FREERADIUS_SERVER
-
-config ADK_PACKAGE_FREERADIUS_MOD_FILES
-	prompt   "freeradius-mod-files.......... Module using local files for authorization"
-	tristate
-	default y
-	depends on ADK_PACKAGE_FREERADIUS_SERVER
-
-config ADK_PACKAGE_FREERADIUS_MOD_LDAP
-	prompt   "freeradius-mod-ldap........... LDAP module"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBOPENLDAP
-	depends on ADK_PACKAGE_FREERADIUS_SERVER
-
-config ADK_PACKAGE_FREERADIUS_MOD_MSCHAP
-	prompt   "freeradius-mod-mschap......... MS-CHAP and MS-CHAPv2 module"
-	tristate
-	default n
-	depends on ADK_PACKAGE_FREERADIUS_SERVER
-
-config ADK_PACKAGE_FREERADIUS_MOD_PAP
-	prompt   "freeradius-mod-pap............ PAP module"
-	tristate
-	default n
-	depends on ADK_PACKAGE_FREERADIUS_SERVER
-
-config ADK_PACKAGE_FREERADIUS_MOD_PREPROCESS
-	prompt   "freeradius-mod-preprocess..... Request pre-processing module"
-	tristate
-	default n
-	depends on ADK_PACKAGE_FREERADIUS_SERVER
-
-config ADK_PACKAGE_FREERADIUS_MOD_REALM
-	prompt   "freeradius-mod-realm.......... Realms handling module"
-	tristate
-	default n
-	depends on ADK_PACKAGE_FREERADIUS_SERVER
-
-config ADK_PACKAGE_FREERADIUS_MOD_SQL
-	prompt   "freeradius-mod-sql............ Base SQL module"
-	tristate
-	default n
-	depends on ADK_PACKAGE_FREERADIUS_SERVER
-
-config ADK_PACKAGE_FREERADIUS_MOD_SQL_MYSQL
-	prompt     "freeradius-mod-sql-mysql.... MySQL module"
-	tristate
-	default n
-	depends on ADK_PACKAGE_FREERADIUS_MOD_SQL
-	select ADK_PACKAGE_LIBMYSQLCLIENT
-
-config ADK_PACKAGE_FREERADIUS_MOD_SQL_PGSQL
-	prompt     "freeradius-mod-sql-pgsql.... PostgreSQL module"
-	tristate
-	default n
-	depends on ADK_PACKAGE_FREERADIUS_MOD_SQL
-	select ADK_PACKAGE_LIBPQ
-
-config ADK_PACKAGE_FREERADIUS_UTILS
-	prompt   "freeradius-utils.............. Misc. client utilities"
-	tristate
-	default n
-	depends on ADK_PACKAGE_FREERADIUS_SERVER
-- 
cgit v1.2.3


From dd163e09b582177ce54fae44b63b10579ee0746d Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 27 Dec 2009 23:09:19 +0100
Subject: fix make allmodconfig

update several packages, remove snort-wireless.
---
 package/freeradius-server/Makefile | 1 +
 1 file changed, 1 insertion(+)

(limited to 'package/freeradius-server')

diff --git a/package/freeradius-server/Makefile b/package/freeradius-server/Makefile
index f8f769da5..6d58d3f85 100644
--- a/package/freeradius-server/Makefile
+++ b/package/freeradius-server/Makefile
@@ -9,6 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		b1f77c5e3116bcb0ac0aa9080a06ebf1
 PKG_DESCR:=		a flexible RADIUS server
 PKG_SECTION:=		net
+PKG_MULTI:=		1
 PKG_DEPENDS:=		libltdl libopenssl libpthread
 PKG_BUILDDEP+=		libtool openssl
 ifneq ($(ADK_PACKAGE_FREERADIUS_MOD_LDAP),)
-- 
cgit v1.2.3


From 86ada69f32491de2415d237605370e7f4e8d5e01 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 30 Dec 2009 15:27:21 +0100
Subject: fix some cygwin issues

---
 package/freeradius-server/Makefile | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'package/freeradius-server')

diff --git a/package/freeradius-server/Makefile b/package/freeradius-server/Makefile
index 6d58d3f85..69f19397c 100644
--- a/package/freeradius-server/Makefile
+++ b/package/freeradius-server/Makefile
@@ -29,6 +29,8 @@ PKG_SITES:=		ftp://ftp.freeradius.org/pub/radius/ \
 			http://freeradius.portal-to-web.de/ \
 			ftp://ftp.uk.freeradius.org/pub/radius/
 
+PKG_HOST_DEPENDS:=	!cygwin
+
 PKG_DESCR_DEMOCERTS:=	Demo certificates to test the server
 PKG_DESCR_CHAP:=	CHAP authentication module
 PKG_DESCR_DETAIL:=	Detailed accounting module
-- 
cgit v1.2.3


From 6daa792eab1488d013fefc5eb7e4d01f40f38687 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 7 Feb 2010 20:03:20 +0100
Subject: change defaults for CONFIG/BUILD/INSTALL styles

All packages need an update, so here is a very huge commit.
Most of the 460 source packages use automatic style for configuration,
building and installing. Make these styles default to "auto".
If you have a package, which does not conform to this, just use
manual style and add a do-$task make target.

I added a new style named AUTOTOOL style, which is needed for some
broken packages, which needs to be updated via autoconf or automake.

I renamed CONFIGURE_STYLE to CONFIG_STYLE.

Updates for some packages, which have newer upstream versions.

Renaming of all package/*/extra directories. Use the directory
src/ to provide overwrites of source files or to add the code, when
no upstream package is available or used. src directory will be automatically
used.
---
 package/freeradius-server/Makefile                 |  57 ++-
 .../files/freeradius-server.conffiles              |   2 +
 .../files/freeradius-server.postinst               |   6 +
 .../freeradius-server/files/freeradius.conffiles   |   2 -
 .../freeradius-server/files/freeradius.postinst    |   6 -
 .../patches/patch-share_dictionary                 | 440 ---------------------
 .../patches/patch-src_main_event_c                 |  10 +-
 .../patches/patch-src_main_modules_c               |  11 +
 .../patches/patch-src_modules_rlm_eap_Makefile_in  |   4 +-
 9 files changed, 52 insertions(+), 486 deletions(-)
 create mode 100644 package/freeradius-server/files/freeradius-server.conffiles
 create mode 100644 package/freeradius-server/files/freeradius-server.postinst
 delete mode 100644 package/freeradius-server/files/freeradius.conffiles
 delete mode 100644 package/freeradius-server/files/freeradius.postinst
 delete mode 100644 package/freeradius-server/patches/patch-share_dictionary
 create mode 100644 package/freeradius-server/patches/patch-src_main_modules_c

(limited to 'package/freeradius-server')

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-server.conffiles b/package/freeradius-server/files/freeradius-server.conffiles
new file mode 100644
index 000000000..56552e6c1
--- /dev/null
+++ b/package/freeradius-server/files/freeradius-server.conffiles
@@ -0,0 +1,2 @@
+/etc/freeradius/clients.conf
+/etc/freeradius/radiusd.conf
diff --git a/package/freeradius-server/files/freeradius-server.postinst b/package/freeradius-server/files/freeradius-server.postinst
new file mode 100644
index 000000000..c65fa195f
--- /dev/null
+++ b/package/freeradius-server/files/freeradius-server.postinst
@@ -0,0 +1,6 @@
+#!/bin/sh
+. $IPKG_INSTROOT/etc/functions.sh
+add_rcconf radiusd radiusd NO
+gid=$(get_next_gid)
+add_group radius $gid
+add_user radius $(get_next_uid) $gid /usr/lib/radius
diff --git a/package/freeradius-server/files/freeradius.conffiles b/package/freeradius-server/files/freeradius.conffiles
deleted file mode 100644
index 56552e6c1..000000000
--- a/package/freeradius-server/files/freeradius.conffiles
+++ /dev/null
@@ -1,2 +0,0 @@
-/etc/freeradius/clients.conf
-/etc/freeradius/radiusd.conf
diff --git a/package/freeradius-server/files/freeradius.postinst b/package/freeradius-server/files/freeradius.postinst
deleted file mode 100644
index c65fa195f..000000000
--- a/package/freeradius-server/files/freeradius.postinst
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf radiusd radiusd NO
-gid=$(get_next_gid)
-add_group radius $gid
-add_user radius $(get_next_uid) $gid /usr/lib/radius
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:
-- 
cgit v1.2.3