port freeradius to buildroot-ng
git-svn-id: svn://svn.openwrt.org/openwrt/packages@4288 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nico
parent
39120f578e
commit
b9a174f30a
365
net/freeradius/Makefile
Normal file
365
net/freeradius/Makefile
Normal file
@ -0,0 +1,365 @@
|
||||
#
|
||||
# Copyright (C) 2006 OpenWrt.org
|
||||
#
|
||||
# This is free software, licensed under the GNU General Public License v2.
|
||||
# See /LICENSE for more information.
|
||||
#
|
||||
# $Id$
|
||||
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=freeradius
|
||||
PKG_VERSION:=1.1.1
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||
PKG_SOURCE_URL:=ftp://ftp.freeradius.org/pub/radius/ \
|
||||
http://freeradius.portal-to-web.de/ \
|
||||
ftp://ftp.uk.freeradius.org/pub/radius/
|
||||
PKG_MD5SUM:=b38b24f6352090fdb571b9e8da52e12e
|
||||
PKG_CAT:=zcat
|
||||
|
||||
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_otp \
|
||||
--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_sql_log \
|
||||
--without-rlm_unix \
|
||||
|
||||
ifneq ($(CONFIG_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"
|
||||
else
|
||||
PKG_CONFIGURE_OPTIONS += --without-rlm_ldap
|
||||
endif
|
||||
ifneq ($(CONFIG_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
|
||||
else
|
||||
PKG_CONFIGURE_OPTIONS += --without-rlm_sql_mysql
|
||||
endif
|
||||
ifneq ($(CONFIG_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 $(INCLUDE_DIR)/package.mk
|
||||
|
||||
define Package/freeradius
|
||||
SECTION:=net
|
||||
CATEGORY:=Network
|
||||
DEPENDS:=+libltdl +libopenssl +libpthread
|
||||
TITLE:=A flexible RADIUS server
|
||||
URL:=http://www.freeradius.org/
|
||||
endef
|
||||
|
||||
define Package/freeradius/conffiles
|
||||
/etc/freeradius/clients.conf
|
||||
/etc/freeradius/radiusd.conf
|
||||
endef
|
||||
|
||||
define Package/freeradius-democerts
|
||||
$(call Package/freeradius)
|
||||
DEPENDS:=freeradius
|
||||
TITLE:=Demo certificates to test the server
|
||||
endef
|
||||
|
||||
define Package/freeradius-mod-chap
|
||||
$(call Package/freeradius)
|
||||
DEPENDS:=freeradius
|
||||
TITLE:=CHAP module
|
||||
endef
|
||||
|
||||
define Package/freeradius-mod-detail
|
||||
$(call Package/freeradius)
|
||||
DEPENDS:=freeradius
|
||||
TITLE:=Detailed accounting module
|
||||
endef
|
||||
|
||||
define Package/freeradius-mod-eap
|
||||
$(call Package/freeradius)
|
||||
DEPENDS:=freeradius
|
||||
TITLE:=Base EAP module
|
||||
endef
|
||||
|
||||
define Package/freeradius-mod-eap/conffiles
|
||||
/etc/freeradius/eap.conf
|
||||
endef
|
||||
|
||||
define Package/freeradius-mod-eap-gtc
|
||||
$(call Package/freeradius)
|
||||
DEPENDS:=freeradius-mod-eap
|
||||
TITLE:=EAP/GTC module
|
||||
endef
|
||||
|
||||
define Package/freeradius-mod-eap-md5
|
||||
$(call Package/freeradius)
|
||||
DEPENDS:=freeradius-mod-eap
|
||||
TITLE:=EAP/MD5 module
|
||||
endef
|
||||
|
||||
define Package/freeradius-mod-eap-mschapv2
|
||||
$(call Package/freeradius)
|
||||
DEPENDS:=freeradius-mod-eap
|
||||
TITLE:=EAP/MS-CHAPv2 module
|
||||
endef
|
||||
|
||||
define Package/freeradius-mod-eap-peap
|
||||
$(call Package/freeradius)
|
||||
DEPENDS:=freeradius-mod-eap
|
||||
TITLE:=EAP/PEAP module
|
||||
endef
|
||||
|
||||
define Package/freeradius-mod-eap-tls
|
||||
$(call Package/freeradius)
|
||||
DEPENDS:=freeradius-mod-eap
|
||||
TITLE:=EAP/TLS module
|
||||
endef
|
||||
|
||||
define Package/freeradius-mod-eap-ttls
|
||||
$(call Package/freeradius)
|
||||
DEPENDS:=freeradius-mod-eap-tls
|
||||
TITLE:=EAP/TTLS module
|
||||
endef
|
||||
|
||||
define Package/freeradius-mod-files
|
||||
$(call Package/freeradius)
|
||||
DEPENDS:=freeradius
|
||||
TITLE:=Module using local files for authorization
|
||||
endef
|
||||
|
||||
define Package/freeradius-mod-files/conffiles
|
||||
/etc/freeradius/acct_users
|
||||
/etc/freeradius/preproxy_users
|
||||
/etc/freeradius/users
|
||||
endef
|
||||
|
||||
define Package/freeradius-mod-ldap
|
||||
$(call Package/freeradius)
|
||||
DEPENDS:=freeradius +libopenldap
|
||||
TITLE:=LDAP module
|
||||
endef
|
||||
|
||||
define Package/freeradius-mod-ldap/conffiles
|
||||
/etc/freeradius/ldap.attrmap
|
||||
endef
|
||||
|
||||
define Package/freeradius-mod-mschap
|
||||
$(call Package/freeradius)
|
||||
DEPENDS:=freeradius
|
||||
TITLE:=MS-CHAP and MS-CHAPv2 module
|
||||
endef
|
||||
|
||||
define Package/freeradius-mod-pap
|
||||
$(call Package/freeradius)
|
||||
DEPENDS:=freeradius
|
||||
TITLE:=PAP module
|
||||
endef
|
||||
|
||||
define Package/freeradius-mod-preprocess
|
||||
$(call Package/freeradius)
|
||||
DEPENDS:=freeradius
|
||||
TITLE:=Request pre-processing module
|
||||
endef
|
||||
|
||||
define Package/freeradius-mod-preprocess/conffiles
|
||||
/etc/freeradius/hints
|
||||
/etc/freeradius/huntgroups
|
||||
endef
|
||||
|
||||
define Package/freeradius-mod-realm
|
||||
$(call Package/freeradius)
|
||||
DEPENDS:=freeradius
|
||||
TITLE:=Realms handling module
|
||||
endef
|
||||
|
||||
define Package/freeradius-mod-realm/conffiles
|
||||
/etc/freeradius/proxy.conf
|
||||
endef
|
||||
|
||||
define Package/freeradius-mod-sql
|
||||
$(call Package/freeradius)
|
||||
DEPENDS:=freeradius
|
||||
TITLE:=Base SQL module
|
||||
endef
|
||||
|
||||
define Package/freeradius-mod-sql-mysql
|
||||
$(call Package/freeradius)
|
||||
DEPENDS:=freeradius-mod-sql +libmysqlclient
|
||||
TITLE:=MySQL module
|
||||
endef
|
||||
|
||||
define Package/freeradius-mod-sql-pgsql
|
||||
$(call Package/freeradius)
|
||||
DEPENDS:=freeradius-mod-sql +libpq
|
||||
TITLE:=PostgreSQL module
|
||||
endef
|
||||
|
||||
define Package/freeradius-mod-sqlcounter
|
||||
$(call Package/freeradius)
|
||||
DEPENDS:=freeradius-mod-sql
|
||||
TITLE:=Generic SQL Counter module
|
||||
endef
|
||||
|
||||
define Package/freeradius-utils
|
||||
$(call Package/freeradius)
|
||||
DEPENDS:=freeradius
|
||||
TITLE:=Misc. client utilities
|
||||
endef
|
||||
|
||||
define Build/Configure
|
||||
(cd $(PKG_BUILD_DIR); rm -f config.cache; \
|
||||
$(TARGET_CONFIGURE_OPTS) \
|
||||
CFLAGS="$(TARGET_CFLAGS)" \
|
||||
CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
|
||||
LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib -L$(PKG_INSTALL_DIR)/usr/lib/freeradius" \
|
||||
LIBS="$(PKG_CONFIGURE_LIBS)" \
|
||||
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) \
|
||||
);
|
||||
endef
|
||||
|
||||
define Build/Compile
|
||||
rm -rf $(PKG_INSTALL_DIR)
|
||||
mkdir -p $(PKG_INSTALL_DIR)
|
||||
$(MAKE) -C $(PKG_BUILD_DIR) \
|
||||
R="$(PKG_INSTALL_DIR)" \
|
||||
INSTALLSTRIP="" \
|
||||
all install
|
||||
endef
|
||||
|
||||
define Package/freeradius/install
|
||||
install -m0755 -d $(1)/etc/init.d
|
||||
install -m0755 ./files/radiusd.init $(1)/etc/init.d/radiusd
|
||||
install -m0755 -d $(1)/etc/freeradius
|
||||
for f in clients.conf dictionary radiusd.conf; do \
|
||||
$(CP) $(PKG_INSTALL_DIR)/etc/freeradius/$$$${f} $(1)/etc/freeradius/ ; \
|
||||
done
|
||||
install -m0755 -d $(1)/usr/share/freeradius
|
||||
$(CP) $(PKG_INSTALL_DIR)/usr/share/freeradius/dictionary $(1)/usr/share/freeradius/
|
||||
for f in freeradius freeradius.internal rfc2865 rfc2866 rfc2867 rfc2868 rfc2869 rfc3162 rfc3576 rfc3580 microsoft wispr; do \
|
||||
$(CP) $(PKG_INSTALL_DIR)/usr/share/freeradius/dictionary.$$$${f} $(1)/usr/share/freeradius/ ; \
|
||||
done
|
||||
install -m0755 -d $(1)/usr/lib/freeradius
|
||||
$(CP) $(PKG_INSTALL_DIR)/usr/lib/freeradius/libradius{,-*}.so $(1)/usr/lib/freeradius/
|
||||
install -m0755 -d $(1)/usr/sbin
|
||||
$(CP) $(PKG_INSTALL_DIR)/usr/sbin/radiusd $(1)/usr/sbin/
|
||||
endef
|
||||
|
||||
define Package/freeradius-democerts/install
|
||||
install -m0755 -d $(1)/etc/freeradius
|
||||
$(CP) $(PKG_INSTALL_DIR)/etc/freeradius/certs $(1)/etc/freeradius/
|
||||
rm -rf $(1)/etc/freeradius/certs/README
|
||||
rm -rf $(1)/etc/freeradius/certs/new*
|
||||
rm -rf $(1)/etc/freeradius/certs/demoCA/index*
|
||||
rm -rf $(1)/etc/freeradius/certs/demoCA/serial*
|
||||
endef
|
||||
|
||||
define Package/freeradius-utils/install
|
||||
install -m0755 -d $(1)/usr/bin
|
||||
for f in radclient; do \
|
||||
$(CP) $(PKG_INSTALL_DIR)/usr/bin/$$$${f} $(1)/usr/bin/ ; \
|
||||
done
|
||||
endef
|
||||
|
||||
define BuildPlugin
|
||||
define Package/$(1)/install
|
||||
[ -z "$(2)" ] || install -d -m0755 $$(1)/usr/lib/freeradius
|
||||
for m in $(2); do \
|
||||
$(CP) $(PKG_INSTALL_DIR)/usr/lib/freeradius/$$$$$$$${m}{,-*}.so $$(1)/usr/lib/freeradius/ ; \
|
||||
done
|
||||
[ -z "$(3)" ] || install -d -m0755 $$(1)/etc/freeradius
|
||||
for f in $(3); do \
|
||||
$(CP) $(PKG_INSTALL_DIR)/etc/freeradius/$$$$$$$${f} $$(1)/etc/freeradius/ ; \
|
||||
done
|
||||
endef
|
||||
|
||||
$$(eval $$(call BuildPackage,$(1)))
|
||||
endef
|
||||
|
||||
$(eval $(call BuildPackage,freeradius))
|
||||
$(eval $(call BuildPackage,freeradius-democerts))
|
||||
$(eval $(call BuildPlugin,freeradius-mod-chap,rlm_chap,))
|
||||
$(eval $(call BuildPlugin,freeradius-mod-detail,rlm_detail,))
|
||||
$(eval $(call BuildPlugin,freeradius-mod-eap,libeap rlm_eap,eap.conf))
|
||||
$(eval $(call BuildPlugin,freeradius-mod-eap-gtc,rlm_eap_gtc,))
|
||||
$(eval $(call BuildPlugin,freeradius-mod-eap-md5,rlm_eap_md5,))
|
||||
$(eval $(call BuildPlugin,freeradius-mod-eap-mschapv2,rlm_eap_mschapv2,))
|
||||
$(eval $(call BuildPlugin,freeradius-mod-eap-peap,rlm_eap_peap,))
|
||||
$(eval $(call BuildPlugin,freeradius-mod-eap-tls,rlm_eap_tls,))
|
||||
$(eval $(call BuildPlugin,freeradius-mod-eap-ttls,rlm_eap_ttls,))
|
||||
$(eval $(call BuildPlugin,freeradius-mod-files,rlm_files,acct_users preproxy_users users))
|
||||
$(eval $(call BuildPlugin,freeradius-mod-ldap,rlm_ldap,ldap.attrmap))
|
||||
$(eval $(call BuildPlugin,freeradius-mod-mschap,rlm_mschap,))
|
||||
$(eval $(call BuildPlugin,freeradius-mod-pap,rlm_pap,))
|
||||
$(eval $(call BuildPlugin,freeradius-mod-preprocess,rlm_preprocess,hints huntgroups))
|
||||
$(eval $(call BuildPlugin,freeradius-mod-realm,rlm_realm,proxy.conf))
|
||||
$(eval $(call BuildPlugin,freeradius-mod-sql,rlm_sql,sql.conf))
|
||||
$(eval $(call BuildPlugin,freeradius-mod-sql-mysql,rlm_sql_mysql,))
|
||||
$(eval $(call BuildPlugin,freeradius-mod-sql-pgsql,rlm_sql_postgresql,))
|
||||
$(eval $(call BuildPlugin,freeradius-mod-sqlcounter,rlm_sqlcounter,))
|
||||
$(eval $(call BuildPackage,freeradius-utils))
|
||||
23
net/freeradius/files/radiusd.init
Normal file
23
net/freeradius/files/radiusd.init
Normal file
@ -0,0 +1,23 @@
|
||||
#!/bin/sh
|
||||
|
||||
DEFAULT=/etc/default/radiusd
|
||||
LOG_D=/var/log/radius
|
||||
RUN_D=/var/run
|
||||
PID_F=$RUN_D/radiusd.pid
|
||||
[ -f $DEFAULT ] && . $DEFAULT
|
||||
|
||||
case $1 in
|
||||
start)
|
||||
[ -d $LOG_D ] || mkdir -p $LOG_D
|
||||
[ -d $RUN_D ] || mkdir -p $RUN_D
|
||||
radiusd $OPTIONS
|
||||
;;
|
||||
stop)
|
||||
[ -f $PID_F ] && kill $(cat $PID_F)
|
||||
;;
|
||||
*)
|
||||
echo "usage: $0 (start|stop)"
|
||||
exit 1
|
||||
esac
|
||||
|
||||
exit $?
|
||||
149
net/freeradius/patches/01-freeradius-1.1.1-dict.patch
Normal file
149
net/freeradius/patches/01-freeradius-1.1.1-dict.patch
Normal file
@ -0,0 +1,149 @@
|
||||
diff -ruN freeradius-1.1.1-old/share/dictionary freeradius-1.1.1-new/share/dictionary
|
||||
--- freeradius-1.1.1-old/share/dictionary 2006-03-16 23:03:11.000000000 +0100
|
||||
+++ freeradius-1.1.1-new/share/dictionary 2006-05-22 09:09:08.000000000 +0200
|
||||
@@ -52,7 +52,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.
|
||||
#
|
||||
-$INCLUDE dictionary.compat
|
||||
+#$INCLUDE dictionary.compat
|
||||
|
||||
#
|
||||
# Include the RFC dictionaries next.
|
||||
@@ -73,75 +73,75 @@
|
||||
#
|
||||
# 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.aruba
|
||||
-$INCLUDE dictionary.ascend
|
||||
-$INCLUDE dictionary.bay
|
||||
-$INCLUDE dictionary.bintec
|
||||
-$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.aruba
|
||||
+#$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.vpn5000
|
||||
-$INCLUDE dictionary.cisco.bbsm
|
||||
-$INCLUDE dictionary.colubris
|
||||
-$INCLUDE dictionary.cosine
|
||||
-$INCLUDE dictionary.epygi
|
||||
-$INCLUDE dictionary.erx
|
||||
-$INCLUDE dictionary.ericsson
|
||||
-$INCLUDE dictionary.extreme
|
||||
+#$INCLUDE dictionary.cisco.vpn5000
|
||||
+#$INCLUDE dictionary.cisco.bbsm
|
||||
+#$INCLUDE dictionary.colubris
|
||||
+#$INCLUDE dictionary.cosine
|
||||
+#$INCLUDE dictionary.epygi
|
||||
+#$INCLUDE dictionary.erx
|
||||
+#$INCLUDE dictionary.ericsson
|
||||
+#$INCLUDE dictionary.extreme
|
||||
$INCLUDE dictionary.freeradius
|
||||
-$INCLUDE dictionary.fortinet
|
||||
-$INCLUDE dictionary.foundry
|
||||
-$INCLUDE dictionary.gandalf
|
||||
-$INCLUDE dictionary.gemtek
|
||||
-$INCLUDE dictionary.issanni
|
||||
-$INCLUDE dictionary.itk
|
||||
-$INCLUDE dictionary.ipunplugged
|
||||
-$INCLUDE dictionary.juniper
|
||||
-$INCLUDE dictionary.karlnet
|
||||
-$INCLUDE dictionary.livingston
|
||||
-$INCLUDE dictionary.localweb
|
||||
-$INCLUDE dictionary.lucent
|
||||
-$INCLUDE dictionary.hp
|
||||
+#$INCLUDE dictionary.fortinet
|
||||
+#$INCLUDE dictionary.foundry
|
||||
+#$INCLUDE dictionary.gandalf
|
||||
+#$INCLUDE dictionary.gemtek
|
||||
+#$INCLUDE dictionary.issanni
|
||||
+#$INCLUDE dictionary.itk
|
||||
+#$INCLUDE dictionary.ipunplugged
|
||||
+#$INCLUDE dictionary.juniper
|
||||
+#$INCLUDE dictionary.karlnet
|
||||
+#$INCLUDE dictionary.livingston
|
||||
+#$INCLUDE dictionary.localweb
|
||||
+#$INCLUDE dictionary.lucent
|
||||
+#$INCLUDE dictionary.hp
|
||||
$INCLUDE dictionary.microsoft
|
||||
-$INCLUDE dictionary.mikrotik
|
||||
-$INCLUDE dictionary.navini
|
||||
-$INCLUDE dictionary.netscreen
|
||||
-$INCLUDE dictionary.ntua
|
||||
-$INCLUDE dictionary.nomadix
|
||||
-$INCLUDE dictionary.nortel
|
||||
-$INCLUDE dictionary.packeteer
|
||||
-$INCLUDE dictionary.propel
|
||||
-$INCLUDE dictionary.quintum
|
||||
-$INCLUDE dictionary.redback
|
||||
-$INCLUDE dictionary.redcreek
|
||||
-$INCLUDE dictionary.roaringpenguin
|
||||
-$INCLUDE dictionary.shasta
|
||||
-$INCLUDE dictionary.shiva
|
||||
-$INCLUDE dictionary.sonicwall
|
||||
-$INCLUDE dictionary.springtide
|
||||
-$INCLUDE dictionary.starent
|
||||
-$INCLUDE dictionary.telebit
|
||||
-$INCLUDE dictionary.trapeze
|
||||
-$INCLUDE dictionary.t_systems_nova
|
||||
-$INCLUDE dictionary.usr
|
||||
-$INCLUDE dictionary.valemount
|
||||
-$INCLUDE dictionary.versanet
|
||||
-$INCLUDE dictionary.waverider
|
||||
+#$INCLUDE dictionary.mikrotik
|
||||
+#$INCLUDE dictionary.navini
|
||||
+#$INCLUDE dictionary.netscreen
|
||||
+#$INCLUDE dictionary.ntua
|
||||
+#$INCLUDE dictionary.nomadix
|
||||
+#$INCLUDE dictionary.nortel
|
||||
+#$INCLUDE dictionary.packeteer
|
||||
+#$INCLUDE dictionary.propel
|
||||
+#$INCLUDE dictionary.quintum
|
||||
+#$INCLUDE dictionary.redback
|
||||
+#$INCLUDE dictionary.redcreek
|
||||
+#$INCLUDE dictionary.roaringpenguin
|
||||
+#$INCLUDE dictionary.shasta
|
||||
+#$INCLUDE dictionary.shiva
|
||||
+#$INCLUDE dictionary.sonicwall
|
||||
+#$INCLUDE dictionary.springtide
|
||||
+#$INCLUDE dictionary.starent
|
||||
+#$INCLUDE dictionary.telebit
|
||||
+#$INCLUDE dictionary.trapeze
|
||||
+#$INCLUDE dictionary.t_systems_nova
|
||||
+#$INCLUDE dictionary.usr
|
||||
+#$INCLUDE dictionary.valemount
|
||||
+#$INCLUDE dictionary.versanet
|
||||
+#$INCLUDE dictionary.waverider
|
||||
$INCLUDE dictionary.wispr
|
||||
-$INCLUDE dictionary.xedia
|
||||
-$INCLUDE dictionary.xylan
|
||||
+#$INCLUDE dictionary.xedia
|
||||
+#$INCLUDE dictionary.xylan
|
||||
|
||||
#
|
||||
# And finally the server internal attributes.
|
||||
302
net/freeradius/patches/02-freeradius-1.1.1-config.patch
Normal file
302
net/freeradius/patches/02-freeradius-1.1.1-config.patch
Normal file
@ -0,0 +1,302 @@
|
||||
diff -ruN freeradius-1.1.1-old/raddb/eap.conf freeradius-1.1.1-new/raddb/eap.conf
|
||||
--- freeradius-1.1.1-old/raddb/eap.conf 2006-01-04 15:29:29.000000000 +0100
|
||||
+++ freeradius-1.1.1-new/raddb/eap.conf 2006-05-22 23:29:11.000000000 +0200
|
||||
@@ -73,8 +73,8 @@
|
||||
# User-Password, or the NT-Password attributes.
|
||||
# 'System' authentication is impossible with LEAP.
|
||||
#
|
||||
- leap {
|
||||
- }
|
||||
+# leap {
|
||||
+# }
|
||||
|
||||
# Generic Token Card.
|
||||
#
|
||||
@@ -87,7 +87,7 @@
|
||||
# the users password will go over the wire in plain-text,
|
||||
# for anyone to see.
|
||||
#
|
||||
- gtc {
|
||||
+# gtc {
|
||||
# The default challenge, which many clients
|
||||
# ignore..
|
||||
#challenge = "Password: "
|
||||
@@ -104,8 +104,8 @@
|
||||
# configured for the request, and do the
|
||||
# authentication itself.
|
||||
#
|
||||
- auth_type = PAP
|
||||
- }
|
||||
+# auth_type = PAP
|
||||
+# }
|
||||
|
||||
## EAP-TLS
|
||||
#
|
||||
@@ -283,7 +283,7 @@
|
||||
# of MS-CHAPv2 in EAP by Cisco, which FreeRADIUS does not
|
||||
# currently support.
|
||||
#
|
||||
- mschapv2 {
|
||||
- }
|
||||
+# mschapv2 {
|
||||
+# }
|
||||
}
|
||||
|
||||
diff -ruN freeradius-1.1.1-old/raddb/radiusd.conf.in freeradius-1.1.1-new/raddb/radiusd.conf.in
|
||||
--- freeradius-1.1.1-old/raddb/radiusd.conf.in 2006-02-10 16:12:02.000000000 +0100
|
||||
+++ freeradius-1.1.1-new/raddb/radiusd.conf.in 2006-05-22 23:33:53.000000000 +0200
|
||||
@@ -31,13 +31,13 @@
|
||||
|
||||
# Location of config and logfiles.
|
||||
confdir = ${raddbdir}
|
||||
-run_dir = ${localstatedir}/run/radiusd
|
||||
+run_dir = ${localstatedir}/run
|
||||
|
||||
#
|
||||
# The logging messages for the server are appended to the
|
||||
# tail of this file.
|
||||
#
|
||||
-log_file = ${logdir}/radius.log
|
||||
+log_file = ${logdir}/radiusd.log
|
||||
|
||||
#
|
||||
# libdir: Where to find the rlm_* modules.
|
||||
@@ -353,7 +353,7 @@
|
||||
nospace_pass = no
|
||||
|
||||
# The program to execute to do concurrency checks.
|
||||
-checkrad = ${sbindir}/checkrad
|
||||
+#checkrad = ${sbindir}/checkrad
|
||||
|
||||
# SECURITY CONFIGURATION
|
||||
#
|
||||
@@ -425,8 +425,8 @@
|
||||
#
|
||||
# allowed values: {no, yes}
|
||||
#
|
||||
-proxy_requests = yes
|
||||
-$INCLUDE ${confdir}/proxy.conf
|
||||
+proxy_requests = no
|
||||
+#$INCLUDE ${confdir}/proxy.conf
|
||||
|
||||
|
||||
# CLIENTS CONFIGURATION
|
||||
@@ -454,7 +454,7 @@
|
||||
# 'snmp' attribute to 'yes'
|
||||
#
|
||||
snmp = no
|
||||
-$INCLUDE ${confdir}/snmp.conf
|
||||
+#$INCLUDE ${confdir}/snmp.conf
|
||||
|
||||
|
||||
# THREAD POOL CONFIGURATION
|
||||
@@ -657,7 +657,7 @@
|
||||
# For all EAP related authentications.
|
||||
# Now in another file, because it is very large.
|
||||
#
|
||||
-$INCLUDE ${confdir}/eap.conf
|
||||
+#$INCLUDE ${confdir}/eap.conf
|
||||
|
||||
# Microsoft CHAP authentication
|
||||
#
|
||||
@@ -1046,8 +1046,8 @@
|
||||
#
|
||||
files {
|
||||
usersfile = ${confdir}/users
|
||||
- acctusersfile = ${confdir}/acct_users
|
||||
- preproxy_usersfile = ${confdir}/preproxy_users
|
||||
+# acctusersfile = ${confdir}/acct_users
|
||||
+# preproxy_usersfile = ${confdir}/preproxy_users
|
||||
|
||||
# If you want to use the old Cistron 'users' file
|
||||
# with FreeRADIUS, you should change the next line
|
||||
@@ -1221,7 +1221,7 @@
|
||||
# For MS-SQL, use: ${confdir}/mssql.conf
|
||||
# For Oracle, use: ${confdir}/oraclesql.conf
|
||||
#
|
||||
- $INCLUDE ${confdir}/sql.conf
|
||||
+# $INCLUDE ${confdir}/sql.conf
|
||||
|
||||
|
||||
# For Cisco VoIP specific accounting with Postgresql,
|
||||
@@ -1694,7 +1694,7 @@
|
||||
# The entire command line (and output) must fit into 253 bytes.
|
||||
#
|
||||
# e.g. Framed-Pool = `%{exec:/bin/echo foo}`
|
||||
- exec
|
||||
+# exec
|
||||
|
||||
#
|
||||
# The expression module doesn't do authorization,
|
||||
@@ -1707,7 +1707,7 @@
|
||||
# listed in any other section. See 'doc/rlm_expr' for
|
||||
# more information.
|
||||
#
|
||||
- expr
|
||||
+# expr
|
||||
|
||||
#
|
||||
# We add the counter module here so that it registers
|
||||
@@ -1734,7 +1734,7 @@
|
||||
# 'raddb/huntgroups' files.
|
||||
#
|
||||
# It also adds the %{Client-IP-Address} attribute to the request.
|
||||
- preprocess
|
||||
+# preprocess
|
||||
|
||||
#
|
||||
# If you want to have a log of authentication requests,
|
||||
@@ -1747,7 +1747,7 @@
|
||||
#
|
||||
# The chap module will set 'Auth-Type := CHAP' if we are
|
||||
# handling a CHAP request and Auth-Type has not already been set
|
||||
- chap
|
||||
+# chap
|
||||
|
||||
#
|
||||
# If the users are logging in with an MS-CHAP-Challenge
|
||||
@@ -1775,7 +1775,7 @@
|
||||
# Otherwise, when the first style of realm doesn't match,
|
||||
# the other styles won't be checked.
|
||||
#
|
||||
- suffix
|
||||
+# suffix
|
||||
# ntdomain
|
||||
|
||||
#
|
||||
@@ -1784,11 +1784,11 @@
|
||||
#
|
||||
# It also sets the EAP-Type attribute in the request
|
||||
# attribute list to the EAP type from the packet.
|
||||
- eap
|
||||
+# eap
|
||||
|
||||
#
|
||||
# Read the 'users' file
|
||||
- files
|
||||
+# files
|
||||
|
||||
#
|
||||
# Look in an SQL database. The schema of the database
|
||||
@@ -1842,24 +1842,24 @@
|
||||
# PAP authentication, when a back-end database listed
|
||||
# in the 'authorize' section supplies a password. The
|
||||
# password can be clear-text, or encrypted.
|
||||
- Auth-Type PAP {
|
||||
- pap
|
||||
- }
|
||||
+# Auth-Type PAP {
|
||||
+# pap
|
||||
+# }
|
||||
|
||||
#
|
||||
# Most people want CHAP authentication
|
||||
# A back-end database listed in the 'authorize' section
|
||||
# MUST supply a CLEAR TEXT password. Encrypted passwords
|
||||
# won't work.
|
||||
- Auth-Type CHAP {
|
||||
- chap
|
||||
- }
|
||||
+# Auth-Type CHAP {
|
||||
+# chap
|
||||
+# }
|
||||
|
||||
#
|
||||
# MSCHAP authentication.
|
||||
- Auth-Type MS-CHAP {
|
||||
- mschap
|
||||
- }
|
||||
+# Auth-Type MS-CHAP {
|
||||
+# mschap
|
||||
+# }
|
||||
|
||||
#
|
||||
# If you have a Cisco SIP server authenticating against
|
||||
@@ -1877,7 +1877,7 @@
|
||||
# containing CHAP-Password attributes CANNOT be authenticated
|
||||
# against /etc/passwd! See the FAQ for details.
|
||||
#
|
||||
- unix
|
||||
+# unix
|
||||
|
||||
# Uncomment it if you want to use ldap for authentication
|
||||
#
|
||||
@@ -1890,7 +1890,7 @@
|
||||
|
||||
#
|
||||
# Allow EAP authentication.
|
||||
- eap
|
||||
+# eap
|
||||
}
|
||||
|
||||
|
||||
@@ -1898,12 +1898,12 @@
|
||||
# Pre-accounting. Decide which accounting type to use.
|
||||
#
|
||||
preacct {
|
||||
- preprocess
|
||||
+# preprocess
|
||||
|
||||
#
|
||||
# Ensure that we have a semi-unique identifier for every
|
||||
# request, and many NAS boxes are broken.
|
||||
- acct_unique
|
||||
+# acct_unique
|
||||
|
||||
#
|
||||
# Look for IPASS-style 'realm/', and if not found, look for
|
||||
@@ -1913,12 +1913,12 @@
|
||||
# Accounting requests are generally proxied to the same
|
||||
# home server as authentication requests.
|
||||
# IPASS
|
||||
- suffix
|
||||
+# suffix
|
||||
# ntdomain
|
||||
|
||||
#
|
||||
# Read the 'acct_users' file
|
||||
- files
|
||||
+# files
|
||||
}
|
||||
|
||||
#
|
||||
@@ -1929,20 +1929,20 @@
|
||||
# Create a 'detail'ed log of the packets.
|
||||
# Note that accounting requests which are proxied
|
||||
# are also logged in the detail file.
|
||||
- detail
|
||||
+# detail
|
||||
# daily
|
||||
|
||||
# Update the wtmp file
|
||||
#
|
||||
# If you don't use "radlast", you can delete this line.
|
||||
- unix
|
||||
+# unix
|
||||
|
||||
#
|
||||
# For Simultaneous-Use tracking.
|
||||
#
|
||||
# Due to packet losses in the network, the data here
|
||||
# may be incorrect. There is little we can do about it.
|
||||
- radutmp
|
||||
+# radutmp
|
||||
# sradutmp
|
||||
|
||||
# Return an address to the IP Pool when we see a stop record.
|
||||
@@ -1970,7 +1970,7 @@
|
||||
# or rlm_sql module can handle this.
|
||||
# The rlm_sql module is *much* faster
|
||||
session {
|
||||
- radutmp
|
||||
+# radutmp
|
||||
|
||||
#
|
||||
# See "Simultaneous Use Checking Querie" in sql.conf
|
||||
@@ -2073,5 +2073,5 @@
|
||||
# hidden inside of the EAP packet, and the end server will
|
||||
# reject the EAP request.
|
||||
#
|
||||
- eap
|
||||
+# eap
|
||||
}
|
||||
1694
net/freeradius/patches/03-freeradius-1.1.1-configure_cross.patch
Normal file
1694
net/freeradius/patches/03-freeradius-1.1.1-configure_cross.patch
Normal file
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,576 @@
|
||||
diff -ruN freeradius-1.1.1-old/src/modules/rlm_ldap/configure freeradius-1.1.1-new/src/modules/rlm_ldap/configure
|
||||
--- freeradius-1.1.1-old/src/modules/rlm_ldap/configure 2005-12-08 20:32:53.000000000 +0100
|
||||
+++ freeradius-1.1.1-new/src/modules/rlm_ldap/configure 2006-05-21 19:54:07.000000000 +0200
|
||||
@@ -929,13 +929,311 @@
|
||||
fi
|
||||
|
||||
smart_try_dir=$rlm_ldap_lib_dir
|
||||
+
|
||||
+
|
||||
+
|
||||
+sm_lib_safe=`echo "sasl" | sed 'y%./+-%__p_%'`
|
||||
+sm_func_safe=`echo "sasl_encode" | sed 'y%./+-%__p_%'`
|
||||
+echo $ac_n "checking for sasl_encode in -lsasl""... $ac_c" 1>&6
|
||||
+echo "configure:939: checking for sasl_encode in -lsasl" >&5
|
||||
+
|
||||
+old_LIBS="$LIBS"
|
||||
+smart_lib=
|
||||
+smart_lib_dir=
|
||||
+
|
||||
+if test "x$smart_try_dir" != "x"; then
|
||||
+ for try in $smart_try_dir; do
|
||||
+ LIBS="-L$try -lsasl $old_LIBS"
|
||||
+ cat > conftest.$ac_ext <<EOF
|
||||
+#line 949 "configure"
|
||||
+#include "confdefs.h"
|
||||
+extern char sasl_encode();
|
||||
+int main() {
|
||||
+ sasl_encode()
|
||||
+; return 0; }
|
||||
+EOF
|
||||
+if { (eval echo configure:956: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
+ rm -rf conftest*
|
||||
+ smart_lib="-L$try -lsasl"
|
||||
+else
|
||||
+ echo "configure: failed program was:" >&5
|
||||
+ cat conftest.$ac_ext >&5
|
||||
+fi
|
||||
+rm -f conftest*
|
||||
+ if test "x$smart_lib" != "x"; then
|
||||
+ break;
|
||||
+ fi
|
||||
+ done
|
||||
+ LIBS="$old_LIBS"
|
||||
+fi
|
||||
+
|
||||
+if test "x$smart_lib" = "x"; then
|
||||
+ LIBS="-lsasl $old_LIBS"
|
||||
+ cat > conftest.$ac_ext <<EOF
|
||||
+#line 974 "configure"
|
||||
+#include "confdefs.h"
|
||||
+extern char sasl_encode();
|
||||
+int main() {
|
||||
+ sasl_encode()
|
||||
+; return 0; }
|
||||
+EOF
|
||||
+if { (eval echo configure:981: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
+ rm -rf conftest*
|
||||
+ smart_lib="-lsasl"
|
||||
+else
|
||||
+ echo "configure: failed program was:" >&5
|
||||
+ cat conftest.$ac_ext >&5
|
||||
+fi
|
||||
+rm -f conftest*
|
||||
+ LIBS="$old_LIBS"
|
||||
+fi
|
||||
+
|
||||
+if test "x$smart_lib" = "x"; then
|
||||
+
|
||||
+
|
||||
+if test "x$LOCATE" != "x"; then
|
||||
+ DIRS=
|
||||
+ file=libsasl${libltdl_cv_shlibext}
|
||||
+
|
||||
+ for x in `${LOCATE} $file 2>/dev/null`; do
|
||||
+ base=`echo $x | sed "s%/${file}%%"`
|
||||
+ if test "x$x" = "x$base"; then
|
||||
+ continue;
|
||||
+ fi
|
||||
+
|
||||
+ dir=`${DIRNAME} $x 2>/dev/null`
|
||||
+ exclude=`echo ${dir} | ${GREP} /home`
|
||||
+ if test "x$exclude" != "x"; then
|
||||
+ continue
|
||||
+ fi
|
||||
+
|
||||
+ already=`echo \$smart_lib_dir ${DIRS} | ${GREP} ${dir}`
|
||||
+ if test "x$already" = "x"; then
|
||||
+ DIRS="$DIRS $dir"
|
||||
+ fi
|
||||
+ done
|
||||
+fi
|
||||
+
|
||||
+eval "smart_lib_dir=\"\$smart_lib_dir $DIRS\""
|
||||
+
|
||||
+
|
||||
+
|
||||
+if test "x$LOCATE" != "x"; then
|
||||
+ DIRS=
|
||||
+ file=libsasl.a
|
||||
+
|
||||
+ for x in `${LOCATE} $file 2>/dev/null`; do
|
||||
+ base=`echo $x | sed "s%/${file}%%"`
|
||||
+ if test "x$x" = "x$base"; then
|
||||
+ continue;
|
||||
+ fi
|
||||
+
|
||||
+ dir=`${DIRNAME} $x 2>/dev/null`
|
||||
+ exclude=`echo ${dir} | ${GREP} /home`
|
||||
+ if test "x$exclude" != "x"; then
|
||||
+ continue
|
||||
+ fi
|
||||
+
|
||||
+ already=`echo \$smart_lib_dir ${DIRS} | ${GREP} ${dir}`
|
||||
+ if test "x$already" = "x"; then
|
||||
+ DIRS="$DIRS $dir"
|
||||
+ fi
|
||||
+ done
|
||||
+fi
|
||||
+
|
||||
+eval "smart_lib_dir=\"\$smart_lib_dir $DIRS\""
|
||||
+
|
||||
+
|
||||
+ for try in $smart_lib_dir /usr/local/lib /opt/lib; do
|
||||
+ LIBS="-L$try -lsasl $old_LIBS"
|
||||
+ cat > conftest.$ac_ext <<EOF
|
||||
+#line 1051 "configure"
|
||||
+#include "confdefs.h"
|
||||
+extern char sasl_encode();
|
||||
+int main() {
|
||||
+ sasl_encode()
|
||||
+; return 0; }
|
||||
+EOF
|
||||
+if { (eval echo configure:1058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
+ rm -rf conftest*
|
||||
+ smart_lib="-L$try -lsasl"
|
||||
+else
|
||||
+ echo "configure: failed program was:" >&5
|
||||
+ cat conftest.$ac_ext >&5
|
||||
+fi
|
||||
+rm -f conftest*
|
||||
+ if test "x$smart_lib" != "x"; then
|
||||
+ break;
|
||||
+ fi
|
||||
+ done
|
||||
+ LIBS="$old_LIBS"
|
||||
+fi
|
||||
+
|
||||
+if test "x$smart_lib" != "x"; then
|
||||
+ echo "$ac_t""yes" 1>&6
|
||||
+ eval "ac_cv_lib_${sm_lib_safe}_${sm_func_safe}=yes"
|
||||
+ LIBS="$smart_lib $old_LIBS"
|
||||
+ SMART_LIBS="$smart_lib $SMART_LIBS"
|
||||
+else
|
||||
+ echo "$ac_t""no" 1>&6
|
||||
+fi
|
||||
+
|
||||
+
|
||||
+
|
||||
+sm_lib_safe=`echo "lber" | sed 'y%./+-%__p_%'`
|
||||
+sm_func_safe=`echo "ber_init" | sed 'y%./+-%__p_%'`
|
||||
+echo $ac_n "checking for ber_init in -llber""... $ac_c" 1>&6
|
||||
+echo "configure:1087: checking for ber_init in -llber" >&5
|
||||
+
|
||||
+old_LIBS="$LIBS"
|
||||
+smart_lib=
|
||||
+smart_lib_dir=
|
||||
+
|
||||
+if test "x$smart_try_dir" != "x"; then
|
||||
+ for try in $smart_try_dir; do
|
||||
+ LIBS="-L$try -llber $old_LIBS"
|
||||
+ cat > conftest.$ac_ext <<EOF
|
||||
+#line 1097 "configure"
|
||||
+#include "confdefs.h"
|
||||
+extern char ber_init();
|
||||
+int main() {
|
||||
+ ber_init()
|
||||
+; return 0; }
|
||||
+EOF
|
||||
+if { (eval echo configure:1104: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
+ rm -rf conftest*
|
||||
+ smart_lib="-L$try -llber"
|
||||
+else
|
||||
+ echo "configure: failed program was:" >&5
|
||||
+ cat conftest.$ac_ext >&5
|
||||
+fi
|
||||
+rm -f conftest*
|
||||
+ if test "x$smart_lib" != "x"; then
|
||||
+ break;
|
||||
+ fi
|
||||
+ done
|
||||
+ LIBS="$old_LIBS"
|
||||
+fi
|
||||
+
|
||||
+if test "x$smart_lib" = "x"; then
|
||||
+ LIBS="-llber $old_LIBS"
|
||||
+ cat > conftest.$ac_ext <<EOF
|
||||
+#line 1122 "configure"
|
||||
+#include "confdefs.h"
|
||||
+extern char ber_init();
|
||||
+int main() {
|
||||
+ ber_init()
|
||||
+; return 0; }
|
||||
+EOF
|
||||
+if { (eval echo configure:1129: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
+ rm -rf conftest*
|
||||
+ smart_lib="-llber"
|
||||
+else
|
||||
+ echo "configure: failed program was:" >&5
|
||||
+ cat conftest.$ac_ext >&5
|
||||
+fi
|
||||
+rm -f conftest*
|
||||
+ LIBS="$old_LIBS"
|
||||
+fi
|
||||
+
|
||||
+if test "x$smart_lib" = "x"; then
|
||||
+
|
||||
+
|
||||
+if test "x$LOCATE" != "x"; then
|
||||
+ DIRS=
|
||||
+ file=liblber${libltdl_cv_shlibext}
|
||||
+
|
||||
+ for x in `${LOCATE} $file 2>/dev/null`; do
|
||||
+ base=`echo $x | sed "s%/${file}%%"`
|
||||
+ if test "x$x" = "x$base"; then
|
||||
+ continue;
|
||||
+ fi
|
||||
+
|
||||
+ dir=`${DIRNAME} $x 2>/dev/null`
|
||||
+ exclude=`echo ${dir} | ${GREP} /home`
|
||||
+ if test "x$exclude" != "x"; then
|
||||
+ continue
|
||||
+ fi
|
||||
+
|
||||
+ already=`echo \$smart_lib_dir ${DIRS} | ${GREP} ${dir}`
|
||||
+ if test "x$already" = "x"; then
|
||||
+ DIRS="$DIRS $dir"
|
||||
+ fi
|
||||
+ done
|
||||
+fi
|
||||
+
|
||||
+eval "smart_lib_dir=\"\$smart_lib_dir $DIRS\""
|
||||
+
|
||||
+
|
||||
+
|
||||
+if test "x$LOCATE" != "x"; then
|
||||
+ DIRS=
|
||||
+ file=liblber.a
|
||||
+
|
||||
+ for x in `${LOCATE} $file 2>/dev/null`; do
|
||||
+ base=`echo $x | sed "s%/${file}%%"`
|
||||
+ if test "x$x" = "x$base"; then
|
||||
+ continue;
|
||||
+ fi
|
||||
+
|
||||
+ dir=`${DIRNAME} $x 2>/dev/null`
|
||||
+ exclude=`echo ${dir} | ${GREP} /home`
|
||||
+ if test "x$exclude" != "x"; then
|
||||
+ continue
|
||||
+ fi
|
||||
+
|
||||
+ already=`echo \$smart_lib_dir ${DIRS} | ${GREP} ${dir}`
|
||||
+ if test "x$already" = "x"; then
|
||||
+ DIRS="$DIRS $dir"
|
||||
+ fi
|
||||
+ done
|
||||
+fi
|
||||
+
|
||||
+eval "smart_lib_dir=\"\$smart_lib_dir $DIRS\""
|
||||
+
|
||||
+
|
||||
+ for try in $smart_lib_dir /usr/local/lib /opt/lib; do
|
||||
+ LIBS="-L$try -llber $old_LIBS"
|
||||
+ cat > conftest.$ac_ext <<EOF
|
||||
+#line 1199 "configure"
|
||||
+#include "confdefs.h"
|
||||
+extern char ber_init();
|
||||
+int main() {
|
||||
+ ber_init()
|
||||
+; return 0; }
|
||||
+EOF
|
||||
+if { (eval echo configure:1206: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
+ rm -rf conftest*
|
||||
+ smart_lib="-L$try -llber"
|
||||
+else
|
||||
+ echo "configure: failed program was:" >&5
|
||||
+ cat conftest.$ac_ext >&5
|
||||
+fi
|
||||
+rm -f conftest*
|
||||
+ if test "x$smart_lib" != "x"; then
|
||||
+ break;
|
||||
+ fi
|
||||
+ done
|
||||
+ LIBS="$old_LIBS"
|
||||
+fi
|
||||
+
|
||||
+if test "x$smart_lib" != "x"; then
|
||||
+ echo "$ac_t""yes" 1>&6
|
||||
+ eval "ac_cv_lib_${sm_lib_safe}_${sm_func_safe}=yes"
|
||||
+ LIBS="$smart_lib $old_LIBS"
|
||||
+ SMART_LIBS="$smart_lib $SMART_LIBS"
|
||||
+else
|
||||
+ echo "$ac_t""no" 1>&6
|
||||
+fi
|
||||
+
|
||||
+
|
||||
if test "x$rlm_ldap_with_threads" = "xyes"; then
|
||||
|
||||
|
||||
sm_lib_safe=`echo "ldap_r" | sed 'y%./+-%__p_%'`
|
||||
sm_func_safe=`echo "ldap_init" | sed 'y%./+-%__p_%'`
|
||||
echo $ac_n "checking for ldap_init in -lldap_r""... $ac_c" 1>&6
|
||||
-echo "configure:939: checking for ldap_init in -lldap_r" >&5
|
||||
+echo "configure:1237: checking for ldap_init in -lldap_r" >&5
|
||||
|
||||
old_LIBS="$LIBS"
|
||||
smart_lib=
|
||||
@@ -945,14 +1243,14 @@
|
||||
for try in $smart_try_dir; do
|
||||
LIBS="-L$try -lldap_r $old_LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
-#line 949 "configure"
|
||||
+#line 1247 "configure"
|
||||
#include "confdefs.h"
|
||||
extern char ldap_init();
|
||||
int main() {
|
||||
ldap_init()
|
||||
; return 0; }
|
||||
EOF
|
||||
-if { (eval echo configure:956: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
+if { (eval echo configure:1254: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
smart_lib="-L$try -lldap_r"
|
||||
else
|
||||
@@ -970,14 +1268,14 @@
|
||||
if test "x$smart_lib" = "x"; then
|
||||
LIBS="-lldap_r $old_LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
-#line 974 "configure"
|
||||
+#line 1272 "configure"
|
||||
#include "confdefs.h"
|
||||
extern char ldap_init();
|
||||
int main() {
|
||||
ldap_init()
|
||||
; return 0; }
|
||||
EOF
|
||||
-if { (eval echo configure:981: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
+if { (eval echo configure:1279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
smart_lib="-lldap_r"
|
||||
else
|
||||
@@ -1047,14 +1345,14 @@
|
||||
for try in $smart_lib_dir /usr/local/lib /opt/lib; do
|
||||
LIBS="-L$try -lldap_r $old_LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
-#line 1051 "configure"
|
||||
+#line 1349 "configure"
|
||||
#include "confdefs.h"
|
||||
extern char ldap_init();
|
||||
int main() {
|
||||
ldap_init()
|
||||
; return 0; }
|
||||
EOF
|
||||
-if { (eval echo configure:1058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
+if { (eval echo configure:1356: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
smart_lib="-L$try -lldap_r"
|
||||
else
|
||||
@@ -1087,7 +1385,7 @@
|
||||
sm_lib_safe=`echo "ldap" | sed 'y%./+-%__p_%'`
|
||||
sm_func_safe=`echo "ldap_init" | sed 'y%./+-%__p_%'`
|
||||
echo $ac_n "checking for ldap_init in -lldap""... $ac_c" 1>&6
|
||||
-echo "configure:1091: checking for ldap_init in -lldap" >&5
|
||||
+echo "configure:1389: checking for ldap_init in -lldap" >&5
|
||||
|
||||
old_LIBS="$LIBS"
|
||||
smart_lib=
|
||||
@@ -1097,14 +1395,14 @@
|
||||
for try in $smart_try_dir; do
|
||||
LIBS="-L$try -lldap $old_LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
-#line 1101 "configure"
|
||||
+#line 1399 "configure"
|
||||
#include "confdefs.h"
|
||||
extern char ldap_init();
|
||||
int main() {
|
||||
ldap_init()
|
||||
; return 0; }
|
||||
EOF
|
||||
-if { (eval echo configure:1108: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
+if { (eval echo configure:1406: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
smart_lib="-L$try -lldap"
|
||||
else
|
||||
@@ -1122,14 +1420,14 @@
|
||||
if test "x$smart_lib" = "x"; then
|
||||
LIBS="-lldap $old_LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
-#line 1126 "configure"
|
||||
+#line 1424 "configure"
|
||||
#include "confdefs.h"
|
||||
extern char ldap_init();
|
||||
int main() {
|
||||
ldap_init()
|
||||
; return 0; }
|
||||
EOF
|
||||
-if { (eval echo configure:1133: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
+if { (eval echo configure:1431: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
smart_lib="-lldap"
|
||||
else
|
||||
@@ -1199,14 +1497,14 @@
|
||||
for try in $smart_lib_dir /usr/local/lib /opt/lib; do
|
||||
LIBS="-L$try -lldap $old_LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
-#line 1203 "configure"
|
||||
+#line 1501 "configure"
|
||||
#include "confdefs.h"
|
||||
extern char ldap_init();
|
||||
int main() {
|
||||
ldap_init()
|
||||
; return 0; }
|
||||
EOF
|
||||
-if { (eval echo configure:1210: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
+if { (eval echo configure:1508: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
smart_lib="-L$try -lldap"
|
||||
else
|
||||
@@ -1241,7 +1539,7 @@
|
||||
|
||||
ac_safe=`echo "ldap.h" | sed 'y%./+-%__pm%'`
|
||||
echo $ac_n "checking for ldap.h""... $ac_c" 1>&6
|
||||
-echo "configure:1245: checking for ldap.h" >&5
|
||||
+echo "configure:1543: checking for ldap.h" >&5
|
||||
|
||||
old_CFLAGS="$CFLAGS"
|
||||
smart_include=
|
||||
@@ -1251,7 +1549,7 @@
|
||||
for try in $smart_try_dir; do
|
||||
CFLAGS="$old_CFLAGS -I$try"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
-#line 1255 "configure"
|
||||
+#line 1553 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <ldap.h>
|
||||
@@ -1259,7 +1557,7 @@
|
||||
int a = 1;
|
||||
; return 0; }
|
||||
EOF
|
||||
-if { (eval echo configure:1263: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
+if { (eval echo configure:1561: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
smart_include="-I$try"
|
||||
else
|
||||
@@ -1278,7 +1576,7 @@
|
||||
|
||||
if test "x$smart_include" = "x"; then
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
-#line 1282 "configure"
|
||||
+#line 1580 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <ldap.h>
|
||||
@@ -1286,7 +1584,7 @@
|
||||
int a = 1;
|
||||
; return 0; }
|
||||
EOF
|
||||
-if { (eval echo configure:1290: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
+if { (eval echo configure:1588: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
smart_include=" "
|
||||
else
|
||||
@@ -1330,7 +1628,7 @@
|
||||
for try in $smart_include_dir /usr/local/include /opt/include; do
|
||||
CFLAGS="$old_CFLAGS -I$try"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
-#line 1334 "configure"
|
||||
+#line 1632 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <ldap.h>
|
||||
@@ -1338,7 +1636,7 @@
|
||||
int a = 1;
|
||||
; return 0; }
|
||||
EOF
|
||||
-if { (eval echo configure:1342: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
+if { (eval echo configure:1640: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
smart_include="-I$try"
|
||||
else
|
||||
@@ -1371,12 +1669,12 @@
|
||||
|
||||
if test "x$fail" = "x"; then
|
||||
echo $ac_n "checking for ldap_start_tls_s""... $ac_c" 1>&6
|
||||
-echo "configure:1375: checking for ldap_start_tls_s" >&5
|
||||
+echo "configure:1673: checking for ldap_start_tls_s" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_func_ldap_start_tls_s'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
-#line 1380 "configure"
|
||||
+#line 1678 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char ldap_start_tls_s(); below. */
|
||||
@@ -1399,7 +1697,7 @@
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
-if { (eval echo configure:1403: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
+if { (eval echo configure:1701: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_func_ldap_start_tls_s=yes"
|
||||
else
|
||||
@@ -1419,12 +1717,12 @@
|
||||
fi
|
||||
|
||||
echo $ac_n "checking for ldap_initialize""... $ac_c" 1>&6
|
||||
-echo "configure:1423: checking for ldap_initialize" >&5
|
||||
+echo "configure:1721: checking for ldap_initialize" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_func_ldap_initialize'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
-#line 1428 "configure"
|
||||
+#line 1726 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char ldap_initialize(); below. */
|
||||
@@ -1447,7 +1745,7 @@
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
-if { (eval echo configure:1451: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
+if { (eval echo configure:1749: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_func_ldap_initialize=yes"
|
||||
else
|
||||
@@ -1467,12 +1765,12 @@
|
||||
fi
|
||||
|
||||
echo $ac_n "checking for ldap_int_tls_config""... $ac_c" 1>&6
|
||||
-echo "configure:1471: checking for ldap_int_tls_config" >&5
|
||||
+echo "configure:1769: checking for ldap_int_tls_config" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_func_ldap_int_tls_config'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
-#line 1476 "configure"
|
||||
+#line 1774 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char ldap_int_tls_config(); below. */
|
||||
@@ -1495,7 +1793,7 @@
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
-if { (eval echo configure:1499: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
+if { (eval echo configure:1797: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_func_ldap_int_tls_config=yes"
|
||||
else
|
||||
diff -ruN freeradius-1.1.1-old/src/modules/rlm_ldap/configure.in freeradius-1.1.1-new/src/modules/rlm_ldap/configure.in
|
||||
--- freeradius-1.1.1-old/src/modules/rlm_ldap/configure.in 2005-08-22 16:50:46.000000000 +0200
|
||||
+++ freeradius-1.1.1-new/src/modules/rlm_ldap/configure.in 2006-05-21 19:51:25.000000000 +0200
|
||||
@@ -90,6 +90,10 @@
|
||||
dnl Static linking will probably not work, but nobody ever
|
||||
dnl complained about it.
|
||||
smart_try_dir=$rlm_ldap_lib_dir
|
||||
+
|
||||
+ AC_SMART_CHECK_LIB(sasl, sasl_encode)
|
||||
+ AC_SMART_CHECK_LIB(lber, ber_init)
|
||||
+
|
||||
if test "x$rlm_ldap_with_threads" = "xyes"; then
|
||||
AC_SMART_CHECK_LIB(ldap_r, ldap_init)
|
||||
if test "x$ac_cv_lib_ldap_r_ldap_init" != "xyes"; then
|
||||
@ -0,0 +1,11 @@
|
||||
diff -ruN freeradius-1.1.1-old/Makefile freeradius-1.1.1-new/Makefile
|
||||
--- freeradius-1.1.1-old/Makefile 2005-04-11 23:18:27.000000000 +0200
|
||||
+++ freeradius-1.1.1-new/Makefile 2006-05-22 08:27:44.000000000 +0200
|
||||
@@ -38,6 +38,7 @@
|
||||
install:
|
||||
$(INSTALL) -d -m 755 $(R)$(sbindir)
|
||||
$(INSTALL) -d -m 755 $(R)$(bindir)
|
||||
+ $(INSTALL) -d -m 755 $(R)$(libdir)
|
||||
$(INSTALL) -d -m 755 $(R)$(raddbdir)
|
||||
$(INSTALL) -d -m 755 $(R)$(mandir)
|
||||
$(INSTALL) -d -m 755 $(R)$(RUNDIR)
|
||||
@ -0,0 +1,27 @@
|
||||
diff -ruN freeradius-1.1.1-old/src/modules/rlm_eap/Makefile.in freeradius-1.1.1-new/src/modules/rlm_eap/Makefile.in
|
||||
--- freeradius-1.1.1-old/src/modules/rlm_eap/Makefile.in 2006-02-10 20:47:08.000000000 +0100
|
||||
+++ freeradius-1.1.1-new/src/modules/rlm_eap/Makefile.in 2006-05-22 08:25:44.000000000 +0200
|
||||
@@ -10,7 +10,6 @@
|
||||
RLM_LIBS = libeap/libeap.la $(LIBLTDL)
|
||||
RLM_INSTALL = install-subdirs
|
||||
RLM_SUBDIRS = libeap @eaptypes@
|
||||
-RLM_UTILS = radeapclient
|
||||
|
||||
#
|
||||
# Not using shared libraries, add in ALL known static modules
|
||||
@@ -29,15 +28,8 @@
|
||||
|
||||
$(LT_OBJS): $(HEADERS)
|
||||
|
||||
-radeapclient: radeapclient.lo $(CLIENTLIBS)
|
||||
- $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(RLM_LDFLAGS) -static -o radeapclient radeapclient.lo $(CLIENTLIBS) $(LIBS)
|
||||
-
|
||||
-radeapclient.lo: radeapclient.c $(HEADERS)
|
||||
- $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(RLM_CFLAGS) -c radeapclient.c
|
||||
-
|
||||
install-subdirs:
|
||||
@$(MAKE) $(MFLAGS) WHAT_TO_MAKE=install common
|
||||
- $(LIBTOOL) --mode=install $(INSTALL) -m 755 $(INSTALLSTRIP) radeapclient$(EXEEXT) $(R)$(bindir)
|
||||
|
||||
common:
|
||||
@for dir in $(RLM_SUBDIRS); do \
|
||||
@ -0,0 +1,24 @@
|
||||
diff -ruN freeradius-1.1.1-old/configure freeradius-1.1.1-new/configure
|
||||
--- freeradius-1.1.1-old/configure 2006-05-21 19:44:54.000000000 +0200
|
||||
+++ freeradius-1.1.1-new/configure 2006-06-02 01:07:28.000000000 +0200
|
||||
@@ -7150,7 +7150,7 @@
|
||||
openssl/ssl.h \
|
||||
openssl/crypto.h \
|
||||
openssl/err.h \
|
||||
- openssl/engine.h
|
||||
+
|
||||
do
|
||||
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
|
||||
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
|
||||
diff -ruN freeradius-1.1.1-old/configure.in freeradius-1.1.1-new/configure.in
|
||||
--- freeradius-1.1.1-old/configure.in 2006-02-06 13:50:52.000000000 +0100
|
||||
+++ freeradius-1.1.1-new/configure.in 2006-06-02 01:07:19.000000000 +0200
|
||||
@@ -574,7 +574,7 @@
|
||||
openssl/ssl.h \
|
||||
openssl/crypto.h \
|
||||
openssl/err.h \
|
||||
- openssl/engine.h,
|
||||
+ ,
|
||||
[],
|
||||
OPENSSL_LIBS=
|
||||
)
|
||||
Loading…
x
Reference in New Issue
Block a user