diff options
| author |   Peter Volkov <pva@gentoo.org> | 2010-03-28 15:33:08 +0000 |
|---|---|---|
| committer | Peter Volkov <pva@gentoo.org> | 2010-03-28 15:33:08 +0000 |
| commit | 56fb3e6de51c8ae562a924f1413dedf7ff99138f (patch) | |
| tree | 7b84bb710c1d117dd9386d184a3d04d6589c20b0 /net-analyzer/wireshark | |
| parent | Fix sqlite useage, disable sound support as not required for building bug #31... (diff) | |
| download | historical-56fb3e6de51c8ae562a924f1413dedf7ff99138f.tar.gz historical-56fb3e6de51c8ae562a924f1413dedf7ff99138f.tar.bz2 historical-56fb3e6de51c8ae562a924f1413dedf7ff99138f.zip | |
Disable zlib, bug #311241
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'net-analyzer/wireshark')
| -rw-r--r-- | net-analyzer/wireshark/ChangeLog | 5 | ||||
| -rw-r--r-- | net-analyzer/wireshark/Manifest | 4 | ||||
| -rw-r--r-- | net-analyzer/wireshark/wireshark-1.2.6-r1.ebuild | 7 |
3 files changed, 9 insertions, 7 deletions
diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog index bf6f045c13d0..dc34ebba130e 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.217 2010/03/26 10:54:12 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.218 2010/03/28 15:33:08 pva Exp $ + + 28 Mar 2010; Peter Volkov <pva@gentoo.org> wireshark-1.2.6-r1.ebuild: + Disable zlib, bug #311241 *wireshark-1.2.6-r1 (26 Mar 2010) diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest index 88e59f65d7d4..08e313b16c5f 100644 --- a/net-analyzer/wireshark/Manifest +++ b/net-analyzer/wireshark/Manifest @@ -5,7 +5,7 @@ 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-r1.ebuild 4569 RMD160 bb0254ee4c8e9cce4648f356c8c1f8f5a06e9181 SHA1 691ae56e45b2358628369b9b5ab23ff9bbdf1841 SHA256 73a2184dec4b2d0217e1459d3d132fb6f9ba8c7b89662a2eeed1508cc1e29b19 +EBUILD wireshark-1.2.6-r1.ebuild 4523 RMD160 0449759928f78fcf9a8376b70b3172925ba2acee SHA1 fd208936c59db0bc7608f861f392ad8dddaec925 SHA256 101c62e67a3fb0c1273982d5544b976d34a4af7bd28ea01799b759bb62e72dfd EBUILD wireshark-1.2.6.ebuild 4551 RMD160 bc94cd69950fa308f550258e151958a5990ca765 SHA1 2953e180f76351c86c9dcd3f0fd96805a088cce5 SHA256 1ffa24ac2dfec46d4496bd1090b47c31d6e4352b99d896559b3457b7cc24cdcd -MISC ChangeLog 32243 RMD160 cc71ef0996ac05f9698b78b9886efa826af35e87 SHA1 3d267726815c8c464e626289c4da8e9ef3642385 SHA256 5c4c2a7d80dcd7808eca45d8fb9845ae93d29fa50a8e3136860d787e4df4c616 +MISC ChangeLog 32338 RMD160 b51ff8e90a3e75127b04e04ddb16ab37da3ff277 SHA1 9766bd1785e9b45b7be83d10e8b2b6f2791add0f SHA256 67d98c83a35e82481e6011792e0020b76d874f74ac218c29d815daf377b140c0 MISC metadata.xml 2154 RMD160 01af8905d25e6c387902d30766daedcd37d94e0e SHA1 d68e79d413654ce72c553d508d7aa96f27fe85b5 SHA256 48c540fcec9cf1e5eebe132d7f90e8330b413f4eb6469761a88720eaa6a2233a diff --git a/net-analyzer/wireshark/wireshark-1.2.6-r1.ebuild b/net-analyzer/wireshark/wireshark-1.2.6-r1.ebuild index e1d84acdf9e7..b6605249cb29 100644 --- a/net-analyzer/wireshark/wireshark-1.2.6-r1.ebuild +++ b/net-analyzer/wireshark/wireshark-1.2.6-r1.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-r1.ebuild,v 1.1 2010/03/26 10:54:12 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.2.6-r1.ebuild,v 1.2 2010/03/28 15:33:08 pva Exp $ EAPI=2 inherit autotools libtool flag-o-matic eutils toolchain-funcs @@ -17,10 +17,9 @@ SRC_URI="http://www.wireshark.org/download/src/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" 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" +IUSE="adns ares gtk ipv6 lua portaudio gnutls gcrypt geoip kerberos threads profile smi +pcap pcre +caps selinux" RDEPEND=">=dev-libs/glib-2.4.0:2 - zlib? ( >=sys-libs/zlib-1.2.3 ) smi? ( net-libs/libsmi ) gtk? ( >=x11-libs/gtk+-2.4.0:2 x11-libs/pango @@ -112,7 +111,7 @@ src_configure() { $(use_with kerberos krb5) \ $(use_with smi libsmi) \ $(use_with pcap) \ - $(use_with zlib) \ + --without-zlib \ $(use_with pcre) \ $(use_with geoip) \ $(use_with portaudio) \ |