Revised packaging for the Radius directory:

include new Radius dictionary files & etc.

svn path=/trunk/; revision=29043

2 files changed, 131 insertions, 3 deletions

diff --git a/Makefile.am b/Makefile.am
index d16ece6092..4310f2c2fc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -110,71 +110,135 @@ dtds_DATA = \
 #
 radiusdir = $(pkgdatadir)/radius
 radius_DATA = \
+	radius/README.radius_dictionary  \
 	radius/dictionary  \
 	radius/dictionary.3com  \
 	radius/dictionary.3gpp  \
 	radius/dictionary.3gpp2  \
 	radius/dictionary.acc  \
+	radius/dictionary.airespace \
 	radius/dictionary.alcatel  \
 	radius/dictionary.alteon  \
 	radius/dictionary.altiga  \
+	radius/dictionary.alvarion \
+	radius/dictionary.apc \
 	radius/dictionary.aptis  \
-	radius/dictionary.ascend  \
 	radius/dictionary.aruba  \
+	radius/dictionary.ascend  \
+	radius/dictionary.asn \
+	radius/dictionary.avaya \
+	radius/dictionary.azaire \
 	radius/dictionary.bay  \
 	radius/dictionary.bintec  \
 	radius/dictionary.bristol  \
 	radius/dictionary.cablelabs  \
 	radius/dictionary.cabletron  \
+	radius/dictionary.chillispot \
 	radius/dictionary.cisco  \
 	radius/dictionary.cisco.bbsm  \
 	radius/dictionary.cisco.vpn3000  \
 	radius/dictionary.cisco.vpn5000  \
+	radius/dictionary.clavister \
 	radius/dictionary.colubris  \
 	radius/dictionary.columbia_university  \
 	radius/dictionary.compat  \
 	radius/dictionary.cosine  \
+	radius/dictionary.dhcp \
+	radius/dictionary.digium \
+	radius/dictionary.epygi \
 	radius/dictionary.ericsson  \
 	radius/dictionary.erx  \
 	radius/dictionary.extreme  \
+	radius/dictionary.fortinet \
 	radius/dictionary.foundry  \
 	radius/dictionary.freeradius  \
+	radius/dictionary.freeradius.internal  \
+	radius/dictionary.freeswitch \
 	radius/dictionary.gandalf  \
 	radius/dictionary.garderos  \
 	radius/dictionary.gemtek  \
+	radius/dictionary.h3c \
+	radius/dictionary.hp \
+	radius/dictionary.huawei \
+	radius/dictionary.infonet \
+	radius/dictionary.ipunplugged \
+	radius/dictionary.issanni \
 	radius/dictionary.itk  \
+	radius/dictionary.jradius \
 	radius/dictionary.juniper  \
 	radius/dictionary.karlnet  \
+	radius/dictionary.lancom \
 	radius/dictionary.livingston  \
 	radius/dictionary.localweb  \
+	radius/dictionary.lucent \
+	radius/dictionary.manzara \
 	radius/dictionary.merit  \
 	radius/dictionary.microsoft  \
 	radius/dictionary.mikrotik  \
+	radius/dictionary.motorola \
 	radius/dictionary.navini  \
 	radius/dictionary.netscreen  \
+	radius/dictionary.networkphysics \
+	radius/dictionary.nexans \
 	radius/dictionary.nokia  \
+	radius/dictionary.nokia.conflict \
 	radius/dictionary.nomadix  \
+	radius/dictionary.nortel \
+	radius/dictionary.ntua \
+	radius/dictionary.openser \
+	radius/dictionary.packeteer \
+	radius/dictionary.patton \
 	radius/dictionary.propel  \
+	radius/dictionary.prosoft \
+	radius/dictionary.quiconnect \
 	radius/dictionary.quintum  \
 	radius/dictionary.redback  \
 	radius/dictionary.redcreek  \
+	radius/dictionary.rfc2865 \
+	radius/dictionary.rfc2866 \
+	radius/dictionary.rfc2867 \
+	radius/dictionary.rfc2868 \
+	radius/dictionary.rfc2869 \
+	radius/dictionary.rfc3162 \
+	radius/dictionary.rfc3576 \
+	radius/dictionary.rfc3580 \
+	radius/dictionary.rfc4072 \
+	radius/dictionary.rfc4372 \
+	radius/dictionary.rfc4675 \
+	radius/dictionary.rfc4679 \
+	radius/dictionary.rfc4818 \
+	radius/dictionary.rfc4849 \
+	radius/dictionary.rfc5090 \
+	radius/dictionary.rfc5176 \
+	radius/dictionary.riverstone \
+	radius/dictionary.roaringpenguin \
 	radius/dictionary.shasta  \
 	radius/dictionary.shiva  \
