Backup_Repos/pentoo-overlay
1
0
Fork 0
mirror of https://github.com/pentoo/pentoo-overlay synced 2026-05-01 03:00:57 +02:00
Code Issues Projects Releases Wiki Activity

wireshark: version bump for 1.2.11 but 1.4.0 segfaults so I'm not adding

Browse source
This commit is contained in:
Zero_Chaos 2010-08-30 19:29:15 +00:00
parent 84fdf9099a
commit 14ad971d80
11 changed files with 1347 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1006
net-analyzer/wireshark/ChangeLog Normal file
View file

File diff suppressed because it is too large Load diff

11
net-analyzer/wireshark/Manifest Normal file
View file

@ -0,0 +1,11 @@
AUX wireshark-0.99.7-asneeded.patch 339 RMD160 faa516dd3dfd8bd6218f66d3bedb5490b0896f5b SHA1 ec2b8952f8fe55471e923c086a6e9b48e06ce7a8 SHA256 9fc8b3ec3fcf1cca714c78c28c1883503abfcfce4fe175e43c6d7ec14ddc9478
AUX wireshark-0.99.8-as-needed.patch 395 RMD160 2e06f641e9789db717544bfd1568e4bf6e85855c SHA1 a18b6fcc85b40c00fc1d30bcdfc81d13dc33e904 SHA256 d2f996a79fa3117296b25c10a1d4a3f0f8027a678de4e37e6c60bfb47a4754b9
AUX wireshark-1.0-sigpipe.patch 850 RMD160 a240a1317681516d207ca1694b0e44584008530b SHA1 8f127c22daa77ce9f658f3b1d3f897e428ee9dde SHA256 3a5130838a48b65cb21b4e25913347cee05689b4641c1dfb407facf9fa4f9f59
AUX wireshark-1.0.5-text2pcap-protos.patch 487 RMD160 20e64be01b281c48516969c508c04455111de300 SHA1 432751cd931baefba3bd13cfa07c3d9863b7c82e SHA256 991e12325670c81f4927c6dc2b665eb8c8938d8f3f0cdfab58601dd37a00d8a4
AUX wireshark-1.1.2--as-needed.patch 830 RMD160 fd192d107147c65ef52625b51b59a2bf4e2f65c3 SHA1 7a743a42542fa59423870a0205e8ed7aa6bde70e SHA256 34aa27c611021c9a515cc4fed9778148395761bf6f4272130d3e83abcc13a499
AUX wireshark-1.2.8-zlib-1.2.5-capture.patch 779 RMD160 7440a7d8a04a1b43057fc7c1e29540a49a77ac0f SHA1 01ab94564003bb230f15a637b355fca31774e27e SHA256 936be11853d8eaf846a28be1dce7e098d386fc58d84ed521bc4f6965e387c69d
AUX wireshark-except-double-free.diff 664 RMD160 2b61f03f5148975f6438351c11de18a500deabc5 SHA1 0239e19ba0ebd2cfb4ab4987a8a4c56646cd9250 SHA256 dc02a5f3e4bdbd128a2ba08f38880358f747661a93ca0b3fe1918c67b255c369
DIST wireshark-1.2.11.tar.gz 19466681 RMD160 34d7c2095dd280193d0c36eca3fc5f0f1b2f714c SHA1 f2a1c558df42845788b71488f5a973e71682bbce SHA256 f1369416c94d6b2cf6a132be138e85cddca2e94b765f79737de5775b2f279608
EBUILD wireshark-1.2.11.ebuild 4572 RMD160 60602a61323267599cabf35f47c63afcbaeadb60 SHA1 edb6b819daef123f3969cefc386deb2b99cd8c93 SHA256 7afe0e09e81849e352925b405c74212046e95fad2f67906ea4776a7706859c44
MISC ChangeLog 35996 RMD160 8ea4dbdbdbfaeabbfe5b885d6597134d716c5d95 SHA1 22903ec60a81a06dab17fa3dc1f4e378093b5b4c SHA256 e4ff4a0b34cc651441d99388eaadbc81d8d30e5a027ca05161018bc2fd57d803
MISC metadata.xml 2242 RMD160 66dbbb758acc194df17217183b60a56f61fced38 SHA1 4498ea4c0f0f04213fd1cba2fd3de44565058f7d SHA256 2dfaef45c385c37c7ae8af96f5d8c58d9bff8f6186d55be8f2d034ebd0c60869

10
net-analyzer/wireshark/files/wireshark-0.99.7-asneeded.patch Normal file
View file

