From 3da2091ba42c0673b32a8d97c951cffc2bdf606c Mon Sep 17 00:00:00 2001 From: fyodor Date: Sat, 11 Aug 2007 06:01:12 +0000 Subject: [PATCH] merge soc07 r5245:5252 - update winpcap libs; fix config optimization bug --- configure | 2 +- configure.ac | 2 +- mswin32/lib/Packet.lib | Bin 8180 -> 8674 bytes mswin32/lib/Wpcap.lib | Bin 17414 -> 17658 bytes mswin32/winpcap/Upgrading-Instructions.txt | 9 ++++++--- 5 files changed, 8 insertions(+), 5 deletions(-) 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 12adc24afd05d699ebbf90a8715273c0d70cd357..361bd4eb06ed96ba3c368d450062abc3a7451edf 100644 GIT binary patch literal 8674 zcmcIo&2JM|5FaNYfj~nD`Tleus_2ChVv`_MRldRCgvd7S(Jc0+tZI9=&W08)z4U-k z4;=UxdZQ8tF6Bfeu02#rrQX^DxBdf&1L?ed`#$%1ad2X3yt^~==J!5k-pqT`Us(0h zy)U~zPpZG!*@d}F^QkLyvnu~m_&Gbj5We2&27ncSo;tvphX8%g0Y)b&4etRE8eE_> z`ULq%V}DZ`Uk4!6-$rR<8Gum#8%m?^Q6H(_r!=_@KxiOGX{?5JkR}k1(D(~V)13f> zhTc&c#x{h8#wjJA0uY*dNhvvl-$;YcC{5i!KGM)*O4Eo>XyR>1kMM~!f@38#xkqW> zHTLUuv6$J|x|J&wSJ(0@xy)AKR<7t-rEhH?ip9;_*=$q}KT-uME?mF8d9%2>R9J%I zR?sl(+^t*n2VdFs9mlPq8K>$M8^~yjYqoFHmib(BweH-v>y7j^DQ$JjvujIb%k%BJ z+8sqeb@O(uOy5*hnXhZ^G*U$Y)m^Go+>+(nCd;~v>SSt;Z_<|eRK8xfjdo=|)y&x? z8z;|XRufT`m5RG#8z)YcQ0=_!U;lpHsYGU35l~%R+0gE$RkgMGiwJ3(oc-Ody+iy` zawyK^eOTVz-d1%GpE8AxXHX$Lu92@X8KU2RgZpNfpP*l^35VN|6|uCuvY{krb>`l6tsB$0cY zscpN4kzs$CgxlV5Y6W-2^&Y6BBb^WuZkvo@?Y>>pMu)Q|NkZGc>(S8HEK7Xei`Ct# zN8CSuNcZ>?6g%c^Zfz-?z;*Sm{b=CXayy6?E!-h>EI z1=^Mbh*RGxS>AQ4R<39RiAWEgFR$`^c^(sHy$9go8Gz?~m^nrP_J#o#1_7Sn``=># z>zJw9`T>?l0N&v9J@S2gZey0q4FJ?oXL17I1?qK91H2nT8QK`f=hGy>%PD{vd_F^) zH}L&2@_p2Mi)|huJx9BHXzMlF!sHFz&;zHS7tTW`jKL60zyJ)wF*pg+&;ecW37moB za01RkA0%N4PQy7EhY=WsVd#fRNI+Z5HriRlns;y0{utel$x6|*6z+nJmY4I5=?%?9 zf{pU%M#5W1!UnY(ZdAM#Pqma2O+W_k)@uOT)R1nCc_*@|i zF{R0PWGQ?RUyV*QUT~nfSgurP4*k$cbAC1*o;mMyXA|vkE%Vd*e+j^B1n@6F;$#93 zdU3yA6yo`^BSxn^kf9>cC4a$_KVn)Qz35`uzPtO)Or9Yv;Y$U_FaH*ycln}IwtQ>m zGUH>h0KcN%@1ZUk<04#o73y7KdZ+N^A4!k!7a{oyrwnuc3GxZuV$m+Z+1@T>(J8~? z1K;;0wX>!))=OeqvUkDI4Yd?pxz#h`9r5TSn;veiId`i)kVj`mVC;O1}4sCXunNd6= zG`wIsupg%9!U;{1n?Dko*#y~>r-RWQZ&1UFb(1%f=GHLH?;uq~60!-*1K~MeskvIg zOI_MuR?yNZGuk;sYZqvGeJDYS*CywaB~)z%&m&@oil`Kw0_P*vFb4CO zf~l6WEn&v^O{an>3glMs;{2vd#|z5tR?y<2;<$n)iuqRXQfwpDyaq2Kuu9-j$dA7* zVZ}sXcN7Z`9!G_CQbA+KnWI8GCD5cpQY&b@XwX&-uYT}Ohp(D^-5|k<*CuzCnB34K z(6sZMK>3J$g%w4H@tqck@+nb*6R%B<@3MKXPU39#3N-cTDL^DIZ4NJW#f*oSfx&%T znEBYR*CTFoh?!hZiyu0Kv5T56S^@EQqZoLLn zByvk2L5bJq#*~in#6bl~x_S^G5_FSzF>y8&!3*v)jtFg7LF1Pst)MNKqwG`kj}Zke za`Vy(YD{%9s-TMN90~5gb$gs|j;VO$l1PFQuTA<&%*e(SBysa3Fb*DdaVL@q1y8=u ZY6UT_(wkHe*)7>op-o9>;_gjG`yU-Iz(fE5 delta 1545 zcmZ{jOK1~O6oyaQq@5&9n`E9zX7W%JpR}=U8YNKBg`lPGTy+sQVkwlm>9(Olw-(Pr zaMOaNf^<^?g7~VdYAFR5b)^smm)3>SW%0i=L+2)9;LFX-dHm;|bMpP#pYi3aa%p&| zT&Y$sbHg$g%9YWfqWh`Gh-jQBF-w%3CrWJ)S?eC=6p=vN^2k_3f^6Mq4<|?;d6+x! z2WrbBvjl&j&Ux4eL;`JL5?>&5=#hhfvc~_@8)JMa1_)sC3)f%LAvNFRl9GpzCl>p%K2E@dQrxwJSxludQpON(v6CMdid z)mY6sfv!IVS6l3E0!}L-lPeiXTh7uChjN$3zdN%G=Df=lk!65y=0*dNhGp`KZ^rIp zBVXkPWpmKl6rZxCt3lb_pFEdri=WvAIm+Z8wx@|d45=J)+LE?wYCI#G#l7W4TR ziUZwGj?TC9CjwoV+)0a;nqr?eyH);}@8~J^$sM)W2a6vUq}-j|$Z&5_D%{`x{<% diff --git a/mswin32/lib/Wpcap.lib b/mswin32/lib/Wpcap.lib index 4a9986ddbe9b83f6194f051de2c056b74a5753e1..a2d2b0b27e735fbc59538decd00fdcd8b36292e3 100644 GIT binary patch delta 3537 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 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 :)