osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Update WinPcap and the developer's pack to 4.1.1. 

svn path=/trunk/; revision=30652
This commit is contained in:
Gerald Combs 2009-10-21 03:13:42 +00:00
parent 6274e6b1ff
commit 09a0650607
8 changed files with 12 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.nmake
View File

@ -205,7 +205,7 @@ GETTEXT_PKG=-runtime-0.17-1
#
PCAP_DIR=$(WIRESHARK_LIBS)\WPdpack
# This macro is used by the nsis installer script, by the u3/portable apps and by the setup target.
PCAP_VERSION=4_1_beta5
PCAP_VERSION=4_1_1
#
# Optional: WinPcap remote capture support and new API

2
packaging/nsis/Makefile.am
View File

@ -8,5 +8,5 @@ EXTRA_DIST = \
VersionCompare.nsh \
AdditionalTasksPage.ini \
WinPcapPage.ini \
WinPcap_4_1.exe \
WinPcap_4_1_1.exe \
Makefile.nmake

2
packaging/nsis/Makefile.nmake
View File

@ -16,7 +16,7 @@ EXE=../../tshark.exe ../../editcap.exe \
!IFDEF GTK_DIR
../../wireshark.exe \
!ENDIF
../../text2pcap.exe ../../mergecap.exe ../../capinfos.exe WinPcap_4_0_2.exe
../../text2pcap.exe ../../mergecap.exe ../../capinfos.exe WinPcap_4_1_1.exe
DLL=../../wiretap/wiretap-$(WTAP_VERSION).dll ../../wsutil/libwsutil.dll
DOC=../../doc/ws.css \
../../doc/capinfos.html \

BIN
packaging/nsis/WinPcap_4_1.exe
View File

Binary file not shown.

BIN
packaging/nsis/WinPcap_4_1_1.exe Executable file
View File

Binary file not shown.

42
packaging/nsis/wireshark.nsi
View File

@ -152,11 +152,6 @@ Page custom DisplayWinPcapPage
!macroend
; ============================================================================
; Services
; ============================================================================
!include "servicelib.nsh"
; ============================================================================
; Command Line
; ============================================================================
@ -790,8 +785,8 @@ IfErrors lbl_winpcap_notinstalled ;if RegKey is unavailable, WinPcap is not inst
;DetailPrint "WinPcap uninstaller returned $0"
lbl_winpcap_notinstalled:
SetOutPath $INSTDIR
File "WinPcap_4_1.exe"
ExecWait '"$INSTDIR\WinPcap_4_1.exe"' $0
File "WinPcap_4_1_1.exe"
ExecWait '"$INSTDIR\WinPcap_4_1_1.exe"' $0
DetailPrint "WinPcap installer returned $0"
SecRequired_skip_Winpcap:
@ -1269,7 +1264,6 @@ FunctionEnd
!include WinMessages.nsh
!include "VersionCompare.nsh"
Var NPF_START ; NPF service registry key
Var WINPCAP_NAME ; DisplayName from WinPcap installation
Var WINPCAP_VERSION ; DisplayVersion from WinPcap installation
@ -1287,21 +1281,20 @@ Function myShowCallback
Goto lbl_winversion_supported
lbl_winversion_unsupported:
MessageBox MB_OK \
"Windows $R0 is no longer supported. The last known version working with 98/ME was Ethereal 0.99.0!" \
"Windows $R0 is no longer supported. The last known version working with 98/ME was Ethereal 0.99.0." \
/SD IDOK
Quit
lbl_winversion_unsupported_nt4:
MessageBox MB_OK \
"Windows $R0 is no longer supported. The last known version working with NT 4.0 was Wireshark 0.99.4!" \
"Windows $R0 is no longer supported. The last known version working with NT 4.0 was Wireshark 0.99.4." \
/SD IDOK
Quit
lbl_winversion_supported:
; detect if WinPcap should be installed
WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 4" "Text" "Install WinPcap 4.1"
WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 4" "Text" "Install WinPcap 4.1.1"
ReadRegStr $WINPCAP_NAME HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\WinPcapInst" "DisplayName"
IfErrors 0 lbl_winpcap_installed ;if RegKey is available, WinPcap is already installed
WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 2" "Text" "WinPcap is currently not installed"
@ -1314,7 +1307,7 @@ lbl_winpcap_installed:
; Compare the installed build against the one we have.
ReadRegStr $WINPCAP_VERSION HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\WinPcapInst" "DisplayVersion"
StrCmp $WINPCAP_VERSION "" lbl_winpcap_do_install ; WinPcap is really old(?) or installed improperly.
${VersionCompare} $WINPCAP_VERSION "4.1.0.1752" $1 ; WinPcap 4.1
${VersionCompare} $WINPCAP_VERSION "4.1.0.1753" $1 ; WinPcap 4.1.1
StrCmp $1 "2" lbl_winpcap_do_install
;lbl_winpcap_dont_install:
@ -1327,7 +1320,7 @@ lbl_winpcap_installed:
; force the user to upgrade by hand
WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 4" "State" "0"
WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 4" "Flags" "DISABLED"
WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 5" "Text" "If you wish to install WinPcap 4.1, please uninstall $WINPCAP_NAME manually first."
WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 5" "Text" "If you wish to install WinPcap 4.1.1, please uninstall $WINPCAP_NAME manually first."
WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 5" "Flags" "DISABLED"
Goto lbl_winpcap_done
@ -1338,27 +1331,6 @@ lbl_winpcap_do_install:
lbl_winpcap_done:
; Disable NPF service setting for Win OT
StrCmp $R0 '95' lbl_npf_disable
StrCmp $R0 '98' lbl_npf_disable
StrCmp $R0 'ME' lbl_npf_disable
; Enable NPF by default under Vista.
StrCmp $R0 'Vista' lbl_npf_enable
ReadRegDWORD $NPF_START HKEY_LOCAL_MACHINE "SYSTEM\CurrentControlSet\Services\NPF" "Start"
; (Winpcap may not be installed already, so no regKey is no error here)
IfErrors lbl_npf_done ;RegKey not available, so do not set it
IntCmp $NPF_START 2 0 lbl_npf_done lbl_npf_done
lbl_npf_enable:
WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 8" "State" "1"
Goto lbl_npf_done
;disable
lbl_npf_disable:
WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 8" "State" "0"
WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 8" "Flags" "DISABLED"
WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 9" "Flags" "DISABLED"
lbl_npf_done:
; if Wireshark was previously installed, unselect previously not installed icons etc.
; detect if Wireshark is already installed ->
ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Wireshark" "UninstallString"

2
tools/win32-setup.sh
View File

@ -4,7 +4,7 @@
# 32-bit wrapper for win-setup.sh.
export DOWNLOAD_TAG="2009-0916C"
export DOWNLOAD_TAG="2009-10-20"
export WIRESHARK_TARGET_PLATFORM="win32"
WIN_SETUP=`echo $0 | sed -e s/win32/win/`

2
tools/win64-setup.sh
View File

@ -4,7 +4,7 @@
# 64-bit wrapper for win-setup.sh.
export DOWNLOAD_TAG="2009-09-16"
export DOWNLOAD_TAG="2009-10-20"
export WIRESHARK_TARGET_PLATFORM="win64"
WIN_SETUP=`echo $0 | sed -e s/win64/win/`