summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Volkov <pva@gentoo.org>2011-04-17 13:16:36 +0000
committerPeter Volkov <pva@gentoo.org>2011-04-17 13:16:36 +0000
commit8ac2d5b4c9c43e9a42c9553fcce103475161ff91 (patch)
tree9065f174db50501667ca549aadfd0eba8ea7ab7b /net-analyzer/wireshark
parentDropping to ~x86 b/c of bugs 331157, 363915. (diff)
downloadgentoo-2-8ac2d5b4c9c43e9a42c9553fcce103475161ff91.tar.gz
gentoo-2-8ac2d5b4c9c43e9a42c9553fcce103475161ff91.tar.bz2
gentoo-2-8ac2d5b4c9c43e9a42c9553fcce103475161ff91.zip
Version bump, fixes security bug 363895, thank Tim Sammut for report. Upstream fixed bug 358097, thank Agostino Sarubbo for report. Drop old.
(Portage version: 2.1.9.46/cvs/Linux x86_64)
Diffstat (limited to 'net-analyzer/wireshark')
-rw-r--r--net-analyzer/wireshark/ChangeLog9
-rw-r--r--net-analyzer/wireshark/wireshark-1.4.5.ebuild (renamed from net-analyzer/wireshark/wireshark-1.4.3.ebuild)9
2 files changed, 13 insertions, 5 deletions
diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index 1b823c74ca03..802b6e485aeb 100644
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for net-analyzer/wireshark
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.281 2011/03/13 11:23:51 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.282 2011/04/17 13:16:36 pva Exp $
+
+*wireshark-1.4.5 (17 Apr 2011)
+
+ 17 Apr 2011; Peter Volkov <pva@gentoo.org> -wireshark-1.4.3.ebuild,
+ +wireshark-1.4.5.ebuild:
+ Version bump, fixes security bug 363895, thank Tim Sammut for report.
+ Upstream fixed bug 358097, thank Agostino Sarubbo for report. Drop old.
13 Mar 2011; Kacper Kowalik <xarthisius@gentoo.org> wireshark-1.4.4.ebuild:
ppc/ppc64 stable wrt #354197
diff --git a/net-analyzer/wireshark/wireshark-1.4.3.ebuild b/net-analyzer/wireshark/wireshark-1.4.5.ebuild
index e22997a655a7..59d0842e9822 100644
--- a/net-analyzer/wireshark/wireshark-1.4.3.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.4.5.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.4.3.ebuild,v 1.8 2011/01/29 13:33:36 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.4.5.ebuild,v 1.1 2011/04/17 13:16:36 pva Exp $
-EAPI=2
+EAPI="3"
PYTHON_DEPEND="python? 2"
inherit libtool flag-o-matic eutils toolchain-funcs python
@@ -13,7 +13,7 @@ SRC_URI="http://www.wireshark.org/download/src/all-versions/${MY_P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
IUSE="adns ares doc doc-pdf gtk ipv6 lua gcrypt geoip kerberos
profile +pcap pcre portaudio python +caps selinux smi ssl threads zlib"
@@ -41,7 +41,6 @@ RDEPEND=">=dev-libs/glib-2.14.0:2
DEPEND="${RDEPEND}
doc? ( dev-libs/libxslt
dev-libs/libxml2
- www-client/elinks
app-doc/doxygen
doc-pdf? ( dev-java/fop ) )
>=dev-util/pkgconfig-0.15.0
@@ -123,6 +122,7 @@ src_configure() {
# profile and pie are incompatible #215806, #292991
if use profile; then
ewarn "You've enabled the 'profile' USE flag, building PIE binaries is disabled."
+ ewarn "Also ignore \"unrecognized option '-nopie'\" gcc warning #358101."
append-flags $(test-flags-CC -nopie)
fi
@@ -202,6 +202,7 @@ src_install() {
done
domenu wireshark.desktop || die
fi
+ chmod o-x "${ED}"/usr/bin/dumpcap #357237
}
pkg_postinst() {