summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
Diffstat (limited to 'package')
-rw-r--r--package/Config.in4
-rw-r--r--package/Depends.mk9
-rw-r--r--package/Makefile4
-rw-r--r--package/freeradius-client/Config.in21
-rw-r--r--package/freeradius-client/Makefile41
-rw-r--r--package/freeradius-server/Config.in (renamed from package/freeradius/Config.in)83
-rw-r--r--package/freeradius-server/Makefile (renamed from package/freeradius/Makefile)56
-rw-r--r--package/freeradius-server/files/clients.conf (renamed from package/freeradius/files/clients.conf)0
-rw-r--r--package/freeradius-server/files/freeradius-mod-eap.conffiles (renamed from package/freeradius/files/freeradius-mod-eap.conffiles)0
-rw-r--r--package/freeradius-server/files/freeradius-mod-files.conffiles (renamed from package/freeradius/files/freeradius-mod-files.conffiles)0
-rw-r--r--package/freeradius-server/files/freeradius-mod-realm.conffiles (renamed from package/freeradius/files/freeradius-mod-realm.conffiles)0
-rw-r--r--package/freeradius-server/files/freeradius-mod-sql.conffiles (renamed from package/freeradius/files/freeradius-mod-sql.conffiles)0
-rw-r--r--package/freeradius-server/files/freeradius.conffiles (renamed from package/freeradius/files/freeradius.conffiles)0
-rw-r--r--package/freeradius-server/files/freeradius.postinst (renamed from package/freeradius/files/freeradius.postinst)0
-rw-r--r--package/freeradius-server/files/radiusd.conf (renamed from package/freeradius/files/radiusd.conf)0
-rw-r--r--package/freeradius-server/files/radiusd.init (renamed from package/freeradius/files/radiusd.init)0
-rw-r--r--package/freeradius-server/files/users (renamed from package/freeradius/files/users)0
-rw-r--r--package/freeradius-server/patches/patch-share_dictionary (renamed from package/freeradius/patches/patch-share_dictionary)113
-rw-r--r--package/freeradius-server/patches/patch-src_main_event_c (renamed from package/freeradius/patches/patch-src_main_event_c)6
-rw-r--r--package/freeradius-server/patches/patch-src_modules_rlm_eap_Makefile_in12
-rw-r--r--package/freeradius/files/freeradius-mod-ldap.conffiles1
-rw-r--r--package/freeradius/files/freeradius-mod-preprocess.conffiles2
-rw-r--r--package/radiusclient-ng/Config.in27
-rw-r--r--package/radiusclient-ng/Makefile36
-rw-r--r--package/radiusclient-ng/patches/01-cross_compile.patch13
25 files changed, 132 insertions, 296 deletions
diff --git a/package/Config.in b/package/Config.in
index d8b1e1d2e..931fe07aa 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -291,7 +291,8 @@ source "package/rtorrent/Config.in"
endmenu
menu "PPP / PPTP / RADIUS"
-source "package/freeradius/Config.in"
+source "package/freeradius-client/Config.in"
+source "package/freeradius-server/Config.in"
source "package/ppp/Config.in"
source "package/pptp/Config.in"
source "package/pptpd/Config.in"
@@ -425,7 +426,6 @@ source "package/popt/Config.in" # libpopt
source "package/postgresql/Config.in" # libpq
source "package/libpthread/Config.in"
source "package/libthread_db/Config.in"
-source "package/radiusclient-ng/Config.in" #libradiusclient-ng
source "package/readline/Config.in" # libreadline
source "package/cyrus-sasl/Config.in" # libsasl2
source "package/speex/Config.in" # libspeex
diff --git a/package/Depends.mk b/package/Depends.mk
index bb5191b78..423c9ea65 100644
--- a/package/Depends.mk
+++ b/package/Depends.mk
@@ -259,15 +259,16 @@ asterisk-compile: sqlite-compile
endif
-freeradius-compile: libtool-compile openssl-compile
+freeradius-client-compile: openssl-compile
+freeradius-server-compile: libtool-compile openssl-compile
ifneq ($(ADK_PACKAGE_FREERADIUS_MOD_LDAP),)
-freeradius-compile: openldap-compile
+freeradius-server-compile: openldap-compile
endif
ifneq ($(ADK_PACKAGE_FREERADIUS_MOD_SQL_MYSQL),)
-freeradius-compile: mysql-compile
+freeradius-server-compile: mysql-compile
endif
ifneq ($(ADK_PACKAGE_FREERADIUS_MOD_SQL_PGSQL),)
-freeradius-compile: postgresql-compile
+freeradius-server-compile: postgresql-compile
endif
hostapd-compile: libnl-compile openssl-compile
diff --git a/package/Makefile b/package/Makefile
index 85e840fd9..653f23d57 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -96,7 +96,8 @@ package-$(ADK_PACKAGE_FONTCACHEPROTO) += fontcacheproto
package-$(ADK_PACKAGE_FPING) += fping
package-$(ADK_PACKAGE_FPROBE) += fprobe
package-$(ADK_PACKAGE_FPROBE_ULOG) += fprobe-ulog
-package-$(ADK_PACKAGE_FREERADIUS) += freeradius
+package-$(ADK_COMPILE_FREERADIUS_CLIENT) += freeradius-client
+package-$(ADK_PACKAGE_FREERADIUS_SERVER) += freeradius-server
package-$(ADK_COMPILE_FREETYPE) += freetype
package-$(ADK_PACKAGE_FRICKIN) += frickin
package-$(ADK_COMPILE_FUSE) += fuse
@@ -300,7 +301,6 @@ package-$(ADK_PACKAGE_PROCMAIL) += procmail
package-$(ADK_PACKAGE_PROCPS) += procps
package-$(ADK_PACKAGE_PTUNNEL) += ptunnel
package-$(ADK_PACKAGE_QUAGGA) += quagga
-package-$(ADK_COMPILE_RADIUSCLIENT_NG) += radiusclient-ng
package-$(ADK_PACKAGE_RADDUMP) += raddump
package-$(ADK_PACKAGE_RADVD) += radvd
package-$(ADK_PACKAGE_RANDRPROTO) += randrproto
diff --git a/package/freeradius-client/Config.in b/package/freeradius-client/Config.in
new file mode 100644
index 000000000..79325a755
--- /dev/null
+++ b/package/freeradius-client/Config.in
@@ -0,0 +1,21 @@
+config ADK_COMPILE_FREERADIUS_CLIENT
+ tristate
+ default n
+ depends ADK_PACKAGE_LIBFREERADIUS_CLIENT
+
+config ADK_PACKAGE_FREERADIUS_CLIENT
+ prompt "freeradius-client................. RADIUS client"
+ tristate
+ default n
+ select ADK_PACKAGE_LIBOPENSSL
+ select ADK_PACKAGE_LIBFREERADIUS_CLIENT
+ help
+ http://freeradius.org/freeradius-client/
+
+config ADK_PACKAGE_LIBFREERADIUS_CLIENT
+ prompt "libfreeradius-client.............. RADIUS client library"
+ tristate
+ default n
+ select ADK_COMPILE_FREERADIUS_CLIENT
+ help
+ http://freeradius.org/freeradius-client/
diff --git a/package/freeradius-client/Makefile b/package/freeradius-client/Makefile
new file mode 100644
index 000000000..5cf7d10b0
--- /dev/null
+++ b/package/freeradius-client/Makefile
@@ -0,0 +1,41 @@
+# $Id$
+#-
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include ${TOPDIR}/rules.mk
+
+PKG_NAME:= freeradius-client
+PKG_VERSION:= 1.1.6
+PKG_RELEASE:= 1
+PKG_MD5SUM:= edd4d904e802ff66d35532be1475cfa7
+PKG_DESCR:= RADIUS client
+PKG_SECTION:= net
+PKG_DEPENDS:= libopenssl
+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/
+
+include ${TOPDIR}/mk/package.mk
+
+$(eval $(call PKG_template,FREERADIUS_CLIENT,freeradius-client,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBFREERADIUS_CLIENT,libfreeradius-client,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+CONFIGURE_STYLE:= gnu
+CONFIGURE_ENV+= ac_cv_func_uname=no
+BUILD_STYLE:= auto
+INSTALL_STYLE:= auto
+
+do-install:
+ ${INSTALL_DIR} ${IDIR_FREERADIUS_CLIENT}/usr/sbin
+ ${INSTALL_BIN} ${WRKINST}/usr/sbin/radiusclient \
+ ${IDIR_FREERADIUS_CLIENT}/usr/sbin
+ ${INSTALL_BIN} ${WRKINST}/usr/sbin/rad{login,status} \
+ ${IDIR_FREERADIUS_CLIENT}/usr/sbin
+ ${CP} ${WRKINST}/etc ${IDIR_FREERADIUS_CLIENT}/
+ ${INSTALL_DIR} ${IDIR_LIBFREERADIUS_CLIENT}/usr/lib
+ ${CP} ${WRKINST}/usr/lib/libfreeradius-client.so* \
+ ${IDIR_LIBFREERADIUS_CLIENT}/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/freeradius/Config.in b/package/freeradius-server/Config.in
index a7a2fa7c1..56fcf16ea 100644
--- a/package/freeradius/Config.in
+++ b/package/freeradius-server/Config.in
@@ -1,7 +1,5 @@
-#menu "freeradius........................ A Flexible RADIUS server implementation"
-
-config ADK_PACKAGE_FREERADIUS
- prompt "freeradius........................ Flexible RADIUS server"
+config ADK_PACKAGE_FREERADIUS_SERVER
+ prompt "freeradius-server................. Flexible RADIUS server"
tristate
default n
select ADK_PACKAGE_LIBLTDL
@@ -9,125 +7,74 @@ config ADK_PACKAGE_FREERADIUS
select ADK_PACKAGE_LIBPTHREAD
help
A flexible RADIUS server
-
http://www.freeradius.org/
- Depends:
- - libltdl
- - libopenssl
- - libpthread
- - libmysqlclient (for MySQL support)
- - libopenldap (for LDAP support)
- - libpq (for PostgreSQL support)
-
config ADK_PACKAGE_FREERADIUS_DEMOCERTS
prompt " freeradius-democerts.......... Demo certificates to test the server"
tristate
default n
- depends ADK_PACKAGE_FREERADIUS
+ depends ADK_PACKAGE_FREERADIUS_SERVER
config ADK_PACKAGE_FREERADIUS_MOD_CHAP
prompt " freeradius-mod-chap........... CHAP module"
tristate
default n
- depends ADK_PACKAGE_FREERADIUS
+ depends ADK_PACKAGE_FREERADIUS_SERVER
config ADK_PACKAGE_FREERADIUS_MOD_DETAIL
prompt " freeradius-mod-detail......... Detailed accounting module"
tristate
default n
- depends ADK_PACKAGE_FREERADIUS
+ depends ADK_PACKAGE_FREERADIUS_SERVER
config ADK_PACKAGE_FREERADIUS_MOD_DIGEST
prompt " freeradius-mod-digest......... Digest authentication"
tristate
default n
- depends ADK_PACKAGE_FREERADIUS
-
-config ADK_PACKAGE_FREERADIUS_MOD_EAP
- prompt " freeradius-mod-eap............ Base EAP module"
- tristate
- default n
- depends ADK_PACKAGE_FREERADIUS
-
-config ADK_PACKAGE_FREERADIUS_MOD_EAP_GTC
- prompt " freeradius-mod-eap-gtc...... EAP/GTC module"
- tristate
- default n
- depends ADK_PACKAGE_FREERADIUS_MOD_EAP
-
-config ADK_PACKAGE_FREERADIUS_MOD_EAP_MD5
- prompt " freeradius-mod-eap-md5...... EAP/MD5 module"
- tristate
- default n
- depends ADK_PACKAGE_FREERADIUS_MOD_EAP
-
-config ADK_PACKAGE_FREERADIUS_MOD_EAP_MSCHAPV2
- prompt " freeradius-mod-eap-mschapv2. EAP/MS-CHAPv2 module"
- tristate
- default n
- depends ADK_PACKAGE_FREERADIUS_MOD_EAP
-
-config ADK_PACKAGE_FREERADIUS_MOD_EAP_PEAP
- prompt " freeradius-mod-eap-peap..... EAP/PEAP module"
- tristate
- default n
- depends ADK_PACKAGE_FREERADIUS_MOD_EAP
-
-config ADK_PACKAGE_FREERADIUS_MOD_EAP_TLS
- prompt " freeradius-mod-eap-tls...... EAP/TLS module"
- tristate
- default n
- depends ADK_PACKAGE_FREERADIUS_MOD_EAP
-
-config ADK_PACKAGE_FREERADIUS_MOD_EAP_TTLS
- prompt " freeradius-mod-eap-ttls... EAP/TTLS module"
- tristate
- default n
- depends ADK_PACKAGE_FREERADIUS_MOD_EAP_TLS
+ depends ADK_PACKAGE_FREERADIUS_SERVER
config ADK_PACKAGE_FREERADIUS_MOD_FILES
prompt " freeradius-mod-files.......... Module using local files for authorization"
tristate
default y
- depends ADK_PACKAGE_FREERADIUS
+ depends ADK_PACKAGE_FREERADIUS_SERVER
config ADK_PACKAGE_FREERADIUS_MOD_LDAP
prompt " freeradius-mod-ldap........... LDAP module"
tristate
default n
select ADK_PACKAGE_LIBOPENLDAP
- depends ADK_PACKAGE_FREERADIUS
+ depends ADK_PACKAGE_FREERADIUS_SERVER
config ADK_PACKAGE_FREERADIUS_MOD_MSCHAP
prompt " freeradius-mod-mschap......... MS-CHAP and MS-CHAPv2 module"
tristate
default n
- depends ADK_PACKAGE_FREERADIUS
+ depends ADK_PACKAGE_FREERADIUS_SERVER
config ADK_PACKAGE_FREERADIUS_MOD_PAP
prompt " freeradius-mod-pap............ PAP module"
tristate
default n
- depends ADK_PACKAGE_FREERADIUS
+ depends ADK_PACKAGE_FREERADIUS_SERVER
config ADK_PACKAGE_FREERADIUS_MOD_PREPROCESS
prompt " freeradius-mod-preprocess..... Request pre-processing module"
tristate
default n
- depends ADK_PACKAGE_FREERADIUS
+ depends ADK_PACKAGE_FREERADIUS_SERVER
config ADK_PACKAGE_FREERADIUS_MOD_REALM
prompt " freeradius-mod-realm.......... Realms handling module"
tristate
default n
- depends ADK_PACKAGE_FREERADIUS
+ depends ADK_PACKAGE_FREERADIUS_SERVER
config ADK_PACKAGE_FREERADIUS_MOD_SQL
prompt " freeradius-mod-sql............ Base SQL module"
tristate
default n
- depends ADK_PACKAGE_FREERADIUS
+ depends ADK_PACKAGE_FREERADIUS_SERVER
config ADK_PACKAGE_FREERADIUS_MOD_SQL_MYSQL
prompt " freeradius-mod-sql-mysql.... MySQL module"
@@ -148,6 +95,4 @@ config ADK_PACKAGE_FREERADIUS_UTILS
prompt " freeradius-utils.............. Misc. client utilities"
tristate
default n
- depends ADK_PACKAGE_FREERADIUS
-
-#endmenu
+ depends ADK_PACKAGE_FREERADIUS_SERVER
diff --git a/package/freeradius/Makefile b/package/freeradius-server/Makefile
index f6e4a29ca..d0e69d6c7 100644
--- a/package/freeradius/Makefile
+++ b/package/freeradius-server/Makefile
@@ -5,10 +5,10 @@
include ${TOPDIR}/rules.mk
-PKG_NAME:= freeradius
-PKG_VERSION:= 2.1.4
+PKG_NAME:= freeradius-server
+PKG_VERSION:= 2.1.6
PKG_RELEASE:= 1
-PKG_MD5SUM:= 07837a2e78028a0fcf5fc3bb5ca292e9
+PKG_MD5SUM:= 078f7d29b4d2d34f7c992abf772c28a0
PKG_DESCR:= a flexible RADIUS server
PKG_SECTION:= net
PKG_DEPENDS:= libltdl libopenssl libpthread
@@ -17,9 +17,6 @@ PKG_SITES:= ftp://ftp.freeradius.org/pub/radius/ \
http://freeradius.portal-to-web.de/ \
ftp://ftp.uk.freeradius.org/pub/radius/
-DISTFILES:= ${PKG_NAME}-server-${PKG_VERSION}.tar.gz
-WRKDIST= ${WRKDIR}/${PKG_NAME}-server-${PKG_VERSION}
-
PKG_CONFIGURE_OPTIONS:=
ifneq (${ADK_PACKAGE_FREERADIUS_MOD_LDAP},)
@@ -69,18 +66,11 @@ ${2}-install:
done
endef
-$(eval $(call PKG_template,FREERADIUS,freeradius,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(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_EAP,freeradius-mod-eap,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,FREERADIUS_MOD_EAP_GTC,freeradius-mod-eap-gtc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,FREERADIUS_MOD_EAP_MD5,freeradius-mod-eap-md5,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,FREERADIUS_MOD_EAP_MSCHAPV2,freeradius-mod-eap-mschapv2,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,FREERADIUS_MOD_EAP_PEAP,freeradius-mod-eap-peap,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,FREERADIUS_MOD_EAP_TLS,freeradius-mod-eap-tls,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,FREERADIUS_MOD_EAP_TTLS,freeradius-mod-eap-ttls,${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}))
@@ -95,13 +85,6 @@ $(eval $(call PKG_template,FREERADIUS_UTILS,freeradius-utils,${PKG_VERSION}-${PK
$(eval $(call PKG_mod_template,FREERADIUS_MOD_CHAP,rlm_chap,))
$(eval $(call PKG_mod_template,FREERADIUS_MOD_DETAIL,rlm_detail,))
$(eval $(call PKG_mod_template,FREERADIUS_MOD_DIGEST,rlm_digest,))
-$(eval $(call PKG_mod_template,FREERADIUS_MOD_EAP,libeap rlm_eap,eap.conf))
-$(eval $(call PKG_mod_template,FREERADIUS_MOD_EAP_GTC,rlm_eap_gtc,))
-$(eval $(call PKG_mod_template,FREERADIUS_MOD_EAP_MD5,rlm_eap_md5,))
-$(eval $(call PKG_mod_template,FREERADIUS_MOD_EAP_MSCHAPV2,rlm_eap_mschapv2,))
-$(eval $(call PKG_mod_template,FREERADIUS_MOD_EAP_PEAP,rlm_eap_peap,))
-$(eval $(call PKG_mod_template,FREERADIUS_MOD_EAP_TLS,rlm_eap_tls,))
-$(eval $(call PKG_mod_template,FREERADIUS_MOD_EAP_TTLS,rlm_eap_ttls,))
$(eval $(call PKG_mod_template,FREERADIUS_MOD_FILES,rlm_files,acct_users preproxy_users users))
$(eval $(call PKG_mod_template,FREERADIUS_MOD_MSCHAP,rlm_mschap,))
$(eval $(call PKG_mod_template,FREERADIUS_MOD_LDAP,rlm_ldap,ldap.attrmap))
@@ -125,6 +108,8 @@ CONFIGURE_ARGS+= ${PKG_CONFIGURE_OPTIONS} \
--without-rlm_checkval \
--without-rlm_counter \
--without-rlm_dbm \
+ --without-rlm_eap \
+ --without-rlm_eap2 \
--without-rlm_eap_sim \
--without-rlm_example \
--without-rlm_ippool \
@@ -158,27 +143,27 @@ FAKE_FLAGS+= R="${WRKINST}" \
INSTALLSTRIP=""
post-install: ${INSTALL_MODS_y} ${INSTALL_MODS_m}
- ${INSTALL_DIR} ${IDIR_FREERADIUS}/etc/freeradius
- ${CP} ./files/users ${IDIR_FREERADIUS}/etc/freeradius/
- ${INSTALL_DATA} ./files/radiusd.conf ${IDIR_FREERADIUS}/etc/freeradius
- ${INSTALL_DATA} ./files/clients.conf ${IDIR_FREERADIUS}/etc/freeradius
+ ${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
for f in dictionary; do \
${CP} ${WRKINST}/etc/freeradius/$${f} \
- ${IDIR_FREERADIUS}/etc/freeradius/ ; \
+ ${IDIR_FREERADIUS_SERVER}/etc/freeradius/ ; \
done
- ${INSTALL_DIR} ${IDIR_FREERADIUS}/usr/share/freeradius
+ ${INSTALL_DIR} ${IDIR_FREERADIUS_SERVER}/usr/share/freeradius
${CP} ${WRKINST}/usr/share/freeradius/dictionary \
- ${IDIR_FREERADIUS}/usr/share/freeradius/
+ ${IDIR_FREERADIUS_SERVER}/usr/share/freeradius/
for f in freeradius freeradius.internal rfc2865 rfc2866 rfc2867 rfc2868 rfc2869 rfc3162 rfc3576 rfc3580 rfc4072 rfc4372 rfc4675 rfc4679 rfc5176; do \
cp ${WRKINST}/usr/share/freeradius/dictionary.$${f} \
- ${IDIR_FREERADIUS}/usr/share/freeradius/ ; \
+ ${IDIR_FREERADIUS_SERVER}/usr/share/freeradius/ ; \
done
- ${INSTALL_DIR} ${IDIR_FREERADIUS}/usr/lib/freeradius
+ ${INSTALL_DIR} ${IDIR_FREERADIUS_SERVER}/usr/lib/freeradius
${CP} ${WRKINST}/usr/lib/freeradius/libfreeradius-radius{,-*}.so \
- ${IDIR_FREERADIUS}/usr/lib
- ${INSTALL_DIR} ${IDIR_FREERADIUS}/usr/sbin
+ ${IDIR_FREERADIUS_SERVER}/usr/lib
+ ${INSTALL_DIR} ${IDIR_FREERADIUS_SERVER}/usr/sbin
${CP} ${WRKINST}/usr/sbin/radiusd \
- ${IDIR_FREERADIUS}/usr/sbin/
+ ${IDIR_FREERADIUS_SERVER}/usr/sbin/
${INSTALL_DIR} ${IDIR_FREERADIUS_DEMOCERTS}/etc/freeradius
${CP} ${WRKINST}/etc/freeradius/certs \
${IDIR_FREERADIUS_DEMOCERTS}/etc/freeradius/
@@ -187,9 +172,6 @@ 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
- for f in radclient; do \
- ${CP} ${WRKINST}/usr/bin/$${f} \
- ${IDIR_FREERADIUS_UTILS}/usr/bin/ ; \
- done
+ ${INSTALL_BIN} ${WRKINST}/usr/bin/radclient ${IDIR_FREERADIUS_UTILS}/usr/bin
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/freeradius/files/clients.conf b/package/freeradius-server/files/clients.conf
index 6c136a197..6c136a197 100644
--- a/package/freeradius/files/clients.conf
+++ b/package/freeradius-server/files/clients.conf
diff --git a/package/freeradius/files/freeradius-mod-eap.conffiles b/package/freeradius-server/files/freeradius-mod-eap.conffiles
index 7e0e30e73..7e0e30e73 100644
--- a/package/freeradius/files/freeradius-mod-eap.conffiles
+++ b/package/freeradius-server/files/freeradius-mod-eap.conffiles
diff --git a/package/freeradius/files/freeradius-mod-files.conffiles b/package/freeradius-server/files/freeradius-mod-files.conffiles
index 4fcd92bff..4fcd92bff 100644
--- a/package/freeradius/files/freeradius-mod-files.conffiles
+++ b/package/freeradius-server/files/freeradius-mod-files.conffiles
diff --git a/package/freeradius/files/freeradius-mod-realm.conffiles b/package/freeradius-server/files/freeradius-mod-realm.conffiles
index a4d412612..a4d412612 100644
--- a/package/freeradius/files/freeradius-mod-realm.conffiles
+++ b/package/freeradius-server/files/freeradius-mod-realm.conffiles
diff --git a/package/freeradius/files/freeradius-mod-sql.conffiles b/package/freeradius-server/files/freeradius-mod-sql.conffiles
index 8ab119d07..8ab119d07 100644
--- a/package/freeradius/files/freeradius-mod-sql.conffiles
+++ b/package/freeradius-server/files/freeradius-mod-sql.conffiles
diff --git a/package/freeradius/files/freeradius.conffiles b/package/freeradius-server/files/freeradius.conffiles
index 56552e6c1..56552e6c1 100644
--- a/package/freeradius/files/freeradius.conffiles
+++ b/package/freeradius-server/files/freeradius.conffiles
diff --git a/package/freeradius/files/freeradius.postinst b/package/freeradius-server/files/freeradius.postinst
index c65fa195f..c65fa195f 100644
--- a/package/freeradius/files/freeradius.postinst
+++ b/package/freeradius-server/files/freeradius.postinst
diff --git a/package/freeradius/files/radiusd.conf b/package/freeradius-server/files/radiusd.conf
index b9a573f69..b9a573f69 100644
--- a/package/freeradius/files/radiusd.conf
+++ b/package/freeradius-server/files/radiusd.conf
diff --git a/package/freeradius/files/radiusd.init b/package/freeradius-server/files/radiusd.init
index 818f803ff..818f803ff 100644
--- a/package/freeradius/files/radiusd.init
+++ b/package/freeradius-server/files/radiusd.init
diff --git a/package/freeradius/files/users b/package/freeradius-server/files/users
index df78de04c..df78de04c 100644
--- a/package/freeradius/files/users
+++ b/package/freeradius-server/files/users
diff --git a/package/freeradius/patches/patch-share_dictionary b/package/freeradius-server/patches/patch-share_dictionary
index 49b472d43..6027a7810 100644
--- a/package/freeradius/patches/patch-share_dictionary
+++ b/package/freeradius-server/patches/patch-share_dictionary
@@ -1,6 +1,6 @@
$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- freeradius-server-2.1.4.orig/share/dictionary 2009-03-11 03:26:50.000000000 +0100
-+++ freeradius-server-2.1.4/share/dictionary 2009-04-29 21:42:22.287143645 +0200
+--- 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.
@@ -10,7 +10,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
#
# Include the RFC dictionaries next.
-@@ -80,109 +80,109 @@ $INCLUDE dictionary.rfc5176
+@@ -82,110 +82,12 @@ $INCLUDE dictionary.rfc5176
#
# Include vendor dictionaries after the standard ones.
#
@@ -31,49 +31,22 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
-$INCLUDE dictionary.cablelabs
-$INCLUDE dictionary.cabletron
-$INCLUDE dictionary.cisco
-+#$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.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.vpn3000
-$INCLUDE dictionary.cisco.vpn5000
-$INCLUDE dictionary.cisco.bbsm
-$INCLUDE dictionary.clavister
-$INCLUDE dictionary.colubris
-$INCLUDE dictionary.cosine
-+#$INCLUDE dictionary.cisco.vpn5000
-+#$INCLUDE dictionary.cisco.bbsm
-+#$INCLUDE dictionary.clavister
-+#$INCLUDE dictionary.colubris
-+#$INCLUDE dictionary.cosine
- #$INCLUDE dictionary.dhcp
+-#$INCLUDE dictionary.dhcp
-$INCLUDE dictionary.digium
-$INCLUDE dictionary.epygi
-$INCLUDE dictionary.erx
-$INCLUDE dictionary.ericsson
-$INCLUDE dictionary.extreme
-+#$INCLUDE dictionary.digium
-+#$INCLUDE dictionary.epygi
-+#$INCLUDE dictionary.erx
-+#$INCLUDE dictionary.ericsson
-+#$INCLUDE dictionary.extreme
$INCLUDE dictionary.freeradius
-$INCLUDE dictionary.freeswitch
-$INCLUDE dictionary.fortinet
@@ -83,6 +56,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
-$INCLUDE dictionary.h3c
-$INCLUDE dictionary.hp
-$INCLUDE dictionary.huawei
+-$INCLUDE dictionary.infonet
-$INCLUDE dictionary.issanni
-$INCLUDE dictionary.itk
-$INCLUDE dictionary.ipunplugged
@@ -103,46 +77,16 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
-$INCLUDE dictionary.nexans
-$INCLUDE dictionary.ntua
-$INCLUDE dictionary.nokia
-+#$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.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
+-# Commented out because of attribute conflicts.
+-#
+-#$INCLUDE dictionary.nokia.conflict
-$INCLUDE dictionary.nomadix
-$INCLUDE dictionary.nortel
-+#$INCLUDE dictionary.nomadix
-+#$INCLUDE dictionary.nortel
- #
- # Commented out because of attribute conflicts.
- #
- #$INCLUDE dictionary.openser
+-#
+-# Commented out because of attribute conflicts.
+-#
+-#$INCLUDE dictionary.openser
-$INCLUDE dictionary.packeteer
-$INCLUDE dictionary.patton
-$INCLUDE dictionary.propel
@@ -174,37 +118,6 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
-$INCLUDE dictionary.wispr
-$INCLUDE dictionary.xedia
-$INCLUDE dictionary.xylan
-+#$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.
diff --git a/package/freeradius/patches/patch-src_main_event_c b/package/freeradius-server/patches/patch-src_main_event_c
index c2067c04e..99184d09a 100644
--- a/package/freeradius/patches/patch-src_main_event_c
+++ b/package/freeradius-server/patches/patch-src_main_event_c
@@ -1,7 +1,7 @@
$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- freeradius-server-2.1.4.orig/src/main/event.c 2009-03-11 03:26:50.000000000 +0100
-+++ freeradius-server-2.1.4/src/main/event.c 2009-05-09 23:47:40.000000000 +0200
-@@ -1628,8 +1628,9 @@ static int originated_coa_request(REQUES
+--- 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
*/
request->num_proxied_requests = 1;
request->num_proxied_responses = 0;
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
new file mode 100644
index 000000000..13cbb8215
--- /dev/null
+++ b/package/freeradius-server/patches/patch-src_modules_rlm_eap_Makefile_in
@@ -0,0 +1,12 @@
+$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
+@@ -37,7 +37,7 @@ radeapclient.lo: radeapclient.c $(HEADER
+
+ install-subdirs:
+ @$(MAKE) $(MFLAGS) WHAT_TO_MAKE=install common
+- $(LIBTOOL) --mode=install $(INSTALL) -m 755 $(INSTALLSTRIP) radeapclient$(EXEEXT) $(R)$(bindir)
++ #$(LIBTOOL) --mode=install $(INSTALL) -m 755 $(INSTALLSTRIP) radeapclient$(EXEEXT) $(R)$(bindir)
+
+ common:
+ @for dir in $(RLM_SUBDIRS); do \
diff --git a/package/freeradius/files/freeradius-mod-ldap.conffiles b/package/freeradius/files/freeradius-mod-ldap.conffiles
deleted file mode 100644
index ada9fafc1..000000000
--- a/package/freeradius/files/freeradius-mod-ldap.conffiles
+++ /dev/null
@@ -1 +0,0 @@
-/etc/freeradius/ldap.attrmap
diff --git a/package/freeradius/files/freeradius-mod-preprocess.conffiles b/package/freeradius/files/freeradius-mod-preprocess.conffiles
deleted file mode 100644
index b29cca816..000000000
--- a/package/freeradius/files/freeradius-mod-preprocess.conffiles
+++ /dev/null
@@ -1,2 +0,0 @@
-/etc/freeradius/hints
-/etc/freeradius/huntgroups
diff --git a/package/radiusclient-ng/Config.in b/package/radiusclient-ng/Config.in
deleted file mode 100644
index 4e37c02da..000000000
--- a/package/radiusclient-ng/Config.in
+++ /dev/null
@@ -1,27 +0,0 @@
-config ADK_COMPILE_RADIUSCLIENT_NG
- tristate
- default n
- depends ADK_PACKAGE_LIBRADIUSCLIENT_NG
-
-config ADK_PACKAGE_RADIUSCLIENT_NG
- prompt "radiusclient-ng................... RADIUS client"
- tristate
- default n
- select ADK_PACKAGE_LIBOPENSSL
- select ADK_PACKAGE_LIBRADIUSCLIENT_NG
- help
- Purpose of this project is to build portable, easy-to-use and standard compliant
- library suitable for developing free and commercial software that need support
- for a RADIUS protocol (RFCs 2128 and 2139).
-
- http://developer.berlios.de/projects/radiusclient-ng/
-
- Depends: libopenssl
-
-config ADK_PACKAGE_LIBRADIUSCLIENT_NG
- prompt "libradiusclient-ng................ RADIUS client library"
- tristate
- default n
- select ADK_COMPILE_RADIUSCLIENT_NG
- help
- Developpment library from radiusclient-ng
diff --git a/package/radiusclient-ng/Makefile b/package/radiusclient-ng/Makefile
deleted file mode 100644
index 610b006ed..000000000
--- a/package/radiusclient-ng/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id$
-#-
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-include ${TOPDIR}/rules.mk
-
-PKG_NAME:= radiusclient-ng
-PKG_VERSION:= 0.5.6
-PKG_RELEASE:= 1
-PKG_MD5SUM:= 6fb7d4d0aefafaee7385831ac46a8e9c
-PKG_DESCR:= RADIUS client
-PKG_SECTION:= net
-PKG_DEPENDS:= libopenssl
-PKG_SITES:= http://download.berlios.de/radiusclient-ng/ \
- http://download2.berlios.de/radiusclient-ng/
-
-include ${TOPDIR}/mk/package.mk
-
-$(eval $(call PKG_template,RADIUSCLIENT_NG,radiusclient-ng,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBRADIUSCLIENT_NG,libradiusclient-ng,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-
-CONFIGURE_STYLE:= gnu
-CONFIGURE_ARGS+= ac_cv_func_getdomainname=yes
-BUILD_STYLE:= auto
-ALL_TARGET:= install-exec install-data
-MAKE_FLAGS+= DESTDIR="${WRKINST}"
-
-do-install:
- ${INSTALL_DIR} ${IDIR_RADIUSCLIENT_NG}/usr
- ${CP} ${WRKINST}/usr/sbin ${IDIR_RADIUSCLIENT_NG}/usr/
- ${CP} ${WRKINST}/etc ${IDIR_RADIUSCLIENT_NG}/
- ${INSTALL_DIR} ${IDIR_LIBRADIUSCLIENT_NG}/usr
- ${CP} ${WRKINST}/usr/lib ${IDIR_LIBRADIUSCLIENT_NG}/usr/
-
-include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/radiusclient-ng/patches/01-cross_compile.patch b/package/radiusclient-ng/patches/01-cross_compile.patch
deleted file mode 100644
index 3c4e3d192..000000000
--- a/package/radiusclient-ng/patches/01-cross_compile.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Nur radiusclient-ng-0.5.5.orig/configure radiusclient-ng-0.5.5/configure
---- radiusclient-ng-0.5.5.orig/configure 2007-02-05 13:53:08.000000000 +0100
-+++ radiusclient-ng-0.5.5/configure 2007-03-05 10:36:37.000000000 +0100
-@@ -23332,8 +23332,7 @@
- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&5
- echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }
-+See \`config.log' for more details." >&2;} }
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */