Wireshark · Wireshark-commits: [Wireshark-commits] master 2bcc8db: NSIS: Install NPcap instead of WinPcap.

[Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>]

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=2bcc8dbf267bb33aae5c62d93653b0e1d3105a1b
Submitter: "Anders Broman <a.broman58@xxxxxxxxx>"
Changed: branch: master
Repository: wireshark

Commits:

2bcc8db by Gerald Combs (gerald@xxxxxxxxxxxxx):

    NSIS: Install NPcap instead of WinPcap.
    
    Install NPcap 0.99-r7 instead of WinPcap in the NSIS installer. Update
    and/or remove installer text, variables, and variable names accordingly.
    
    Change-Id: Ied36f00c2516127969894f55698e70401dfffb4f
    Reviewed-on: https://code.wireshark.org/review/30829
    Petri-Dish: Anders Broman <a.broman58@xxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    

Actions performed:

    from  1bab83d   maxmind: Move response processing to a thread.
     add  2bcc8db   NSIS: Install NPcap instead of WinPcap.


Summary of changes:
 CMakeLists.txt                                    |   4 -
 caputils/capture-wpcap.c                          |  12 +-
 cmake/modules/FindPCAP.cmake                      |   2 +-
 packaging/nsis/CMakeLists.txt                     |  11 +-
 packaging/nsis/{WinPcapPage.ini => NpcapPage.ini} |  10 +-
 packaging/nsis/VersionCompare.nsh                 |  91 --------------
 packaging/nsis/config.nsh.in                      |   5 +-
 packaging/nsis/uninstall.nsi                      |  18 +--
 packaging/nsis/wireshark.nsi                      | 141 +++++++++-------------
 packaging/wix/CMakeLists.txt                      |  11 --
 tools/win-setup.ps1                               |   8 +-
 wsutil/wspcap.h                                   |   2 +-
 12 files changed, 95 insertions(+), 220 deletions(-)
 rename packaging/nsis/{WinPcapPage.ini => NpcapPage.ini} (67%)
 delete mode 100644 packaging/nsis/VersionCompare.nsh