diff options
| -rw-r--r-- | net-analyzer/wireshark/ChangeLog | 7 | ||||
| -rw-r--r-- | net-analyzer/wireshark/Manifest | 10 | ||||
| -rw-r--r-- | net-analyzer/wireshark/wireshark-1.6.7.ebuild | 217 |
3 files changed, 229 insertions, 5 deletions
diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog index 4c0ce914f2f4..030f65ec62cd 100644 --- a/net-analyzer/wireshark/ChangeLog +++ b/net-analyzer/wireshark/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-analyzer/wireshark # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.331 2012/04/10 16:28:05 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.332 2012/04/10 18:12:16 jer Exp $ + +*wireshark-1.6.7 (10 Apr 2012) + + 10 Apr 2012; Jeroen Roovers <jer@gentoo.org> +wireshark-1.6.7.ebuild: + Version bump (bug #411473). 10 Apr 2012; Jeroen Roovers <jer@gentoo.org> wireshark-1.6.6.ebuild, +files/wireshark-1.6.6-gtk-pcap.patch: diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest index e90fecb361c9..702142362c57 100644 --- a/net-analyzer/wireshark/Manifest +++ b/net-analyzer/wireshark/Manifest @@ -8,16 +8,18 @@ DIST wireshark-1.4.9.tar.bz2 20604645 RMD160 e8f6d68b5b49607fa337ef05ff6bd6c5acd DIST wireshark-1.6.2.tar.bz2 21408664 RMD160 e343d9bb5600b236dea708bb68ecad805a9ee20a SHA1 a18d4e8eaf56fe0214b19d7fde0eb91a06817a49 SHA256 5343f514ce98c28498ec4734e40e34e2bbf779a6c57d958837e3f70234471e7f DIST wireshark-1.6.4.tar.bz2 21464517 RMD160 9437c416a5963aee1c049c0275bdfd3edd7488e8 SHA1 8abd7681e8c05841b7cf31d5dc83c1092c54e79f SHA256 7f98191f53d375f020312a99a9747ff3b846ac4029af4027fc883f685fabef5d DIST wireshark-1.6.6.tar.bz2 21527655 RMD160 27a3d7fa7f78350dabb00d3ee382c335f7e110ae SHA1 0b60fd7d117e78292548fd50d71f750a5dca8b37 SHA256 44dae5898209ece3803c6ce7c9bbb8544b565dd301e8890a6a2213f4a6a2172e +DIST wireshark-1.6.7.tar.bz2 21524856 RMD160 20ced0176d0c2f7a856078d033ebf7ba531f7f57 SHA1 392c4f35cd8d16287ba9eba3afec226fcadd9746 SHA256 1e9d806d02ebfc3a70b948b4e82d19ba5bcde671eb229b18569149f95681f17b EBUILD wireshark-1.4.9.ebuild 6308 RMD160 1cc754917fc9fa2b67dcde05296c031c5b3dbc58 SHA1 40233e735c52457737c555fe196ac92a9b5780de SHA256 d968bdf0343ff49a3809dfc995233ce612662bc0903afa641b3e4fb9bf18d1f5 EBUILD wireshark-1.6.2.ebuild 6315 RMD160 7bd88e4d7009dee6cc65d2e2a0ccb7411804f49e SHA1 c24b9b04671fb26c508185997ff11ca2a10ac4b4 SHA256 1eee0327c11708795aaac2af165f31bb0ee8039a1698b58ecf07f421f6551a1d EBUILD wireshark-1.6.4.ebuild 6496 RMD160 2e2def4d88b4dcad721b993387ce50ecc5238131 SHA1 a6fc4c1254b67b56f780b6eec6362f6dea759308 SHA256 24d1b1569cccfe1eb74accf9000c6ad4e29c67273f04c4b2d8eae305359ddffe EBUILD wireshark-1.6.6.ebuild 6461 RMD160 d48e897148c981872772ff667c31e0180cd03bf6 SHA1 57064665a656602a90d2610259dbb391675ac688 SHA256 b5d74d65e61dca7cc480714dfb4ac9d890b0d208e367818e42a8d672d8bd2d6d -MISC ChangeLog 48254 RMD160 2de788eb2f8b085a3f027b7356a6b64686f3c161 SHA1 58e81a9a68403a9f109e08391cf563c33d7f7580 SHA256 cb03f8c7d72699d1f76001f57434937710f0be289fede2f8299bb98a060846da +EBUILD wireshark-1.6.7.ebuild 6470 RMD160 60cb4ae3ed1ac83581bbbf9f7416481e9e969a1b SHA1 e56cc1dbb455cd3059e0e1cd7c20edb75c552b43 SHA256 fd9bd34e267437fc6f5ff72fd06562c5f2582c365a72e8341a735c0c2a794cde +MISC ChangeLog 48389 RMD160 91b4ad60bcb52fbba396eee43a5d6a2cb4a2de10 SHA1 7945c0c1bd21e7d7b064705338c548a1a4d0ae3e SHA256 6ca204065ea40f1b7014c19a8b02ad007eda820129afbf6bdcf7d2307578c1de MISC metadata.xml 2242 RMD160 66dbbb758acc194df17217183b60a56f61fced38 SHA1 4498ea4c0f0f04213fd1cba2fd3de44565058f7d SHA256 2dfaef45c385c37c7ae8af96f5d8c58d9bff8f6186d55be8f2d034ebd0c60869 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk+EX5oACgkQVWmRsqeSphPwOACeLUdtag4oICOfFz1h2mZ1IIlL -p+4An3cel639w/4KQ71Okcr5VYUA1vxa -=HX98 +iEYEARECAAYFAk+EeAYACgkQVWmRsqeSphMuEgCfdrMI9kekdMvmKvL8RXpxk1Vp +23wAn0/Y2KXjTCezi5hIZb8+0Y7PdaPX +=VPVu -----END PGP SIGNATURE----- diff --git a/net-analyzer/wireshark/wireshark-1.6.7.ebuild b/net-analyzer/wireshark/wireshark-1.6.7.ebuild new file mode 100644 index 000000000000..f266787549fa --- /dev/null +++ b/net-analyzer/wireshark/wireshark-1.6.7.ebuild @@ -0,0 +1,217 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.6.7.ebuild,v 1.1 2012/04/10 18:12:16 jer Exp $ + +EAPI="3" +PYTHON_DEPEND="python? 2" +inherit eutils flag-o-matic libtool python toolchain-funcs + +[[ -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 portaudio python +caps selinux smi ssl threads zlib" + +RDEPEND=">=dev-libs/glib-2.14: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 + x11-misc/xdg-utils ) + ssl? ( <net-libs/gnutls-3 ) + gcrypt? ( dev-libs/libgcrypt ) + pcap? ( net-libs/libpcap ) + 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 + 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 + !!<net-analyzer/wireshark-1.6.0_rc1" + +S=${WORKDIR}/${MY_P} + +# borrowed from GSoC2010_Gentoo_Capabilities by constanze and flameyeys +# @FUNCTION: fcaps +# @USAGE: fcaps {uid:gid} {file-mode} {cap1[,cap2,...]} {file} +# @RETURN: 0 if all okay; non-zero if failure and fallback +# @DESCRIPTION: +# fcaps sets the specified capabilities in the effective and permitted set of +# the given file. In case of failure fcaps sets the given file-mode. +fcaps() { + local uid_gid=$1 + local perms=$2 + local capset=$3 + local path=$4 + local res + + chmod $perms $path && \ + chown $uid_gid $path + res=$? + + use caps || return $res + + #set the capability + setcap "$capset=ep" "$path" &> /dev/null + #check if the capabilitiy got set correctly + setcap -v "$capset=ep" "$path" &> /dev/null + res=$? + + if [ $res -ne 0 ]; then + ewarn "Failed to set capabilities. Probable reason is missed kernel support." + ewarn "Kernel must have <FS>_FS_SECURITY enabled where <FS> is the filesystem" + ewarn "to store ${path} (e.g. EXT3_FS_SECURITY). For kernels version before" + ewarn "2.6.33_rc1 SECURITY_FILE_CAPABILITIES must be enabled as well." + ewarn + ewarn "Falling back to suid now..." + chmod u+s ${path} + fi + return $res +} + +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() { + epatch "${FILESDIR}"/${PN}-1.6.6-gtk-pcap.patch +} + +src_configure() { + local myconf + + if [[ $(gcc-major-version) -lt 3 || + ( $(gcc-major-version) -eq 3 && + $(gcc-minor-version) -le 4 ) ]] ; then + die "Unsupported compiler version, please upgrade." + 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." + ewarn "Also ignore \"unrecognized option '-nopie'\" gcc warning #358101." + 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 zlib) \ + $(use_with geoip) \ + $(use_with portaudio) \ + $(use_with python) \ + $(use_with caps libcap) \ + $(use_with pcap) \ + $(use_with pcap dumpcap-group wireshark) \ + $(use pcap && use_enable caps setcap-install) \ + $(use pcap && use_enable !caps setuid-install) \ + --sysconfdir="${EPREFIX}"/etc/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}} + 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 + + 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 + domenu wireshark.desktop || die + fi + use pcap && chmod o-x "${ED}"/usr/bin/dumpcap #357237 +} + +pkg_postinst() { + if use caps && use pcap; then + fcaps 0:wireshark 550 cap_net_raw,cap_net_admin "${EROOT}"/usr/bin/dumpcap + fi + echo + ewarn "NOTE: To run wireshark as normal user you have to add yourself to" + ewarn "the wireshark group. This security measure ensures that only trusted" + ewarn "users are allowed to sniff your traffic." + echo +} |