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 0760D138350 for ; Fri, 17 Jan 2020 14:15:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0C45BE089D; Fri, 17 Jan 2020 14:15:13 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 D7194E089D for ; Fri, 17 Jan 2020 14:15:12 +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 CF02234E1BA for ; Fri, 17 Jan 2020 14:15:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0512890 for ; Fri, 17 Jan 2020 14:15:10 +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: <1579270508.964659308f26cfe4d6101ac6029e8fcd97aa2b0d.jer@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/wireshark/files/wireshark-2.4-androiddump.patch net-analyzer/wireshark/files/wireshark-99999999-androiddump-wsutil.patch X-VCS-Directories: net-analyzer/wireshark/files/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: 964659308f26cfe4d6101ac6029e8fcd97aa2b0d X-VCS-Branch: master Date: Fri, 17 Jan 2020 14:15:10 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 76b1aa90-5903-4c85-9ab8-9f260edd3cee X-Archives-Hash: 24b4da405499eb6485b29df9d4af3b60 commit: 964659308f26cfe4d6101ac6029e8fcd97aa2b0d Author: Jeroen Roovers gentoo org> AuthorDate: Fri Jan 17 13:59:12 2020 +0000 Commit: Jeroen Roovers gentoo org> CommitDate: Fri Jan 17 14:15:08 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96465930 net-analyzer/wireshark: Update patches Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Jeroen Roovers gentoo.org> net-analyzer/wireshark/files/wireshark-2.4-androiddump.patch | 8 ++++---- .../wireshark/files/wireshark-99999999-androiddump-wsutil.patch | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/net-analyzer/wireshark/files/wireshark-2.4-androiddump.patch b/net-analyzer/wireshark/files/wireshark-2.4-androiddump.patch index e67ab21b6a8..2272ef891c2 100644 --- a/net-analyzer/wireshark/files/wireshark-2.4-androiddump.patch +++ b/net-analyzer/wireshark/files/wireshark-2.4-androiddump.patch @@ -1,7 +1,7 @@ --- a/extcap/androiddump.c +++ b/extcap/androiddump.c -@@ -363,13 +363,13 @@ - pcap = pcap_open_dead_with_tstamp_precision(encap_ext, PACKET_LENGTH, PCAP_TSTAMP_PRECISION_NANO); +@@ -438,13 +438,13 @@ + pcap = pcap_open_dead_with_tstamp_precision(encap, PACKET_LENGTH, PCAP_TSTAMP_PRECISION_NANO); extcap_dumper.dumper.pcap = pcap_dump_open(pcap, fifo); if (!extcap_dumper.dumper.pcap) { - g_warning("Can't open %s for saving packets: %s", pcap_geterr(pcap)); @@ -15,8 +15,8 @@ + g_warning("Write to %s failed: %s", fifo, g_strerror(errno)); } #else - int err = 0; -@@ -416,7 +416,7 @@ + wtap_dump_params params = WTAP_DUMP_PARAMS_INIT; +@@ -480,7 +480,7 @@ pcap_dump((u_char *) extcap_dumper.dumper.pcap, &pcap_header, buffer); if (pcap_dump_flush(extcap_dumper.dumper.pcap) == -1) { diff --git a/net-analyzer/wireshark/files/wireshark-99999999-androiddump-wsutil.patch b/net-analyzer/wireshark/files/wireshark-99999999-androiddump-wsutil.patch index 9715de676f1..3d3a2a9c932 100644 --- a/net-analyzer/wireshark/files/wireshark-99999999-androiddump-wsutil.patch +++ b/net-analyzer/wireshark/files/wireshark-99999999-androiddump-wsutil.patch @@ -1,15 +1,15 @@ --- a/extcap/CMakeLists.txt +++ b/extcap/CMakeLists.txt -@@ -68,6 +68,8 @@ +@@ -91,6 +91,8 @@ if(BUILD_androiddump) if(HAVE_LIBPCAP) set(androiddump_LIBS ui + wiretap + wsutil ${GLIB2_LIBRARIES} - ${PCAP_LIBRARIES} - ) -@@ -78,6 +80,7 @@ + ${WIN_WS2_32_LIBRARY} + $<$:pcap::pcap> +@@ -102,6 +104,7 @@ if(BUILD_androiddump) set(androiddump_LIBS ui wiretap