wireshark: the portage is up to date

This commit is contained in:
Anton Bolshakov 2010-12-17 08:05:33 +00:00
parent aa8d34ecdb
commit d67b234b76
5 changed files with 0 additions and 1256 deletions

File diff suppressed because it is too large Load diff

View file

@ -1,5 +0,0 @@
AUX wireshark-except-double-free.diff 664 RMD160 2b61f03f5148975f6438351c11de18a500deabc5 SHA1 0239e19ba0ebd2cfb4ab4987a8a4c56646cd9250 SHA256 dc02a5f3e4bdbd128a2ba08f38880358f747661a93ca0b3fe1918c67b255c369
DIST wireshark-1.4.2.tar.bz2 20208792 RMD160 5f0c1a9c52347782fcdcd6c11e24d21cfe89f7e2 SHA1 03eb2bcd1de93fd0b45d6f1346e97d5f03a47c3e SHA256 44c6e1ec328fa8e1e7b3838b2f25d51c36b38c562fc0d097ba464205fdb049b2
EBUILD wireshark-1.4.2.ebuild 5718 RMD160 a483a5a9358833a22c2fa4f70ee50c8d24711788 SHA1 d2ace392ce7d62b358c3be3e441c018ad27ebb19 SHA256 f3511919b978115a8cd41f276d23ed01f9b063bef2074ec3a68107d7358cac04
MISC ChangeLog 35996 RMD160 8ea4dbdbdbfaeabbfe5b885d6597134d716c5d95 SHA1 22903ec60a81a06dab17fa3dc1f4e378093b5b4c SHA256 e4ff4a0b34cc651441d99388eaadbc81d8d30e5a027ca05161018bc2fd57d803
MISC metadata.xml 2242 RMD160 66dbbb758acc194df17217183b60a56f61fced38 SHA1 4498ea4c0f0f04213fd1cba2fd3de44565058f7d SHA256 2dfaef45c385c37c7ae8af96f5d8c58d9bff8f6186d55be8f2d034ebd0c60869

View file

@ -1,16 +0,0 @@
Index: except.c
===================================================================
--- except.c (revision 19876)
+++ except.c (working copy)
@@ -192,6 +192,11 @@
assert (top->except_type == XCEPT_CATCHER);
except_free(catcher->except_obj.except_dyndata);
+ /* make sure no else can free this pointer again
+ See http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1001
+ http://bugs.gentoo.org/show_bug.cgi?id=133092
+ http://bugs.gentoo.org/show_bug.cgi?id=145974 */
+ catcher->except_obj.except_dyndata = NULL;
for (i = 0; i < catcher->except_size; pi++, i++) {
if (match(&except->except_id, pi)) {

View file

@ -1,38 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>netmon</herd>
<maintainer>
<email>pva@gentoo.org</email>
<name>Peter Volkov</name>
</maintainer>
<longdescription>
Wireshark is the world's foremost network protocol analyzer, and is the de
facto (and often de jure) standard across many industries and educational
institutions. Wireshark has a rich feature set which includes 1) deep
inspection of hundreds of protocols, with more being added all the time, 2)
live capture and offline analysis, 3) standard three-pane packet browser, 4)
captured network data can be browsed via a GUI, or via the TTY-mode TShark
utility, 5) the most powerful display filters in the industry, 6) rich VoIP
analysis, 7) read/write many different capture file formats: tcpdump
(libpcap), Catapult DCT2000, Cisco Secure IDS iplog, Microsoft Network
Monitor, Network General Sniffer® (compressed and uncompressed), Sniffer®
Pro, and NetXray®, Network Instruments Observer, Novell LANalyzer, RADCOM
WAN/LAN Analyzer, Shomiti/Finisar Surveyor, Tektronix K12xx, Visual Networks
Visual UpTime, WildPackets EtherPeek/TokenPeek/AiroPeek, and many others, 8)
capture files compressed with gzip can be decompressed on the fly, 9) live
data can be read from Ethernet, IEEE 802.11, PPP/HDLC, ATM, Bluetooth, USB,
Token Ring, Frame Relay, FDDI, and others, 10) decryption support for many
protocols, including IPsec, ISAKMP, Kerberos, SNMPv3, SSL/TLS, WEP, and
WPA/WPA2, 11) coloring rules can be applied to the packet list for quick,
intuitive analysis, 12) output can be exported to XML, PostScript®, CSV, or
plain text
</longdescription>
<use>
<flag name='ares'>Use GNU <pkg>net-dns/c-ares</pkg> library to resolve DNS names</flag>
<flag name='doc-pdf'>Build documentation in pdf format (US and a4 paper sizes)</flag>
<flag name='gcrypt'>Use GNU crypto library (<pkg>dev-libs/libgcrypt</pkg>) to decrypt ipsec traffic</flag>
<flag name='pcap'>Use <pkg>net-libs/libpcap</pkg> for network packet capturing (build dumpcap, rawshark)</flag>
<flag name='smi'>Use <pkg>net-libs/libsmi</pkg> to resolve numeric OIDs into human readable format</flag>
</use>
</pkgmetadata>

View file

