diff options
| author |   Daniel Black <dragonheart@gentoo.org> | 2007-02-16 22:47:34 +0000 |
|---|---|---|
| committer | Daniel Black <dragonheart@gentoo.org> | 2007-02-16 22:47:34 +0000 |
| commit | 5a50578e3e3ba4326919fddc2e1f31c29e87d574 (patch) | |
| tree | a73c8835cc6d4fbc05123c13b400920051ab1e13 /net-analyzer | |
| parent | Fixing hang on lightmap recalculation. Bug #166547 (diff) | |
| download | gentoo-2-5a50578e3e3ba4326919fddc2e1f31c29e87d574.tar.gz gentoo-2-5a50578e3e3ba4326919fddc2e1f31c29e87d574.tar.bz2 gentoo-2-5a50578e3e3ba4326919fddc2e1f31c29e87d574.zip | |
upstream patch to fix bug #165896 - hopefully
(Portage version: 2.1.2-r9)
Diffstat (limited to 'net-analyzer')
| -rw-r--r-- | net-analyzer/wireshark/ChangeLog | 6 | ||||
| -rw-r--r-- | net-analyzer/wireshark/files/wireshark-0.99.5-sizet.patch | 13 | ||||
| -rw-r--r-- | net-analyzer/wireshark/wireshark-0.99.5.ebuild | 3 |
3 files changed, 20 insertions, 2 deletions
diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog index f1105ed5e44d..e3a9884440ab 100644 --- a/net-analyzer/wireshark/ChangeLog +++ b/net-analyzer/wireshark/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-analyzer/wireshark # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.45 2007/02/10 06:57:47 mjolnir Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.46 2007/02/16 22:47:34 dragonheart Exp $ + + 16 Feb 2007; Daniel Black <dragonheart@gentoo.org> + +files/wireshark-0.99.5-sizet.patch, wireshark-0.99.5.ebuild: + upstream patch to fix bug #165896 - hopefully 10 Feb 2007; Martin Jackson <mjolnir@gentoo.org> +files/wireshark-epan_dissectors_packet-diameter.diff, diff --git a/net-analyzer/wireshark/files/wireshark-0.99.5-sizet.patch b/net-analyzer/wireshark/files/wireshark-0.99.5-sizet.patch new file mode 100644 index 000000000000..1b2cfad7ff12 --- /dev/null +++ b/net-analyzer/wireshark/files/wireshark-0.99.5-sizet.patch @@ -0,0 +1,13 @@ +--- crypt/airpdcap_interop.h.orig 2007-02-02 09:56:19.000000000 +1100 ++++ crypt/airpdcap_interop.h 2007-02-10 15:29:13.000000000 +1100 +@@ -86,8 +86,10 @@ + #endif + + #ifndef size_t ++#ifndef _SIZE_T + typedef gsize size_t; + #endif ++#endif + + #ifdef WIN32 + #include <winsock2.h> /* ntohs() */ diff --git a/net-analyzer/wireshark/wireshark-0.99.5.ebuild b/net-analyzer/wireshark/wireshark-0.99.5.ebuild index 474a2b325968..81de69b57654 100644 --- a/net-analyzer/wireshark/wireshark-0.99.5.ebuild +++ b/net-analyzer/wireshark/wireshark-0.99.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-0.99.5.ebuild,v 1.2 2007/02/10 06:57:47 mjolnir Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-0.99.5.ebuild,v 1.3 2007/02/16 22:47:34 dragonheart Exp $ inherit libtool flag-o-matic eutils autotools @@ -57,6 +57,7 @@ pkg_setup() { src_unpack() { unpack ${A} cd "${S}"/epan + epatch "${FILESDIR}"/${P}-sizet.patch epatch "${FILESDIR}"/wireshark-except-double-free.diff epatch "${FILESDIR}"/wireshark-epan_dissectors_packet-diameter.diff } |