merge soc07 r4852:4858 - Added nmap specific information (name/lang/company/copyright etc.) to windows installer. Need to come up with a way to automate the version information in both the .rc and the .nsis file. Now nmap registers with add/remove programs. Updated winpcap to version 4.0. winpcap 4.0 - removed files no longer needed from winpcap 3.1 installtion.

mswin32/nsis/Nmap.nsi

@@ -19,7 +19,16 @@
   
   ;Get installation folder from registry if available
   InstallDirRegKey HKCU "Software\Nmap" ""
-
+  
+  VIProductVersion 4.2.0.7
+  VIAddVersionKey /LANG=1033 "FileVersion" "4.20ALPHA7"
+  VIAddVersionKey /LANG=1033 "ProductName" "Nmap"
+  VIAddVersionKey /LANG=1033 "CompanyName" "Insecure.org"
+  VIAddVersionKey /LANG=1033 "InternalName" "NmapInstaller.exe"
+  VIAddVersionKey /LANG=1033 "LegalCopyright" "Copyright (c) Insecure.Com LLC (fyodor@insecure.org)"
+  VIAddVersionKey /LANG=1033 "LegalTrademark" "NMAP"
+  VIAddVersionKey /LANG=1033 "FileDescription" "Nmap installer"
+  
 ;--------------------------------
 ;Interface Settings
 
@@ -65,13 +74,20 @@ Section "Nmap Core Files" SecCore
   File ..\nmap_performance.reg
   File ..\..\README-WIN32
   File /r ..\..\scripts
+  File ..\icon1.ico
  
   ;Store installation folder
   WriteRegStr HKCU "Software\Nmap" "" $INSTDIR
   
   ;Create uninstaller
   WriteUninstaller "$INSTDIR\Uninstall.exe"
-
+  
+  ; Register Nmap with add/remove programs
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Nmap" "DisplayName" "Nmap 4.20ALPHA7"
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Nmap" "UninstallString" '"$INSTDIR\uninstall.exe"'
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Nmap" "DisplayIcon" '"$INSTDIR\icon1.ico"'
+  WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Nmap" "NoModify" 1
+  WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Nmap" "NoRepair" 1
 SectionEnd
 
 Section "Register Nmap Path" SecRegisterPath
@@ -79,11 +95,10 @@ Section "Register Nmap Path" SecRegisterPath
   Call AddToPath
 SectionEnd
 
-
-Section "WinPcap 3.1" SecWinPcap
-  File ..\winpcap\winpcap-nmap-3.1.B.exe
-  Exec '"$INSTDIR\winpcap-nmap-3.1.B.exe"'
-  Delete "$INSTDIR\winpcap-nmap-3.1.B.exe"
+Section "WinPcap 4.0" SecWinPcap
+  File ..\winpcap\winpcap-nmap-4.0.exe
+  Exec '"$INSTDIR\winpcap-nmap-4.0.exe"'
+  Delete "$INSTDIR\winpcap-nmap-4.0.exe"
 SectionEnd
 
 Section "Network Performance Improvements (Registry Changes)" SecPerfRegistryMods
@@ -97,7 +112,7 @@ SectionEnd
   ;Component strings
   LangString DESC_SecCore ${LANG_ENGLISH} "Installs Nmap executables and script files"
   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 3.1 (required for most Nmap scans unless it is already installed)"
+  LangString DESC_SecWinPcap ${LANG_ENGLISH} "Installs WinPcap 4.0 (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."
 
   ;Assign language strings to sections
@@ -134,6 +149,7 @@ Section "Uninstall"
   Delete "$INSTDIR\nmap.xsl"
   Delete "$INSTDIR\nmap_performance.reg"
   Delete "$INSTDIR\README-WIN32"
+  Delete "$INSTDIR\icon1.ico"
 
   Delete "$INSTDIR\Uninstall.exe"
 
@@ -143,12 +159,11 @@ Section "Uninstall"
   DetailPrint "Deleting Registry Keys..."
   SetDetailsPrint listonly
   DeleteRegKey /ifempty HKCU "Software\Nmap"
-
+  DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Nmap"
   SetDetailsPrint textonly
   DetailPrint "Unregistering Nmap Path..."
   Push $INSTDIR
   Call un.RemoveFromPath
 
   SetDetailsPrint both
-SectionEnd
-
+SectionEnd

mswin32/winpcap/winpcap-nmap.nsi

@@ -1,13 +1,14 @@
 ;; Custom winpcap for nmap
 ;; Started by Doug Hoyte, April 2006
+;; Updated to 4.0, June 2007
 
 ;--------------------------------
 
 ; The name of the installer
-Name "winpcap-nmap-3.1"
+Name "winpcap-nmap-4.0"
 
 ; The file to write
-OutFile "winpcap-nmap-3.1.B.exe"
+OutFile "winpcap-nmap-4.0.exe"
 
 ; The default installation directory
 InstallDir $PROGRAMFILES\WinPcap
@@ -97,9 +98,6 @@ Section "" ;No components page, name is not important
   SetOutPath $INSTDIR
   
   ; Put file there
-  File daemon_mgm.exe
-  File NetMonInstaller.exe
-  File npf_mgm.exe
   File rpcapd.exe
   File LICENSE
 
@@ -120,7 +118,7 @@ Section "" ;No components page, name is not important
   WriteRegStr HKLM "Software\WinPcap" "" '"$INSTDIR"'
 
   ; Write the uninstall keys for Windows
-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\winpcap-nmap" "DisplayName" "winpcap-nmap 3.1"
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\winpcap-nmap" "DisplayName" "winpcap-nmap 4.0"
   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\winpcap-nmap" "UninstallString" '"$INSTDIR\uninstall.exe"'
   WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\winpcap-nmap" "NoModify" 1
   WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\winpcap-nmap" "NoRepair" 1
@@ -135,9 +133,6 @@ Section "Uninstall"
   DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\winpcap-nmap"
   DeleteRegKey HKLM "Software\WinPcap"
 
-  Delete $INSTDIR\daemon_mgm.exe
-  Delete $INSTDIR\NetMonInstaller.exe
-  Delete $INSTDIR\npf_mgm.exe
   Delete $INSTDIR\rpcapd.exe
   Delete $INSTDIR\LICENSE
   Delete $INSTDIR\uninstall.exe
@@ -151,4 +146,4 @@ Section "Uninstall"
 
   RMDir "$INSTDIR"
 
-SectionEnd
+SectionEnd