Added first release candidate.
authorPeter Volkov <pva@gentoo.org>
Mon, 14 Jun 2010 14:47:34 +0000 (14:47 +0000)
committerPeter Volkov <pva@gentoo.org>
Mon, 14 Jun 2010 14:47:34 +0000 (14:47 +0000)
Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

net-analyzer/wireshark/ChangeLog
net-analyzer/wireshark/Manifest
net-analyzer/wireshark/metadata.xml
net-analyzer/wireshark/wireshark-1.4.0_rc1.ebuild [new file with mode: 0644]

index 9863e82f65f6acf988a6815fabda500b96554651..5c14574ff0ab5a8114c9bdc7a2bc1c59f01d2003 100644 (file)
@@ -1,6 +1,12 @@
 # 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.229 2010/06/11 10:28:32 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.230 2010/06/14 14:47:34 pva Exp $
+
+*wireshark-1.4.0_rc1 (14 Jun 2010)
+
+  14 Jun 2010; Peter Volkov <pva@gentoo.org> +wireshark-1.4.0_rc1.ebuild,
+  metadata.xml:
+  Added first release candidate.
 
 *wireshark-1.2.9 (11 Jun 2010)
 
index 66bba91226fc99f811253383c07f281ffca5bd1a..0252386d05cf09597f12c0b76df432fd320ec375 100644 (file)
@@ -7,7 +7,9 @@ AUX wireshark-1.2.8-zlib-1.2.5-capture.patch 779 RMD160 7440a7d8a04a1b43057fc7c1
 AUX wireshark-except-double-free.diff 664 RMD160 2b61f03f5148975f6438351c11de18a500deabc5 SHA1 0239e19ba0ebd2cfb4ab4987a8a4c56646cd9250 SHA256 dc02a5f3e4bdbd128a2ba08f38880358f747661a93ca0b3fe1918c67b255c369
 DIST wireshark-1.2.8.tar.gz 19434341 RMD160 1affc20a741c1a452dac8fcf26ff337bff05e50f SHA1 709e4d272de3f92914e17a65ee58d1a0e19852e9 SHA256 d83158be1cdad86f95fc6ddf513f673ea928de5cc796fa21306b99778a6dfb97
 DIST wireshark-1.2.9.tar.gz 19444904 RMD160 f4c149a9160f9e9dffd74c0d143afd94d1bc784c SHA1 e8a09c1cf432e88ec444afe7886bd2bfd56cfaa6 SHA256 24c1821dcc582bf455f1996c8dfe7ce9f8d4dd0dca0f1f8f61e6a4bc6ecf3b32
+DIST wireshark-1.4.0rc1.tar.bz2 20400088 RMD160 0518fe9acf84867360086acb3dde930f0862dae7 SHA1 35978e507966d18fefcf63f8746dbd31d2cb94ac SHA256 924afcfa5a0309b90e41fb521f55c22407cbe17c0b3e79b890aaa263dba9f8fb
 EBUILD wireshark-1.2.8-r1.ebuild 4627 RMD160 6ffdf01d5bcd52aef81e692ca39fa5931ed38b24 SHA1 78cb79f73d8c1804cbf34e87b7208f24b3101895 SHA256 6871fd79e3678c841e8894c1ec0a7d76f41cac07dee42c23f0bcd3c019935993
 EBUILD wireshark-1.2.9.ebuild 4576 RMD160 e200b5bb1cc831d31d42ecde3c7bfbe36b3cd9a2 SHA1 03b1fd9d98b8ae7fda74aef3b55c670df8c41517 SHA256 acb078274e8c206b9ba6564a082abda3e4a56539c3381ac8af639cc87a8f08b5
-MISC ChangeLog 33989 RMD160 e9dcab7207e111fb79919248d439a66e8e59f224 SHA1 e1a2219bdbebc0d20c01e9aa1136d590437cfcf3 SHA256 d3cca2b7285559381f540706a66de70a2e764c256bb8aa9c3bcdd25ecbeddf0b
-MISC metadata.xml 2154 RMD160 01af8905d25e6c387902d30766daedcd37d94e0e SHA1 d68e79d413654ce72c553d508d7aa96f27fe85b5 SHA256 48c540fcec9cf1e5eebe132d7f90e8330b413f4eb6469761a88720eaa6a2233a
+EBUILD wireshark-1.4.0_rc1.ebuild 5692 RMD160 099b6a5aa90af512246c40f5558ad91237fd3038 SHA1 08fc50e7bd8fbd30c79f2cbc8089b3cc4cbd8fca SHA256 bb730635b75f5573424c9f122559126de939a0e94d5ce3201a70af3cf06ccbad
+MISC ChangeLog 34149 RMD160 5d8dfaf10f6a7787e706ab2d82900109f5c3f01f SHA1 1f617cb6dd2e37ec17a6d36e8e56abdea3adeffe SHA256 729dc2f154b78f69d131157aab1b6f9a1cb7c3d8882816a10de7021009323187
+MISC metadata.xml 2242 RMD160 66dbbb758acc194df17217183b60a56f61fced38 SHA1 4498ea4c0f0f04213fd1cba2fd3de44565058f7d SHA256 2dfaef45c385c37c7ae8af96f5d8c58d9bff8f6186d55be8f2d034ebd0c60869
index 059e62c8061846347ce12df3f32194b86c8c3827..d334ff256aaf69ace17c13e427be2493697b27af 100644 (file)
@@ -29,8 +29,9 @@
        plain text 
 </longdescription>
 <use>
-<flag name='gcrypt'>Use GNU crypto library (<pkg>dev-libs/libgcrypt</pkg>) to decrypt SSL traffic</flag>
 <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>
diff --git a/net-analyzer/wireshark/wireshark-1.4.0_rc1.ebuild b/net-analyzer/wireshark/wireshark-1.4.0_rc1.ebuild
new file mode 100644 (file)
index 0000000..2811bca
--- /dev/null
@@ -0,0 +1,191 @@
+# 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_rc1.ebuild,v 1.1 2010/06/14 14:47:34 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="~amd64 ~ppc ~ppc64 ~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
+}