Skip to content

Commit

Permalink
Nmap's version of the WinPcap installer has been updated to 4.1.2.
Browse files Browse the repository at this point in the history
  • Loading branch information
robert committed Jul 15, 2010
1 parent cad9067 commit e8aab6d
Show file tree
Hide file tree
Showing 12 changed files with 15 additions and 14 deletions.
10 changes: 5 additions & 5 deletions mswin32/nsis/Nmap.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -240,10 +240,10 @@ Section "Register Nmap Path" SecRegisterPath
Call AddToPath
SectionEnd

Section "WinPcap 4.1.1" SecWinPcap
Section "WinPcap 4.1.2" SecWinPcap
SetOutPath "$INSTDIR"
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
IfSilent winpcap_silent winpcap_loud
winpcap_silent:
Expand All @@ -254,12 +254,12 @@ Section "WinPcap 4.1.1" SecWinPcap
StrCmp $2 "NO" 0 NoSkipNPFStartup
StrCpy $1 "/NPFSTARTUP=NO $1"
NoSkipNPFStartup:
ExecWait '"$INSTDIR\winpcap-nmap-4.11.exe" $1 /S'
ExecWait '"$INSTDIR\winpcap-nmap-4.12.exe" $1 /S'
Goto delete_winpcap
winpcap_loud:
ExecWait '"$INSTDIR\winpcap-nmap-4.11.exe"'
ExecWait '"$INSTDIR\winpcap-nmap-4.12.exe"'
delete_winpcap:
Delete "$INSTDIR\winpcap-nmap-4.11.exe"
Delete "$INSTDIR\winpcap-nmap-4.12.exe"
SectionEnd

Section "Network Performance Improvements" SecPerfRegistryMods
Expand Down
2 changes: 1 addition & 1 deletion mswin32/winpcap/LICENSE
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
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.

Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
Expand Down
Binary file modified mswin32/winpcap/npf.sys
Binary file not shown.
Binary file modified mswin32/winpcap/nt5/x64/Packet.dll
Binary file not shown.
Binary file modified mswin32/winpcap/nt5/x86/Packet.dll
Binary file not shown.
Binary file modified mswin32/winpcap/rpcapd.exe
Binary file not shown.
Binary file modified mswin32/winpcap/vista/x64/Packet.dll
Binary file not shown.
Binary file modified mswin32/winpcap/vista/x86/Packet.dll
Binary file not shown.
17 changes: 9 additions & 8 deletions mswin32/winpcap/winpcap-nmap.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

;; Rob Nicholls
;; Updated to 4.1.1, October 2009
;; Updated to 4.1.2, July 2010

SetCompressor /SOLID /FINAL lzma

Expand All @@ -25,10 +26,10 @@ SetCompressor /SOLID /FINAL lzma
;General

; The name of the installer
Name "WinPcap (Nmap) 4.1.1"
Name "WinPcap (Nmap) 4.1.2"

; The file to write
OutFile "winpcap-nmap-4.11.exe"
OutFile "winpcap-nmap-4.12.exe"

RequestExecutionLevel admin

Expand All @@ -42,10 +43,10 @@ Function un.is64bit
System::Call "kernel32::IsWow64Process(i s, *i .r0)"
FunctionEnd

VIProductVersion "4.1.0.1753"
VIAddVersionKey /LANG=1033 "FileVersion" "4.1.0.1753"
VIProductVersion "4.1.0.2001"
VIAddVersionKey /LANG=1033 "FileVersion" "4.1.0.2001"
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" ""

;--------------------------------
Expand Down Expand Up @@ -130,7 +131,7 @@ Function .onInit
var /GLOBAL inst_ver
var /GLOBAL my_ver
var /GLOBAL npf_startup
StrCpy $my_ver "4.1.0.1753"
StrCpy $my_ver "4.1.0.2001"
StrCpy $npf_startup "YES"

; Always use the requested /D= $INSTDIR if given.
Expand Down Expand Up @@ -453,8 +454,8 @@ Section "WinPcap" SecWinPcap

; 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" "DisplayVersion" "4.1.0.1753"
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.2001"
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" "URLUpdateInfo" "http://www.winpcap.org"
Expand Down
Binary file modified mswin32/winpcap/wpcap.dll
Binary file not shown.
Binary file modified mswin32/winpcap/x64/npf.sys
Binary file not shown.
Binary file modified mswin32/winpcap/x64/wpcap.dll
Binary file not shown.

0 comments on commit e8aab6d

Please sign in to comment.