@ -0,0 +1,10 @@
--- ./epan/dissectors/Makefile.am.orig 2007-12-11 16:38:03.000000000 +0300
+++ ./epan/dissectors/Makefile.am 2007-12-11 16:38:37.000000000 +0300
@@ -32,6 +32,7 @@
libasndissectors_la_SOURCES = \
$(ASN_DISSECTOR_SRC)
+libasndissectors_la_LIBADD = ../../wiretap/libwiretap.la
libpidldissectors_la_SOURCES = \
$(PIDL_DISSECTOR_SRC)

11
net-analyzer/wireshark/files/wireshark-0.99.8-as-needed.patch Normal file
View file

@ -0,0 +1,11 @@
--- wiretap/Makefile.am.orig 2008-02-21 23:11:41.000000000 +0300
+++ wiretap/Makefile.am 2008-02-21 23:12:08.000000000 +0300
@@ -67,7 +67,7 @@
$(GENERATOR_FILES) \
$(GENERATED_FILES)
-libwiretap_la_LIBADD = libwiretap_generated.la
+libwiretap_la_LIBADD = libwiretap_generated.la $(GLIB_LIBS)
libwiretap_la_DEPENDENCIES = libwiretap_generated.la
RUNLEX = $(top_srcdir)/tools/runlex.sh

31
net-analyzer/wireshark/files/wireshark-1.0-sigpipe.patch Normal file
View file