+	radius/dictionary.slipstream \
+	radius/dictionary.sofaware \
 	radius/dictionary.sonicwall  \
 	radius/dictionary.springtide  \
 	radius/dictionary.starent  \
 	radius/dictionary.t_systems_nova  \
 	radius/dictionary.telebit  \
+	radius/dictionary.telkom \
 	radius/dictionary.trapeze  \
+	radius/dictionary.tropos \
 	radius/dictionary.tunnel  \
 	radius/dictionary.unisphere  \
 	radius/dictionary.unix  \
 	radius/dictionary.usr  \
+	radius/dictionary.utstarcom \
 	radius/dictionary.valemount  \
 	radius/dictionary.versanet  \
+	radius/dictionary.vqp \
+	radius/dictionary.walabi \
+	radius/dictionary.waverider \
 	radius/dictionary.wimax  \
 	radius/dictionary.wispr  \
-	radius/dictionary.xedia
+	radius/dictionary.xedia \
+	radius/dictionary.xylan \
+	radius/dictionary.zyxel
 
 #
 # Install the tpncp directory files in the "tpncp" subdirectory
diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi
index ba3a6c8516..fac3b6e63d 100644
--- a/packaging/nsis/wireshark.nsi
+++ b/packaging/nsis/wireshark.nsi
@@ -484,71 +484,135 @@ SetOutPath $INSTDIR
 ; of the installation directory.
 ;
 SetOutPath $INSTDIR\radius
+File "..\..\radius\README.radius_dictionary"
 File "..\..\radius\dictionary"
 File "..\..\radius\dictionary.3com"
 File "..\..\radius\dictionary.3gpp"
 File "..\..\radius\dictionary.3gpp2"
 File "..\..\radius\dictionary.acc"
+File "..\..\radius\dictionary.airespace"
 File "..\..\radius\dictionary.alcatel"
 File "..\..\radius\dictionary.alteon"
 File "..\..\radius\dictionary.altiga"
+File "..\..\radius\dictionary.alvarion"
+File "..\..\radius\dictionary.apc"
 File "..\..\radius\dictionary.aptis"
-File "..\..\radius\dictionary.ascend"
 File "..\..\radius\dictionary.aruba"
+File "..\..\radius\dictionary.ascend"
+File "..\..\radius\dictionary.asn"
+File "..\..\radius\dictionary.avaya"
+File "..\..\radius\dictionary.azaire"
 File "..\..\radius\dictionary.bay"
 File "..\..\radius\dictionary.bintec"
 File "..\..\radius\dictionary.bristol"
 File "..\..\radius\dictionary.cablelabs"
 File "..\..\radius\dictionary.cabletron"
+File "..\..\radius\dictionary.chillispot"
 File "..\..\radius\dictionary.cisco"
 File "..\..\radius\dictionary.cisco.bbsm"
 File "..\..\radius\dictionary.cisco.vpn3000"
 File "..\..\radius\dictionary.cisco.vpn5000"
+File "..\..\radius\dictionary.clavister"
 File "..\..\radius\dictionary.colubris"
 File "..\..\radius\dictionary.columbia_university"
 File "..\..\radius\dictionary.compat"
 File "..\..\radius\dictionary.cosine"
+File "..\..\radius\dictionary.dhcp"
+File "..\..\radius\dictionary.digium"
+File "..\..\radius\dictionary.epygi"
 File "..\..\radius\dictionary.ericsson"
 File "..\..\radius\dictionary.erx"
 File "..\..\radius\dictionary.extreme"
+File "..\..\radius\dictionary.fortinet"
 File "..\..\radius\dictionary.foundry"
 File "..\..\radius\dictionary.freeradius"
+File "..\..\radius\dictionary.freeradius.internal"
+File "..\..\radius\dictionary.freeswitch"
 File "..\..\radius\dictionary.gandalf"
 File "..\..\radius\dictionary.garderos"
 File "..\..\radius\dictionary.gemtek"
