* [gentoo-commits] gentoo-x86 commit in net-analyzer/wireshark: wireshark-1.99.0-r1.ebuild ChangeLog
@ 2014-10-24 21:30 Jeroen Roovers (jer)
0 siblings, 0 replies; only message in thread
From: Jeroen Roovers (jer) @ 2014-10-24 21:30 UTC (permalink / raw
To: gentoo-commits
jer 14/10/24 21:30:54
Modified: ChangeLog
Added: wireshark-1.99.0-r1.ebuild
Log:
Add USE=qt5 (bug #488640).
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Revision Changes Path
1.661 net-analyzer/wireshark/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/ChangeLog?rev=1.661&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/ChangeLog?rev=1.661&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/ChangeLog?r1=1.660&r2=1.661
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v
retrieving revision 1.660
retrieving revision 1.661
diff -u -r1.660 -r1.661
--- ChangeLog 14 Oct 2014 13:52:37 -0000 1.660
+++ ChangeLog 24 Oct 2014 21:30:54 -0000 1.661
@@ -1,6 +1,12 @@
# ChangeLog for net-analyzer/wireshark
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.660 2014/10/14 13:52:37 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.661 2014/10/24 21:30:54 jer Exp $
+
+*wireshark-1.99.0-r1 (24 Oct 2014)
+
+ 24 Oct 2014; Jeroen Roovers <jer@gentoo.org> +wireshark-1.99.0-r1.ebuild,
+ +files/wireshark-1.99.0-qt5.patch:
+ Add USE=qt5 (bug #488640).
14 Oct 2014; Jeroen Roovers <jer@gentoo.org> wireshark-1.12.1.ebuild,
wireshark-1.99.0.ebuild:
1.1 net-analyzer/wireshark/wireshark-1.99.0-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-1.99.0-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-1.99.0-r1.ebuild?rev=1.1&content-type=text/plain
Index: wireshark-1.99.0-r1.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.99.0-r1.ebuild,v 1.1 2014/10/24 21:30:54 jer Exp $
EAPI=5
inherit autotools eutils fcaps multilib qt4-r2 user
DESCRIPTION="A network protocol analyzer formerly known as ethereal"
HOMEPAGE="http://www.wireshark.org/"
SRC_URI="${HOMEPAGE}download/src/all-versions/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0/${PV}"
KEYWORDS=""
IUSE="
adns +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua +netlink +pcap
portaudio +qt4 qt5 selinux smi sse4_2 ssl zlib
"
REQUIRED_USE="
ssl? ( crypt )
?? ( qt4 qt5 )
"
GTK_COMMON_DEPEND="
x11-libs/gdk-pixbuf
x11-libs/pango
x11-misc/xdg-utils
virtual/freedesktop-icon-theme
"
RDEPEND="
>=dev-libs/glib-2.14:2
netlink? ( dev-libs/libnl:3 )
adns? ( >=net-dns/c-ares-1.5 )
crypt? ( dev-libs/libgcrypt:0 )
caps? ( sys-libs/libcap )
geoip? ( dev-libs/geoip )
gtk3? (
${GTK_COMMON_DEPEND}
x11-libs/gtk+:3
)
kerberos? ( virtual/krb5 )
lua? ( >=dev-lang/lua-5.1 )
pcap? ( net-libs/libpcap )
portaudio? ( media-libs/portaudio )
qt4? (
dev-qt/qtcore:4
dev-qt/qtgui:4
x11-misc/xdg-utils
)
qt5? (
dev-qt/qtcore:5
dev-qt/qtgui:5
dev-qt/qtprintsupport:5
dev-qt/qtwidgets:5
x11-misc/xdg-utils
)
selinux? ( sec-policy/selinux-wireshark )
smi? ( net-libs/libsmi )
ssl? ( net-libs/gnutls )
zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 )
"
DEPEND="
${RDEPEND}
doc? (
app-doc/doxygen
app-text/asciidoc
dev-libs/libxml2
dev-libs/libxslt
doc-pdf? ( dev-java/fop )
www-client/lynx
)
>=virtual/perl-Pod-Simple-3.170.0
sys-devel/bison
sys-devel/flex
virtual/perl-Getopt-Long
virtual/perl-Time-Local
virtual/pkgconfig
"
pkg_setup() {
enewgroup wireshark
}
src_prepare() {
epatch \
"${FILESDIR}"/${PN}-1.6.13-ldflags.patch \
"${FILESDIR}"/${PN}-1.11.0-oldlibs.patch \
"${FILESDIR}"/${PN}-1.11.3-gtk-deprecated-warnings.patch \
"${FILESDIR}"/${PN}-1.99.0.1975-gcc_option.patch \
"${FILESDIR}"/${PN}-1.99.0.1975-sse4_2.patch \
"${FILESDIR}"/${PN}-1.99.0-qt5.patch
epatch_user
eautoreconf
}
src_configure() {
local myconf
# 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
# Enable wireshark binary with any supported GUI toolkit (bug #473188)
if use gtk3 || use qt4 || use qt5; then
myconf+=( "--enable-wireshark" )
else
myconf+=( "--disable-wireshark" )
fi
use qt4 && export QT_MIN_VERSION=4.6.0
use qt5 && export QT_MIN_VERSION=5.3.0
# 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
# --disable-profile-build bugs #215806, #292991, #479602
econf \
$(use_enable ipv6) \
$(use_with adns c-ares) \
$(use_with caps libcap) \
$(use_with crypt gcrypt) \
$(use_with geoip) \
$(use_with gtk3) \
$(use_with kerberos krb5) \
$(use_with lua) \
$(use_with pcap dumpcap-group wireshark) \
$(use_with pcap) \
$(use_with portaudio) \
$(use_with qt4) \
$(use_with qt5) \
$(usex qt5 MOC=/usr/$(get_libdir)/qt5/bin/moc '') \
$(usex qt5 UIC=/usr/$(get_libdir)/qt5/bin/uic '') \
$(use_with smi libsmi) \
$(use_with ssl gnutls) \
$(use_with zlib) \
$(usex netlink --with-libnl=3 --without-libnl) \
$(usex sse4_2 --enable-sse4_2 '') \
--disable-profile-build \
--disable-usr-local \
--disable-warnings-as-errors \
--sysconfdir="${EPREFIX}"/etc/wireshark \
--without-adns \
${myconf[@]}
}
src_compile() {
default
if use doc; then
use doc-pdf && addpredict "/root/.java"
emake -j1 -C docbook
fi
}
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 \
color.h \
config.h \
epan/*.h \
epan/crypt/*.h \
epan/dfilter/*.h \
epan/dissectors/*.h \
epan/ftypes/*.h \
epan/wmem/*.h \
register.h \
wiretap/*.h \
ws_symbol_export.h \
wsutil/*.h
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 gtk3 || use qt4; then
local c d
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
fi
if use gtk3; then
domenu wireshark.desktop
fi
if use qt4; then
sed -e '/Exec=/s|wireshark|&-qt|g' wireshark.desktop > wireshark-qt.desktop || die
domenu wireshark-qt.desktop
fi
prune_libtool_files
}
pkg_postinst() {
# Add group for users allowed to sniff.
enewgroup wireshark
if use pcap; then
fcaps -o 0 -g wireshark -m 4710 -M 0710 \
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."
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2014-10-24 21:31 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-10-24 21:30 [gentoo-commits] gentoo-x86 commit in net-analyzer/wireshark: wireshark-1.99.0-r1.ebuild ChangeLog Jeroen Roovers (jer)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox