diff options
12 files changed, 67 insertions, 25 deletions
diff --git a/package/freeradius/Config.in b/package/freeradius/Config.in index fac15befc..6756652d0 100644 --- a/package/freeradius/Config.in +++ b/package/freeradius/Config.in @@ -32,6 +32,12 @@ config BR2_PACKAGE_FREERADIUS_MOD_CHAP default m if CONFIG_DEVEL depends BR2_PACKAGE_FREERADIUS +config BR2_PACKAGE_FREERADIUS_MOD_DETAIL + prompt "freeradius-mod-detail........... Detailed accounting module" + tristate + default m if CONFIG_DEVEL + depends BR2_PACKAGE_FREERADIUS + config BR2_PACKAGE_FREERADIUS_MOD_EAP prompt "freeradius-mod-eap.............. Base EAP module" tristate @@ -99,6 +105,18 @@ config BR2_PACKAGE_FREERADIUS_MOD_PAP default m if CONFIG_DEVEL depends BR2_PACKAGE_FREERADIUS +config BR2_PACKAGE_FREERADIUS_MOD_PREPROCESS + prompt "freeradius-mod-preprocess....... Request pre-processing module" + tristate + default m if CONFIG_DEVEL + depends BR2_PACKAGE_FREERADIUS + +config BR2_PACKAGE_FREERADIUS_MOD_REALM + prompt "freeradius-mod-realm............ Realms handling module" + tristate + default m if CONFIG_DEVEL + depends BR2_PACKAGE_FREERADIUS + config BR2_PACKAGE_FREERADIUS_MOD_SQL prompt "freeradius-mod-sql.............. Base SQL module" tristate diff --git a/package/freeradius/Makefile b/package/freeradius/Makefile index 55798727b..7d529ab51 100644 --- a/package/freeradius/Makefile +++ b/package/freeradius/Makefile @@ -99,6 +99,7 @@ endef $(eval $(call PKG_template,FREERADIUS,freeradius,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) $(eval $(call PKG_template,FREERADIUS_DEMOCERTS,freeradius-democerts,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) $(eval $(call PKG_template,FREERADIUS_MOD_CHAP,freeradius-mod-chap,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) +$(eval $(call PKG_template,FREERADIUS_MOD_DETAIL,freeradius-mod-detail,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) $(eval $(call PKG_template,FREERADIUS_MOD_EAP,freeradius-mod-eap,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) $(eval $(call PKG_template,FREERADIUS_MOD_EAP_GTC,freeradius-mod-eap-gtc,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) $(eval $(call PKG_template,FREERADIUS_MOD_EAP_MD5,freeradius-mod-eap-md5,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) @@ -110,6 +111,8 @@ $(eval $(call PKG_template,FREERADIUS_MOD_FILES,freeradius-mod-files,$(PKG_VERSI $(eval $(call PKG_template,FREERADIUS_MOD_LDAP,freeradius-mod-ldap,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) $(eval $(call PKG_template,FREERADIUS_MOD_MSCHAP,freeradius-mod-mschap,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) $(eval $(call PKG_template,FREERADIUS_MOD_PAP,freeradius-mod-pap,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) +$(eval $(call PKG_template,FREERADIUS_MOD_PREPROCESS,freeradius-mod-preprocess,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) +$(eval $(call PKG_template,FREERADIUS_MOD_REALM,freeradius-mod-realm,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) $(eval $(call PKG_template,FREERADIUS_MOD_SQL,freeradius-mod-sql,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) $(eval $(call PKG_template,FREERADIUS_MOD_SQL_MYSQL,freeradius-mod-sql-mysql,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) $(eval $(call PKG_template,FREERADIUS_MOD_SQL_PGSQL,freeradius-mod-sql-pgsql,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) @@ -117,6 +120,7 @@ $(eval $(call PKG_template,FREERADIUS_MOD_SQLCOUNTER,freeradius-mod-sqlcounter,$ $(eval $(call PKG_template,FREERADIUS_UTILS,freeradius-utils,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) $(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_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,)) @@ -128,6 +132,8 @@ $(eval $(call PKG_mod_template,FREERADIUS_MOD_FILES,rlm_files,acct_users preprox $(eval $(call PKG_mod_template,FREERADIUS_MOD_LDAP,rlm_ldap,ldap.attrmap)) $(eval $(call PKG_mod_template,FREERADIUS_MOD_MSCHAP,rlm_mschap,)) $(eval $(call PKG_mod_template,FREERADIUS_MOD_PAP,rlm_pap,)) +$(eval $(call PKG_mod_template,FREERADIUS_MOD_PREPROCESS,rlm_preprocess,hints huntgroups)) +$(eval $(call PKG_mod_template,FREERADIUS_MOD_REALM,rlm_realm,proxy.conf)) $(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,)) @@ -136,33 +142,33 @@ $(eval $(call PKG_mod_template,FREERADIUS_MOD_SQLCOUNTER,rlm_sqlcounter,)) $(PKG_BUILD_DIR)/.configured: (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include" \ - CPPFLAGS="-I$(STAGING_DIR)/usr/include" \ - LDFLAGS="-L$(STAGING_DIR)/usr/lib" \ - sys_lib_dlsearch_path_spec="$(STAGING_DIR)/lib $(STAGING_DIR)/usr/lib" \ - sys_lib_search_path_spec="$(STAGING_DIR)/lib $(STAGING_DIR)/usr/lib" \ + CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \ + CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \ + LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \ + sys_lib_dlsearch_path_spec="$(STAGING_DIR)/usr/lib $(STAGING_DIR)/lib" \ + sys_lib_search_path_spec="$(STAGING_DIR)/usr/lib $(STAGING_DIR)/lib" \ MYSQL_CONFIG="no" \ ./configure \ - --target=$(GNU_TARGET_NAME) \ - --host=$(GNU_TARGET_NAME) \ - --build=$(GNU_HOST_NAME) \ - --program-prefix="" \ - --program-suffix="" \ - --prefix=/usr \ - --exec-prefix=/usr \ - --bindir=/usr/bin \ - --datadir=/usr/share \ - --includedir=/usr/include \ - --infodir=/usr/share/info \ - --libdir=/usr/lib/freeradius \ - --libexecdir=/usr/lib/freeradius \ - --localstatedir=/var \ - --mandir=/usr/share/man \ - --sbindir=/usr/sbin \ - --sysconfdir=/etc \ - $(DISABLE_LARGEFILE) \ - $(DISABLE_NLS) \ - $(PKG_CONFIGURE_OPTIONS) \ + --target=$(GNU_TARGET_NAME) \ + --host=$(GNU_TARGET_NAME) \ + --build=$(GNU_HOST_NAME) \ + --program-prefix="" \ + --program-suffix="" \ + --prefix=/usr \ + --exec-prefix=/usr \ + --bindir=/usr/bin \ + --datadir=/usr/share \ + --includedir=/usr/include \ + --infodir=/usr/share/info \ + --libdir=/usr/lib/freeradius \ + --libexecdir=/usr/lib/freeradius \ + --localstatedir=/var \ + --mandir=/usr/share/man \ + --sbindir=/usr/sbin \ + --sysconfdir=/etc \ + $(DISABLE_LARGEFILE) \ + $(DISABLE_NLS) \ + $(PKG_CONFIGURE_OPTIONS) \ ) touch $@ diff --git a/package/freeradius/ipkg/freeradius-mod-detail.control b/package/freeradius/ipkg/freeradius-mod-detail.control new file mode 100644 index 000000000..8254c0076 --- /dev/null +++ b/package/freeradius/ipkg/freeradius-mod-detail.control @@ -0,0 +1,5 @@ +Package: freeradius-mod-detail +Priority: optional +Section: net +Description: a detailed accounting module for FreeRADIUS +Depends: freeradius diff --git a/package/freeradius/ipkg/freeradius-mod-preprocess.conffiles b/package/freeradius/ipkg/freeradius-mod-preprocess.conffiles new file mode 100644 index 000000000..b29cca816 --- /dev/null +++ b/package/freeradius/ipkg/freeradius-mod-preprocess.conffiles @@ -0,0 +1,2 @@ +/etc/freeradius/hints +/etc/freeradius/huntgroups diff --git a/package/freeradius/ipkg/freeradius-mod-preprocess.control b/package/freeradius/ipkg/freeradius-mod-preprocess.control new file mode 100644 index 000000000..7adc171a4 --- /dev/null +++ b/package/freeradius/ipkg/freeradius-mod-preprocess.control @@ -0,0 +1,5 @@ +Package: freeradius-mod-preprocess +Priority: optional +Section: net +Description: a request preprocessing module for FreeRADIUS +Depends: freeradius diff --git a/package/freeradius/ipkg/freeradius-mod-realm.conffiles b/package/freeradius/ipkg/freeradius-mod-realm.conffiles new file mode 100644 index 000000000..a4d412612 --- /dev/null +++ b/package/freeradius/ipkg/freeradius-mod-realm.conffiles @@ -0,0 +1 @@ +/etc/freeradius/proxy.conf diff --git a/package/freeradius/ipkg/freeradius-mod-realm.control b/package/freeradius/ipkg/freeradius-mod-realm.control new file mode 100644 index 000000000..3f84e3621 --- /dev/null +++ b/package/freeradius/ipkg/freeradius-mod-realm.control @@ -0,0 +1,5 @@ +Package: freeradius-mod-realm +Priority: optional +Section: net +Description: a realm module for FreeRADIUS +Depends: freeradius diff --git a/package/freeradius/patches/freeradius-1.0.3-dict.patch b/package/freeradius/patches/01-dict.patch index 43ff995ab..43ff995ab 100644 --- a/package/freeradius/patches/freeradius-1.0.3-dict.patch +++ b/package/freeradius/patches/01-dict.patch diff --git a/package/freeradius/patches/freeradius-1.0.4-config.patch b/package/freeradius/patches/02-config.patch index a1c9c5198..a1c9c5198 100644 --- a/package/freeradius/patches/freeradius-1.0.4-config.patch +++ b/package/freeradius/patches/02-config.patch diff --git a/package/freeradius/patches/freeradius-1.0.2-modules-ldflags.patch b/package/freeradius/patches/03-modules-ldflags.patch index 473d488c1..473d488c1 100644 --- a/package/freeradius/patches/freeradius-1.0.2-modules-ldflags.patch +++ b/package/freeradius/patches/03-modules-ldflags.patch diff --git a/package/freeradius/patches/freeradius-1.0.2-autoconf.patch b/package/freeradius/patches/04-autoconf-libtool.patch index 2a304ec5b..2a304ec5b 100644 --- a/package/freeradius/patches/freeradius-1.0.2-autoconf.patch +++ b/package/freeradius/patches/04-autoconf-libtool.patch diff --git a/package/freeradius/patches/freeradius-1.0.2-mysql-autoconf.patch b/package/freeradius/patches/05-autoconf-rlm_sql_mysql.patch index 9803a5fb6..9803a5fb6 100644 --- a/package/freeradius/patches/freeradius-1.0.2-mysql-autoconf.patch +++ b/package/freeradius/patches/05-autoconf-rlm_sql_mysql.patch |