From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 30A4C139082 for ; Mon, 27 Nov 2017 07:52:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3384EE08C3; Mon, 27 Nov 2017 07:52:51 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 018BFE08C3 for ; Mon, 27 Nov 2017 07:52:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 257C933BE19 for ; Mon, 27 Nov 2017 07:52:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B1061A90B for ; Mon, 27 Nov 2017 07:52:47 +0000 (UTC) From: "Jeroen Roovers" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" Message-ID: <1511769165.5f1fdf39a7d536af29a578d167a44cc50d8544c2.jer@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/, net-analyzer/wireshark/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/wireshark/Manifest net-analyzer/wireshark/files/wireshark-99999999-androiddump.patch net-analyzer/wireshark/wireshark-99999999.ebuild X-VCS-Directories: net-analyzer/wireshark/ net-analyzer/wireshark/files/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: 5f1fdf39a7d536af29a578d167a44cc50d8544c2 X-VCS-Branch: master Date: Mon, 27 Nov 2017 07:52:47 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 0249b166-229a-4f0e-9e89-3be80c68d4e0 X-Archives-Hash: 15a060716a52598d34735cee3d565b59 commit: 5f1fdf39a7d536af29a578d167a44cc50d8544c2 Author: Jeroen Roovers gentoo org> AuthorDate: Mon Nov 27 07:52:28 2017 +0000 Commit: Jeroen Roovers gentoo org> CommitDate: Mon Nov 27 07:52:45 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f1fdf39 net-analyzer/wireshark: Fix header install (bug #638866 by Garri), configure options, androiddump patch. Package-Manager: Portage-2.3.16, Repoman-2.3.6 net-analyzer/wireshark/Manifest | 4 ++-- net-analyzer/wireshark/files/wireshark-99999999-androiddump.patch | 6 +++--- net-analyzer/wireshark/wireshark-99999999.ebuild | 6 +----- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest index c15d386eaf9..8be664a29b2 100644 --- a/net-analyzer/wireshark/Manifest +++ b/net-analyzer/wireshark/Manifest @@ -1,2 +1,2 @@ -DIST wireshark-2.2.7.tar.bz2 32309420 SHA256 689ddf62221b152779d8846ab5b2063cc7fd41ec1a9f04eefab09b5d5486dbb5 SHA512 417836810eb895b3f2a6ac1cfd138fb0275382ea2edc60fc5f5e5f8ce433b56b8120aa8b58b4f77296986630fdf49e4c5c3859b2c2c5e26b1ce0651393b7d716 WHIRLPOOL 0361821da9c113a8de1339cc48cae0291be84bcffb1ba34b1fc3f457b22525329e954a2060f7eef25bca550d0ccdaf4a9e9587d35394b0abd9b0d38bc6023e44 -DIST wireshark-2.4.2.tar.xz 28791712 SHA256 d1acb24735fd35e18e9b7a0555ec58277c2b87da45a19ebeb8087c3dda55f47d SHA512 212964482a1e45af490ef78b3f2465384f84c007a76c3a99e8de0e2c37d933fb34b0da5631f4a36ca12d2fa7cc4376d3d405cbe7f7113791ea09dba7e5915417 WHIRLPOOL 245454643e138c61ccb380ae236482fea702cf4c0507de1c1d3d6dc9f7312809533db7b0fba585f95b8caf5b76affa4da23ad263b8f95174dfbb9c2ee3300177 +DIST wireshark-2.2.7.tar.bz2 32309420 BLAKE2B a4ec32fab15235c5bde9f03ceafc5760055a769dd40d96526a18ad16d5642e957f620fc58f42c3323745bd679d6ef7b006283e7b9ddc52ddadc2680789d957ea SHA512 417836810eb895b3f2a6ac1cfd138fb0275382ea2edc60fc5f5e5f8ce433b56b8120aa8b58b4f77296986630fdf49e4c5c3859b2c2c5e26b1ce0651393b7d716 +DIST wireshark-2.4.2.tar.xz 28791712 BLAKE2B 64a965f522478e2e5690a4439554764bd341c0b8017003af4b0d328094cf56a72462df9dfdb9c9318e4bfc1fe57e4caedc43e0d0c18c704c8342dbb3baa36d91 SHA512 212964482a1e45af490ef78b3f2465384f84c007a76c3a99e8de0e2c37d933fb34b0da5631f4a36ca12d2fa7cc4376d3d405cbe7f7113791ea09dba7e5915417 diff --git a/net-analyzer/wireshark/files/wireshark-99999999-androiddump.patch b/net-analyzer/wireshark/files/wireshark-99999999-androiddump.patch index 124a9b8b00b..db1c560848e 100644 --- a/net-analyzer/wireshark/files/wireshark-99999999-androiddump.patch +++ b/net-analyzer/wireshark/files/wireshark-99999999-androiddump.patch @@ -1,10 +1,10 @@ --- a/extcap/Makefile.am +++ b/extcap/Makefile.am -@@ -49,6 +49,7 @@ - androiddump_LDADD = \ +@@ -32,6 +32,7 @@ + ../ui/libui.a \ ../wiretap/libwiretap.la \ ../wsutil/libwsutil.la \ + @PCAP_LIBS@ \ @GLIB_LIBS@ - if ENABLE_STATIC + randpktdump_SOURCES = \ diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild index 5d11c1bd60e..f8b854c9dc0 100644 --- a/net-analyzer/wireshark/wireshark-99999999.ebuild +++ b/net-analyzer/wireshark/wireshark-99999999.ebuild @@ -146,8 +146,6 @@ src_configure() { 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 androiddump && use pcap && echo --enable-androiddump-use-libpcap=yes) \ $(use dumpcap && use_with pcap dumpcap-group wireshark) \ @@ -173,7 +171,7 @@ src_configure() { $(use_with geoip) \ $(use_with gtk gtk 3) \ $(use_with kerberos krb5) \ - $(use_with libssh ssh) \ + $(use_with libssh) \ $(use_with libxml2) \ $(use_with lua) \ $(use_with nghttp2) \ @@ -192,7 +190,6 @@ src_configure() { $(usex qt5 MOC=$(qt5_get_bindir)/moc '') \ $(usex qt5 RCC=$(qt5_get_bindir)/rcc '') \ $(usex qt5 UIC=$(qt5_get_bindir)/uic '') \ - --disable-profile-build \ --disable-warnings-as-errors \ --sysconfdir="${EPREFIX}"/etc/wireshark \ ${myconf[@]} @@ -236,7 +233,6 @@ src_install() { epan/dissectors/*.h \ epan/ftypes/*.h \ epan/wmem/*.h \ - register.h \ wiretap/*.h \ ws_diag_control.h \ ws_symbol_export.h \