diff options
| -rw-r--r-- | Makefile.nmake | 12 | ||||
| -rw-r--r-- | config.nmake | 10 | ||||
| -rw-r--r-- | docbook/release-notes.xml | 6 | ||||
| -rw-r--r-- | packaging/nsis/wireshark.nsi | 20 | ||||
| -rwxr-xr-x | tools/win32-setup.sh | 2 | ||||
| -rwxr-xr-x | tools/win64-setup.sh | 2 |
6 files changed, 30 insertions, 22 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 11b3ce7dc4..262710becb 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -823,7 +823,7 @@ process_libs: !ENDIF !IFDEF SMI_DIR @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ - . libsmi-0.4.8.zip + . libsmi-$(SMI_PKG)-$(WIRESHARK_TARGET_PLATFORM)ws.zip !ENDIF !IFDEF GEOIP_DIR @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ @@ -877,6 +877,7 @@ clean_setup: rm -r -f lua5.1.4 rm -r -f libsmi-0.4.5 rm -r -f libsmi-0.4.8 + rm -r -f libsmi-win??-svn-40773 rm -r -f nasm-2.00 rm -r -f nasm-2.02 rm -r -f nasm-2.09.08 @@ -1084,8 +1085,13 @@ install-all: install-generated-files !IFDEF SMI_DIR if not exist $(INSTALL_DIR)\snmp mkdir $(INSTALL_DIR)\snmp if not exist $(INSTALL_DIR)\snmp\mibs mkdir $(INSTALL_DIR)\snmp\mibs - xcopy "$(SMI_DIR)\lib\smi.dll" $(INSTALL_DIR) /d - xcopy "$(SMI_DIR)\mibs\*" $(INSTALL_DIR)\snmp\mibs /d + xcopy "$(SMI_DIR)\bin\libsmi-2.dll" $(INSTALL_DIR) /d + xcopy "$(SMI_DIR)\share\mibs\iana\*" $(INSTALL_DIR)\snmp\mibs /d + xcopy "$(SMI_DIR)\share\mibs\ietf\*" $(INSTALL_DIR)\snmp\mibs /d + xcopy "$(SMI_DIR)\share\mibs\irtf\*" $(INSTALL_DIR)\snmp\mibs /d + xcopy "$(SMI_DIR)\share\mibs\tubs\*" $(INSTALL_DIR)\snmp\mibs /d + xcopy "$(SMI_DIR)\share\pibs\*" $(INSTALL_DIR)\snmp\mibs /d + xcopy "$(SMI_DIR)\share\yang\*.yang" $(INSTALL_DIR)\snmp\mibs /d !ENDIF checkapi_local: diff --git a/config.nmake b/config.nmake index 69c6914ed6..3c689c8496 100644 --- a/config.nmake +++ b/config.nmake @@ -394,7 +394,7 @@ AIRPCAP_DIR=$(WIRESHARK_LIBS)\AirPcap_Devpack_4_1_0_1622\AirPcap_Devpack # # Used for oid-name resolution for SNMP and other protocols # -SMI_DIR=$(WIRESHARK_LIBS)\libsmi-0.4.8 +SMI_PKG=svn-40773 # # Optional: GeoIP, IP address database lookups @@ -589,7 +589,7 @@ AIRPCAP_DIR=$(WIRESHARK_LIBS)\AirPcap_Devpack_4_1_0_1622\AirPcap_Devpack # # Used for oid-name resolution for SNMP and other protocols # -#SMI_DIR=$(WIRESHARK_LIBS)\libsmi-0.4.8 +SMI_PKG=svn-40773 # # Optional: GeoIP, IP address database lookups @@ -1250,11 +1250,13 @@ HHC_CFLAGS= HHC_LIBS= !ENDIF -!IFDEF SMI_DIR +!IFDEF SMI_PKG +SMI_DIR=$(WIRESHARK_LIBS)\libsmi-$(SMI_PKG)-$(WIRESHARK_TARGET_PLATFORM)ws SMI_CONFIG=^#define HAVE_LIBSMI 1 SMI_CFLAGS=/I$(SMI_DIR)\include -SMI_LIBS=$(SMI_DIR)\lib\smi.lib +SMI_LIBS=$(SMI_DIR)\lib\libsmi-2.lib !ELSE +SMI_DIR= SMI_LIBS= SMI_CFLAGS= SMI_CONFIG= diff --git a/docbook/release-notes.xml b/docbook/release-notes.xml index a5915e0935..4d91bdd407 100644 --- a/docbook/release-notes.xml +++ b/docbook/release-notes.xml @@ -83,6 +83,12 @@ Wireshark Info </para> </listitem> + <listitem> + <para> + OID resolution is now supported on 64-bit Windows. + </para> + </listitem> + </itemizedlist> </para> diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index ed0919390d..ce60466aff 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -414,7 +414,7 @@ File "..\..\epan\wslua\console.lua" File "..\..\epan\wslua\dtd_gen.lua" !endif !ifdef SMI_DIR -File "${SMI_DIR}\lib\smi.dll" +File "${SMI_DIR}\bin\libsmi-2.dll" !endif File "..\..\wireshark-gtk2\COPYING.txt" File "..\..\wireshark-gtk2\NEWS.txt" @@ -934,19 +934,16 @@ File "..\..\plugins\mate\mate.dll" SectionEnd -!ifdef NET_SNMP_DIR -Section "SNMP MIBs" SecMIBs -;------------------------------------------- -SetOutPath $INSTDIR\snmp\mibs -File "${NET_SNMP_DIR}\mibs\*.txt" -SectionEnd -!endif - !ifdef SMI_DIR Section "SNMP MIBs" SecMIBs ;------------------------------------------- SetOutPath $INSTDIR\snmp\mibs -File "${SMI_DIR}\mibs\*" +File "${SMI_DIR}\share\mibs\iana\*" +File "${SMI_DIR}\share\mibs\ietf\*" +File "${SMI_DIR}\share\mibs\irtf\*" +File "${SMI_DIR}\share\mibs\tubs\*" +File "${SMI_DIR}\share\pibs\*" +File "${SMI_DIR}\share\yang\*.yang" SectionEnd !endif @@ -1236,9 +1233,6 @@ SectionEnd !insertmacro MUI_DESCRIPTION_TEXT ${SecPlugins} "Plugins with some extended dissections." !insertmacro MUI_DESCRIPTION_TEXT ${SecStatsTree} "Plugin for some extended statistics." !insertmacro MUI_DESCRIPTION_TEXT ${SecMate} "Plugin - Meta Analysis and Tracing Engine (Experimental)." -!ifdef NET_SNMP_DIR - !insertmacro MUI_DESCRIPTION_TEXT ${SecMIBs} "SNMP MIBs for better SNMP dissection." -!endif !ifdef SMI_DIR !insertmacro MUI_DESCRIPTION_TEXT ${SecMIBs} "SNMP MIBs for better SNMP dissection." !endif diff --git a/tools/win32-setup.sh b/tools/win32-setup.sh index 7e1c296252..b7c734a1c6 100755 --- a/tools/win32-setup.sh +++ b/tools/win32-setup.sh @@ -4,7 +4,7 @@ # 32-bit wrapper for win-setup.sh. -export DOWNLOAD_TAG="2011-05-19" +export DOWNLOAD_TAG="2011-06-27" export WIRESHARK_TARGET_PLATFORM="win32" WIN_SETUP=`echo $0 | sed -e s/win32/win/` diff --git a/tools/win64-setup.sh b/tools/win64-setup.sh index 2d9e06d0c0..f7b750b82d 100755 --- a/tools/win64-setup.sh +++ b/tools/win64-setup.sh @@ -4,7 +4,7 @@ # 64-bit wrapper for win-setup.sh. -export DOWNLOAD_TAG="2011-05-19" +export DOWNLOAD_TAG="2011-06-27" export WIRESHARK_TARGET_PLATFORM="win64" WIN_SETUP=`echo $0 | sed -e s/win64/win/` |