Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

freeradius3: Add support for SQL #7752

Merged
merged 2 commits into from
Apr 2, 2019
Merged

freeradius3: Add support for SQL #7752

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6ed9c2d
freeradius3: Add support for SQL
yangfl Dec 22, 2018
76b0132
freeradius3: update to 3.0.18
yangfl Apr 2, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
134 changes: 121 additions & 13 deletions net/freeradius3/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@
include $(TOPDIR)/rules.mk

PKG_NAME:=freeradius3
PKG_VERSION:=release_3_0_17
PKG_RELEASE:=3
PKG_VERSION:=release_3_0_18
PKG_RELEASE:=1

PKG_SOURCE:=$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://github.com/FreeRADIUS/freeradius-server/archive
PKG_HASH:=5b2382f08c0d9d064298281c1fb8348fc13df76550ce7a5cfc47ea91361fad91
PKG_HASH:=c6802e3ec675b1cf59c850b0f01ed088e2983c5c4daa7f64cc22be4e6ad13ae5

PKG_MAINTAINER:=Lucile Quirion <[email protected]>
PKG_MAINTAINER:=
PKG_LICENSE:=GPL-2.0
PKG_LICENSE_FILES:=COPYRIGHT LICENSE

Expand Down Expand Up @@ -54,7 +54,7 @@ endef
define Package/freeradius3-common
$(call Package/freeradius3/Default)
TITLE:=common files
DEPENDS:=+USE_GLIBC:libpthread +FREERADIUS3_OPENSSL:libopenssl +libcap +libpcap +libncurses +PACKAGE_libpcre:libpcre +libreadline +libtalloc
DEPENDS:=+USE_GLIBC:libpthread +FREERADIUS3_OPENSSL:libopenssl +libcap +libpcap +libncurses +PACKAGE_libpcre:libpcre +libreadline +libtalloc +libatomic
endef

define Package/freeradius3-default
Expand Down Expand Up @@ -349,7 +349,75 @@ define Package/freeradius3-mod-realm/conffiles
/etc/freeradius3/mods-enabled/realm
endef

# SQL support has not been ported
define Package/freeradius3-mod-sql
$(call Package/freeradius3/Default)
DEPENDS:=freeradius3
TITLE:=Radius generic SQL front-end
endef

define Package/freeradius3-mod-sql/conffiles
/etc/freeradius3/mods-available/sql
endef

define Package/freeradius3-mod-sql-mysql
$(call Package/freeradius3/Default)
DEPENDS:=freeradius3-mod-sql +libmysqlclient
TITLE:=Radius MySQL back-end drivers
endef

define Package/freeradius3-mod-sql-mysql/conffiles
/etc/freeradius3/mods-config/sql/main/mysql
endef

define Package/freeradius3-mod-sql-null
$(call Package/freeradius3/Default)
DEPENDS:=freeradius3-mod-sql
TITLE:=Radius Dummy SQL back-end drivers
endef

define Package/freeradius3-mod-sql-postgresql
$(call Package/freeradius3/Default)
DEPENDS:=freeradius3-mod-sql +libpq
TITLE:=Radius PostgreSQL back-end drivers
endef

define Package/freeradius3-mod-sql-mysql/conffiles
/etc/freeradius3/mods-config/sql/main/postgresql
endef

define Package/freeradius3-mod-sql-sqlite
$(call Package/freeradius3/Default)
DEPENDS:=freeradius3-mod-sql +libsqlite3
TITLE:=Radius SQLite back-end drivers
endef

define Package/freeradius3-mod-sql-mysql/conffiles
/etc/freeradius3/mods-config/sql/main/sqlite
endef

define Package/freeradius3-mod-sqlcounter
$(call Package/freeradius3/Default)
DEPENDS:=+freeradius3-mod-sql
TITLE:=Packet counter using accounting records written into an SQL database
endef

define Package/freeradius3-mod-sqlcounter/conffiles
/etc/freeradius3/mods-config/sql/counter
/etc/freeradius3/mods-available/sqlcounter
endef

define Package/freeradius3-mod-sqlippool
$(call Package/freeradius3/Default)
DEPENDS:=+freeradius3-mod-sql
TITLE:=Radius SQL Based IP Pool module
endef

define Package/freeradius3-mod-sqlippool/conffiles
/etc/freeradius3/mods-config/sql/ippool
/etc/freeradius3/mods-config/sql/ippool-dhcp
/etc/freeradius3/mods-available/dhcp_sqlippool
/etc/freeradius3/mods-available/sqlippool
endef

