diff --git a/configure b/configure index c76c5fb9b..73c6403df 100755 --- a/configure +++ b/configure @@ -3163,7 +3163,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -include +#include int main () diff --git a/configure.ac b/configure.ac index 718eb2f69..116767e92 100644 --- a/configure.ac +++ b/configure.ac @@ -76,7 +76,7 @@ fi # Remember that all following tests will run with this CXXFLAGS by default AC_MSG_CHECKING(for __func__) AC_TRY_COMPILE([ -include +#include ],[printf ("%s", __func__);], have_func=yes, have_func=no) if test "x$have_func" = "xyes"; then diff --git a/mswin32/lib/Packet.lib b/mswin32/lib/Packet.lib index 12adc24af..361bd4eb0 100644 Binary files a/mswin32/lib/Packet.lib and b/mswin32/lib/Packet.lib differ diff --git a/mswin32/lib/Wpcap.lib b/mswin32/lib/Wpcap.lib index 4a9986ddb..a2d2b0b27 100644 Binary files a/mswin32/lib/Wpcap.lib and b/mswin32/lib/Wpcap.lib differ diff --git a/mswin32/winpcap/Upgrading-Instructions.txt b/mswin32/winpcap/Upgrading-Instructions.txt index 51eaaffd5..06f1dcdca 100644 --- a/mswin32/winpcap/Upgrading-Instructions.txt +++ b/mswin32/winpcap/Upgrading-Instructions.txt @@ -35,11 +35,14 @@ How to upgrade nmap to a new winpcap release (2007) You should only have to change the version number. The section you need to look at starts like this 'Section "WinPcap X.X" SecWinPcap' -8) Recompile Nmap.nsi in the same way as winpcap-nmap.nsi. Test it. You may want to try +8) Download winpcap developer package and replace all files in mswin32/lib/ with the new + versions inside the package + +9) Recompile Nmap.nsi in the same way as winpcap-nmap.nsi. Test it. You may want to try it with nmap already installed and with different versions installed. Also check everything appears in add/remove programs correctly -9) Test nmap functionallity that uses winpcap. (E.G. Raw packet scans/raw packet pings +10) Test nmap functionallity that uses winpcap. (E.G. Raw packet scans/raw packet pings /traceroute) -10) Sit back and have a cup of coffee, you deserve it :) +11) Sit back and have a cup of coffee, you deserve it :)