diff options
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/nsis/Makefile.am | 2 | ||||
| -rw-r--r-- | packaging/nsis/WinPcapPage.ini | 2 | ||||
| -rw-r--r-- | packaging/nsis/WinPcap_3_1.exe | bin | 0 -> 467181 bytes | |||
| -rwxr-xr-x | packaging/nsis/WinPcap_3_1_beta4.exe | bin | 484652 -> 0 bytes | |||
| -rw-r--r-- | packaging/nsis/ethereal.nsi | 14 |
5 files changed, 10 insertions, 8 deletions
diff --git a/packaging/nsis/Makefile.am b/packaging/nsis/Makefile.am index 89fa2d0c4a..6b7d2c05ab 100644 --- a/packaging/nsis/Makefile.am +++ b/packaging/nsis/Makefile.am @@ -8,5 +8,5 @@ EXTRA_DIST = \ servicelib.nsh \ AdditionalTasksPage.ini \ WinPcapPage.ini \ - WinPcap_3_1_beta4.exe \ + WinPcap_3_1.exe \ Makefile.nmake diff --git a/packaging/nsis/WinPcapPage.ini b/packaging/nsis/WinPcapPage.ini index 25b69501e4..59c28526ad 100644 --- a/packaging/nsis/WinPcapPage.ini +++ b/packaging/nsis/WinPcapPage.ini @@ -45,7 +45,7 @@ Text=This text will be replaced, depending if WinPcap is already installed [Field 6] Type=Button Left=0 -Right=150 +Right=100 Top=120 Bottom=135 Text=What is WinPcap? diff --git a/packaging/nsis/WinPcap_3_1.exe b/packaging/nsis/WinPcap_3_1.exe Binary files differnew file mode 100644 index 0000000000..de14652014 --- /dev/null +++ b/packaging/nsis/WinPcap_3_1.exe diff --git a/packaging/nsis/WinPcap_3_1_beta4.exe b/packaging/nsis/WinPcap_3_1_beta4.exe Binary files differdeleted file mode 100755 index 21d78061b8..0000000000 --- a/packaging/nsis/WinPcap_3_1_beta4.exe +++ /dev/null diff --git a/packaging/nsis/ethereal.nsi b/packaging/nsis/ethereal.nsi index 196a9192c1..0b83f12c32 100644 --- a/packaging/nsis/ethereal.nsi +++ b/packaging/nsis/ethereal.nsi @@ -531,16 +531,17 @@ StrCmp $0 "0" SecRequired_skip_Winpcap ; Uinstall old WinPcap first ReadRegStr $WINPCAP_UNINSTALL HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\WinPcapInst" "UninstallString" IfErrors lbl_winpcap_notinstalled ;if RegKey is unavailable, WinPcap is not installed -ExecWait '$WINPCAP_UNINSTALL' $0 -DetailPrint "WinPcap uninstaller returned $0" +; from released version 3.1, WinPcap will uninstall an old version by itself +;ExecWait '$WINPCAP_UNINSTALL' $0 +;DetailPrint "WinPcap uninstaller returned $0" lbl_winpcap_notinstalled: SetOutPath $INSTDIR -File "WinPcap_3_1_beta4.exe" -ExecWait '"$INSTDIR\WinPcap_3_1_beta4.exe"' $0 +File "WinPcap_3_1.exe" +ExecWait '"$INSTDIR\WinPcap_3_1.exe"' $0 DetailPrint "WinPcap installer returned $0" SecRequired_skip_Winpcap: -; Load Winpcap NPF service at startup (depending on additional tasks page) +; Load Winpcap NPF service at startup (depending on winpcap page) ReadINIStr $0 "$PLUGINSDIR\WinPcapPage.ini" "Field 8" "State" StrCmp $0 "0" SecRequired_no_WinpcapService WriteRegDWORD HKEY_LOCAL_MACHINE "SYSTEM\CurrentControlSet\Services\NPF" "Start" 2 ;set NPF to (SERVICE_AUTO_START) @@ -1060,7 +1061,7 @@ lbl_ignore_wimp: !endif ; detect if WinPcap should be installed - WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 4" "Text" "Install WinPcap 3.1 beta 4" + WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 4" "Text" "Install WinPcap 3.1" ReadRegStr $WINPCAP_VERSION 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" @@ -1080,6 +1081,7 @@ lbl_winpcap_installed: StrCmp "$WINPCAP_VERSION" "WinPcap 3.1 beta" lbl_winpcap_do_install StrCmp "$WINPCAP_VERSION" "WinPcap 3.1 beta2" lbl_winpcap_do_install StrCmp "$WINPCAP_VERSION" "WinPcap 3.1 beta3" lbl_winpcap_do_install + StrCmp "$WINPCAP_VERSION" "WinPcap 3.1 beta4" lbl_winpcap_do_install ; lbl_winpcap_dont_install: ; seems to be the current or even a newer version, so don't install |