define Package/freeradius3-mod-radutmp
$(call Package/freeradius3/Default)
Expand Down Expand Up @@ -427,22 +495,17 @@ CONFIGURE_ARGS+= \
--without-rlm_ruby \
--without-rlm_securid \
--without-rlm_smsotp \
--without-rlm_sql \
--without-rlm_sql_db2 \
--without-rlm_sql_firebird \
--without-rlm_sql_freetds \
--without-rlm_sql_iodbc \
--without-rlm_sql_mysql \
--without-rlm_sql_oracle \
--without-rlm_sql_postgresql \
--without-rlm_sql_sqlite \
--without-rlm_sql_unixodbc \
--without-rlm_sqlcounter \
--without-rlm_sqlhpwippool \
--without-rlm_sqlippool \
--without-rlm_unbound \
--without-rlm_yubikey \

CONFIGURE_LIBS+= -latomic

PKG_DICTIONARIES:= \
compat \
freeradius freeradius.internal \
Expand Down Expand Up @@ -491,6 +554,44 @@ else
CONFIGURE_ARGS+= --without-rlm_eap_pwd
endif

ifneq ($(SDK)$(CONFIG_PACKAGE_freeradius3-mod-sql),)
CONFIGURE_ARGS+= --with-rlm_sql
else
CONFIGURE_ARGS+= --without-rlm_sql
endif

ifneq ($(SDK)$(CONFIG_PACKAGE_freeradius3-mod-sql-mysql),)
CONFIGURE_ARGS+= \
--with-rlm_sql_mysql \
--with-mysql-include-dir="$(STAGING_DIR)/usr/include/mysql"
else
CONFIGURE_ARGS+= --without-rlm_sql_mysql
endif

ifneq ($(SDK)$(CONFIG_PACKAGE_freeradius3-mod-sql-postgresql),)
CONFIGURE_ARGS+= --with-rlm_sql_postgresql
else
CONFIGURE_ARGS+= --without-rlm_sql_postgresql
endif

ifneq ($(SDK)$(CONFIG_PACKAGE_freeradius3-mod-sql-sqlite),)
CONFIGURE_ARGS+= --with-rlm_sql_sqlite
else
CONFIGURE_ARGS+= --without-rlm_sql_sqlite
endif

ifneq ($(SDK)$(CONFIG_PACKAGE_freeradius3-mod-sqlcounter),)
CONFIGURE_ARGS+= --with-rlm_sqlcounter
else
CONFIGURE_ARGS+= --without-rlm_sqlcounter
endif

ifneq ($(SDK)$(CONFIG_PACKAGE_freeradius3-mod-sqlippool),)
CONFIGURE_ARGS+= --with-rlm_sqlippool
else
CONFIGURE_ARGS+= --without-rlm_sqlippool
endif

ifneq ($(SDK)$(CONFIG_PACKAGE_freeradius3-mod-radutmp),)
CONFIGURE_ARGS+= --with-rlm_radutmp
else
Expand Down Expand Up @@ -641,5 +742,12 @@ $(eval $(call BuildPlugin,freeradius3-mod-passwd,rlm_passwd,))
$(eval $(call BuildPlugin,freeradius3-mod-preprocess,rlm_preprocess,))
$(eval $(call BuildPlugin,freeradius3-mod-radutmp,rlm_radutmp,))
$(eval $(call BuildPlugin,freeradius3-mod-realm,rlm_realm,))
$(eval $(call BuildPlugin,freeradius3-mod-sql,rlm_sql,))
$(eval $(call BuildPlugin,freeradius3-mod-sql-mysql,rlm_sql_mysql,))
$(eval $(call BuildPlugin,freeradius3-mod-sql-null,rlm_sql_null,))
$(eval $(call BuildPlugin,freeradius3-mod-sql-postgresql,rlm_sql_postgresql,))
$(eval $(call BuildPlugin,freeradius3-mod-sql-sqlite,rlm_sql_sqlite,))
$(eval $(call BuildPlugin,freeradius3-mod-sqlcounter,rlm_sqlcounter,))
$(eval $(call BuildPlugin,freeradius3-mod-sqlippool,rlm_sqlippool,))
$(eval $(call BuildPlugin,freeradius3-mod-unix,rlm_unix,))
$(eval $(call BuildPackage,freeradius3-utils))
4 changes: 2 additions & 2 deletions net/freeradius3/patches/002-disable-session-cache-CVE-2017-9148.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Last-Update: 2017-05-30

return state;
}
@@ -3151,7 +3151,7 @@ post_ca:
@@ -3277,7 +3277,7 @@ post_ca:
/*
* Callbacks, etc. for session resumption.
*/
Expand All @@ -36,7 +36,7 @@ Last-Update: 2017-05-30
/*
* Cache sessions on disk if requested.
*/
@@ -3221,7 +3221,7 @@ post_ca:
@@ -3347,7 +3347,7 @@ post_ca:
/*
* Setup session caching
*/
Expand Down
24 changes: 0 additions & 24 deletions net/freeradius3/patches/004-tls.c-allow-build-with-no-openssl-engine-support.patch
View file
Open in desktop

This file was deleted.