From fe5d25e9afabdd0ce6d4dff89562dedc721b710c Mon Sep 17 00:00:00 2001 From: nico Date: Tue, 14 Jun 2005 22:22:46 +0000 Subject: [PATCH] Update to new upstream release (v1.0.3) Add some mirror URLs Split patches git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1244 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/freeradius/Makefile | 10 +- ...o.diff => freeradius-1.0.2-autoconf.patch} | 729 ------------------ .../patches/freeradius-1.0.2-config.patch | 309 ++++++++ .../freeradius-1.0.2-modules-ldflags.patch | 42 + .../freeradius-1.0.2-mysql-autoconf.patch | 88 +++ .../patches/freeradius-1.0.3-dict.patch | 100 +++ 6 files changed, 545 insertions(+), 733 deletions(-) rename package/freeradius/patches/{freeradius-1.0.2-2-nico.diff => freeradius-1.0.2-autoconf.patch} (89%) create mode 100644 package/freeradius/patches/freeradius-1.0.2-config.patch create mode 100644 package/freeradius/patches/freeradius-1.0.2-modules-ldflags.patch create mode 100644 package/freeradius/patches/freeradius-1.0.2-mysql-autoconf.patch create mode 100644 package/freeradius/patches/freeradius-1.0.3-dict.patch diff --git a/package/freeradius/Makefile b/package/freeradius/Makefile index 9615922fb..b9ea12715 100644 --- a/package/freeradius/Makefile +++ b/package/freeradius/Makefile @@ -3,11 +3,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=freeradius -PKG_VERSION:=1.0.2 -PKG_RELEASE:=2 -PKG_MD5SUM:=f5dfce4efbb03bbc47ceae08270a875e +PKG_VERSION:=1.0.3 +PKG_RELEASE:=1 +PKG_MD5SUM:=7fe6732fa69ff4351f51d69212e89bb6 -PKG_SOURCE_URL:=ftp://ftp.freeradius.org/pub/radius/ +PKG_SOURCE_URL:=ftp://ftp.freeradius.org/pub/radius/ \ + http://freeradius.portal-to-web.de/ \ + ftp://ftp.uk.freeradius.org/pub/radius/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_CAT:=zcat diff --git a/package/freeradius/patches/freeradius-1.0.2-2-nico.diff b/package/freeradius/patches/freeradius-1.0.2-autoconf.patch similarity index 89% rename from package/freeradius/patches/freeradius-1.0.2-2-nico.diff rename to package/freeradius/patches/freeradius-1.0.2-autoconf.patch index d3024241f..2a304ec5b 100644 --- a/package/freeradius/patches/freeradius-1.0.2-2-nico.diff +++ b/package/freeradius/patches/freeradius-1.0.2-autoconf.patch @@ -5534,732 +5534,3 @@ diff -ruN freeradius-1.0.2-orig/libltdl/configure freeradius-1.0.2-2/libltdl/con exit 0 EOF -diff -ruN freeradius-1.0.2-orig/raddb/eap.conf freeradius-1.0.2-2/raddb/eap.conf ---- freeradius-1.0.2-orig/raddb/eap.conf 2004-04-15 20:34:41.000000000 +0200 -+++ freeradius-1.0.2-2/raddb/eap.conf 2005-03-13 23:05:13.000000000 +0100 -@@ -72,8 +72,8 @@ - # User-Password, or the NT-Password attributes. - # 'System' authentication is impossible with LEAP. - # -- leap { -- } -+# leap { -+# } - - # Generic Token Card. - # -@@ -86,7 +86,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: " -@@ -103,8 +103,8 @@ - # configured for the request, and do the - # authentication itself. - # -- auth_type = PAP -- } -+# auth_type = PAP -+# } - - ## EAP-TLS - # -@@ -272,7 +272,7 @@ - # of MS-CHAPv2 in EAP by Cisco, which FreeRADIUS does not - # currently support. - # -- mschapv2 { -- } -+# mschapv2 { -+# } - } - -diff -ruN freeradius-1.0.2-orig/raddb/radiusd.conf.in freeradius-1.0.2-2/raddb/radiusd.conf.in ---- freeradius-1.0.2-orig/raddb/radiusd.conf.in 2005-02-07 20:52:05.000000000 +0100 -+++ freeradius-1.0.2-2/raddb/radiusd.conf.in 2005-03-13 23:05:13.000000000 +0100 -@@ -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 = ${localstatedir}/log/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 - # -@@ -1034,7 +1034,7 @@ - # - files { - usersfile = ${confdir}/users -- acctusersfile = ${confdir}/acct_users -+# acctusersfile = ${confdir}/acct_users - - # If you want to use the old Cistron 'users' file - # with FreeRADIUS, you should change the next line -@@ -1167,7 +1167,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, -@@ -1535,7 +1535,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, -@@ -1548,7 +1548,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 -@@ -1575,7 +1575,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, -@@ -1588,7 +1588,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 -@@ -1596,7 +1596,7 @@ - # the MS-CHAP-Challenge attribute, and add 'Auth-Type := MS-CHAP' - # to the request, which will cause the server to then use - # the mschap module for authentication. -- mschap -+# mschap - - # - # If you have a Cisco SIP server authenticating against -@@ -1616,7 +1616,7 @@ - # Otherwise, when the first style of realm doesn't match, - # the other styles won't be checked. - # -- suffix -+# suffix - # ntdomain - - # -@@ -1625,11 +1625,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 -@@ -1683,24 +1683,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 -@@ -1718,7 +1718,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 - # -@@ -1731,7 +1731,7 @@ - - # - # Allow EAP authentication. -- eap -+# eap - } - - -@@ -1739,12 +1739,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 -@@ -1754,12 +1754,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 - } - - # -@@ -1770,20 +1770,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. -@@ -1806,7 +1806,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 -@@ -1900,5 +1900,5 @@ - # hidden inside of the EAP packet, and the end server will - # reject the EAP request. - # -- eap -+# eap - } -diff -ruN freeradius-1.0.2-orig/share/dictionary freeradius-1.0.2-2/share/dictionary ---- freeradius-1.0.2-orig/share/dictionary 2005-02-09 18:50:53.000000000 +0100 -+++ freeradius-1.0.2-2/share/dictionary 2005-03-13 23:05:13.000000000 +0100 -@@ -50,55 +50,55 @@ - # directive to the end of the file if you want to see the old names - # in the logfiles, INSTEAD OF the new names. - # --$INCLUDE dictionary.compat # compability issues --$INCLUDE dictionary.3com --$INCLUDE dictionary.3gpp --$INCLUDE dictionary.3gpp2 --$INCLUDE dictionary.acc --$INCLUDE dictionary.alcatel --$INCLUDE dictionary.alteon --$INCLUDE dictionary.ascend --$INCLUDE dictionary.bay --$INCLUDE dictionary.bintec --$INCLUDE dictionary.cabletron -+#$INCLUDE dictionary.compat # compability issues -+#$INCLUDE dictionary.3com -+#$INCLUDE dictionary.3gpp -+#$INCLUDE dictionary.3gpp2 -+#$INCLUDE dictionary.acc -+#$INCLUDE dictionary.alcatel -+#$INCLUDE dictionary.alteon -+#$INCLUDE dictionary.ascend -+#$INCLUDE dictionary.bay -+#$INCLUDE dictionary.bintec -+#$INCLUDE dictionary.cabletron - $INCLUDE dictionary.cisco - # - # This is the same as the altiga dictionary. - # - #$INCLUDE dictionary.cisco.vpn3000 --$INCLUDE dictionary.cisco.vpn5000 --$INCLUDE dictionary.cisco.bbsm --$INCLUDE dictionary.colubris --$INCLUDE dictionary.erx --$INCLUDE dictionary.extreme -+#$INCLUDE dictionary.cisco.vpn5000 -+#$INCLUDE dictionary.cisco.bbsm -+#$INCLUDE dictionary.colubris -+#$INCLUDE dictionary.erx -+#$INCLUDE dictionary.extreme - $INCLUDE dictionary.freeradius --$INCLUDE dictionary.foundry --$INCLUDE dictionary.gandalf --$INCLUDE dictionary.garderos --$INCLUDE dictionary.itk --$INCLUDE dictionary.juniper --$INCLUDE dictionary.karlnet --$INCLUDE dictionary.livingston --$INCLUDE dictionary.localweb -+#$INCLUDE dictionary.foundry -+#$INCLUDE dictionary.gandalf -+#$INCLUDE dictionary.garderos -+#$INCLUDE dictionary.itk -+#$INCLUDE dictionary.juniper -+#$INCLUDE dictionary.karlnet -+#$INCLUDE dictionary.livingston -+#$INCLUDE dictionary.localweb - $INCLUDE dictionary.microsoft --$INCLUDE dictionary.navini --$INCLUDE dictionary.nomadix --$INCLUDE dictionary.propel --$INCLUDE dictionary.quintum --$INCLUDE dictionary.redback --$INCLUDE dictionary.redcreek --$INCLUDE dictionary.shasta --$INCLUDE dictionary.shiva --$INCLUDE dictionary.sonicwall --$INCLUDE dictionary.springtide --$INCLUDE dictionary.telebit --$INCLUDE dictionary.trapeze -+#$INCLUDE dictionary.navini -+#$INCLUDE dictionary.nomadix -+#$INCLUDE dictionary.propel -+#$INCLUDE dictionary.quintum -+#$INCLUDE dictionary.redback -+#$INCLUDE dictionary.redcreek -+#$INCLUDE dictionary.shasta -+#$INCLUDE dictionary.shiva -+#$INCLUDE dictionary.sonicwall -+#$INCLUDE dictionary.springtide -+#$INCLUDE dictionary.telebit -+#$INCLUDE dictionary.trapeze - $INCLUDE dictionary.tunnel --$INCLUDE dictionary.usr --$INCLUDE dictionary.valemount --$INCLUDE dictionary.versanet -+#$INCLUDE dictionary.usr -+#$INCLUDE dictionary.valemount -+#$INCLUDE dictionary.versanet - $INCLUDE dictionary.wispr --$INCLUDE dictionary.xedia -+#$INCLUDE dictionary.xedia - - # - # The following are the proper new names. Use these. -diff -ruN freeradius-1.0.2-orig/src/modules/rlm_attr_rewrite/config.h.in freeradius-1.0.2-2/src/modules/rlm_attr_rewrite/config.h.in ---- freeradius-1.0.2-orig/src/modules/rlm_attr_rewrite/config.h.in 2001-07-13 22:04:47.000000000 +0200 -+++ freeradius-1.0.2-2/src/modules/rlm_attr_rewrite/config.h.in 2005-03-13 23:05:13.000000000 +0100 -@@ -1,4 +1,4 @@ --/* config.h.in. Generated automatically from configure.in by autoheader. */ -+/* config.h.in. Generated automatically from configure.in by autoheader 2.13. */ - - /* Define if you have the header file. */ - #undef HAVE_REGEX_H -diff -ruN freeradius-1.0.2-orig/src/modules/rlm_checkval/config.h.in freeradius-1.0.2-2/src/modules/rlm_checkval/config.h.in ---- freeradius-1.0.2-orig/src/modules/rlm_checkval/config.h.in 2003-02-02 04:00:06.000000000 +0100 -+++ freeradius-1.0.2-2/src/modules/rlm_checkval/config.h.in 2005-03-13 23:05:13.000000000 +0100 -@@ -1,4 +1,4 @@ --/* config.h.in. Generated automatically from configure.in by autoheader. */ -+/* config.h.in. Generated automatically from configure.in by autoheader 2.13. */ - - /* Define if you have the header file. */ - #undef HAVE_REGEX_H -diff -ruN freeradius-1.0.2-orig/src/modules/rlm_eap/types/rlm_eap_md5/config.h.in freeradius-1.0.2-2/src/modules/rlm_eap/types/rlm_eap_md5/config.h.in ---- freeradius-1.0.2-orig/src/modules/rlm_eap/types/rlm_eap_md5/config.h.in 1970-01-01 01:00:00.000000000 +0100 -+++ freeradius-1.0.2-2/src/modules/rlm_eap/types/rlm_eap_md5/config.h.in 2005-03-13 23:05:13.000000000 +0100 -@@ -0,0 +1,4 @@ -+/* config.h.in. Generated automatically from configure.in by autoheader 2.13. */ -+ -+/* Define if you have the header file. */ -+#undef HAVE_MALLOC_H -diff -ruN freeradius-1.0.2-orig/src/modules/rlm_eap/types/rlm_eap_mschapv2/config.h.in freeradius-1.0.2-2/src/modules/rlm_eap/types/rlm_eap_mschapv2/config.h.in ---- freeradius-1.0.2-orig/src/modules/rlm_eap/types/rlm_eap_mschapv2/config.h.in 1970-01-01 01:00:00.000000000 +0100 -+++ freeradius-1.0.2-2/src/modules/rlm_eap/types/rlm_eap_mschapv2/config.h.in 2005-03-13 23:05:13.000000000 +0100 -@@ -0,0 +1,4 @@ -+/* config.h.in. Generated automatically from configure.in by autoheader 2.13. */ -+ -+/* Define if you have the header file. */ -+#undef HAVE_MALLOC_H -diff -ruN freeradius-1.0.2-orig/src/modules/rlm_eap/types/rlm_eap_peap/config.h.in freeradius-1.0.2-2/src/modules/rlm_eap/types/rlm_eap_peap/config.h.in ---- freeradius-1.0.2-orig/src/modules/rlm_eap/types/rlm_eap_peap/config.h.in 2004-02-05 08:32:47.000000000 +0100 -+++ freeradius-1.0.2-2/src/modules/rlm_eap/types/rlm_eap_peap/config.h.in 2005-03-13 23:05:13.000000000 +0100 -@@ -1,25 +1,7 @@ - /* config.h.in. Generated automatically from configure.in by autoheader 2.13. */ --/* -- --acconfig.h - template used by autoheader to create config.h.in --config.h.in - used by autoconf to create config.h --config.h - created by autoconf; contains defines generated by autoconf -- --*/ -- - - /* Define if you have the header file. */ - #undef HAVE_OPENSSL_ENGINE_H - - /* Define if you have the header file. */ - #undef HAVE_OPENSSL_ERR_H -- --#ifndef HAVE_SNPRINTF --#define HAVE_LOCAL_SNPRINTF --#define snprintf lrad_snprintf --#endif -- --#ifndef HAVE_VSNPRINTF --#define HAVE_LOCAL_SNPRINTF --#define vsnprintf lrad_vsnprintf --#endif -diff -ruN freeradius-1.0.2-orig/src/modules/rlm_eap/types/rlm_eap_sim/config.h.in freeradius-1.0.2-2/src/modules/rlm_eap/types/rlm_eap_sim/config.h.in ---- freeradius-1.0.2-orig/src/modules/rlm_eap/types/rlm_eap_sim/config.h.in 2004-02-05 08:32:47.000000000 +0100 -+++ freeradius-1.0.2-2/src/modules/rlm_eap/types/rlm_eap_sim/config.h.in 2005-03-13 23:05:13.000000000 +0100 -@@ -1,25 +1,7 @@ - /* config.h.in. Generated automatically from configure.in by autoheader 2.13. */ --/* -- --acconfig.h - template used by autoheader to create config.h.in --config.h.in - used by autoconf to create config.h --config.h - created by autoconf; contains defines generated by autoconf -- --*/ -- - - /* Define if you have the header file. */ - #undef HAVE_OPENSSL_ENGINE_H - - /* Define if you have the header file. */ - #undef HAVE_OPENSSL_ERR_H -- --#ifndef HAVE_SNPRINTF --#define HAVE_LOCAL_SNPRINTF --#define snprintf lrad_snprintf --#endif -- --#ifndef HAVE_VSNPRINTF --#define HAVE_LOCAL_SNPRINTF --#define vsnprintf lrad_vsnprintf --#endif -diff -ruN freeradius-1.0.2-orig/src/modules/rlm_eap/types/rlm_eap_tls/config.h.in freeradius-1.0.2-2/src/modules/rlm_eap/types/rlm_eap_tls/config.h.in ---- freeradius-1.0.2-orig/src/modules/rlm_eap/types/rlm_eap_tls/config.h.in 2004-02-05 08:32:48.000000000 +0100 -+++ freeradius-1.0.2-2/src/modules/rlm_eap/types/rlm_eap_tls/config.h.in 2005-03-13 23:05:13.000000000 +0100 -@@ -1,25 +1,7 @@ - /* config.h.in. Generated automatically from configure.in by autoheader 2.13. */ --/* -- --acconfig.h - template used by autoheader to create config.h.in --config.h.in - used by autoconf to create config.h --config.h - created by autoconf; contains defines generated by autoconf -- --*/ -- - - /* Define if you have the header file. */ - #undef HAVE_OPENSSL_ENGINE_H - - /* Define if you have the header file. */ - #undef HAVE_OPENSSL_ERR_H -- --#ifndef HAVE_SNPRINTF --#define HAVE_LOCAL_SNPRINTF --#define snprintf lrad_snprintf --#endif -- --#ifndef HAVE_VSNPRINTF --#define HAVE_LOCAL_SNPRINTF --#define vsnprintf lrad_vsnprintf --#endif -diff -ruN freeradius-1.0.2-orig/src/modules/rlm_eap/types/rlm_eap_ttls/config.h.in freeradius-1.0.2-2/src/modules/rlm_eap/types/rlm_eap_ttls/config.h.in ---- freeradius-1.0.2-orig/src/modules/rlm_eap/types/rlm_eap_ttls/config.h.in 2004-02-05 08:32:48.000000000 +0100 -+++ freeradius-1.0.2-2/src/modules/rlm_eap/types/rlm_eap_ttls/config.h.in 2005-03-13 23:05:13.000000000 +0100 -@@ -1,25 +1,7 @@ - /* config.h.in. Generated automatically from configure.in by autoheader 2.13. */ --/* -- --acconfig.h - template used by autoheader to create config.h.in --config.h.in - used by autoconf to create config.h --config.h - created by autoconf; contains defines generated by autoconf -- --*/ -- - - /* Define if you have the header file. */ - #undef HAVE_OPENSSL_ENGINE_H - - /* Define if you have the header file. */ - #undef HAVE_OPENSSL_ERR_H -- --#ifndef HAVE_SNPRINTF --#define HAVE_LOCAL_SNPRINTF --#define snprintf lrad_snprintf --#endif -- --#ifndef HAVE_VSNPRINTF --#define HAVE_LOCAL_SNPRINTF --#define vsnprintf lrad_vsnprintf --#endif -diff -ruN freeradius-1.0.2-orig/src/modules/rlm_example/config.h.in freeradius-1.0.2-2/src/modules/rlm_example/config.h.in ---- freeradius-1.0.2-orig/src/modules/rlm_example/config.h.in 2001-04-05 15:51:01.000000000 +0200 -+++ freeradius-1.0.2-2/src/modules/rlm_example/config.h.in 2005-03-13 23:05:13.000000000 +0100 -@@ -1,4 +1,4 @@ --/* config.h.in. Generated automatically from configure.in by autoheader. */ -+/* config.h.in. Generated automatically from configure.in by autoheader 2.13. */ - - /* Define if you have the printf function. */ - #undef HAVE_PRINTF -diff -ruN freeradius-1.0.2-orig/src/modules/rlm_smb/config.h.in freeradius-1.0.2-2/src/modules/rlm_smb/config.h.in ---- freeradius-1.0.2-orig/src/modules/rlm_smb/config.h.in 2002-08-06 18:50:31.000000000 +0200 -+++ freeradius-1.0.2-2/src/modules/rlm_smb/config.h.in 2005-03-13 23:05:13.000000000 +0100 -@@ -1,4 +1,4 @@ --/* config.h.in. Generated automatically from configure.in by autoheader. */ -+/* config.h.in. Generated automatically from configure.in by autoheader 2.13. */ - - /* Define if you have the header file. */ - #undef HAVE_ARPA_INET_H -@@ -18,6 +18,9 @@ - /* Define if you have the header file. */ - #undef HAVE_NETINET_TCP_H - -+/* Define if you have the header file. */ -+#undef HAVE_SIGNAL_H -+ - /* Define if you have the header file. */ - #undef HAVE_SYS_SIGNAL_H - -diff -ruN freeradius-1.0.2-orig/src/modules/rlm_sql/drivers/rlm_sql_mysql/configure freeradius-1.0.2-2/src/modules/rlm_sql/drivers/rlm_sql_mysql/configure ---- freeradius-1.0.2-orig/src/modules/rlm_sql/drivers/rlm_sql_mysql/configure 2004-05-31 16:20:40.000000000 +0200 -+++ freeradius-1.0.2-2/src/modules/rlm_sql/drivers/rlm_sql_mysql/configure 2005-03-13 23:05:13.000000000 +0100 -@@ -947,26 +947,6 @@ - echo $ac_n "checking for mysql/mysql.h""... $ac_c" 1>&6 - echo "configure:949: checking for mysql/mysql.h" >&5 - -- cat > conftest.$ac_ext < --int main() { --int a = 1; --; return 0; } --EOF --if { (eval echo configure:959: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -- rm -rf conftest* -- MYSQL_INCLUDE=" " --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- MYSQL_INCLUDE= -- --fi --rm -f conftest* -- - if test "x$MYSQL_INCLUDE" = "x"; then - old_CFLAGS="$CFLAGS" - -@@ -974,14 +954,14 @@ - for try in $mysql_include_dir /usr/local/include /usr/local/mysql/include ; do - CFLAGS="$old_CFLAGS -I$try" - cat > conftest.$ac_ext < - int main() { - int a = 1; - ; return 0; } - EOF --if { (eval echo configure:985: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:965: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - MYSQL_INCLUDE="-I$try" - else -@@ -1016,7 +996,7 @@ - - - echo $ac_n "checking for mysql_init in -lmysqlclient""... $ac_c" 1>&6 --echo "configure:1020: checking for mysql_init in -lmysqlclient" >&5 -+echo "configure:1000: checking for mysql_init in -lmysqlclient" >&5 - - old_LIBS="$LIBS" - -@@ -1024,14 +1004,14 @@ - for try in $mysql_lib_dir /usr/lib /usr/lib/mysql /usr/local/lib/mysql /usr/local/mysql/lib/mysql; do - LIBS="$old_LIBS -L$try -lmysqlclient" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:1015: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - MYSQL_LIBS="-L$try -lmysqlclient $old_LIBS" - else -diff -ruN freeradius-1.0.2-orig/src/modules/rlm_sql/drivers/rlm_sql_mysql/configure.in freeradius-1.0.2-2/src/modules/rlm_sql/drivers/rlm_sql_mysql/configure.in ---- freeradius-1.0.2-orig/src/modules/rlm_sql/drivers/rlm_sql_mysql/configure.in 2004-01-22 19:23:19.000000000 +0100 -+++ freeradius-1.0.2-2/src/modules/rlm_sql/drivers/rlm_sql_mysql/configure.in 2005-03-13 23:05:13.000000000 +0100 -@@ -38,11 +38,6 @@ - - AC_MSG_CHECKING([for mysql/mysql.h]) - -- AC_TRY_COMPILE([#include ], [int a = 1;], -- MYSQL_INCLUDE=" ", -- MYSQL_INCLUDE= -- ) -- - if test "x$MYSQL_INCLUDE" = "x"; then - old_CFLAGS="$CFLAGS" - -diff -ruN freeradius-1.0.2-orig/src/modules/rlm_sql/drivers/rules.mak freeradius-1.0.2-2/src/modules/rlm_sql/drivers/rules.mak ---- freeradius-1.0.2-orig/src/modules/rlm_sql/drivers/rules.mak 2003-06-05 22:16:54.000000000 +0200 -+++ freeradius-1.0.2-2/src/modules/rlm_sql/drivers/rules.mak 2005-03-13 23:53:24.000000000 +0100 -@@ -67,7 +67,7 @@ - # - ####################################################################### - $(TARGET).a: $(STATIC_OBJS) -- $(LIBTOOL) --mode=link $(LD) -module -static $(CFLAGS) $(RLM_SQL_CFLAGS) $^ -o $@ -+ $(LIBTOOL) --mode=link $(LD) -module -static $(CFLAGS) $(RLM_SQL_CFLAGS) $(LDFLAGS) $^ -o $@ - - # - # If the module is in the list of static modules, then the "dynamic" -@@ -93,7 +93,7 @@ - $(TARGET).la: $(DYNAMIC_OBJS) - $(LIBTOOL) --mode=link $(CC) -release $(RADIUSD_VERSION) \ - -module $(LINK_MODE) $(CFLAGS) \ -- $(RLM_SQL_CFLAGS) -o $@ -rpath $(libdir) $^ $(RLM_SQL_LIBS) -+ $(RLM_SQL_CFLAGS) $(LDFLAGS) -o $@ -rpath $(libdir) $^ $(RLM_SQL_LIBS) - - ####################################################################### - # -diff -ruN freeradius-1.0.2-orig/src/modules/rlm_sqlcounter/config.h.in freeradius-1.0.2-2/src/modules/rlm_sqlcounter/config.h.in ---- freeradius-1.0.2-orig/src/modules/rlm_sqlcounter/config.h.in 2002-04-23 07:48:40.000000000 +0200 -+++ freeradius-1.0.2-2/src/modules/rlm_sqlcounter/config.h.in 2005-03-13 23:05:13.000000000 +0100 -@@ -1,3 +1 @@ --/* config.h.in. Generated automatically from configure.in by autoheader. */ -- --/* do we need anything in here? */ -+/* config.h.in. Generated automatically from configure.in by autoheader 2.13. */ -diff -ruN freeradius-1.0.2-orig/src/modules/rlm_x99_token/config.h.in freeradius-1.0.2-2/src/modules/rlm_x99_token/config.h.in ---- freeradius-1.0.2-orig/src/modules/rlm_x99_token/config.h.in 1970-01-01 01:00:00.000000000 +0100 -+++ freeradius-1.0.2-2/src/modules/rlm_x99_token/config.h.in 2005-03-13 23:05:13.000000000 +0100 -@@ -0,0 +1 @@ -+/* config.h.in. Generated automatically from configure.in by autoheader 2.13. */ -diff -ruN freeradius-1.0.2-orig/src/modules/rules.mak freeradius-1.0.2-2/src/modules/rules.mak ---- freeradius-1.0.2-orig/src/modules/rules.mak 2002-08-06 18:11:39.000000000 +0200 -+++ freeradius-1.0.2-2/src/modules/rules.mak 2005-03-13 23:53:31.000000000 +0100 -@@ -70,7 +70,7 @@ - ####################################################################### - $(TARGET).a: $(STATIC_OBJS) - $(LIBTOOL) --mode=link $(LD) \ -- -module -static $(CFLAGS) $(RLM_CFLAGS) $^ -o $@ -+ -module -static $(CFLAGS) $(RLM_CFLAGS) $(LDFLAGS) $^ -o $@ - - # - # If the module is in the list of static modules, then the "dynamic" -@@ -95,7 +95,7 @@ - - $(TARGET).la: $(DYNAMIC_OBJS) - $(LIBTOOL) --mode=link $(CC) -release $(RADIUSD_VERSION) \ -- -module $(LINK_MODE) $(CFLAGS) $(RLM_CFLAGS) $(RLM_LDFLAGS) \ -+ -module $(LINK_MODE) $(CFLAGS) $(RLM_CFLAGS) $(LDFLAGS) $(RLM_LDFLAGS) \ - -o $@ -rpath $(libdir) $^ $(RLM_LIBS) $(LIBS) - - ####################################################################### diff --git a/package/freeradius/patches/freeradius-1.0.2-config.patch b/package/freeradius/patches/freeradius-1.0.2-config.patch new file mode 100644 index 000000000..e75d2efd6 --- /dev/null +++ b/package/freeradius/patches/freeradius-1.0.2-config.patch @@ -0,0 +1,309 @@ +diff -ruN freeradius-1.0.2-orig/raddb/eap.conf freeradius-1.0.2-2/raddb/eap.conf +--- freeradius-1.0.2-orig/raddb/eap.conf 2004-04-15 20:34:41.000000000 +0200 ++++ freeradius-1.0.2-2/raddb/eap.conf 2005-03-13 23:05:13.000000000 +0100 +@@ -72,8 +72,8 @@ + # User-Password, or the NT-Password attributes. + # 'System' authentication is impossible with LEAP. + # +- leap { +- } ++# leap { ++# } + + # Generic Token Card. + # +@@ -86,7 +86,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: " +@@ -103,8 +103,8 @@ + # configured for the request, and do the + # authentication itself. + # +- auth_type = PAP +- } ++# auth_type = PAP ++# } + + ## EAP-TLS + # +@@ -272,7 +272,7 @@ + # of MS-CHAPv2 in EAP by Cisco, which FreeRADIUS does not + # currently support. + # +- mschapv2 { +- } ++# mschapv2 { ++# } + } + +diff -ruN freeradius-1.0.2-orig/raddb/radiusd.conf.in freeradius-1.0.2-2/raddb/radiusd.conf.in +--- freeradius-1.0.2-orig/raddb/radiusd.conf.in 2005-02-07 20:52:05.000000000 +0100 ++++ freeradius-1.0.2-2/raddb/radiusd.conf.in 2005-03-13 23:05:13.000000000 +0100 +@@ -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 = ${localstatedir}/log/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 + # +@@ -1034,7 +1034,7 @@ + # + files { + usersfile = ${confdir}/users +- acctusersfile = ${confdir}/acct_users ++# acctusersfile = ${confdir}/acct_users + + # If you want to use the old Cistron 'users' file + # with FreeRADIUS, you should change the next line +@@ -1167,7 +1167,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, +@@ -1535,7 +1535,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, +@@ -1548,7 +1548,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 +@@ -1575,7 +1575,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, +@@ -1588,7 +1588,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 +@@ -1596,7 +1596,7 @@ + # the MS-CHAP-Challenge attribute, and add 'Auth-Type := MS-CHAP' + # to the request, which will cause the server to then use + # the mschap module for authentication. +- mschap ++# mschap + + # + # If you have a Cisco SIP server authenticating against +@@ -1616,7 +1616,7 @@ + # Otherwise, when the first style of realm doesn't match, + # the other styles won't be checked. + # +- suffix ++# suffix + # ntdomain + + # +@@ -1625,11 +1625,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 +@@ -1683,24 +1683,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 +@@ -1718,7 +1718,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 + # +@@ -1731,7 +1731,7 @@ + + # + # Allow EAP authentication. +- eap ++# eap + } + + +@@ -1739,12 +1739,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 +@@ -1754,12 +1754,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 + } + + # +@@ -1770,20 +1770,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. +@@ -1806,7 +1806,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 +@@ -1900,5 +1900,5 @@ + # hidden inside of the EAP packet, and the end server will + # reject the EAP request. + # +- eap ++# eap + } diff --git a/package/freeradius/patches/freeradius-1.0.2-modules-ldflags.patch b/package/freeradius/patches/freeradius-1.0.2-modules-ldflags.patch new file mode 100644 index 000000000..473d488c1 --- /dev/null +++ b/package/freeradius/patches/freeradius-1.0.2-modules-ldflags.patch @@ -0,0 +1,42 @@ +diff -ruN freeradius-1.0.2-orig/src/modules/rlm_sql/drivers/rules.mak freeradius-1.0.2-2/src/modules/rlm_sql/drivers/rules.mak +--- freeradius-1.0.2-orig/src/modules/rlm_sql/drivers/rules.mak 2003-06-05 22:16:54.000000000 +0200 ++++ freeradius-1.0.2-2/src/modules/rlm_sql/drivers/rules.mak 2005-03-13 23:53:24.000000000 +0100 +@@ -67,7 +67,7 @@ + # + ####################################################################### + $(TARGET).a: $(STATIC_OBJS) +- $(LIBTOOL) --mode=link $(LD) -module -static $(CFLAGS) $(RLM_SQL_CFLAGS) $^ -o $@ ++ $(LIBTOOL) --mode=link $(LD) -module -static $(CFLAGS) $(RLM_SQL_CFLAGS) $(LDFLAGS) $^ -o $@ + + # + # If the module is in the list of static modules, then the "dynamic" +@@ -93,7 +93,7 @@ + $(TARGET).la: $(DYNAMIC_OBJS) + $(LIBTOOL) --mode=link $(CC) -release $(RADIUSD_VERSION) \ + -module $(LINK_MODE) $(CFLAGS) \ +- $(RLM_SQL_CFLAGS) -o $@ -rpath $(libdir) $^ $(RLM_SQL_LIBS) ++ $(RLM_SQL_CFLAGS) $(LDFLAGS) -o $@ -rpath $(libdir) $^ $(RLM_SQL_LIBS) + + ####################################################################### + # +diff -ruN freeradius-1.0.2-orig/src/modules/rules.mak freeradius-1.0.2-2/src/modules/rules.mak +--- freeradius-1.0.2-orig/src/modules/rules.mak 2002-08-06 18:11:39.000000000 +0200 ++++ freeradius-1.0.2-2/src/modules/rules.mak 2005-03-13 23:53:31.000000000 +0100 +@@ -70,7 +70,7 @@ + ####################################################################### + $(TARGET).a: $(STATIC_OBJS) + $(LIBTOOL) --mode=link $(LD) \ +- -module -static $(CFLAGS) $(RLM_CFLAGS) $^ -o $@ ++ -module -static $(CFLAGS) $(RLM_CFLAGS) $(LDFLAGS) $^ -o $@ + + # + # If the module is in the list of static modules, then the "dynamic" +@@ -95,7 +95,7 @@ + + $(TARGET).la: $(DYNAMIC_OBJS) + $(LIBTOOL) --mode=link $(CC) -release $(RADIUSD_VERSION) \ +- -module $(LINK_MODE) $(CFLAGS) $(RLM_CFLAGS) $(RLM_LDFLAGS) \ ++ -module $(LINK_MODE) $(CFLAGS) $(RLM_CFLAGS) $(LDFLAGS) $(RLM_LDFLAGS) \ + -o $@ -rpath $(libdir) $^ $(RLM_LIBS) $(LIBS) + + ####################################################################### diff --git a/package/freeradius/patches/freeradius-1.0.2-mysql-autoconf.patch b/package/freeradius/patches/freeradius-1.0.2-mysql-autoconf.patch new file mode 100644 index 000000000..9803a5fb6 --- /dev/null +++ b/package/freeradius/patches/freeradius-1.0.2-mysql-autoconf.patch @@ -0,0 +1,88 @@ +diff -ruN freeradius-1.0.2-orig/src/modules/rlm_sql/drivers/rlm_sql_mysql/configure freeradius-1.0.2-2/src/modules/rlm_sql/drivers/rlm_sql_mysql/configure +--- freeradius-1.0.2-orig/src/modules/rlm_sql/drivers/rlm_sql_mysql/configure 2004-05-31 16:20:40.000000000 +0200 ++++ freeradius-1.0.2-2/src/modules/rlm_sql/drivers/rlm_sql_mysql/configure 2005-03-13 23:05:13.000000000 +0100 +@@ -947,26 +947,6 @@ + echo $ac_n "checking for mysql/mysql.h""... $ac_c" 1>&6 + echo "configure:949: checking for mysql/mysql.h" >&5 + +- cat > conftest.$ac_ext < +-int main() { +-int a = 1; +-; return 0; } +-EOF +-if { (eval echo configure:959: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +- rm -rf conftest* +- MYSQL_INCLUDE=" " +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- MYSQL_INCLUDE= +- +-fi +-rm -f conftest* +- + if test "x$MYSQL_INCLUDE" = "x"; then + old_CFLAGS="$CFLAGS" + +@@ -974,14 +954,14 @@ + for try in $mysql_include_dir /usr/local/include /usr/local/mysql/include ; do + CFLAGS="$old_CFLAGS -I$try" + cat > conftest.$ac_ext < + int main() { + int a = 1; + ; return 0; } + EOF +-if { (eval echo configure:985: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:965: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + MYSQL_INCLUDE="-I$try" + else +@@ -1016,7 +996,7 @@ + + + echo $ac_n "checking for mysql_init in -lmysqlclient""... $ac_c" 1>&6 +-echo "configure:1020: checking for mysql_init in -lmysqlclient" >&5 ++echo "configure:1000: checking for mysql_init in -lmysqlclient" >&5 + + old_LIBS="$LIBS" + +@@ -1024,14 +1004,14 @@ + for try in $mysql_lib_dir /usr/lib /usr/lib/mysql /usr/local/lib/mysql /usr/local/mysql/lib/mysql; do + LIBS="$old_LIBS -L$try -lmysqlclient" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:1015: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + MYSQL_LIBS="-L$try -lmysqlclient $old_LIBS" + else +diff -ruN freeradius-1.0.2-orig/src/modules/rlm_sql/drivers/rlm_sql_mysql/configure.in freeradius-1.0.2-2/src/modules/rlm_sql/drivers/rlm_sql_mysql/configure.in +--- freeradius-1.0.2-orig/src/modules/rlm_sql/drivers/rlm_sql_mysql/configure.in 2004-01-22 19:23:19.000000000 +0100 ++++ freeradius-1.0.2-2/src/modules/rlm_sql/drivers/rlm_sql_mysql/configure.in 2005-03-13 23:05:13.000000000 +0100 +@@ -38,11 +38,6 @@ + + AC_MSG_CHECKING([for mysql/mysql.h]) + +- AC_TRY_COMPILE([#include ], [int a = 1;], +- MYSQL_INCLUDE=" ", +- MYSQL_INCLUDE= +- ) +- + if test "x$MYSQL_INCLUDE" = "x"; then + old_CFLAGS="$CFLAGS" + diff --git a/package/freeradius/patches/freeradius-1.0.3-dict.patch b/package/freeradius/patches/freeradius-1.0.3-dict.patch new file mode 100644 index 000000000..43ff995ab --- /dev/null +++ b/package/freeradius/patches/freeradius-1.0.3-dict.patch @@ -0,0 +1,100 @@ +--- freeradius-1.0.3/share/dictionary.orig 2005-06-07 09:36:04.000000000 +0200 ++++ freeradius-1.0.3/share/dictionary 2005-06-07 09:42:58.000000000 +0200 +@@ -50,56 +50,56 @@ + # directive to the end of the file if you want to see the old names + # in the logfiles, INSTEAD OF the new names. + # +-$INCLUDE dictionary.compat # compability issues +-$INCLUDE dictionary.3com +-$INCLUDE dictionary.3gpp +-$INCLUDE dictionary.3gpp2 +-$INCLUDE dictionary.acc +-$INCLUDE dictionary.alcatel +-$INCLUDE dictionary.alteon +-$INCLUDE dictionary.ascend +-$INCLUDE dictionary.bay +-$INCLUDE dictionary.bintec +-$INCLUDE dictionary.cabletron ++#$INCLUDE dictionary.compat # compability issues ++#$INCLUDE dictionary.3com ++#$INCLUDE dictionary.3gpp ++#$INCLUDE dictionary.3gpp2 ++#$INCLUDE dictionary.acc ++#$INCLUDE dictionary.alcatel ++#$INCLUDE dictionary.alteon ++#$INCLUDE dictionary.ascend ++#$INCLUDE dictionary.bay ++#$INCLUDE dictionary.bintec ++#$INCLUDE dictionary.cabletron + $INCLUDE dictionary.cisco + # + # This is the same as the altiga dictionary. + # + #$INCLUDE dictionary.cisco.vpn3000 +-$INCLUDE dictionary.cisco.vpn5000 +-$INCLUDE dictionary.cisco.bbsm +-$INCLUDE dictionary.colubris +-$INCLUDE dictionary.erx +-$INCLUDE dictionary.extreme ++#$INCLUDE dictionary.cisco.vpn5000 ++#$INCLUDE dictionary.cisco.bbsm ++#$INCLUDE dictionary.colubris ++#$INCLUDE dictionary.erx ++#$INCLUDE dictionary.extreme + $INCLUDE dictionary.freeradius +-$INCLUDE dictionary.foundry +-$INCLUDE dictionary.gandalf +-$INCLUDE dictionary.garderos +-$INCLUDE dictionary.gemtek +-$INCLUDE dictionary.itk +-$INCLUDE dictionary.juniper +-$INCLUDE dictionary.karlnet +-$INCLUDE dictionary.livingston +-$INCLUDE dictionary.localweb ++#$INCLUDE dictionary.foundry ++#$INCLUDE dictionary.gandalf ++#$INCLUDE dictionary.garderos ++#$INCLUDE dictionary.gemtek ++#$INCLUDE dictionary.itk ++#$INCLUDE dictionary.juniper ++#$INCLUDE dictionary.karlnet ++#$INCLUDE dictionary.livingston ++#$INCLUDE dictionary.localweb + $INCLUDE dictionary.microsoft +-$INCLUDE dictionary.navini +-$INCLUDE dictionary.nomadix +-$INCLUDE dictionary.propel +-$INCLUDE dictionary.quintum +-$INCLUDE dictionary.redback +-$INCLUDE dictionary.redcreek +-$INCLUDE dictionary.shasta +-$INCLUDE dictionary.shiva +-$INCLUDE dictionary.sonicwall +-$INCLUDE dictionary.springtide +-$INCLUDE dictionary.telebit +-$INCLUDE dictionary.trapeze ++#$INCLUDE dictionary.navini ++#$INCLUDE dictionary.nomadix ++#$INCLUDE dictionary.propel ++#$INCLUDE dictionary.quintum ++#$INCLUDE dictionary.redback ++#$INCLUDE dictionary.redcreek ++#$INCLUDE dictionary.shasta ++#$INCLUDE dictionary.shiva ++#$INCLUDE dictionary.sonicwall ++#$INCLUDE dictionary.springtide ++#$INCLUDE dictionary.telebit ++#$INCLUDE dictionary.trapeze + $INCLUDE dictionary.tunnel +-$INCLUDE dictionary.usr +-$INCLUDE dictionary.valemount +-$INCLUDE dictionary.versanet ++#$INCLUDE dictionary.usr ++#$INCLUDE dictionary.valemount ++#$INCLUDE dictionary.versanet + $INCLUDE dictionary.wispr +-$INCLUDE dictionary.xedia ++#$INCLUDE dictionary.xedia + + # + # The following are the proper new names. Use these.