1
0
mirror of https://github.com/nmap/nmap.git synced 2025-12-08 13:41:29 +00:00

Nmap's version of the WinPcap installer has been updated to 4.1.2.

This commit is contained in:
robert
2010-07-15 17:25:24 +00:00
parent cad9067c01
commit e8aab6daac
12 changed files with 15 additions and 14 deletions

View File

@@ -240,10 +240,10 @@ Section "Register Nmap Path" SecRegisterPath
Call AddToPath Call AddToPath
SectionEnd SectionEnd
Section "WinPcap 4.1.1" SecWinPcap Section "WinPcap 4.1.2" SecWinPcap
SetOutPath "$INSTDIR" SetOutPath "$INSTDIR"
SetOverwrite on SetOverwrite on
File ..\winpcap\winpcap-nmap-4.11.exe File ..\winpcap\winpcap-nmap-4.12.exe
; If the Nmap installer was launched using /S then pass some arguments to WinPcap ; If the Nmap installer was launched using /S then pass some arguments to WinPcap
IfSilent winpcap_silent winpcap_loud IfSilent winpcap_silent winpcap_loud
winpcap_silent: winpcap_silent:
@@ -254,12 +254,12 @@ Section "WinPcap 4.1.1" SecWinPcap
StrCmp $2 "NO" 0 NoSkipNPFStartup StrCmp $2 "NO" 0 NoSkipNPFStartup
StrCpy $1 "/NPFSTARTUP=NO $1" StrCpy $1 "/NPFSTARTUP=NO $1"
NoSkipNPFStartup: NoSkipNPFStartup:
ExecWait '"$INSTDIR\winpcap-nmap-4.11.exe" $1 /S' ExecWait '"$INSTDIR\winpcap-nmap-4.12.exe" $1 /S'
Goto delete_winpcap Goto delete_winpcap
winpcap_loud: winpcap_loud:
ExecWait '"$INSTDIR\winpcap-nmap-4.11.exe"' ExecWait '"$INSTDIR\winpcap-nmap-4.12.exe"'
delete_winpcap: delete_winpcap:
Delete "$INSTDIR\winpcap-nmap-4.11.exe" Delete "$INSTDIR\winpcap-nmap-4.12.exe"
SectionEnd SectionEnd
Section "Network Performance Improvements" SecPerfRegistryMods Section "Network Performance Improvements" SecPerfRegistryMods

View File

@@ -1,5 +1,5 @@
Copyright (c) 1999 - 2005 NetGroup, Politecnico di Torino (Italy). Copyright (c) 1999 - 2005 NetGroup, Politecnico di Torino (Italy).
Copyright (c) 2005 - 2009 CACE Technologies, Davis (California). Copyright (c) 2005 - 2010 CACE Technologies, Davis (California).
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -12,6 +12,7 @@
;; Rob Nicholls ;; Rob Nicholls
;; Updated to 4.1.1, October 2009 ;; Updated to 4.1.1, October 2009
;; Updated to 4.1.2, July 2010
SetCompressor /SOLID /FINAL lzma SetCompressor /SOLID /FINAL lzma
@@ -25,10 +26,10 @@ SetCompressor /SOLID /FINAL lzma
;General ;General
; The name of the installer ; The name of the installer
Name "WinPcap (Nmap) 4.1.1" Name "WinPcap (Nmap) 4.1.2"
; The file to write ; The file to write
OutFile "winpcap-nmap-4.11.exe" OutFile "winpcap-nmap-4.12.exe"
RequestExecutionLevel admin RequestExecutionLevel admin
@@ -42,10 +43,10 @@ Function un.is64bit
System::Call "kernel32::IsWow64Process(i s, *i .r0)" System::Call "kernel32::IsWow64Process(i s, *i .r0)"
FunctionEnd FunctionEnd
VIProductVersion "4.1.0.1753" VIProductVersion "4.1.0.2001"
VIAddVersionKey /LANG=1033 "FileVersion" "4.1.0.1753" VIAddVersionKey /LANG=1033 "FileVersion" "4.1.0.2001"
VIAddVersionKey /LANG=1033 "ProductName" "WinPcap" VIAddVersionKey /LANG=1033 "ProductName" "WinPcap"
VIAddVersionKey /LANG=1033 "FileDescription" "WinPcap 4.1.1 installer" VIAddVersionKey /LANG=1033 "FileDescription" "WinPcap 4.1.2 installer"
VIAddVersionKey /LANG=1033 "LegalCopyright" "" VIAddVersionKey /LANG=1033 "LegalCopyright" ""
;-------------------------------- ;--------------------------------
@@ -130,7 +131,7 @@ Function .onInit
var /GLOBAL inst_ver var /GLOBAL inst_ver
var /GLOBAL my_ver var /GLOBAL my_ver
var /GLOBAL npf_startup var /GLOBAL npf_startup
StrCpy $my_ver "4.1.0.1753" StrCpy $my_ver "4.1.0.2001"
StrCpy $npf_startup "YES" StrCpy $npf_startup "YES"
; Always use the requested /D= $INSTDIR if given. ; Always use the requested /D= $INSTDIR if given.
@@ -453,8 +454,8 @@ Section "WinPcap" SecWinPcap
; Write the rest of the uninstall keys for Windows ; Write the rest of the uninstall keys for Windows
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\WinPcapInst" "DisplayName" "WinPcap 4.1.1" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\WinPcapInst" "DisplayName" "WinPcap 4.1.2"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\WinPcapInst" "DisplayVersion" "4.1.0.1753" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\WinPcapInst" "DisplayVersion" "4.1.0.2001"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\WinPcapInst" "Publisher" "CACE Technologies" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\WinPcapInst" "Publisher" "CACE Technologies"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\WinPcapInst" "URLInfoAbout" "http://www.cacetech.com" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\WinPcapInst" "URLInfoAbout" "http://www.cacetech.com"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\WinPcapInst" "URLUpdateInfo" "http://www.winpcap.org" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\WinPcapInst" "URLUpdateInfo" "http://www.winpcap.org"

Binary file not shown.

Binary file not shown.

Binary file not shown.