Old.
authorJeroen Roovers <jer@gentoo.org>
Wed, 3 Dec 2014 10:01:15 +0000 (10:01 +0000)
committerJeroen Roovers <jer@gentoo.org>
Wed, 3 Dec 2014 10:01:15 +0000 (10:01 +0000)
Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

net-analyzer/wireshark/ChangeLog
net-analyzer/wireshark/Manifest
net-analyzer/wireshark/wireshark-1.12.1.ebuild [deleted file]

index 2b824a9fd3a9afc5b54deda320452a2c76d9fffe..4e66cfe97bf45b2a98376f147e5a7de1e8d21796 100644 (file)
@@ -1,6 +1,9 @@
 # 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.676 2014/12/03 09:56:53 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.677 2014/12/03 10:01:14 jer Exp $
+
+  03 Dec 2014; Jeroen Roovers <jer@gentoo.org> -wireshark-1.12.1.ebuild:
+  Old.
 
   03 Dec 2014; Agostino Sarubbo <ago@gentoo.org> wireshark-1.12.2.ebuild:
   Stable for ppc, wrt bug #529100
index ce84ce23d127ba0a75ba0c8e5d61db26ae9089f6..e2396d3300d6f908cb2c09081a1dc33304dd01cf 100644 (file)
@@ -7,29 +7,17 @@ AUX wireshark-1.6.13-ldflags.patch 230 SHA256 bb56440fb9de9ed480b992d202feac93a5
 AUX wireshark-1.99.0-qt5.patch 2757 SHA256 79621949e1b0d99229e1a033b58f7a2c18cfb1afa0e4868d1ae91b7f372ced8f SHA512 e3e660db8711985e2522bd2e1fea7833781ce8b7d5e00489d50141ea9c3a1ee41105d5cdd48750fbee4437a5607ec7161c1f5a6cf40ea938ef16975183b28078 WHIRLPOOL e40f53957c9cb2f54cb2f1abb768c75e73cc7d5e26dd41613c9d0519306bdbd669d4712f5e4006a6369f80e97da6e47355936dc4d3320eb02b6902952e19d97d
 AUX wireshark-1.99.0.1975-gcc_option.patch 2939 SHA256 4d534da5b4a45f311a622108a0a4313d1581925a8cdf35d8429d5f46baab0963 SHA512 a48204408b05cd61ee9e1beb36dcb4d11b49bdb150c13fbdf490f9bb4a14fee3fc5113c501c03e294a944ae3fb36ad9d37a406eeb09ea87e02f2ce44ab6b6568 WHIRLPOOL 0c7d944840a93931fc95d5deb53e45b3e43e6129d9af51a9ac53c1a0f190b202c02b9abf89b04e863f3d803a52d91c5496cf357cb3e5bd244a49c0fa7c56e8b0
 AUX wireshark-1.99.0.1975-sse4_2.patch 555 SHA256 bef93463a257b6154cf55f85e7860b373264e2a89f212f6db773ad02f3a6bedf SHA512 5086b36ecf9b1dd3292011602c8824a572dc759a0e35049a39f0da8045a93738a8f2c2b4c053a0f1d999dc8cdb7bfec3b33f2780d8795135dd65984355485578 WHIRLPOOL 55301e3ff688fbe7df405d40dd8a6e942d1613ee0e4543f46fa83ac6f0688170753fe1cfc67bbe00b9bd7a46cf73513530cc746ee29ba7845e3a45d12ed07743
-DIST wireshark-1.12.1.tar.bz2 29059989 SHA256 82b26bd416ec15903b27785e35a622687008a743342054e96eaaeaa249be584b SHA512 840f348c8cdaa0e4d96c34e0a752f3d575d975ac8e61b31f6456a0eba4b484268651c96b943cfe213a6c40edcb18670ec921564413c052fcafdf32b2c8523929 WHIRLPOOL f98131bde6680370943cf6070cb44c6ad96d42060573e521051b81ad9d934b03741bb4d75a1d30762eebf5f22387f9eb7158acee4caee2503c4eafff52a12ada
 DIST wireshark-1.12.2.tar.bz2 29138867 SHA256 30ae16b408a592642ce3a84dd9877d24df7a6dae8da4847486965190039df292 SHA512 b46f50bc6f748df37c6e35b542b5e813b805d04605a3f8b8f7baf61095597ff6f7eacc25c1f15f1e115c75866489c30c2c3bd9b0be10fdf03fcaa3e9e62cec94 WHIRLPOOL 4b208e81c1680fbe9c4dcdb566b5f80f271cf96e14b1eac66ba95fd48578f34d954e13d12b748f4b8530ca03894fe588b36f944e4f07f17b57d5c4908bdd81a7
 DIST wireshark-1.99.0.tar.bz2 29782811 SHA256 9454180264c288c0ae03dfc3856310e319acf29f7b2e8a8ea2fd91665b606364 SHA512 021d4adfe8a6a326def81daa79ede1fea8a214f6d9f9c3f1cb008a36e82fe42655cc6c6f4de2a425181e03e61f3dba5cad2ebb11605d29f4bbc0623f66f0d3db WHIRLPOOL 04e22741d28b4576bfceb1c0507fd8cce7b7781999245e1cc8cd1ae2063f62fa518c007f42826a445acf99f18c61b7b9f3deb67629438e7e3c9276d2282a5793
