diff options
author | Jeroen Roovers <jer@gentoo.org> | 2013-01-31 15:59:24 +0000 |
---|---|---|
committer | Jeroen Roovers <jer@gentoo.org> | 2013-01-31 15:59:24 +0000 |
commit | 6f86531853e0165d09b1018fe22b5aab03554afe (patch) | |
tree | 2e31cdeb714ebf781681ed19d92265c947a2e50d /net-analyzer | |
parent | Remove old versions (diff) | |
download | gentoo-2-6f86531853e0165d09b1018fe22b5aab03554afe.tar.gz gentoo-2-6f86531853e0165d09b1018fe22b5aab03554afe.tar.bz2 gentoo-2-6f86531853e0165d09b1018fe22b5aab03554afe.zip |
Use fcaps.eclass.
(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Diffstat (limited to 'net-analyzer')
-rw-r--r-- | net-analyzer/wireshark/ChangeLog | 9 | ||||
-rw-r--r-- | net-analyzer/wireshark/wireshark-1.6.13-r1.ebuild | 192 | ||||
-rw-r--r-- | net-analyzer/wireshark/wireshark-1.6.13.ebuild | 4 | ||||
-rw-r--r-- | net-analyzer/wireshark/wireshark-1.8.5-r1.ebuild | 204 |
4 files changed, 406 insertions, 3 deletions
diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog index 4feb41eeece1..5ec2d2fe6f42 100644 --- a/net-analyzer/wireshark/ChangeLog +++ b/net-analyzer/wireshark/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-analyzer/wireshark # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.438 2013/01/31 15:21:50 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.439 2013/01/31 15:59:24 jer Exp $ + +*wireshark-1.8.5-r1 (31 Jan 2013) +*wireshark-1.6.13-r1 (31 Jan 2013) + + 31 Jan 2013; Jeroen Roovers <jer@gentoo.org> wireshark-1.6.13.ebuild, + +wireshark-1.6.13-r1.ebuild, +wireshark-1.8.5-r1.ebuild: + Use fcaps.eclass. 31 Jan 2013; Jeroen Roovers <jer@gentoo.org> wireshark-1.6.13.ebuild, wireshark-1.8.5.ebuild: diff --git a/net-analyzer/wireshark/wireshark-1.6.13-r1.ebuild b/net-analyzer/wireshark/wireshark-1.6.13-r1.ebuild new file mode 100644 index 000000000000..d0923ff96bba --- /dev/null +++ b/net-analyzer/wireshark/wireshark-1.6.13-r1.ebuild @@ -0,0 +1,192 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.6.13-r1.ebuild,v 1.1 2013/01/31 15:59:24 jer Exp $ + +EAPI=5 +PYTHON_DEPEND="python? 2" +inherit autotools eutils fcaps flag-o-matic python toolchain-funcs user + +[[ -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/${PV}" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE=" + adns doc doc-pdf gtk ipv6 libadns lua crypt geoip kerberos profile + +pcap portaudio python 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 ) + crypt? ( dev-libs/libgcrypt ) + pcap? ( net-libs/libpcap ) + kerberos? ( virtual/krb5 ) + portaudio? ( media-libs/portaudio ) + adns? ( + !libadns? ( >=net-dns/c-ares-1.5 ) + ) + libadns? ( 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 ) ) + virtual/pkgconfig + 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 +} + +src_prepare() { + epatch \ + "${FILESDIR}"/${PN}-1.6.6-gtk-pcap.patch \ + "${FILESDIR}"/${PN}-1.6.13-ldflags.patch + sed -i -e 's|.png||g' ${PN}.desktop || die + eautoreconf +} + +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 + + # 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 + + if use adns; then + if use libadns; then + myconf+=" --with-adns --without-c-ares" + else + myconf+=" --without-adns --with-c-ares" + fi + else + if use libadns; then + myconf+=" --with-adns --without-c-ares" + fi + 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 pcap && use_enable !filecaps setuid-install) \ + $(use pcap && use_enable filecaps setcap-install) \ + $(use_enable gtk wireshark) \ + $(use_enable ipv6) \ + $(use_enable profile profile-build) \ + $(use_enable threads) \ + $(use_with filecaps libcap) \ + $(use_with crypt gcrypt) \ + $(use_with geoip) \ + $(use_with kerberos krb5) \ + $(use_with lua) \ + $(use_with pcap dumpcap-group wireshark) \ + $(use_with pcap) \ + $(use_with portaudio) \ + $(use_with python) \ + $(use_with smi libsmi) \ + $(use_with ssl gnutls) \ + $(use_with zlib) \ + --sysconfdir="${EPREFIX}"/etc/wireshark \ + --disable-extra-gcc-checks \ + ${myconf} +} + +src_compile() { + default + use doc && cd docbook && { emake; } +} + +src_install() { + default + 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 + 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 + + 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 + fi + use pcap && chmod o-x "${ED}"/usr/bin/dumpcap #357237 +} + +pkg_postinst() { + # Add group for users allowed to sniff. + enewgroup wireshark + + if use filecaps && use pcap; then + fcaps -o 0 -g wireshark -m 550 \ + cap_dac_read_search,cap_net_raw,cap_net_admin \ + "${EROOT}"/usr/bin/dumpcap + fi + + 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." +} diff --git a/net-analyzer/wireshark/wireshark-1.6.13.ebuild b/net-analyzer/wireshark/wireshark-1.6.13.ebuild index 6bba367f852a..816fbf3ace2f 100644 --- a/net-analyzer/wireshark/wireshark-1.6.13.ebuild +++ b/net-analyzer/wireshark/wireshark-1.6.13.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.6.13.ebuild,v 1.9 2013/01/31 15:21:50 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.6.13.ebuild,v 1.10 2013/01/31 15:59:24 jer Exp $ EAPI=5 PYTHON_DEPEND="python? 2" @@ -165,7 +165,7 @@ src_configure() { $(use_enable profile profile-build) \ $(use_enable threads) \ $(use_with caps libcap) \ - $(use_with crypt) \ + $(use_with crypt gcrypt) \ $(use_with geoip) \ $(use_with kerberos krb5) \ $(use_with lua) \ diff --git a/net-analyzer/wireshark/wireshark-1.8.5-r1.ebuild b/net-analyzer/wireshark/wireshark-1.8.5-r1.ebuild new file mode 100644 index 000000000000..6a62d64ca5e4 --- /dev/null +++ b/net-analyzer/wireshark/wireshark-1.8.5-r1.ebuild @@ -0,0 +1,204 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.8.5-r1.ebuild,v 1.1 2013/01/31 15:59:24 jer Exp $ + +EAPI="5" +PYTHON_DEPEND="python? 2" +inherit autotools eutils fcaps flag-o-matic python toolchain-funcs user + +[[ -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/${PV}" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE=" + adns doc doc-pdf geoip gtk crypt ipv6 kerberos libadns lua +pcap + portaudio profile python selinux smi ssl 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 dev-libs/libgcrypt ) + crypt? ( dev-libs/libgcrypt ) + pcap? ( net-libs/libpcap ) + kerberos? ( virtual/krb5 ) + portaudio? ( media-libs/portaudio ) + adns? ( + !libadns? ( >=net-dns/c-ares-1.5 ) + ) + libadns? ( 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 ) ) + virtual/pkgconfig + 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 +} + +src_prepare() { + epatch \ + "${FILESDIR}"/${PN}-1.6.13-ldflags.patch \ + "${FILESDIR}"/${PN}-1.8.3-gnutls3.patch + sed -i -e 's|.png||g' ${PN}.desktop || die + eautoreconf +} + +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 + + # 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 + + if use adns; then + if use libadns; then + myconf+=( "--with-adns --without-c-ares" ) + else + myconf+=( "--without-adns --with-c-ares" ) + fi + else + if use libadns; then + myconf+=( "--with-adns --without-c-ares" ) + else + myconf+=( "--without-adns --without-c-ares" ) + fi + 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 pcap && use_enable !filecaps setuid-install) \ + $(use pcap && use_enable filecaps setcap-install) \ + $(use_enable gtk wireshark) \ + $(use_enable ipv6) \ + $(use_enable profile profile-build) \ + $(use_with filecaps libcap) \ + $(use_with crypt gcrypt) \ + $(use_with geoip) \ + $(use_with kerberos krb5) \ + $(use_with lua) \ + $(use_with pcap dumpcap-group wireshark) \ + $(use_with pcap) \ + $(use_with portaudio) \ + $(use_with python) \ + $(use_with smi libsmi) \ + $(use_with ssl gnutls) \ + $(use_with zlib) \ + --disable-extra-gcc-checks \ + --disable-usr-local \ + --sysconfdir="${EPREFIX}"/etc/wireshark \ + ${myconf[@]} +} + +src_compile() { + default + use doc && emake -C docbook +} + +src_install() { + default + 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 + 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*} + + # install headers + local wsheader + for wsheader in $( echo $(< debian/wireshark-dev.header-files ) ); do + insinto /usr/include/wireshark/$( dirname ${wsheader} ) + doins ${wsheader} + done + + #with the above this really shouldn't be needed, but things may be looking in wiretap/ instead of wireshark/wiretap/ + insinto /usr/include/wiretap + doins wiretap/wtap.h + + 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 + fi + use pcap && chmod o-x "${ED}"/usr/bin/dumpcap #357237 +} + +pkg_postinst() { + # Add group for users allowed to sniff. + enewgroup wireshark + + if use filecaps && use pcap; then + fcaps -o 0 -g wireshark -m 550 \ + cap_dac_read_search,cap_net_raw,cap_net_admin \ + "${EROOT}"/usr/bin/dumpcap + fi + + 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." +} |