+File "..\..\radius\dictionary.h3c"
+File "..\..\radius\dictionary.hp"
+File "..\..\radius\dictionary.huawei"
+File "..\..\radius\dictionary.infonet"
+File "..\..\radius\dictionary.ipunplugged"
+File "..\..\radius\dictionary.issanni"
 File "..\..\radius\dictionary.itk"
+File "..\..\radius\dictionary.jradius"
 File "..\..\radius\dictionary.juniper"
 File "..\..\radius\dictionary.karlnet"
+File "..\..\radius\dictionary.lancom"
 File "..\..\radius\dictionary.livingston"
 File "..\..\radius\dictionary.localweb"
+File "..\..\radius\dictionary.lucent"
+File "..\..\radius\dictionary.manzara"
 File "..\..\radius\dictionary.merit"
 File "..\..\radius\dictionary.microsoft"
 File "..\..\radius\dictionary.mikrotik"
+File "..\..\radius\dictionary.motorola"
 File "..\..\radius\dictionary.navini"
 File "..\..\radius\dictionary.netscreen"
+File "..\..\radius\dictionary.networkphysics"
+File "..\..\radius\dictionary.nexans"
 File "..\..\radius\dictionary.nokia"
+File "..\..\radius\dictionary.nokia.conflict"
 File "..\..\radius\dictionary.nomadix"
+File "..\..\radius\dictionary.nortel"
+File "..\..\radius\dictionary.ntua"
+File "..\..\radius\dictionary.openser"
+File "..\..\radius\dictionary.packeteer"
+File "..\..\radius\dictionary.patton"
 File "..\..\radius\dictionary.propel"
+File "..\..\radius\dictionary.prosoft"
+File "..\..\radius\dictionary.quiconnect"
 File "..\..\radius\dictionary.quintum"
 File "..\..\radius\dictionary.redback"
 File "..\..\radius\dictionary.redcreek"
+File "..\..\radius\dictionary.rfc2865"
+File "..\..\radius\dictionary.rfc2866"
+File "..\..\radius\dictionary.rfc2867"
+File "..\..\radius\dictionary.rfc2868"
+File "..\..\radius\dictionary.rfc2869"
+File "..\..\radius\dictionary.rfc3162"
+File "..\..\radius\dictionary.rfc3576"
+File "..\..\radius\dictionary.rfc3580"
+File "..\..\radius\dictionary.rfc4072"
+File "..\..\radius\dictionary.rfc4372"
+File "..\..\radius\dictionary.rfc4675"
+File "..\..\radius\dictionary.rfc4679"
+File "..\..\radius\dictionary.rfc4818"
+File "..\..\radius\dictionary.rfc4849"
+File "..\..\radius\dictionary.rfc5090"
+File "..\..\radius\dictionary.rfc5176"
+File "..\..\radius\dictionary.riverstone"
+File "..\..\radius\dictionary.roaringpenguin"
 File "..\..\radius\dictionary.shasta"
 File "..\..\radius\dictionary.shiva"
+File "..\..\radius\dictionary.slipstream"
+File "..\..\radius\dictionary.sofaware"
 File "..\..\radius\dictionary.sonicwall"
 File "..\..\radius\dictionary.springtide"
 File "..\..\radius\dictionary.starent"
 File "..\..\radius\dictionary.t_systems_nova"
 File "..\..\radius\dictionary.telebit"
+File "..\..\radius\dictionary.telkom"
 File "..\..\radius\dictionary.trapeze"
+File "..\..\radius\dictionary.tropos"
 File "..\..\radius\dictionary.tunnel"
 File "..\..\radius\dictionary.unisphere"
 File "..\..\radius\dictionary.unix"
 File "..\..\radius\dictionary.usr"
+File "..\..\radius\dictionary.utstarcom"
 File "..\..\radius\dictionary.valemount"
 File "..\..\radius\dictionary.versanet"
+File "..\..\radius\dictionary.vqp"
+File "..\..\radius\dictionary.walabi"
+File "..\..\radius\dictionary.waverider"
 File "..\..\radius\dictionary.wimax"
 File "..\..\radius\dictionary.wispr"
 File "..\..\radius\dictionary.xedia"
+File "..\..\radius\dictionary.xylan"
+File "..\..\radius\dictionary.zyxel"
 SetOutPath $INSTDIR
 
 ;