-EBUILD wireshark-1.12.1.ebuild 5610 SHA256 ea618d3154bc15ae0f14c81c22e0599919e4a2aa7f165ae72da6a03d9e8f4688 SHA512 f452d8cda0c6c827f0c0d556bdc93f219f75ca581af8b48db0b63d31128363ca3bbb3e65b7916b923cff73fc0f15f36b8295df2e41e70328561de3e3e44b9a79 WHIRLPOOL 608c1cf29a0efe9c17f6e919f4f6a94e549f7f2783eea65c9ebc514e97eb7fb421d87d6b1ad95ae66c9b04225b497d538ad6a16848cc406f01989b7cfe5cb5d6
 EBUILD wireshark-1.12.2.ebuild 5978 SHA256 aecd0a2d39acd3c8cb1272569f4f030dfbc6a520e80c66ccf818d1a2f2505e98 SHA512 c5d8be585e7fe67f3b6e88fef340d589d96ac70fa1686237ea593d2f61397b4360f0366271279be45bffb8c88ce100ca1e17f65aa1edc3231b6a31a7b88d0808 WHIRLPOOL e471778ccd0e54e2c39152966e28fb5d22940f79db9ac4cbfefbc802f83c7c4df18ecc1f13a6eeb10aa6305bef4076d33e3afc79c61824d54f09a3740c5623e3
 EBUILD wireshark-1.99.0-r1.ebuild 6071 SHA256 39f3ef6db644a39416211fc138ef7272e01c5aef0a36a32ca6b89430ac355c4e SHA512 a9e45c83218de4a0f033783183971e1ba014724e9df9fc51c55b6be3c39907a781a155433489124b02a4f57c16810a0121a4a9fa6d63bd7fd6f1245b151d1960 WHIRLPOOL 9fab95db580184050cd82c93bf52e6584fa4561d495fbe1d95ce631893e37ec713606f835caa8c1e6f9b03fc20347b287495727d21307b0aa51cf3ddf9977033
 EBUILD wireshark-99999999.ebuild 6114 SHA256 5aad3e002e08c37e4c4555474ca8d827ff08e749edf153f245750b73741354c3 SHA512 31f918b0c4b4839e09088204724d8359d3bc62cd86eb1f7c93a38cde0b6467d129f301e05c7edc50cf462a839fa37c573c8efe29a91116af05fce18922c0df52 WHIRLPOOL c73b5725c3656fb3b2bd0f0291830a1680797a2fca76c909f8ac3679dbea688260c8d8d97eabeb9568c30060fb91b1fe9f636462f6b8fde373f84a32dc833d26
