diff options
| author |   Peter Volkov <pva@gentoo.org> | 2008-11-16 15:18:01 +0000 |
|---|---|---|
| committer | Peter Volkov <pva@gentoo.org> | 2008-11-16 15:18:01 +0000 |
| commit | 08e861220d0b9fa62a2f265e22efdd848ccb34d1 (patch) | |
| tree | 63df1e5411e2c01d4b69f6699f383614d9c82b6b /net-analyzer/tcpdump/files | |
| parent | Fix dialog not finding tty. Bug #120471 (diff) | |
| download | gentoo-2-08e861220d0b9fa62a2f265e22efdd848ccb34d1.tar.gz gentoo-2-08e861220d0b9fa62a2f265e22efdd848ccb34d1.tar.bz2 gentoo-2-08e861220d0b9fa62a2f265e22efdd848ccb34d1.zip | |
Version bump, bug #245179, thank Krzysztof Olędzki for report. Removed old.
(Portage version: 2.2_rc14/cvs/Linux 2.6.26-openvz.git-35f41f1 i686)
Diffstat (limited to 'net-analyzer/tcpdump/files')
4 files changed, 41 insertions, 32 deletions
diff --git a/net-analyzer/tcpdump/files/tcpdump-3.9.5-print-802_11.c.diff b/net-analyzer/tcpdump/files/tcpdump-3.9.5-print-802_11.c.diff deleted file mode 100644 index a1f107dc7c70..000000000000 --- a/net-analyzer/tcpdump/files/tcpdump-3.9.5-print-802_11.c.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- tcpdump/print-802_11.c 2006/06/13 22:25:30 1.42 -+++ tcpdump/print-802_11.c 2007/02/01 02:18:18 1.43 -@@ -264,7 +264,7 @@ - - if (pbody->tim.length <= 3) - break; -- if (pbody->rates.length > sizeof pbody->tim.bitmap) -+ if (pbody->tim.length - 3 > sizeof pbody->tim.bitmap) - return; - if (!TTEST2(*(p + offset), pbody->tim.length - 3)) - return; diff --git a/net-analyzer/tcpdump/files/tcpdump-3.9.6-bgp-integer-overflow.patch b/net-analyzer/tcpdump/files/tcpdump-3.9.6-bgp-integer-overflow.patch deleted file mode 100644 index 76cd330c0aa3..000000000000 --- a/net-analyzer/tcpdump/files/tcpdump-3.9.6-bgp-integer-overflow.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Nuar tcpdump-3.9.5.orig/print-bgp.c tcpdump-3.9.5/print-bgp.c ---- tcpdump-3.9.5.orig/print-bgp.c 2007-07-10 17:16:02.000000000 +0400 -+++ tcpdump-3.9.5/print-bgp.c 2007-07-10 17:16:45.000000000 +0400 -@@ -669,7 +669,7 @@ - tlen-=15; - - /* ok now the variable part - lets read out TLVs*/ -- while (tlen>0) { -+ while (tlen>0 && strlen <= buflen) { - if (tlen < 3) - return -1; - TCHECK2(pptr[0], 3); -@@ -684,7 +684,7 @@ - tlv_type, - tlv_len); - ttlv_len=ttlv_len/8+1; /* how many bytes do we need to read ? */ -- while (ttlv_len>0) { -+ while (ttlv_len>0 && strlen <= buflen) { - TCHECK(pptr[0]); - strlen+=snprintf(buf+strlen,buflen-strlen, "%02x",*pptr++); - ttlv_len--; diff --git a/net-analyzer/tcpdump/files/tcpdump-4.0.0-ipv6-build.patch b/net-analyzer/tcpdump/files/tcpdump-4.0.0-ipv6-build.patch new file mode 100644 index 000000000000..4d4aa575686a --- /dev/null +++ b/net-analyzer/tcpdump/files/tcpdump-4.0.0-ipv6-build.patch @@ -0,0 +1,16 @@ +=== modified file 'print-enc.c' +--- print-enc.c 2008-11-04 16:24:30 +0000 ++++ print-enc.c 2008-11-04 16:45:04 +0000 +@@ -77,9 +77,11 @@ + case AF_INET: + ip_print(gndo, p, length); + break; ++#ifdef INET6 + case AF_INET6: + ip6_print(p, length); + break; ++#endif /*INET6*/ + } + + out: + diff --git a/net-analyzer/tcpdump/files/tcpdump-4.0.0-libsmi-autodep.patch b/net-analyzer/tcpdump/files/tcpdump-4.0.0-libsmi-autodep.patch new file mode 100644 index 000000000000..467018d07f12 --- /dev/null +++ b/net-analyzer/tcpdump/files/tcpdump-4.0.0-libsmi-autodep.patch @@ -0,0 +1,25 @@ +=== modified file 'configure.in' +--- configure.in 2008-11-04 16:24:30 +0000 ++++ configure.in 2008-11-04 17:16:11 +0000 +@@ -70,6 +70,12 @@ + esac + + ++AC_ARG_WITH(smi, ++[ --with-smi link with libsmi (allows to load MIBs on the fly to decode SNMP packets. [default=yes] ++ --without-smi don't link with libsmi],, ++ with_smi=yes) ++ ++if test "x$with_smi" != "xno" ; then + AC_CHECK_HEADERS(smi.h) + AC_CHECK_LIB(smi, smiInit) + if test "$ac_cv_header_smi_h" = yes -a "$ac_cv_lib_smi_smiInit" = yes +@@ -111,6 +117,7 @@ + libsmi=no] + ) + fi ++fi + + AC_MSG_CHECKING([whether to enable the possibly-buggy SMB printer]) + AC_ARG_ENABLE(smb, + |