@ -0,0 +1,31 @@
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1740
https://bugs.gentoo.org/show_bug.cgi?id=260457
=== modified file 'capture_opts.c'
--- capture_opts.c 2009-03-05 16:59:51 +0000
+++ capture_opts.c 2009-03-05 17:06:49 +0000
@@ -59,6 +59,7 @@
# include "inet_v6defs.h"
#endif
+#include <signal.h>
#include <glib.h>
#include <epan/packet.h>
@@ -759,6 +760,15 @@
"Dropped");
}
+#ifndef _WIN32
+ /* handle SIGPIPE signal to default action */
+ struct sigaction act;
+ act.sa_handler = SIG_DFL;
+ sigemptyset(&act.sa_mask);
+ act.sa_flags = SA_RESTART;
+ sigaction(SIGPIPE,&act,NULL);
+#endif
+
while (1) { /* XXX - Add signal handling? */
for (stat_entry = g_list_first(stat_list); stat_entry != NULL; stat_entry = g_list_next(stat_entry)) {
if_stat = stat_entry->data;

18
net-analyzer/wireshark/files/wireshark-1.0.5-text2pcap-protos.patch Normal file
View file

@ -0,0 +1,18 @@
defining _XOPEN_SOURCE to nothing means the oldest version which means glibc
will not provide the strdup() prototype. this leads to an implicit decl which
leads to a return type of "int" -- 32bits of a ptr on a 64bit arch leads to
kaboom.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3161
--- text2pcap.c
+++ text2pcap.c
@@ -90,7 +90,7 @@
# define __USE_XOPEN
#endif
#ifndef _XOPEN_SOURCE
-# define _XOPEN_SOURCE
+# define _XOPEN_SOURCE 600
#endif
#include <ctype.h>

20
net-analyzer/wireshark/files/wireshark-1.1.2--as-needed.patch Normal file
View file

@ -0,0 +1,20 @@
diff --git a/epan/Makefile.am b/epan/Makefile.am
index b2a569d..717e233 100644
--- a/epan/Makefile.am
+++ b/epan/Makefile.am
@@ -130,6 +130,7 @@ libwireshark_la_LIBADD = \
dissectors/libdirtydissectors.la $(wslua_lib) @SOCKET_LIBS@ @NSL_LIBS@ \
@C_ARES_LIBS@ @ADNS_LIBS@ @LIBGCRYPT_LIBS@ @LIBGNUTLS_LIBS@ \
@KRB5_LIBS@ @SSL_LIBS@ @LIBSMI_LDFLAGS@ @GEOIP_LIBS@ \
+ ${top_builddir}/wiretap/libwiretap.la \
${top_builddir}/wsutil/libwsutil.la -lm
libwireshark_la_DEPENDENCIES = \
@@ -137,6 +138,7 @@ libwireshark_la_DEPENDENCIES = \
libwireshark_asmopt.la crypt/libairpdcap.la ftypes/libftypes.la \
dfilter/libdfilter.la dissectors/libdissectors.la \
dissectors/libdirtydissectors.la $(wslua_lib) \
+ ${top_builddir}/wiretap/libwiretap.la \
${top_builddir}/wsutil/libwsutil.la
#EXTRA_PROGRAMS = reassemble_test

30
net-analyzer/wireshark/files/wireshark-1.2.8-zlib-1.2.5-capture.patch Normal file
View file

@ -0,0 +1,30 @@
http://anonsvn.wireshark.org/viewvc?view=rev&revision=32715
--- trunk/wiretap/wtap.c 2010/05/07 19:24:32 32714
+++ trunk/wiretap/wtap.c 2010/05/07 19:45:47 32715
@@ -35,6 +35,10 @@
#include <unistd.h>
#endif
+#ifdef HAVE_LIBZ
+#include <zlib.h>
+#endif
+
#include "wtap-int.h"
#include "wtap.h"
@@ -646,6 +650,14 @@
*/
wth->phdr.pkt_encap = wth->file_encap;
+#if defined(ZLIB_VERNUM) && ZLIB_VERNUM == 0x1250
+ /* Reset EOF */
+ /* g_log(NULL, G_LOG_LEVEL_DEBUG, "wtap_read: eof before seek: %d", gzeof(wth->fh)); */
+ if (gzeof(wth->fh))
+ gzseek(wth->fh, 0, SEEK_CUR);
+ /* g_log(NULL, G_LOG_LEVEL_DEBUG, "wtap_read: eof after seek: %d", gzeof(wth->fh)); */
+#endif
+
if (!wth->subtype_read(wth, err, err_info, data_offset))
return FALSE; /* failure */

16
net-analyzer/wireshark/files/wireshark-except-double-free.diff Normal file
View file

@ -0,0 +1,16 @@
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)) {

38
net-analyzer/wireshark/metadata.xml Normal file
View file

@ -0,0 +1,38 @@
<?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>

156
net-analyzer/wireshark/wireshark-1.2.11.ebuild Normal file
View file

@ -0,0 +1,156 @@
# 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.10.ebuild,v 1.7 2010/08/10 17:36:58 ranger Exp $
EAPI=2
inherit autotools libtool flag-o-matic eutils toolchain-funcs
DESCRIPTION="A network protocol analyzer formerly known as ethereal"
HOMEPAGE="http://www.wireshark.org/"
# _rc versions has different download location.
[[ -n ${PV#*_rc} && ${PV#*_rc} != ${PV} ]] && {
SRC_URI="http://www.wireshark.org/download/prerelease/${PN}-${PV/_rc/pre}.tar.gz";
S=${WORKDIR}/${PN}-${PV/_rc/pre} ; } || \
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"
RDEPEND=">=dev-libs/glib-2.4.0:2
zlib? ( sys-libs/zlib
!=sys-libs/zlib-1.2.4 )
smi? ( net-libs/libsmi )
gtk? ( >=x11-libs/gtk+-2.4.0:2
x11-libs/pango
dev-libs/atk )
gnutls? ( 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}
>=dev-util/pkgconfig-0.15.0
dev-lang/perl
sys-devel/bison
sys-devel/flex"
pkg_setup() {
if ! use gtk; then
ewarn "USE=-gtk will means no gui called wireshark will be created and"
ewarn "only command line utils are available"
fi
# Add group for users allowed to sniff.
enewgroup wireshark
}
src_prepare() {
cd "${S}"/epan # our hardened toolchain bug...
epatch "${FILESDIR}/wireshark-except-double-free.diff"
cd "${S}"
epatch "${FILESDIR}/${PN}-1.1.2--as-needed.patch"
eautoreconf
}
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
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
einfo "You asked for both, ares and adns, but we can use only one of them."
einfo "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
# see bug #133092; bugs.wireshark.org/bugzilla/show_bug.cgi?id=1001
# our hardened toolchain bug
filter-flags -fstack-protector
# 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*) myconf="${myconf} --with-ssl" ;;
esac
fi
# dumpcap requires libcap, setuid-install requires dumpcap
econf $(use_enable gtk wireshark) \
$(use_enable profile profile-build) \
$(use_with 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 caps libcap) \
$(use_enable pcap setuid-install) \
--sysconfdir=/etc/wireshark \
${myconf}
}
src_install() {
emake DESTDIR="${D}" install || die "emake install failed"
use pcap && fowners 0:wireshark /usr/bin/dumpcap
use pcap && fperms 6550 /usr/bin/dumpcap
insinto /usr/include/wiretap
doins wiretap/wtap.h
# FAQ is not required as is installed from help/faq.txt
dodoc AUTHORS ChangeLog NEWS README{,.bsd,.linux,.macos,.vmware} doc/randpkt.txt
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
fi
}
pkg_postinst() {
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
}