@ -1,191 +0,0 @@
# 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.4.0_rc2.ebuild,v 1.1 2010/07/30 10:27:15 pva Exp $
EAPI=2
PYTHON_DEPEND="python? 2"
inherit libtool flag-o-matic eutils toolchain-funcs python
[[ -n ${PV#*_rc} && ${PV#*_rc} != ${PV} ]] && MY_P=${PN}-${PV/_} || MY_P=${P}
DESCRIPTION="A network protocol analyzer formerly known as ethereal"
HOMEPAGE="http://www.wireshark.org/"
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"
IUSE="adns ares doc doc-pdf gtk ipv6 lua gcrypt geoip kerberos
profile +pcap pcre portaudio python +caps selinux smi ssl threads zlib"
RDEPEND=">=dev-libs/glib-2.14.0:2
zlib? ( sys-libs/zlib
!=sys-libs/zlib-1.2.4 )
smi? ( net-libs/libsmi )
x11-misc/xdg-utils
gtk? ( >=x11-libs/gtk+-2.4.0:2
x11-libs/pango
dev-libs/atk )
ssl? ( net-libs/gnutls )
gcrypt? ( dev-libs/libgcrypt )
pcap? ( net-libs/libpcap )
pcre? ( dev-libs/libpcre )
caps? ( sys-libs/libcap )
kerberos? ( virtual/krb5 )
portaudio? ( media-libs/portaudio )
ares? ( >=net-dns/c-ares-1.5 )
!ares? ( adns? ( net-libs/adns ) )
geoip? ( dev-libs/geoip )
lua? ( >=dev-lang/lua-5.1 )
selinux? ( sec-policy/selinux-wireshark )"
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
dev-lang/perl
sys-devel/bison
sys-apps/sed
sys-devel/flex"
S=${WORKDIR}/${MY_P}
pkg_setup() {
if ! use gtk; then
ewarn "USE=-gtk disables gtk-based gui called wireshark."
ewarn "Only command line utils will be built available"
fi
if use python; then
python_set_active_version 2
python_pkg_setup
fi
# Add group for users allowed to sniff.
enewgroup wireshark
}
src_prepare() {
cd "${S}"/epan # old hardened toolchain bug...
epatch "${FILESDIR}/wireshark-except-double-free.diff"
}
src_configure() {
local myconf
# optimization bug, see bug #165340, bug #40660
if [[ $(gcc-version) == 3.4 ]] ; then
elog "Found gcc 3.4, forcing -O3 into CFLAGS"
replace-flags -O? -O3
# see bug #133092; bugs.wireshark.org/bugzilla/show_bug.cgi?id=1001
# our old hardened toolchain bug
filter-flags -fstack-protector
elif [[ $(gcc-version) == 3.3 || $(gcc-version) == 3.2 ]] ; then
elog "Found <=gcc-3.3, forcing -O into CFLAGS"
replace-flags -O? -O
fi
if use ares && use adns; then
elog "You asked for both, ares and adns, but we can use only one of them."
elog "c-ares supersedes adns resolver thus using c-ares (ares USE flag)."
myconf="$(use_with ares c-ares) --without-adns"
else
myconf="$(use_with adns) $(use_with ares c-ares)"
fi
# profile and pie are incompatible #215806, #292991
if use profile; then
ewarn "You've enabled the 'profile' USE flag, building PIE binaries is disabled."
append-flags $(test-flags-CC -nopie)
fi
# Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
# --with-ssl to ./configure. (Mimics code from acinclude.m4).
if use kerberos; then
case `krb5-config --libs` in
*-lcrypto*)
ewarn "Kerberos was built with ssl support: linkage with openssl is enabled."
ewarn "Note there are annoying license incompatibilities between the OpenSSL"
ewarn "license and the GPL, so do your check before distributing such package."
myconf+=" --with-ssl"
;;
esac
fi
# Hack around inability to disable doxygen/fop doc generation
use doc || export ac_cv_prog_HAVE_DOXYGEN=false
use doc-pdf || export ac_cv_prog_HAVE_FOP=false
# dumpcap requires libcap, setuid-install requires dumpcap
econf $(use_enable gtk wireshark) \
$(use_enable profile profile-build) \
$(use_with ssl gnutls) \
$(use_with gcrypt) \
$(use_enable ipv6) \
$(use_enable threads) \
$(use_with lua) \
$(use_with kerberos krb5) \
$(use_with smi libsmi) \
$(use_with pcap) \
$(use_with zlib) \
$(use_with pcre) \
$(use_with geoip) \
$(use_with portaudio) \
$(use_with python) \
$(use_with caps libcap) \
$(use_enable caps setcap-install) \
$(use caps || use_enable pcap setuid-install) \
--sysconfdir=/etc/wireshark \
--with-dumpcap-group=wireshark \
--disable-extra-gcc-checks \
${myconf}
}
src_compile() {
emake || die
use doc && cd docbook && { emake || die; }
}
src_install() {
emake DESTDIR="${D}" install || die "emake install failed"
if use doc; then
dohtml -r docbook/{release-notes.html,ws{d,u}g_html{,_chunked}}
# for dir in ws{d,u}g_html{,_chunked}; do
# dohtml -p ${dir} -r docbook/${dir}/ || die
# done
if use doc-pdf; then
insinto /usr/share/doc/${PF}/pdf/
doins docbook/{{developer,user}-guide,release-notes}-{a4,us}.pdf || die
fi
fi
# FAQ is not required as is installed from help/faq.txt
dodoc AUTHORS ChangeLog NEWS README{,.bsd,.linux,.macos,.vmware} \
doc/{randpkt.txt,README*}
insinto /usr/include/wiretap
doins wiretap/wtap.h || die
use caps && local perms=550 || local perms=6550
use pcap && fperms ${perms} /usr/bin/dumpcap
if use gtk; then
for c in hi lo; do
for d in 16 32 48; do
insinto /usr/share/icons/${c}color/${d}x${d}/apps
newins image/${c}${d}-app-wireshark.png wireshark.png
done
done
insinto /usr/share/applications
doins wireshark.desktop || die
fi
}
pkg_postinst() {
use caps && setcap cap_net_raw,cap_net_admin+eip "${ROOT}"/usr/bin/dumpcap
echo
ewarn "NOTE: To run wireshark as normal user you have to add yourself into"
ewarn "wireshark group. This security measure ensures that only trusted"
ewarn "users allowed to sniff your traffic."
echo
}