diff options
author | Peter Volkov <pva@gentoo.org> | 2009-01-19 09:40:18 +0000 |
---|---|---|
committer | Peter Volkov <pva@gentoo.org> | 2009-01-19 09:40:18 +0000 |
commit | 489fc3fdc03f962df43181f45bf46b2ac67b8ff5 (patch) | |
tree | ee2ade948ebf57393e0a0c5381903b26e4b93d62 /net-analyzer | |
parent | Fix incorrect SRC_URI path. (diff) | |
download | historical-489fc3fdc03f962df43181f45bf46b2ac67b8ff5.tar.gz historical-489fc3fdc03f962df43181f45bf46b2ac67b8ff5.tar.bz2 historical-489fc3fdc03f962df43181f45bf46b2ac67b8ff5.zip |
Version bump of development version, remove old.
Package-Manager: portage-2.1.6.6/cvs/Linux 2.6.26-gentoo-r4 x86_64
Diffstat (limited to 'net-analyzer')
-rw-r--r-- | net-analyzer/wireshark/ChangeLog | 14 | ||||
-rw-r--r-- | net-analyzer/wireshark/Manifest | 22 | ||||
-rw-r--r-- | net-analyzer/wireshark/files/wireshark-1.0.4-zlib-build.patch | 12 | ||||
-rw-r--r-- | net-analyzer/wireshark/files/wireshark-1.1.1--as-needed.patch | 11 | ||||
-rw-r--r-- | net-analyzer/wireshark/files/wireshark-1.1.1-misc-warnings.patch | 160 | ||||
-rw-r--r-- | net-analyzer/wireshark/files/wireshark-1.1.2--as-needed.patch | 20 | ||||
-rw-r--r-- | net-analyzer/wireshark/wireshark-1.0.4.ebuild | 167 | ||||
-rw-r--r-- | net-analyzer/wireshark/wireshark-1.1.2.ebuild (renamed from net-analyzer/wireshark/wireshark-1.1.1.ebuild) | 12 |
8 files changed, 42 insertions, 376 deletions
diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog index c7382675507d..49fcb475e4c4 100644 --- a/net-analyzer/wireshark/ChangeLog +++ b/net-analyzer/wireshark/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for net-analyzer/wireshark -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.144 2008/12/26 09:02:51 vapier Exp $ +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.145 2009/01/19 09:40:18 pva Exp $ + +*wireshark-1.1.2 (19 Jan 2009) + + 19 Jan 2009; Peter Volkov <pva@gentoo.org> + -files/wireshark-1.0.4-zlib-build.patch, + -files/wireshark-1.1.1--as-needed.patch, + -files/wireshark-1.1.1-misc-warnings.patch, + +files/wireshark-1.1.2--as-needed.patch, -wireshark-1.0.4.ebuild, + -wireshark-1.1.1.ebuild, +wireshark-1.1.2.ebuild: + Version bump of development version, remove old. 26 Dec 2008; Mike Frysinger <vapier@gentoo.org> +files/wireshark-1.0.5-text2pcap-protos.patch, wireshark-1.0.5.ebuild: diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest index 92633ba3a878..6160afc56e54 100644 --- a/net-analyzer/wireshark/Manifest +++ b/net-analyzer/wireshark/Manifest @@ -1,26 +1,12 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - 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.4-zlib-build.patch 370 RMD160 f3403f6813460c9630d782fddd1478db60a87363 SHA1 83aa0694fc836b89a1ce5cf2748510daeb0ec108 SHA256 21ca38ec05e3e6b4fddf196c038d39b748b59256a40333b3623eff59715aff00 AUX wireshark-1.0.5-glib-1-build.patch 721 RMD160 d4de28a4e8b45e2b2243b0d113a7f767a0d2f7f1 SHA1 89caa207c6d4e74c3b3a2f47cd62304ff58b341b SHA256 536c1e3bdfc609fa0867c7d37e4f4b88b24d4525a1687992ee7606c365eaef0a AUX wireshark-1.0.5-text2pcap-protos.patch 487 RMD160 20e64be01b281c48516969c508c04455111de300 SHA1 432751cd931baefba3bd13cfa07c3d9863b7c82e SHA256 991e12325670c81f4927c6dc2b665eb8c8938d8f3f0cdfab58601dd37a00d8a4 -AUX wireshark-1.1.1--as-needed.patch 314 RMD160 5a9af8d8c1c2a6d2109413201659bd00f04a7bcd SHA1 87015021390434032716f244bc5432993c37f00f SHA256 f01cb55439c550c337f76354edd6f837e242544971a1f2dd3b45e911e75b42a7 -AUX wireshark-1.1.1-misc-warnings.patch 5519 RMD160 24b02a98a96861621f3ebd14534bc16ab162b4a6 SHA1 2110476f7079b15982c384fa9e0c0754162a6b52 SHA256 ff335d097283d3d32a47952c33684e2485e7f506f26088957deb3c4a06121d30 +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.0.4.tar.bz2 13126757 RMD160 741b6618ba34b55079f15d5725a1e9a22a4fc351 SHA1 8e75a6d909a1da803db77f6f86fdd5096e5bbac8 SHA256 20a37f018a4e2644fdb373f2d9c5d43d4f43e41f1fa29ac6edb53045c0a70e3a DIST wireshark-1.0.5.tar.bz2 13144320 RMD160 72b1ac2e78a02e84525b6ecd6563698b5b7474fc SHA1 593aaf3a7527e8ca74e4982caeb5a77831b121db SHA256 4f923e24d674ac62ded3da402a4de6d402886d80e3d7cac91cf026921f32fcf7 -DIST wireshark-1.1.1.tar.gz 17856811 RMD160 522a717e9163b844e452cb3d50376f113335aca9 SHA1 5d6d57a6e67b30fbbd8241c9305002d410a3e920 SHA256 e55f72b7910a4556411bace181e9ecdb3c7da6b8510ade7a632a5144cee4a94a -EBUILD wireshark-1.0.4.ebuild 5023 RMD160 fe695d6eb4d09a78775c50259012f93cf821ac92 SHA1 52fd64fd410b4aaf5bd42afa2c658b63d5b42f9d SHA256 2003524940e631e83ce4d5fbd3029c2a96eeb0438655f86066b1bf75338bf29f +DIST wireshark-1.1.2.tar.gz 18365823 RMD160 19898543f9d7d7544a5547f823b7d8bdd6d01b48 SHA1 e02a4344a14ad508d99add35ab2cdca5786e7fa2 SHA256 a4f91012c8e2aff275dc6463389d118aa29898e8b488e2fc7de0f5ff19414e3b EBUILD wireshark-1.0.5.ebuild 4950 RMD160 2cadc6b79baa2f8d021cfe1a0ee55c01572e3838 SHA1 ebfda05895fe1f1f68c348b48cd200221d15fd2d SHA256 93bf69963f6dc31656339b1e5c9dd79ca09bb6c823829a94a767d5ceb500c030 -EBUILD wireshark-1.1.1.ebuild 4877 RMD160 41554c22880caec66f8cd7bb4f6166e77a4f17e8 SHA1 7fdd83bed14bebbda885a73f21d75b96edbf33d7 SHA256 743847dde1635d343813d1b7a0a9c2cb4e0f63ad0c2c7719ef7ae454da812823 -MISC ChangeLog 22178 RMD160 24720010d42a5db56162968c1bc4849283f7c75b SHA1 7a54724d135ae6e2d61636942d2a350341aae28f SHA256 75b6acc18359e2c6519feb2cea0aa35ca76af18a2be12e810cd113104131b006 +EBUILD wireshark-1.1.2.ebuild 4804 RMD160 b47b603327fbac008eeeebc3b91bf1ee86fb32bc SHA1 b8c555d16abad8fc8ffc0ef235fa0e4c5971d2a3 SHA256 826e1ac7b9f44ab507da736ecf9283a11830f40354325a2feba42228f9ca1cb7 +MISC ChangeLog 22556 RMD160 6d3ce58b74b999522116e59b74e89115e0ba0a4e SHA1 c2f5ad680bbc100ed32843c2c55c44431b2fa42f SHA256 abd5ef9a761f2fa364794c906ece9d429c66ad842676d568dda14eb1b582dffa MISC metadata.xml 2154 RMD160 01af8905d25e6c387902d30766daedcd37d94e0e SHA1 d68e79d413654ce72c553d508d7aa96f27fe85b5 SHA256 48c540fcec9cf1e5eebe132d7f90e8330b413f4eb6469761a88720eaa6a2233a ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.9 (GNU/Linux) - -iEYEARECAAYFAklUncQACgkQn/5bYzqsSmEvQACfdK/6WRjZZ3djwWV9cFisoyUw -S9wAn15TjbUDX3w7WPzhOuREvxrMxk0Z -=9bMK ------END PGP SIGNATURE----- diff --git a/net-analyzer/wireshark/files/wireshark-1.0.4-zlib-build.patch b/net-analyzer/wireshark/files/wireshark-1.0.4-zlib-build.patch deleted file mode 100644 index ccc8b60bf128..000000000000 --- a/net-analyzer/wireshark/files/wireshark-1.0.4-zlib-build.patch +++ /dev/null @@ -1,12 +0,0 @@ -http://anonsvn.wireshark.org/viewvc?view=rev&revision=26524 - ---- trunk-1.0/wiretap/file_access.c 2008/10/23 14:30:35 26523 -+++ trunk-1.0/wiretap/file_access.c 2008/10/23 16:38:52 26524 -@@ -978,6 +978,7 @@ - static FILE *wtap_dump_file_fdopen(wtap_dumper *wdh _U_, int fd) - { - return fdopen(fd, "wb"); -+} - #endif - - /* internally writing raw bytes (compressed or not) */ diff --git a/net-analyzer/wireshark/files/wireshark-1.1.1--as-needed.patch b/net-analyzer/wireshark/files/wireshark-1.1.1--as-needed.patch deleted file mode 100644 index bf708c5b98f8..000000000000 --- a/net-analyzer/wireshark/files/wireshark-1.1.1--as-needed.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./epan/wslua/Makefile.am.orig 2008-10-17 12:08:43.000000000 +0400 -+++ ./epan/wslua/Makefile.am 2008-10-17 12:08:48.000000000 +0400 -@@ -47,7 +47,7 @@ - init_wslua.c \ - wslua.h - --libwslua_la_LIBADD = @LUA_LIBS@ -+libwslua_la_LIBADD = @LUA_LIBS@ ../../wiretap/libwiretap.la - - BUILT_SOURCES = \ - taps_wslua.c \ diff --git a/net-analyzer/wireshark/files/wireshark-1.1.1-misc-warnings.patch b/net-analyzer/wireshark/files/wireshark-1.1.1-misc-warnings.patch deleted file mode 100644 index 8e6d339b7c69..000000000000 --- a/net-analyzer/wireshark/files/wireshark-1.1.1-misc-warnings.patch +++ /dev/null @@ -1,160 +0,0 @@ ---- ./epan/dissectors/packet-ldp.c.orig 2008-10-16 22:58:47.000000000 +0400 -+++ ./epan/dissectors/packet-ldp.c 2008-10-16 22:59:03.000000000 +0400 -@@ -2484,7 +2484,7 @@ - int length_remaining; - guint16 plen; - int length; -- tvbuff_t *next_tvb; -+ tvbuff_t *volatile next_tvb; - - while (tvb_reported_length_remaining(tvb, offset) != 0) { - length_remaining = tvb_length_remaining(tvb, offset); ---- ./epan/dissectors/packet-tpkt.c.orig 2008-10-16 23:24:58.000000000 +0400 -+++ ./epan/dissectors/packet-tpkt.c 2008-10-16 23:25:27.000000000 +0400 -@@ -217,7 +217,7 @@ - int mgcp_version = 0; - int mgcp_reserved = 0; - volatile int length; -- tvbuff_t *next_tvb; -+ tvbuff_t *volatile next_tvb; - const char *saved_proto; - guint8 string[4]; - /* -@@ -372,7 +372,7 @@ - int length_remaining; - int data_len; - volatile int length; -- tvbuff_t *next_tvb; -+ tvbuff_t *volatile next_tvb; - const char *saved_proto; - - /* ---- ./epan/dissectors/packet-gssapi.c.orig 2008-10-16 22:55:09.000000000 +0400 -+++ ./epan/dissectors/packet-gssapi.c 2008-10-16 22:56:06.000000000 +0400 -@@ -172,8 +172,8 @@ - dissect_gssapi_work(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, - gboolean is_verifier) - { -- proto_item *item; -- proto_tree *subtree; -+ proto_item *volatile item; -+ proto_tree *volatile subtree; - volatile int return_offset = 0; - gssapi_conv_info_t *volatile gss_info; - gssapi_oid_value *oidvalue; ---- ./epan/dissectors/packet-tds.c.orig 2008-10-16 23:22:27.000000000 +0400 -+++ ./epan/dissectors/packet-tds.c 2008-10-16 23:22:40.000000000 +0400 -@@ -1725,7 +1725,7 @@ - guint8 type; - guint16 plen; - guint length; -- tvbuff_t *next_tvb; -+ tvbuff_t *volatile next_tvb; - proto_item *tds_item = NULL; - proto_tree *tds_tree = NULL; - ---- ./epan/dissectors/packet-isl.c.orig 2008-10-16 22:57:53.000000000 +0400 -+++ ./epan/dissectors/packet-isl.c 2008-10-16 22:58:15.000000000 +0400 -@@ -149,7 +149,7 @@ - { - proto_tree *volatile fh_tree = NULL; - proto_item *ti, *hidden_item; -- guint8 type; -+ volatile guint8 type; - volatile guint16 length; - gint captured_length; - tvbuff_t *volatile payload_tvb = NULL; ---- ./epan/dissectors/packet-ieee802154.c.orig 2008-10-16 22:56:53.000000000 +0400 -+++ ./epan/dissectors/packet-ieee802154.c 2008-10-16 22:57:23.000000000 +0400 -@@ -484,7 +484,7 @@ - static void - dissect_ieee802154_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint options) - { -- tvbuff_t *payload_tvb; -+ tvbuff_t *volatile payload_tvb; - proto_tree *volatile ieee802154_tree = NULL; - proto_item *volatile proto_root = NULL; - proto_item *ti; ---- ./epan/dissectors/packet-tr.c.orig 2008-10-16 23:25:37.000000000 +0400 -+++ ./epan/dissectors/packet-tr.c 2008-10-16 23:26:20.000000000 +0400 -@@ -326,10 +326,10 @@ - { - proto_tree *tr_tree, *bf_tree; - proto_item *ti, *hidden_item; -- int frame_type; - guint8 rcf1, rcf2; - tvbuff_t *next_tvb; - -+ volatile int frame_type; - volatile int fixoffset = 0; - volatile int source_routed = 0; - volatile guint8 trn_rif_bytes; ---- ./epan/dissectors/packet-bgp.c.orig 2008-10-16 22:40:35.000000000 +0400 -+++ ./epan/dissectors/packet-bgp.c 2008-10-16 22:49:31.000000000 +0400 -@@ -2623,7 +2623,7 @@ - } - - static void --dissect_bgp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, -+dissect_bgp_pdu(tvbuff_t *volatile tvb, packet_info *pinfo, proto_tree *tree, - gboolean first) - { - guint16 bgp_len; /* Message length */ -@@ -2740,7 +2740,7 @@ - guint length_remaining; - guint length; - volatile gboolean first = TRUE; /* TRUE for the first BGP message in packet */ -- tvbuff_t *next_tvb; -+ tvbuff_t *volatile next_tvb; - - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "BGP"); ---- ./epan/dissectors/packet-ethertype.c.orig 2008-10-16 22:51:48.000000000 +0400 -+++ ./epan/dissectors/packet-ethertype.c 2008-10-16 22:52:25.000000000 +0400 -@@ -193,7 +193,7 @@ - guint length_before; - gint captured_length, reported_length; - volatile gboolean dissector_found = FALSE; -- const char *saved_proto; -+ const char *volatile saved_proto; - - /* Add the Ethernet type to the protocol tree */ - if (tree) { ---- ./epan/dissectors/packet-vlan.c.orig 2008-10-16 23:26:42.000000000 +0400 -+++ ./epan/dissectors/packet-vlan.c 2008-10-16 23:27:07.000000000 +0400 -@@ -74,7 +74,8 @@ - dissect_vlan(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) - { - proto_tree *ti; -- guint16 tci,encap_proto; -+ guint16 tci; -+ volatile guint16 encap_proto; - volatile gboolean is_802_2; - proto_tree *volatile vlan_tree; - -=== modified file 'epan/dissectors/packet-scsi.h' ---- epan/dissectors/packet-scsi.h 2008-11-22 14:42:31 +0000 -+++ epan/dissectors/packet-scsi.h 2008-11-22 14:45:00 +0000 -@@ -241,7 +241,7 @@ - */ - #define TRY_SCSI_CDB_ALLOC_LEN(pinfo, tvb, offset, length) \ - { \ -- gboolean short_packet; \ -+ volatile gboolean short_packet; \ - tvbuff_t *new_tvb; \ - guint32 end_data_offset=0; \ - \ - -=== modified file 'epan/dissectors/packet-x11.c' ---- epan/dissectors/packet-x11.c 2008-11-22 14:42:31 +0000 -+++ epan/dissectors/packet-x11.c 2008-11-22 14:50:41 +0000 -@@ -4066,7 +4066,7 @@ - conversation_t *conversation; - x11_conv_data_t *volatile state; - int length; -- tvbuff_t *next_tvb; -+ tvbuff_t *volatile next_tvb; - - while (tvb_reported_length_remaining(tvb, offset) != 0) { - /* - diff --git a/net-analyzer/wireshark/files/wireshark-1.1.2--as-needed.patch b/net-analyzer/wireshark/files/wireshark-1.1.2--as-needed.patch new file mode 100644 index 000000000000..7da659c099fe --- /dev/null +++ b/net-analyzer/wireshark/files/wireshark-1.1.2--as-needed.patch @@ -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 diff --git a/net-analyzer/wireshark/wireshark-1.0.4.ebuild b/net-analyzer/wireshark/wireshark-1.0.4.ebuild deleted file mode 100644 index c85f797ea9d9..000000000000 --- a/net-analyzer/wireshark/wireshark-1.0.4.ebuild +++ /dev/null @@ -1,167 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.0.4.ebuild,v 1.8 2008/11/15 17:42:03 dertobi123 Exp $ - -EAPI=1 -WANT_AUTOMAKE="1.9" -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/all-versions/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd" -IUSE="adns gtk ipv6 lua portaudio gnutls gcrypt zlib kerberos threads profile smi +pcap pcre +caps selinux" - -RDEPEND="zlib? ( sys-libs/zlib ) - smi? ( net-libs/libsmi ) - gtk? ( >=dev-libs/glib-2.0.4 - =x11-libs/gtk+-2* - x11-libs/pango - dev-libs/atk ) - !gtk? ( =dev-libs/glib-1.2* ) - gnutls? ( net-libs/gnutls ) - gcrypt? ( dev-libs/libgcrypt ) - pcap? ( net-libs/libpcap ) - pcre? ( dev-libs/libpcre ) - caps? ( sys-libs/libcap ) - adns? ( net-libs/adns ) - kerberos? ( virtual/krb5 ) - portaudio? ( media-libs/portaudio ) - 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 mean 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 || die "Failed to create wireshark group" -} - -src_unpack() { - unpack ${A} - - # Try to drop --as-needed patches for 1.0.1. All problems are supposed to be - # fixed there... - cd "${S}" - epatch "${FILESDIR}"/${PN}-0.99.7-asneeded.patch - epatch "${FILESDIR}"/${PN}-0.99.8-as-needed.patch - epatch "${FILESDIR}"/${P}-zlib-build.patch #244931 - - cd "${S}"/epan - epatch "${FILESDIR}"/wireshark-except-double-free.diff - - cd "${S}" - eautoreconf -} - -src_compile() { - # 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 - - # see bug #133092; bugs.wireshark.org/bugzilla/show_bug.cgi?id=1001 - # our hardened toolchain bug - filter-flags -fstack-protector - - # profile and -fomit-frame-pointer are incompatible, bug #215806 - use profile && filter-flags -fomit-frame-pointer - - local myconf - if use gtk; then - einfo "Building with gtk support" - else - einfo "Building without gtk support" - myconf="${myconf} --disable-wireshark" - 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 gtk2) \ - $(use_enable profile profile-build) \ - $(use_with gnutls) \ - $(use_with gcrypt) \ - $(use_enable gtk wireshark) \ - $(use_enable ipv6) \ - $(use_enable threads) \ - $(use_with lua) \ - $(use_with adns) \ - $(use_with kerberos krb5) \ - $(use_with smi libsmi) \ - $(use_with pcap) \ - $(use_with zlib) \ - $(use_with pcre) \ - $(use_with portaudio) \ - $(use_with caps libcap) \ - $(use_enable pcap setuid-install) \ - --sysconfdir=/etc/wireshark \ - ${myconf} || die "econf failed" - - emake || die "emake failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - - fowners 0:wireshark /usr/bin/tshark - fperms 6550 /usr/bin/tshark - 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 - insinto /usr/share/icons/hicolor/16x16/apps - newins image/hi16-app-wireshark.png wireshark.png - insinto /usr/share/icons/hicolor/32x32/apps - newins image/hi32-app-wireshark.png wireshark.png - insinto /usr/share/icons/hicolor/48x48/apps - newins image/hi48-app-wireshark.png wireshark.png - insinto /usr/share/applications - doins wireshark.desktop - fi -} - -pkg_postinst() { - echo - ewarn "With version 0.99.7, all function calls that require elevated privileges" - ewarn "have been moved out of the GUI to dumpcap. WIRESHARK CONTAINS OVER ONE" - ewarn "POINT FIVE MILLION LINES OF SOURCE CODE. DO NOT RUN THEM AS ROOT." - ewarn - 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 -} diff --git a/net-analyzer/wireshark/wireshark-1.1.1.ebuild b/net-analyzer/wireshark/wireshark-1.1.2.ebuild index 2054ed7031a4..003b1f9f7f75 100644 --- a/net-analyzer/wireshark/wireshark-1.1.1.ebuild +++ b/net-analyzer/wireshark/wireshark-1.1.2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.1.1.ebuild,v 1.3 2008/10/21 05:51:38 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.1.2.ebuild,v 1.1 2009/01/19 09:40:18 pva Exp $ EAPI=1 inherit autotools libtool flag-o-matic eutils toolchain-funcs @@ -17,7 +17,7 @@ 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 +gtk ipv6 lua portaudio gnutls ares gcrypt zlib kerberos threads profile smi +pcap pcre +caps selinux" +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 ) @@ -34,6 +34,7 @@ RDEPEND=">=dev-libs/glib-2.4.0:2 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 )" @@ -69,9 +70,7 @@ src_unpack() { epatch "${FILESDIR}/wireshark-except-double-free.diff" cd "${S}" - epatch "${FILESDIR}/${P}-misc-warnings.patch" - # made dependent on lua as generally dissectors shouldn't depend on wiretap - use lua && epatch "${FILESDIR}/${P}--as-needed.patch" + epatch "${FILESDIR}/${PN}-1.1.2--as-needed.patch" eautoreconf } @@ -113,6 +112,7 @@ src_compile() { $(use_with pcap) \ $(use_with zlib) \ $(use_with pcre) \ + $(use_with geoip) \ $(use_with portaudio) \ $(use_with caps libcap) \ $(use_enable pcap setuid-install) \ |