summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Volkov <pva@gentoo.org>2010-03-26 09:10:58 +0000
committerPeter Volkov <pva@gentoo.org>2010-03-26 09:10:58 +0000
commit77559a910137fd08d8d60cfb9ff9cc50b6e5d02b (patch)
treedf05e7c036fd44b6ee25a6bef3373f0bb1c4e13a /net-analyzer/wireshark
parentMissing pkgconfig depend wrt #311409. (diff)
downloadhistorical-77559a910137fd08d8d60cfb9ff9cc50b6e5d02b.tar.gz
historical-77559a910137fd08d8d60cfb9ff9cc50b6e5d02b.tar.bz2
historical-77559a910137fd08d8d60cfb9ff9cc50b6e5d02b.zip
Require <zlib-1.2.4, bug #311241 thank Kristian for report.
Package-Manager: portage-2.1.8.3/cvs/Linux x86_64
Diffstat (limited to 'net-analyzer/wireshark')
-rw-r--r--net-analyzer/wireshark/ChangeLog5
-rw-r--r--net-analyzer/wireshark/Manifest4
-rw-r--r--net-analyzer/wireshark/wireshark-1.2.6.ebuild4
3 files changed, 8 insertions, 5 deletions
diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index 573216de2dc0..0ec9a2eca23a 100644
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for net-analyzer/wireshark
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.215 2010/01/30 15:07:41 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.216 2010/03/26 09:10:58 pva Exp $
+
+ 26 Mar 2010; Peter Volkov <pva@gentoo.org> wireshark-1.2.6.ebuild:
+ Require <zlib-1.2.4, bug #311241 thank Kristian for report.
30 Jan 2010; Peter Volkov <pva@gentoo.org> -wireshark-1.2.5.ebuild,
wireshark-1.2.6.ebuild:
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 3fa834868a16..766182fae0eb 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -5,6 +5,6 @@ AUX wireshark-1.0.5-text2pcap-protos.patch 487 RMD160 20e64be01b281c48516969c508
AUX wireshark-1.1.2--as-needed.patch 830 RMD160 fd192d107147c65ef52625b51b59a2bf4e2f65c3 SHA1 7a743a42542fa59423870a0205e8ed7aa6bde70e SHA256 34aa27c611021c9a515cc4fed9778148395761bf6f4272130d3e83abcc13a499
AUX wireshark-except-double-free.diff 664 RMD160 2b61f03f5148975f6438351c11de18a500deabc5 SHA1 0239e19ba0ebd2cfb4ab4987a8a4c56646cd9250 SHA256 dc02a5f3e4bdbd128a2ba08f38880358f747661a93ca0b3fe1918c67b255c369
DIST wireshark-1.2.6.tar.gz 19381295 RMD160 271a05afbf1701630a6070ecabeabcb842715b12 SHA1 62f5571e4786d3fa0cfc3d528f69a5c431e42d75 SHA256 0788f3424f056c8cbb94fb0eef49cc92ac63a67b122153e3b920cfce8d6e95ab
-EBUILD wireshark-1.2.6.ebuild 4544 RMD160 b48889891faa004404390d4c06cf208b084b6b81 SHA1 2d7a9d2cf3666c887b33edc35e863ea6417840b5 SHA256 ef1035ff9869178f6211b23d41bb8e62cc112939dd7f67ec23b082b40de9efad
-MISC ChangeLog 31905 RMD160 5ffc1c314b569c47b08b0c60c3fc8b4e28cb5611 SHA1 b07e83a73a08a4d033082277049aa840e29a7a86 SHA256 69c655242f1fcc4822191928d5665f33d1a27368417f301b8b9fd6c89b549680
+EBUILD wireshark-1.2.6.ebuild 4551 RMD160 bc94cd69950fa308f550258e151958a5990ca765 SHA1 2953e180f76351c86c9dcd3f0fd96805a088cce5 SHA256 1ffa24ac2dfec46d4496bd1090b47c31d6e4352b99d896559b3457b7cc24cdcd
+MISC ChangeLog 32037 RMD160 934aa70bb6871463155f51253c6130540c9d648d SHA1 7f6a4abe472911da91f9f6331542fc828862fa4f SHA256 7c619a475ecf2e6f77c245aa393b65988bac7168e2f3f0e6c6e7c7ab0a012d8a
MISC metadata.xml 2154 RMD160 01af8905d25e6c387902d30766daedcd37d94e0e SHA1 d68e79d413654ce72c553d508d7aa96f27fe85b5 SHA256 48c540fcec9cf1e5eebe132d7f90e8330b413f4eb6469761a88720eaa6a2233a
diff --git a/net-analyzer/wireshark/wireshark-1.2.6.ebuild b/net-analyzer/wireshark/wireshark-1.2.6.ebuild
index d0932057a2c9..c05d5f988a5f 100644
--- a/net-analyzer/wireshark/wireshark-1.2.6.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.2.6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.2.6.ebuild,v 1.6 2010/01/30 15:07:41 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.2.6.ebuild,v 1.7 2010/03/26 09:10:58 pva Exp $
EAPI=2
inherit autotools libtool flag-o-matic eutils toolchain-funcs
@@ -20,7 +20,7 @@ KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
IUSE="adns ares gtk ipv6 lua portaudio gnutls gcrypt geoip zlib kerberos threads profile smi +pcap pcre +caps selinux"
RDEPEND=">=dev-libs/glib-2.4.0:2
- zlib? ( sys-libs/zlib )
+ zlib? ( <sys-libs/zlib-1.2.4 )
smi? ( net-libs/libsmi )
gtk? ( >=x11-libs/gtk+-2.4.0:2
x11-libs/pango