From: Nicolas Thill Date: Wed, 26 Jul 2006 00:17:32 +0000 (+0000) Subject: port freeradius to buildroot-ng X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;h=4cd66c89c4564cfdb78385bfa7106676095b98ef port freeradius to buildroot-ng SVN-Revision: 4288 --- diff --git a/net/freeradius/Makefile b/net/freeradius/Makefile new file mode 100644 index 0000000000..0d0e964f4c --- /dev/null +++ b/net/freeradius/Makefile @@ -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)) diff --git a/net/freeradius/files/radiusd.init b/net/freeradius/files/radiusd.init new file mode 100644 index 0000000000..3ec16896ac --- /dev/null +++ b/net/freeradius/files/radiusd.init @@ -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 $? diff --git a/net/freeradius/patches/01-freeradius-1.1.1-dict.patch b/net/freeradius/patches/01-freeradius-1.1.1-dict.patch new file mode 100644 index 0000000000..b80d19dfe9 --- /dev/null +++ b/net/freeradius/patches/01-freeradius-1.1.1-dict.patch @@ -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. diff --git a/net/freeradius/patches/02-freeradius-1.1.1-config.patch b/net/freeradius/patches/02-freeradius-1.1.1-config.patch new file mode 100644 index 0000000000..271cf56098 --- /dev/null +++ b/net/freeradius/patches/02-freeradius-1.1.1-config.patch @@ -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 + } diff --git a/net/freeradius/patches/03-freeradius-1.1.1-configure_cross.patch b/net/freeradius/patches/03-freeradius-1.1.1-configure_cross.patch new file mode 100644 index 0000000000..b561757d31 --- /dev/null +++ b/net/freeradius/patches/03-freeradius-1.1.1-configure_cross.patch @@ -0,0 +1,1694 @@ +diff -ruN freeradius-1.1.1-old/aclocal.m4 freeradius-1.1.1-new/aclocal.m4 +--- freeradius-1.1.1-old/aclocal.m4 2006-02-06 13:52:10.000000000 +0100 ++++ freeradius-1.1.1-new/aclocal.m4 2006-05-21 19:27:12.000000000 +0200 +@@ -1931,7 +1931,23 @@ + version_type=none + dynamic_linker="$host_os ld.so" + sys_lib_dlsearch_path_spec="/lib /usr/lib" +-sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" ++if test "$cross_compiling" = yes; then ++ sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries: *=*//"` ++ if echo "$sys_lib_search_path_spec" | egrep ';' >/dev/null ; then ++ # if the path contains ";" then we assume it to be the separator ++ # otherwise default to the standard path separator (i.e. ":") - it is ++ # assumed that no part of a normal pathname contains ";" but that should ++ # okay in the real world where ";" in dirpaths is itself problematic. ++ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | sed -e 's/;/ /g'` ++ else ++ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | sed -e "s/$PATH_SEPARATOR/ /g"` ++ fi ++else ++ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" ++fi ++if test "x$lt_sys_lib_search_path_spec" != "x"; then ++ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_sys_lib_search_path_spec" ++fi + + case $host_os in + aix3*) +diff -ruN freeradius-1.1.1-old/configure freeradius-1.1.1-new/configure +--- freeradius-1.1.1-old/configure 2006-02-06 13:55:53.000000000 +0100 ++++ freeradius-1.1.1-new/configure 2006-05-21 19:31:52.000000000 +0200 +@@ -4024,7 +4024,23 @@ + version_type=none + dynamic_linker="$host_os ld.so" + sys_lib_dlsearch_path_spec="/lib /usr/lib" +-sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" ++if test "$cross_compiling" = yes; then ++ sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries: *=*//"` ++ if echo "$sys_lib_search_path_spec" | egrep ';' >/dev/null ; then ++ # if the path contains ";" then we assume it to be the separator ++ # otherwise default to the standard path separator (i.e. ":") - it is ++ # assumed that no part of a normal pathname contains ";" but that should ++ # okay in the real world where ";" in dirpaths is itself problematic. ++ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | sed -e 's/;/ /g'` ++ else ++ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | sed -e "s/$PATH_SEPARATOR/ /g"` ++ fi ++else ++ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" ++fi ++if test "x$lt_sys_lib_search_path_spec" != "x"; then ++ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_sys_lib_search_path_spec" ++fi + + case $host_os in + aix3*) +@@ -4412,7 +4428,7 @@ + ## + # Report the final consequences. + echo $ac_n "checking if libtool supports shared libraries""... $ac_c" 1>&6 +-echo "configure:4416: checking if libtool supports shared libraries" >&5 ++echo "configure:4432: checking if libtool supports shared libraries" >&5 + echo "$ac_t""$can_build_shared" 1>&6 + ## + ## END FIXME +@@ -4420,7 +4436,7 @@ + ## FIXME: this should be a separate macro + ## + echo $ac_n "checking whether to build shared libraries""... $ac_c" 1>&6 +-echo "configure:4424: checking whether to build shared libraries" >&5 ++echo "configure:4440: checking whether to build shared libraries" >&5 + test "$can_build_shared" = "no" && enable_shared=no + + # On AIX, shared libraries and static libraries use the same namespace, and +@@ -4447,7 +4463,7 @@ + ## FIXME: this should be a separate macro + ## + echo $ac_n "checking whether to build static libraries""... $ac_c" 1>&6 +-echo "configure:4451: checking whether to build static libraries" >&5 ++echo "configure:4467: checking whether to build static libraries" >&5 + # Make sure either enable_shared or enable_static is yes. + test "$enable_shared" = yes || enable_static=yes + echo "$ac_t""$enable_static" 1>&6 +@@ -4490,12 +4506,12 @@ + + *) + echo $ac_n "checking for shl_load""... $ac_c" 1>&6 +-echo "configure:4494: checking for shl_load" >&5 ++echo "configure:4510: checking for shl_load" >&5 + if eval "test \"`echo '$''{'ac_cv_func_shl_load'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4538: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_shl_load=yes" + else +@@ -4536,7 +4552,7 @@ + else + echo "$ac_t""no" 1>&6 + echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6 +-echo "configure:4540: checking for shl_load in -ldld" >&5 ++echo "configure:4556: checking for shl_load in -ldld" >&5 + ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -4544,7 +4560,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-ldld $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4575: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -4574,12 +4590,12 @@ + else + echo "$ac_t""no" 1>&6 + echo $ac_n "checking for dlopen""... $ac_c" 1>&6 +-echo "configure:4578: checking for dlopen" >&5 ++echo "configure:4594: checking for dlopen" >&5 + if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_dlopen=yes" + else +@@ -4620,7 +4636,7 @@ + else + echo "$ac_t""no" 1>&6 + echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 +-echo "configure:4624: checking for dlopen in -ldl" >&5 ++echo "configure:4640: checking for dlopen in -ldl" >&5 + ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -4628,7 +4644,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-ldl $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4659: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -4658,7 +4674,7 @@ + else + echo "$ac_t""no" 1>&6 + echo $ac_n "checking for dlopen in -lsvld""... $ac_c" 1>&6 +-echo "configure:4662: checking for dlopen in -lsvld" >&5 ++echo "configure:4678: checking for dlopen in -lsvld" >&5 + ac_lib_var=`echo svld'_'dlopen | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -4666,7 +4682,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lsvld $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4697: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -4696,7 +4712,7 @@ + else + echo "$ac_t""no" 1>&6 + echo $ac_n "checking for dld_link in -ldld""... $ac_c" 1>&6 +-echo "configure:4700: checking for dld_link in -ldld" >&5 ++echo "configure:4716: checking for dld_link in -ldld" >&5 + ac_lib_var=`echo dld'_'dld_link | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -4704,7 +4720,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-ldld $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -4771,7 +4787,7 @@ + LIBS="$lt_cv_dlopen_libs $LIBS" + + echo $ac_n "checking whether a program can dlopen itself""... $ac_c" 1>&6 +-echo "configure:4775: checking whether a program can dlopen itself" >&5 ++echo "configure:4791: checking whether a program can dlopen itself" >&5 + if eval "test \"`echo '$''{'lt_cv_dlopen_self'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -4781,7 +4797,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then ++ if { (eval echo configure:4862: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then + (./conftest; exit; ) 2>/dev/null + lt_status=$? + case x$lt_status in +@@ -4865,7 +4881,7 @@ + if test "x$lt_cv_dlopen_self" = xyes; then + LDFLAGS="$LDFLAGS $link_static_flag" + echo $ac_n "checking whether a statically linked program can dlopen itself""... $ac_c" 1>&6 +-echo "configure:4869: checking whether a statically linked program can dlopen itself" >&5 ++echo "configure:4885: checking whether a statically linked program can dlopen itself" >&5 + if eval "test \"`echo '$''{'lt_cv_dlopen_self_static'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -4875,7 +4891,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then ++ if { (eval echo configure:4956: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then + (./conftest; exit; ) 2>/dev/null + lt_status=$? + case x$lt_status in +@@ -4987,14 +5003,14 @@ + # systems, -lgcc has to come before -lc. If gcc already passes -lc + # to ld, don't add -lc before -lgcc. + echo $ac_n "checking whether -lc should be explicitly linked in""... $ac_c" 1>&6 +-echo "configure:4991: checking whether -lc should be explicitly linked in" >&5 ++echo "configure:5007: checking whether -lc should be explicitly linked in" >&5 + if eval "test \"`echo '$''{'lt_cv_archive_cmds_need_lc'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + $rm conftest* + echo 'static int dummy;' > conftest.$ac_ext + +- if { (eval echo configure:4998: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++ if { (eval echo configure:5014: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + soname=conftest + lib=conftest + libobjs=conftest.$ac_objext +@@ -5007,7 +5023,7 @@ + libname=conftest + save_allow_undefined_flag=$allow_undefined_flag + allow_undefined_flag= +- if { (eval echo configure:5011: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\") 1>&5; (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5; } ++ if { (eval echo configure:5027: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\") 1>&5; (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5; } + then + lt_cv_archive_cmds_need_lc=no + else +@@ -5590,7 +5606,7 @@ + # Extract the first word of "libtool", so it can be a program name with args. + set dummy libtool; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:5594: checking for $ac_word" >&5 ++echo "configure:5610: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_LIBTOOL'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -5650,7 +5666,7 @@ + + logdir='${localstatedir}/log/radius' + echo $ac_n "checking logdir""... $ac_c" 1>&6 +-echo "configure:5654: checking logdir" >&5 ++echo "configure:5670: checking logdir" >&5 + # Check whether --with-logdir or --without-logdir was given. + if test "${with_logdir+set}" = set; then + withval="$with_logdir" +@@ -5672,7 +5688,7 @@ + + radacctdir='${logdir}/radacct' + echo $ac_n "checking radacctdir""... $ac_c" 1>&6 +-echo "configure:5676: checking radacctdir" >&5 ++echo "configure:5692: checking radacctdir" >&5 + # Check whether --with-radacctdir or --without-radacctdir was given. + if test "${with_radacctdir+set}" = set; then + withval="$with_radacctdir" +@@ -5694,7 +5710,7 @@ + + raddbdir='${sysconfdir}/raddb' + echo $ac_n "checking raddbdir""... $ac_c" 1>&6 +-echo "configure:5698: checking raddbdir" >&5 ++echo "configure:5714: checking raddbdir" >&5 + # Check whether --with-raddbdir or --without-raddbdir was given. + if test "${with_raddbdir+set}" = set; then + withval="$with_raddbdir" +@@ -5905,7 +5921,7 @@ + # Extract the first word of "perl", so it can be a program name with args. + set dummy perl; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:5909: checking for $ac_word" >&5 ++echo "configure:5925: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -5944,7 +5960,7 @@ + # Extract the first word of "snmpget", so it can be a program name with args. + set dummy snmpget; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:5948: checking for $ac_word" >&5 ++echo "configure:5964: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_SNMPGET'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -5983,7 +5999,7 @@ + # Extract the first word of "snmpwalk", so it can be a program name with args. + set dummy snmpwalk; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:5987: checking for $ac_word" >&5 ++echo "configure:6003: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_SNMPWALK'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -6022,7 +6038,7 @@ + # Extract the first word of "rusers", so it can be a program name with args. + set dummy rusers; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:6026: checking for $ac_word" >&5 ++echo "configure:6042: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_RUSERS'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -6058,7 +6074,7 @@ + + missing_dir=`cd $ac_aux_dir && pwd` + echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 +-echo "configure:6062: checking for working aclocal" >&5 ++echo "configure:6078: checking for working aclocal" >&5 + # Run test in a subshell; some versions of sh will print an error if + # an executable is not found, even if stderr is redirected. + # Redirect stdin to placate older versions of autoconf. Sigh. +@@ -6071,7 +6087,7 @@ + fi + + echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 +-echo "configure:6075: checking for working autoconf" >&5 ++echo "configure:6091: checking for working autoconf" >&5 + # Run test in a subshell; some versions of sh will print an error if + # an executable is not found, even if stderr is redirected. + # Redirect stdin to placate older versions of autoconf. Sigh. +@@ -6084,7 +6100,7 @@ + fi + + echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 +-echo "configure:6088: checking for working autoheader" >&5 ++echo "configure:6104: checking for working autoheader" >&5 + # Run test in a subshell; some versions of sh will print an error if + # an executable is not found, even if stderr is redirected. + # Redirect stdin to placate older versions of autoconf. Sigh. +@@ -6100,7 +6116,7 @@ + # Extract the first word of "locate", so it can be a program name with args. + set dummy locate; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:6104: checking for $ac_word" >&5 ++echo "configure:6120: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_LOCATE'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -6135,7 +6151,7 @@ + # Extract the first word of "dirname", so it can be a program name with args. + set dummy dirname; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:6139: checking for $ac_word" >&5 ++echo "configure:6155: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_DIRNAME'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -6170,7 +6186,7 @@ + # Extract the first word of "grep", so it can be a program name with args. + set dummy grep; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:6174: checking for $ac_word" >&5 ++echo "configure:6190: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_GREP'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -6214,17 +6230,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:6218: checking for $ac_hdr" >&5 ++echo "configure:6234: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:6228: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:6244: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -6253,7 +6269,7 @@ + + + echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 +-echo "configure:6257: checking for pthread_create in -lpthread" >&5 ++echo "configure:6273: checking for pthread_create in -lpthread" >&5 + ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -6261,7 +6277,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lpthread $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:6292: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -6292,7 +6308,7 @@ + else + echo "$ac_t""no" 1>&6 + echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6 +-echo "configure:6296: checking for pthread_create in -lc_r" >&5 ++echo "configure:6312: checking for pthread_create in -lc_r" >&5 + ac_lib_var=`echo c_r'_'pthread_create | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -6300,7 +6316,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lc_r $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:6331: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -6346,14 +6362,14 @@ + + + echo $ac_n "checking for library containing sem_init""... $ac_c" 1>&6 +-echo "configure:6350: checking for library containing sem_init" >&5 ++echo "configure:6366: checking for library containing sem_init" >&5 + if eval "test \"`echo '$''{'ac_cv_search_sem_init'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + ac_func_search_save_LIBS="$LIBS" + ac_cv_search_sem_init="no" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:6384: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cv_search_sem_init="none required" + else +@@ -6375,7 +6391,7 @@ + test "$ac_cv_search_sem_init" = "no" && for i in pthread sem posix4 rt; do + LIBS="-l$i $ac_func_search_save_LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:6406: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cv_search_sem_init="-l$i" + break +@@ -6410,7 +6426,7 @@ + fi + + echo $ac_n "checking for getsockname in -lsocket""... $ac_c" 1>&6 +-echo "configure:6414: checking for getsockname in -lsocket" >&5 ++echo "configure:6430: checking for getsockname in -lsocket" >&5 + ac_lib_var=`echo socket'_'getsockname | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -6418,7 +6434,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lsocket $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:6449: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -6458,7 +6474,7 @@ + + + echo $ac_n "checking for inet_aton in -lresolv""... $ac_c" 1>&6 +-echo "configure:6462: checking for inet_aton in -lresolv" >&5 ++echo "configure:6478: checking for inet_aton in -lresolv" >&5 + ac_lib_var=`echo resolv'_'inet_aton | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -6466,7 +6482,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lresolv $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:6497: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -6506,7 +6522,7 @@ + + + echo $ac_n "checking for inet_ntoa in -lnsl""... $ac_c" 1>&6 +-echo "configure:6510: checking for inet_ntoa in -lnsl" >&5 ++echo "configure:6526: checking for inet_ntoa in -lnsl" >&5 + ac_lib_var=`echo nsl'_'inet_ntoa | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -6514,7 +6530,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lnsl $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:6545: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -6559,7 +6575,7 @@ + LIBS="-L$OPENSSL_LIB_DIR $LIBS" + fi + echo $ac_n "checking for DH_new in -lcrypto""... $ac_c" 1>&6 +-echo "configure:6563: checking for DH_new in -lcrypto" >&5 ++echo "configure:6579: checking for DH_new in -lcrypto" >&5 + ac_lib_var=`echo crypto'_'DH_new | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -6567,7 +6583,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lcrypto $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:6598: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -6599,7 +6615,7 @@ + EOF + + echo $ac_n "checking for SSL_new in -lssl""... $ac_c" 1>&6 +-echo "configure:6603: checking for SSL_new in -lssl" >&5 ++echo "configure:6619: checking for SSL_new in -lssl" >&5 + ac_lib_var=`echo ssl'_'SSL_new | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -6607,7 +6623,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lssl $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:6638: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -6669,12 +6685,12 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 +-echo "configure:6673: checking for $ac_hdr that defines DIR" >&5 ++echo "configure:6689: checking for $ac_hdr that defines DIR" >&5 + if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #include <$ac_hdr> +@@ -6682,7 +6698,7 @@ + DIR *dirp = 0; + ; return 0; } + EOF +-if { (eval echo configure:6686: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:6702: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + eval "ac_cv_header_dirent_$ac_safe=yes" + else +@@ -6707,7 +6723,7 @@ + # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. + if test $ac_header_dirent = dirent.h; then + echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 +-echo "configure:6711: checking for opendir in -ldir" >&5 ++echo "configure:6727: checking for opendir in -ldir" >&5 + ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -6715,7 +6731,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-ldir $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:6746: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -6748,7 +6764,7 @@ + + else + echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 +-echo "configure:6752: checking for opendir in -lx" >&5 ++echo "configure:6768: checking for opendir in -lx" >&5 + ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -6756,7 +6772,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lx $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:6787: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -6790,12 +6806,12 @@ + fi + + echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 +-echo "configure:6794: checking for ANSI C header files" >&5 ++echo "configure:6810: checking for ANSI C header files" >&5 + if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #include +@@ -6803,7 +6819,7 @@ + #include + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:6807: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:6823: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -6820,7 +6836,7 @@ + if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. + cat > conftest.$ac_ext < + EOF +@@ -6838,7 +6854,7 @@ + if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. + cat > conftest.$ac_ext < + EOF +@@ -6859,7 +6875,7 @@ + : + else + cat > conftest.$ac_ext < + #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +@@ -6870,7 +6886,7 @@ + exit (0); } + + EOF +-if { (eval echo configure:6874: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:6890: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + : + else +@@ -6894,12 +6910,12 @@ + fi + + echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 +-echo "configure:6898: checking whether time.h and sys/time.h may both be included" >&5 ++echo "configure:6914: checking whether time.h and sys/time.h may both be included" >&5 + if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #include +@@ -6908,7 +6924,7 @@ + struct tm *tp; + ; return 0; } + EOF +-if { (eval echo configure:6912: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:6928: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_header_time=yes + else +@@ -6929,12 +6945,12 @@ + fi + + echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 +-echo "configure:6933: checking for sys/wait.h that is POSIX.1 compatible" >&5 ++echo "configure:6949: checking for sys/wait.h that is POSIX.1 compatible" >&5 + if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #include +@@ -6950,7 +6966,7 @@ + s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; + ; return 0; } + EOF +-if { (eval echo configure:6954: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:6970: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_header_sys_wait_h=yes + else +@@ -7005,17 +7021,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:7009: checking for $ac_hdr" >&5 ++echo "configure:7025: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:7019: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:7035: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -7045,17 +7061,17 @@ + REGEX=no + ac_safe=`echo "regex.h" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for regex.h""... $ac_c" 1>&6 +-echo "configure:7049: checking for regex.h" >&5 ++echo "configure:7065: checking for regex.h" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:7059: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:7075: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -7083,7 +7099,7 @@ + REGEX_EXTENDED=no + REGEX=yes + cat > conftest.$ac_ext < + #ifdef REG_EXTENDED +@@ -7138,17 +7154,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:7142: checking for $ac_hdr" >&5 ++echo "configure:7158: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:7152: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:7168: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -7178,9 +7194,9 @@ + + if test "x$OPENSSL_LIBS" != "x"; then + echo $ac_n "checking for OpenSSL version >= 0.9.7""... $ac_c" 1>&6 +-echo "configure:7182: checking for OpenSSL version >= 0.9.7" >&5 ++echo "configure:7198: checking for OpenSSL version >= 0.9.7" >&5 + cat > conftest.$ac_ext < + #if (OPENSSL_VERSION_NUMBER >= 0x00907000L) +@@ -7215,12 +7231,12 @@ + + + echo $ac_n "checking for off_t""... $ac_c" 1>&6 +-echo "configure:7219: checking for off_t" >&5 ++echo "configure:7235: checking for off_t" >&5 + if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #if STDC_HEADERS +@@ -7248,12 +7264,12 @@ + fi + + echo $ac_n "checking for pid_t""... $ac_c" 1>&6 +-echo "configure:7252: checking for pid_t" >&5 ++echo "configure:7268: checking for pid_t" >&5 + if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #if STDC_HEADERS +@@ -7281,12 +7297,12 @@ + fi + + echo $ac_n "checking for size_t""... $ac_c" 1>&6 +-echo "configure:7285: checking for size_t" >&5 ++echo "configure:7301: checking for size_t" >&5 + if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #if STDC_HEADERS +@@ -7314,12 +7330,12 @@ + fi + + echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 +-echo "configure:7318: checking for uid_t in sys/types.h" >&5 ++echo "configure:7334: checking for uid_t in sys/types.h" >&5 + if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + EOF +@@ -7350,13 +7366,13 @@ + + + echo $ac_n "checking for socklen_t""... $ac_c" 1>&6 +-echo "configure:7354: checking for socklen_t" >&5 ++echo "configure:7370: checking for socklen_t" >&5 + if eval "test \"`echo '$''{'ac_cv_type_socklen_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + ac_cv_type_socklen_t=no + cat > conftest.$ac_ext < +@@ -7369,7 +7385,7 @@ + socklen_t foo + ; return 0; } + EOF +-if { (eval echo configure:7373: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7389: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_type_socklen_t=yes + else +@@ -7393,13 +7409,13 @@ + + + echo $ac_n "checking for uint8_t""... $ac_c" 1>&6 +-echo "configure:7397: checking for uint8_t" >&5 ++echo "configure:7413: checking for uint8_t" >&5 + if eval "test \"`echo '$''{'ac_cv_type_uint8_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + ac_cv_type_uint8_t=no + cat > conftest.$ac_ext < +@@ -7412,7 +7428,7 @@ + uint8_t foo + ; return 0; } + EOF +-if { (eval echo configure:7416: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7432: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_type_uint8_t=yes + else +@@ -7436,13 +7452,13 @@ + + + echo $ac_n "checking for uint16_t""... $ac_c" 1>&6 +-echo "configure:7440: checking for uint16_t" >&5 ++echo "configure:7456: checking for uint16_t" >&5 + if eval "test \"`echo '$''{'ac_cv_type_uint16_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + ac_cv_type_uint16_t=no + cat > conftest.$ac_ext < +@@ -7455,7 +7471,7 @@ + uint16_t foo + ; return 0; } + EOF +-if { (eval echo configure:7459: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7475: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_type_uint16_t=yes + else +@@ -7479,13 +7495,13 @@ + + + echo $ac_n "checking for uint32_t""... $ac_c" 1>&6 +-echo "configure:7483: checking for uint32_t" >&5 ++echo "configure:7499: checking for uint32_t" >&5 + if eval "test \"`echo '$''{'ac_cv_type_uint32_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + ac_cv_type_uint32_t=no + cat > conftest.$ac_ext < +@@ -7498,7 +7514,7 @@ + uint32_t foo + ; return 0; } + EOF +-if { (eval echo configure:7502: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7518: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_type_uint32_t=yes + else +@@ -7547,12 +7563,12 @@ + + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:7551: checking for $ac_func" >&5 ++echo "configure:7567: checking for $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:7595: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" + else +@@ -7611,12 +7627,12 @@ + + do + echo $ac_n "checking whether $ac_func must be declared""... $ac_c" 1>&6 +-echo "configure:7615: checking whether $ac_func must be declared" >&5 ++echo "configure:7631: checking whether $ac_func must be declared" >&5 + if eval "test \"`echo '$''{'radius_cv_decl_needed_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < +@@ -7671,7 +7687,7 @@ + char *(*pfn) = (char *(*)) $ac_func + ; return 0; } + EOF +-if { (eval echo configure:7675: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7691: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + eval "radius_cv_decl_needed_$ac_func=no" + else +@@ -7698,12 +7714,12 @@ + + + echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 +-echo "configure:7702: checking return type of signal handlers" >&5 ++echo "configure:7718: checking return type of signal handlers" >&5 + if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #include +@@ -7720,7 +7736,7 @@ + int i; + ; return 0; } + EOF +-if { (eval echo configure:7724: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7740: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_type_signal=void + else +@@ -7743,11 +7759,11 @@ + then + + echo $ac_n "checking for ut_xtime in struct utmpx""... $ac_c" 1>&6 +-echo "configure:7747: checking for ut_xtime in struct utmpx" >&5 ++echo "configure:7763: checking for ut_xtime in struct utmpx" >&5 + + + cat > conftest.$ac_ext < +@@ -7759,7 +7775,7 @@ + int foo = offsetof(struct utmpx, ut_xtime) + ; return 0; } + EOF +-if { (eval echo configure:7763: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7779: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + has_element=" " + else +@@ -7790,11 +7806,11 @@ + + + echo $ac_n "checking for ipi_addr in struct in_pktinfo""... $ac_c" 1>&6 +-echo "configure:7794: checking for ipi_addr in struct in_pktinfo" >&5 ++echo "configure:7810: checking for ipi_addr in struct in_pktinfo" >&5 + + + cat > conftest.$ac_ext < +@@ -7806,7 +7822,7 @@ + int foo = offsetof(struct in_pktinfo, ipi_addr) + ; return 0; } + EOF +-if { (eval echo configure:7810: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7826: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + has_element=" " + else +@@ -7836,12 +7852,12 @@ + + + echo $ac_n "checking for working const""... $ac_c" 1>&6 +-echo "configure:7840: checking for working const" >&5 ++echo "configure:7856: checking for working const" >&5 + if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7910: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_c_const=yes + else +@@ -7912,7 +7928,7 @@ + + + echo $ac_n "checking type of OS""... $ac_c" 1>&6 +-echo "configure:7916: checking type of OS" >&5 ++echo "configure:7932: checking type of OS" >&5 + OS=`uname -s` + echo "$ac_t""$OS" 1>&6 + if test "$OS" = "OS/2"; then +@@ -7927,7 +7943,7 @@ + fi + + echo $ac_n "checking for developer gcc flags""... $ac_c" 1>&6 +-echo "configure:7931: checking for developer gcc flags" >&5 ++echo "configure:7947: checking for developer gcc flags" >&5 + if test "x$developer" = "xyes" -a "x$GCC" = "xyes"; then + devflags="-g -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -W -Wredundant-decls -Wundef" + CFLAGS="$CFLAGS $devflags" +@@ -7942,7 +7958,7 @@ + + + echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6 +-echo "configure:7946: checking for crypt in -lcrypt" >&5 ++echo "configure:7962: checking for crypt in -lcrypt" >&5 + ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -7950,7 +7966,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lcrypt $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:7981: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -7989,12 +8005,12 @@ + + else + echo $ac_n "checking for crypt""... $ac_c" 1>&6 +-echo "configure:7993: checking for crypt" >&5 ++echo "configure:8009: checking for crypt" >&5 + if eval "test \"`echo '$''{'ac_cv_func_crypt'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8037: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_crypt=yes" + else +@@ -8042,7 +8058,7 @@ + fi + + echo $ac_n "checking for setkey in -lcipher""... $ac_c" 1>&6 +-echo "configure:8046: checking for setkey in -lcipher" >&5 ++echo "configure:8062: checking for setkey in -lcipher" >&5 + ac_lib_var=`echo cipher'_'setkey | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -8050,7 +8066,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lcipher $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8081: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -8090,10 +8106,10 @@ + + + echo $ac_n "checking for asn1.h,snmp.h,snmp_impl.h""... $ac_c" 1>&6 +-echo "configure:8094: checking for asn1.h,snmp.h,snmp_impl.h" >&5 ++echo "configure:8110: checking for asn1.h,snmp.h,snmp_impl.h" >&5 + + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:8139: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + SNMP_INCLUDE="";ucdsnmp=yes + else +@@ -8135,7 +8151,7 @@ + for try in /usr/include /usr/local/include $with_snmp_include_dir; do + CFLAGS="$old_CFLAGS -I$try" + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:8181: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + SNMP_INCLUDE="-I$try";ucdsnmp=yes + else +@@ -8183,7 +8199,7 @@ + for try in /usr/include/ucd-snmp /usr/local/include/ucd-snmp $with_snmp_include_dir; do + CFLAGS="$old_CFLAGS -I$try" + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:8228: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + SNMP_INCLUDE="";ucdsnmp=no + else +@@ -8230,7 +8246,7 @@ + for try in /usr/include/ucd-snmp /usr/local/include/ucd-snmp $with_snmp_include_dir; do + CFLAGS="$old_CFLAGS -I$try" + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:8275: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + SNMP_INCLUDE="-I$try";ucdsnmp=no + else +@@ -8289,19 +8305,19 @@ + + fi + echo $ac_n "checking for snmp_build_var_op in -lsnmp""... $ac_c" 1>&6 +-echo "configure:8293: checking for snmp_build_var_op in -lsnmp" >&5 ++echo "configure:8309: checking for snmp_build_var_op in -lsnmp" >&5 + + old_LIBS="$LIBS" + LIBS="$old_LIBS -lsnmp" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8321: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + SNMP_LIBS="-lsnmp" + else +@@ -8316,14 +8332,14 @@ + for try in /usr/lib /usr/local/lib /usr/local/snmp/lib $with_snmp_lib_dir; do + LIBS="$old_LIBS -L$try -lsnmp" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + SNMP_LIBS="-L$try -lsnmp" + else +@@ -8338,14 +8354,14 @@ + fi + LIBS="$old_LIBS -L$try -lsnmp -lcrypto" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8365: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + SNMP_LIBS="-L$try -lsnmp -lcrypto" + else +@@ -8360,14 +8376,14 @@ + fi + LIBS="$old_LIBS -L$try -lsnmp -lcrypto -lkstat" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8387: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + SNMP_LIBS="-L$try -lsnmp -lcrypto -lkstat" + else +@@ -8405,7 +8421,7 @@ + + gethostbyaddrrstyle="" + echo $ac_n "checking gethostbyaddr_r() syntax""... $ac_c" 1>&6 +-echo "configure:8409: checking gethostbyaddr_r() syntax" >&5 ++echo "configure:8425: checking gethostbyaddr_r() syntax" >&5 + case "$host" in + *-freebsd*) + cat >> confdefs.h <<\EOF +@@ -8418,7 +8434,7 @@ + esac + if test "x$gethostbyaddrrstyle" = "x"; then + cat > conftest.$ac_ext < +@@ -8428,7 +8444,7 @@ + gethostbyaddr_r(NULL, 0, 0, NULL, NULL, 0, NULL, NULL) + ; return 0; } + EOF +-if { (eval echo configure:8432: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8448: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + + cat >> confdefs.h <<\EOF +@@ -8445,7 +8461,7 @@ + fi + if test "x$gethostbyaddrrstyle" = "x"; then + cat > conftest.$ac_ext < +@@ -8455,7 +8471,7 @@ + gethostbyaddr_r(NULL, 0, 0, NULL, NULL, 0, NULL) + ; return 0; } + EOF +-if { (eval echo configure:8459: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8475: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + + cat >> confdefs.h <<\EOF +@@ -8472,7 +8488,7 @@ + fi + if test "x$gethostbyaddrrstyle" = "x"; then + cat > conftest.$ac_ext < +@@ -8482,7 +8498,7 @@ + gethostbyaddr(NULL, 0, 0) + ; return 0; } + EOF +-if { (eval echo configure:8486: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8502: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + + cat >> confdefs.h <<\EOF +@@ -8510,9 +8526,9 @@ + + gethostbynamerstyle="" + echo $ac_n "checking gethostbyname_r() syntax""... $ac_c" 1>&6 +-echo "configure:8514: checking gethostbyname_r() syntax" >&5 ++echo "configure:8530: checking gethostbyname_r() syntax" >&5 + cat > conftest.$ac_ext < +@@ -8522,7 +8538,7 @@ + gethostbyname_r(NULL, NULL, NULL, 0, NULL, NULL) + ; return 0; } + EOF +-if { (eval echo configure:8526: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8542: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + + cat >> confdefs.h <<\EOF +@@ -8538,7 +8554,7 @@ + rm -f conftest* + if test "x$gethostbynamerstyle" = "x"; then + cat > conftest.$ac_ext < +@@ -8548,7 +8564,7 @@ + gethostbyname_r(NULL, NULL, NULL, 0, NULL) + ; return 0; } + EOF +-if { (eval echo configure:8552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8568: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + + cat >> confdefs.h <<\EOF +@@ -8565,7 +8581,7 @@ + fi + if test "x$gethostbynamerstyle" = "x"; then + cat > conftest.$ac_ext < +@@ -8575,7 +8591,7 @@ + gethostbyname(NULL) + ; return 0; } + EOF +-if { (eval echo configure:8579: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8595: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + + cat >> confdefs.h <<\EOF +@@ -8603,9 +8619,9 @@ + + ctimerstyle="" + echo $ac_n "checking ctime_r() syntax""... $ac_c" 1>&6 +-echo "configure:8607: checking ctime_r() syntax" >&5 ++echo "configure:8623: checking ctime_r() syntax" >&5 + cat > conftest.$ac_ext < +@@ -8614,7 +8630,7 @@ + ctime_r(NULL, NULL, 0) + ; return 0; } + EOF +-if { (eval echo configure:8618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8634: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + + cat >> confdefs.h <<\EOF +@@ -8630,7 +8646,7 @@ + rm -f conftest* + if test "x$ctimerstyle" = "x"; then + cat > conftest.$ac_ext < +@@ -8639,7 +8655,7 @@ + ctime_r(NULL, NULL) + ; return 0; } + EOF +-if { (eval echo configure:8643: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8659: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + + cat >> confdefs.h <<\EOF +@@ -8664,7 +8680,7 @@ + + if test x"$rad_enable_largefiles" = xyes ; then + echo $ac_n "checking for largefile linkage""... $ac_c" 1>&6 +-echo "configure:8668: checking for largefile linkage" >&5 ++echo "configure:8684: checking for largefile linkage" >&5 + case "$host" in + *-aix4.01*) + echo "$ac_t""no" 1>&6 +@@ -8701,7 +8717,7 @@ + # Extract the first word of "getconf", so it can be a program name with args. + set dummy getconf; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:8705: checking for $ac_word" >&5 ++echo "configure:8721: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_GETCONF'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else diff --git a/net/freeradius/patches/04-freeradius-1.1.1-rlm_ldap-configure.patch b/net/freeradius/patches/04-freeradius-1.1.1-rlm_ldap-configure.patch new file mode 100644 index 0000000000..dd394e6f50 --- /dev/null +++ b/net/freeradius/patches/04-freeradius-1.1.1-rlm_ldap-configure.patch @@ -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 <&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 <&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 <&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 <&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 <&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 <&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 <&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 <&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 <&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 <&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 <&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 <&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 < +@@ -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 < +@@ -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 < +@@ -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 <&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 <&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 <&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 diff --git a/net/freeradius/patches/05-freeradius-1.1.1-create_libdir_at_install.patch b/net/freeradius/patches/05-freeradius-1.1.1-create_libdir_at_install.patch new file mode 100644 index 0000000000..b96864423c --- /dev/null +++ b/net/freeradius/patches/05-freeradius-1.1.1-create_libdir_at_install.patch @@ -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) diff --git a/net/freeradius/patches/06-freeradius-1.1.1-no_radeapclient.patch b/net/freeradius/patches/06-freeradius-1.1.1-no_radeapclient.patch new file mode 100644 index 0000000000..37edad1900 --- /dev/null +++ b/net/freeradius/patches/06-freeradius-1.1.1-no_radeapclient.patch @@ -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 \ diff --git a/net/freeradius/patches/07-freeradius-1.1.1-no_openssl_engine_check.patch b/net/freeradius/patches/07-freeradius-1.1.1-no_openssl_engine_check.patch new file mode 100644 index 0000000000..12f53f1f96 --- /dev/null +++ b/net/freeradius/patches/07-freeradius-1.1.1-no_openssl_engine_check.patch @@ -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= + )