Updated Nmap NSIS file to use WinPcap 4.1.3 installer.

This commit is contained in:
robert 2014-01-11 15:00:05 +00:00
parent 98ed1cb771
commit 0772a10895

View file

@ -219,10 +219,10 @@ Section "Register Nmap Path" SecRegisterPath
Call AddToPath
SectionEnd
Section "WinPcap 4.1.2" SecWinPcap
Section "WinPcap 4.1.3" SecWinPcap
SetOutPath "$INSTDIR"
SetOverwrite on
File ..\winpcap\winpcap-nmap-4.12.exe
File ..\winpcap\winpcap-nmap-4.13.exe
; If the Nmap installer was launched using /S then pass some arguments to WinPcap
IfSilent winpcap_silent winpcap_loud
winpcap_silent:
@ -233,12 +233,12 @@ Section "WinPcap 4.1.2" SecWinPcap
StrCmp $2 "NO" 0 NoSkipNPFStartup
StrCpy $1 "/NPFSTARTUP=NO $1"
NoSkipNPFStartup:
ExecWait '"$INSTDIR\winpcap-nmap-4.12.exe" $1 /S'
ExecWait '"$INSTDIR\winpcap-nmap-4.13.exe" $1 /S'
Goto delete_winpcap
winpcap_loud:
ExecWait '"$INSTDIR\winpcap-nmap-4.12.exe"'
ExecWait '"$INSTDIR\winpcap-nmap-4.13.exe"'
delete_winpcap:
Delete "$INSTDIR\winpcap-nmap-4.12.exe"
Delete "$INSTDIR\winpcap-nmap-4.13.exe"
SectionEnd
Section "Network Performance Improvements" SecPerfRegistryMods
@ -422,7 +422,7 @@ FunctionEnd
;Component strings
LangString DESC_SecCore ${LANG_ENGLISH} "Installs Nmap executable, NSE scripts and Visual C++ 2010 runtime components"
LangString DESC_SecRegisterPath ${LANG_ENGLISH} "Registers Nmap path to System path so you can execute it from any directory"
LangString DESC_SecWinPcap ${LANG_ENGLISH} "Installs WinPcap 4.1.2 (required for most Nmap scans unless it is already installed)"
LangString DESC_SecWinPcap ${LANG_ENGLISH} "Installs WinPcap 4.1.3 (required for most Nmap scans unless it is already installed)"
LangString DESC_SecPerfRegistryMods ${LANG_ENGLISH} "Modifies Windows registry values to improve TCP connect scan performance. Recommended."
LangString DESC_SecZenmap ${LANG_ENGLISH} "Installs Zenmap, the official Nmap graphical user interface, and Visual C++ 2008 runtime components. Recommended."
LangString DESC_SecNcat ${LANG_ENGLISH} "Installs Ncat, Nmap's Netcat replacement."