diff --git a/mswin32/nsis/Nmap.nsi b/mswin32/nsis/Nmap.nsi index 032da49803..dc260a8378 100644 --- a/mswin32/nsis/Nmap.nsi +++ b/mswin32/nsis/Nmap.nsi @@ -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: @@ -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 diff --git a/mswin32/winpcap/LICENSE b/mswin32/winpcap/LICENSE index 9b14b6bad1..85cec823be 100644 --- a/mswin32/winpcap/LICENSE +++ b/mswin32/winpcap/LICENSE @@ -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: diff --git a/mswin32/winpcap/npf.sys b/mswin32/winpcap/npf.sys index daebc52ace..f256f4cb89 100644 Binary files a/mswin32/winpcap/npf.sys and b/mswin32/winpcap/npf.sys differ diff --git a/mswin32/winpcap/nt5/x64/Packet.dll b/mswin32/winpcap/nt5/x64/Packet.dll index f165b30a0b..1a991b438d 100755 Binary files a/mswin32/winpcap/nt5/x64/Packet.dll and b/mswin32/winpcap/nt5/x64/Packet.dll differ diff --git a/mswin32/winpcap/nt5/x86/Packet.dll b/mswin32/winpcap/nt5/x86/Packet.dll index 7975174c4f..ed3b2f79dc 100755 Binary files a/mswin32/winpcap/nt5/x86/Packet.dll and b/mswin32/winpcap/nt5/x86/Packet.dll differ diff --git a/mswin32/winpcap/rpcapd.exe b/mswin32/winpcap/rpcapd.exe index a90ff6ed9e..3857a62ab6 100755 Binary files a/mswin32/winpcap/rpcapd.exe and b/mswin32/winpcap/rpcapd.exe differ diff --git a/mswin32/winpcap/vista/x64/Packet.dll b/mswin32/winpcap/vista/x64/Packet.dll index e1e1f8dc4e..aa54b5e372 100755 Binary files a/mswin32/winpcap/vista/x64/Packet.dll and b/mswin32/winpcap/vista/x64/Packet.dll differ diff --git a/mswin32/winpcap/vista/x86/Packet.dll b/mswin32/winpcap/vista/x86/Packet.dll index a0d04c5ae6..9d21036e96 100755 Binary files a/mswin32/winpcap/vista/x86/Packet.dll and b/mswin32/winpcap/vista/x86/Packet.dll differ diff --git a/mswin32/winpcap/winpcap-nmap.nsi b/mswin32/winpcap/winpcap-nmap.nsi index 4f16ee0f04..1aef4328f1 100644 --- a/mswin32/winpcap/winpcap-nmap.nsi +++ b/mswin32/winpcap/winpcap-nmap.nsi @@ -12,6 +12,7 @@ ;; Rob Nicholls ;; Updated to 4.1.1, October 2009 +;; Updated to 4.1.2, July 2010 SetCompressor /SOLID /FINAL lzma @@ -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 @@ -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" "" ;-------------------------------- @@ -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. @@ -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" diff --git a/mswin32/winpcap/wpcap.dll b/mswin32/winpcap/wpcap.dll index 2babd78da4..ebb17ad55c 100644 Binary files a/mswin32/winpcap/wpcap.dll and b/mswin32/winpcap/wpcap.dll differ diff --git a/mswin32/winpcap/x64/npf.sys b/mswin32/winpcap/x64/npf.sys index fbc71bcb76..3e373fa6c9 100644 Binary files a/mswin32/winpcap/x64/npf.sys and b/mswin32/winpcap/x64/npf.sys differ diff --git a/mswin32/winpcap/x64/wpcap.dll b/mswin32/winpcap/x64/wpcap.dll index ecaa08944f..d68e476e41 100755 Binary files a/mswin32/winpcap/x64/wpcap.dll and b/mswin32/winpcap/x64/wpcap.dll differ