-MISC ChangeLog 98826 SHA256 921fa815ad55d57490dd566a5a28f9ba8a01b71679008904f8282e572572e392 SHA512 928c8f03d1bedd865692387e58285f6e28722b94362832a9e3e581c92b7139b92453e54a79353e1761029e4007706df85ee1040c201fb8f0a8ab63f207cb27b7 WHIRLPOOL da79c206dd323832a530e40469b21a157300cad79e775f2fbddf8bda99a39f4b73edb2e0bccc8e4cc84987365f6a951bf30392127e2cbe47a73b615ed0965298
+MISC ChangeLog 98907 SHA256 790e5e5c41a4649964a87acf5af3965aed62e6a5efee1ae8d6cebf41a9374b9e SHA512 65ba3225fa1f9eb477d6605a6a44f53b7e5cc2925772fdeb2bfaf0123368c419d14ebeda5b852d1662b6f1860355c23cd3d3e8c9c0cb0bd97277931b4c82eb71 WHIRLPOOL 5970e88a77c43f0bf950c55b7cb1aa8943d5f2dc8be368aefd88bd36dd6fc5e5603422a2527ae3411d3bf420d9b9d6181c1c9a4ab35c8ad81a53c4c63953552b
 MISC metadata.xml 2460 SHA256 c764e8b164a3c24ee43cbbd46f3ce01b4015da62e9d29b1117868a3644497dc5 SHA512 f957bb3ce85ede2c8944581e116160fb601c1dddcc7cfdfa9b6a39fe5c9c7e51afe686369681a31ebc231a46aac33be5223730b1143f1895deb7569a606f2fd2 WHIRLPOOL 57259e5c67ec9d2dfd7ae69f17146a514915e4f3d0031eaebbdd9640f4b11ad9df25de71f223cf4df044bfa749a148ee5069faf790060761d800476e56619f26
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUft5mAAoJELp701BxlEWfdK8P/1B3zIw2YX4xXDIKl/0kPHxk
-ZaN64GeDTFocL7hXGBox81mwufFn0np9iGPx25CtYoxPiv9JqymwP9H6jnh69iZI
-kXRlLGqkOsFxSizueiciS7887UXjRw1ZzWLe6RQoTmbRLqX0UhOlqUjurw4DSZ5G
-whMoyzJONkG4swX2mkhoireTp00bkfucxFZqeF63y0yDjvnNN3wpOplhm1UW4540
-mtv+f69JThxmhEKdzQkpuj2289pATajmpEm1rUKdcVJXNtzZ3gicXGzFhYYr6Bjz
-93wxz7QXhIudoTPso0g4vXvi2hg9lPvj5uOBBugJEQhB3MAgQqJa76LJ35Ga79ir
-vPTlHS7Ot6b8QiFCWwQXq8w92aZeY6iCQy7ZisKwWrEXlIdvTIMDpkv6LBt5r8Pw
-SycN93WcbIGTTnl5p+juKV+wheslChO33IkTAnll6CnWG5rSLOSF5J9TSKoi0JTu
-KHn0X4ZAImhFMpdH+RiSauVrYaDCtX1gjFfyh6OCiEzEoz7RKKYERto7WuBpkb+o
-nMb4bWm1EcVCQ/UejCTRJ2hfj5F6ZJoQHVS//c+6P9fShdfb2fCg605DsutObzWZ
-kdMRww8ikVIuaa4u3f7/XgBi719B5+zvUhbZ2Kv6JBs8sR5fig//9bWbpn2Rb4AQ
-Q9bIhZpZQ0d4PKy1/qKh
-=jX6W
+iEYEAREIAAYFAlR+32sACgkQVWmRsqeSphOlOACfS1V1ZxWfHcgqkW0EdqK8mNOJ
+YkIAn22EZHLGa8d2+4tUMx4xqY9KjXPd
+=9LBB
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/wireshark/wireshark-1.12.1.ebuild b/net-analyzer/wireshark/wireshark-1.12.1.ebuild
deleted file mode 100644 (file)
index da70d4e..0000000
+++ /dev/null
@@ -1,228 +0,0 @@
-# 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.12.1.ebuild,v 1.14 2014/11/11 10:21:06 jer Exp $
-
-EAPI=5
-inherit autotools eutils fcaps 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="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="
-       adns +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua +netlink +pcap
-       portaudio +qt4 selinux smi ssl zlib
-"
-REQUIRED_USE="
-       ssl? ( crypt )
-"
-
-GTK_COMMON_DEPEND="
-       x11-libs/gdk-pixbuf
-       x11-libs/pango
-       x11-misc/xdg-utils
-       virtual/freedesktop-icon-theme
-"
-CDEPEND="
-       >=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[accessibility]
-               x11-misc/xdg-utils
-               )
-       smi? ( net-libs/libsmi )
-       ssl? ( net-libs/gnutls )
-       zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 )
-"
-
-# We need perl for `pod2html`.  The rest of the perl stuff is to block older
-# and broken installs. #455122
-DEPEND="
-       ${CDEPEND}
-       dev-lang/perl
-       !<virtual/perl-Pod-Simple-3.170
-       !<perl-core/Pod-Simple-3.170
-       doc? (
-               app-doc/doxygen
-               app-text/asciidoc
-               dev-libs/libxml2
-               dev-libs/libxslt
-               doc-pdf? ( dev-java/fop )
-               www-client/lynx
-       )
-       sys-devel/bison
-       sys-devel/flex
-       virtual/pkgconfig
-"
-RDEPEND="
-       ${CDEPEND}
-       selinux? ( sec-policy/selinux-wireshark )
-"
-
-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
-
-       # Qt5 support is broken since the build system does not determine
-       # properly which `moc' it ought to use
-       sed -i -e 's|Qt5||g' acinclude.m4 || die
-
-       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 ; then
-               myconf+=( "--enable-wireshark" )
-       else
-               myconf+=( "--disable-wireshark" )
-       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
-       # --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 qt) \
-               $(use_with smi libsmi) \
-               $(use_with ssl gnutls) \
-               $(use_with zlib) \
-               $(usex netlink --with-libnl=3 --without-libnl) \
-               --disable-profile-build \
-               --disable-usr-local \
-               --sysconfdir="${EPREFIX}"/etc/wireshark \
-               --without-adns \
-               ${myconf[@]}
-}
-
-src_compile() {
-       default
-       use doc && emake -j1 -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 \
-               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."
-}