X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=openwrt%2Fpackage%2Ffreeradius%2FMakefile;h=0ae21bbb76338ece8334fafa4dbec442ce5cd534;hb=475e0d886041b4345585e13f0c04bcb9af0c0c5a;hp=6da13253d7d2d58fd818b1356fa1e80fd05c6e6b;hpb=a30fc45109b8f41d789036bdd9cc1ed9125ed2f8;p=openwrt.git diff --git a/openwrt/package/freeradius/Makefile b/openwrt/package/freeradius/Makefile index 6da13253d7..0ae21bbb76 100644 --- a/openwrt/package/freeradius/Makefile +++ b/openwrt/package/freeradius/Makefile @@ -3,30 +3,92 @@ include $(TOPDIR)/rules.mk PKG_NAME:=freeradius -PKG_VERSION:=1.0.2 +PKG_VERSION:=1.0.5 PKG_RELEASE:=1 -PKG_MD5SUM:=f5dfce4efbb03bbc47ceae08270a875e +PKG_MD5SUM:=00d06fc31e3b8279f6456d25401c81cb -PKG_SOURCE_URL:=ftp://ftp.freeradius.org/pub/radius/ +PKG_SOURCE_URL:=ftp://ftp.freeradius.org/pub/radius/ \ + http://freeradius.portal-to-web.de/ \ + ftp://ftp.uk.freeradius.org/pub/radius/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install +PKG_CONFIGURE_OPTIONS := \ + --enable-shared \ + --disable-static \ + --disable-ltdl-install \ + --with-ltdl-include="$(STAGING_DIR)/usr/include" \ + --with-ltdl-lib="$(STAGING_DIR)/usr/lib" \ + --with-openssl-includes="$(STAGING_DIR)/usr/include" \ + --with-openssl-libraries="$(STAGING_DIR)/usr/lib" \ + --enable-strict-dependencies \ + --with-raddbdir=/etc/freeradius \ + --without-edir \ + --without-snmp \ + --with-experimental-modules \ + --without-rlm_attr-rewrite \ + --without-rlm_checkval \ + --without-rlm_counter \ + --without-rlm_dbm \ + --with-rlm_eap \ + --without-rlm_eap_sim \ + --without-rlm_example \ + --without-rlm_ippool \ + --without-rlm_krb5 \ + --without-rlm_pam \ + --without-rlm_perl \ + --without-rlm_python \ + --without-rlm_radutmp \ + --without-rlm_smb \ + --with-rlm_sql \ + --with-rlm_sqlcounter \ + --without-rlm_sql_db2 \ + --without-rlm_sql_freetds \ + --without-rlm_sql_iodbc \ + --without-rlm_sql_oracle \ + --without-rlm_sql_sybase \ + --without-rlm_sql_unixodbc \ + --without-rlm_unix \ + --without-rlm_x99-token \ + +ifneq ($(BR2_PACKAGE_FREERADIUS_MOD_LDAP),) +PKG_CONFIGURE_OPTIONS += \ + --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 +endif +ifneq ($(BR2_PACKAGE_FREERADIUS_MOD_SQL_MYSQL),) +PKG_CONFIGURE_OPTIONS += \ + --with-mysql-include-dir="$(STAGING_DIR)/usr/include/mysql" \ + --with-mysql-lib-dir="$(STAGING_DIR)/usr/lib/mysql" +else +PKG_CONFIGURE_OPTIONS += --without-rlm_sql_mysql +endif +ifneq ($(BR2_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" +else +PKG_CONFIGURE_OPTIONS += --without-rlm_sql_postgresql +endif + include $(TOPDIR)/package/rules.mk define PKG_mod_template $$(IPKG_$(1)): - install -d -m0755 $$(IDIR_$(1))/usr/lib/freeradius + [ -z "$(2)" ] || install -d -m0755 $$(IDIR_$(1))/usr/lib/freeradius for m in $(2); do \ - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/freeradius/$$$${m}{,-*}.so \ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/freeradius/$$$${m}{,-*}.so \ $$(IDIR_$(1))/usr/lib/freeradius/ ; \ done - install -d -m0755 $$(IDIR_$(1))/etc/freeradius + [ -z "$(3)" ] || install -d -m0755 $$(IDIR_$(1))/etc/freeradius for f in $(3); do \ - cp -fpR $(PKG_INSTALL_DIR)/etc/freeradius/$$$${f} \ + $(CP) $(PKG_INSTALL_DIR)/etc/freeradius/$$$${f} \ $$(IDIR_$(1))/etc/freeradius/ ; \ done $(RSTRIP) $$(IDIR_$(1)) @@ -37,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))) @@ -48,12 +111,16 @@ $(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))) +$(eval $(call PKG_template,FREERADIUS_MOD_SQLCOUNTER,freeradius-mod-sqlcounter,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) $(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,)) @@ -65,71 +132,43 @@ $(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,)) +$(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 -L$(PKG_INSTALL_DIR)/usr/lib/freeradius" \ - lt_sys_lib_search_path_spec="$(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) \ - --enable-shared \ - --disable-static \ - --disable-ltdl-install \ - --with-ltdl-include="$(STAGING_DIR)/usr/include" \ - --with-ltdl-lib="$(STAGING_DIR)/usr/lib" \ - --with-openssl-includes="$(STAGING_DIR)/usr/include" \ - --with-openssl-libraries="$(STAGING_DIR)/usr/lib" \ - --enable-strict-dependencies \ - --with-raddbdir=/etc/freeradius \ - --without-edir \ - --without-snmp \ - --without-rlm_attr-rewrite \ - --with-rlm_checkval \ - --without-rlm_counter \ - --without-rlm_dbm \ - --with-rlm_eap \ - --without-rlm_eap_sim \ - --with-rlm_files \ - --without-rlm_ippool \ - --without-rlm_krb5 \ - --with-rlm_ldap-include-dir="$(STAGING_DIR)/usr/include" \ - --with-rlm_ldap-lib-dir="$(STAGING_DIR)/usr/lib" \ - --without-rlm_pam \ - --without-rlm_radutmp \ - --without-rlm_sql_iodbc \ - --with-mysql-include-dir="$(STAGING_DIR)/usr/include/mysql" \ - --with-mysql-lib-dir="$(STAGING_DIR)/usr/lib/mysql" \ - --without-rlm_sql_oracle \ - --with-rlm_sql_postgresql-include-dir="$(STAGING_DIR)/usr/include" \ - --with-rlm_sql_postgresql-lib-dir="$(STAGING_DIR)/usr/lib" \ - --without-rlm_sql_unixodbc \ - --without-rlm_unix \ - --without-rlm_x99-token \ + --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 $@ @@ -147,28 +186,28 @@ $(IPKG_FREERADIUS): install -m0755 ./files/radiusd.init $(IDIR_FREERADIUS)/etc/init.d/radiusd install -m0755 -d $(IDIR_FREERADIUS)/etc/freeradius for f in clients.conf dictionary radiusd.conf; do \ - cp -fpR $(PKG_INSTALL_DIR)/etc/freeradius/$${f} \ + $(CP) $(PKG_INSTALL_DIR)/etc/freeradius/$${f} \ $(IDIR_FREERADIUS)/etc/freeradius/ ; \ done install -m0755 -d $(IDIR_FREERADIUS)/usr/share/freeradius - cp -fpR $(PKG_INSTALL_DIR)/usr/share/freeradius/dictionary \ + $(CP) $(PKG_INSTALL_DIR)/usr/share/freeradius/dictionary \ $(IDIR_FREERADIUS)/usr/share/freeradius/ for f in cisco freeradius microsoft tunnel wispr; do \ - cp -fpR $(PKG_INSTALL_DIR)/usr/share/freeradius/dictionary.$${f} \ + $(CP) $(PKG_INSTALL_DIR)/usr/share/freeradius/dictionary.$${f} \ $(IDIR_FREERADIUS)/usr/share/freeradius/ ; \ done install -m0755 -d $(IDIR_FREERADIUS)/usr/lib/freeradius - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/freeradius/libradius{,-*}.so \ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/freeradius/libradius{,-*}.so \ $(IDIR_FREERADIUS)/usr/lib/freeradius/ install -m0755 -d $(IDIR_FREERADIUS)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/radiusd \ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/radiusd \ $(IDIR_FREERADIUS)/usr/sbin/ $(RSTRIP) $(IDIR_FREERADIUS) $(IPKG_BUILD) $(IDIR_FREERADIUS) $(PACKAGE_DIR) $(IPKG_FREERADIUS_DEMOCERTS): install -m0755 -d $(IDIR_FREERADIUS_DEMOCERTS)/etc/freeradius - cp -fpR $(PKG_INSTALL_DIR)/etc/freeradius/certs \ + $(CP) $(PKG_INSTALL_DIR)/etc/freeradius/certs \ $(IDIR_FREERADIUS_DEMOCERTS)/etc/freeradius/ rm -rf $(IDIR_FREERADIUS_DEMOCERTS)/etc/freeradius/certs/README rm -rf $(IDIR_FREERADIUS_DEMOCERTS)/etc/freeradius/certs/new* @@ -180,7 +219,7 @@ $(IPKG_FREERADIUS_DEMOCERTS): $(IPKG_FREERADIUS_UTILS): install -m0755 -d $(IDIR_FREERADIUS_UTILS)/usr/bin for f in radclient radeapclient; do \ - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/$${f} \ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/$${f} \ $(IDIR_FREERADIUS_UTILS)/usr/bin/ ; \ done $(RSTRIP) $(IDIR_FREERADIUS_UTILS)