summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2020-11-16 06:10:41 +0000
committerSam James <sam@gentoo.org>2020-11-16 06:10:41 +0000
commitcf1f049003feaf74580f26c50ad6a91c35056d8e (patch)
tree7d9073402e04e2aff262e0f9659d8f15194a68c4 /net-analyzer/wireshark/files
parentdev-lang/duktape: fix UnnecessarySlashStrip (diff)
downloadgentoo-cf1f049003feaf74580f26c50ad6a91c35056d8e.tar.gz
gentoo-cf1f049003feaf74580f26c50ad6a91c35056d8e.tar.bz2
gentoo-cf1f049003feaf74580f26c50ad6a91c35056d8e.zip
net-analyzer/wireshark: security cleanup
Bug: https://bugs.gentoo.org/750692 Package-Manager: Portage-3.0.8, Repoman-3.0.2 Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'net-analyzer/wireshark/files')
-rw-r--r--net-analyzer/wireshark/files/wireshark-2.4-androiddump.patch27
-rw-r--r--net-analyzer/wireshark/files/wireshark-2.9.0-tfshark-libm.patch10
-rw-r--r--net-analyzer/wireshark/files/wireshark-99999999-androiddump-wsutil.patch19
-rw-r--r--net-analyzer/wireshark/files/wireshark-99999999-qtsvg.patch10
4 files changed, 0 insertions, 66 deletions
diff --git a/net-analyzer/wireshark/files/wireshark-2.4-androiddump.patch b/net-analyzer/wireshark/files/wireshark-2.4-androiddump.patch
deleted file mode 100644
index 2272ef891c2..00000000000
--- a/net-analyzer/wireshark/files/wireshark-2.4-androiddump.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/extcap/androiddump.c
-+++ b/extcap/androiddump.c
-@@ -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));
-+ g_warning("Can't open %s for saving packets: %s", fifo, pcap_geterr(pcap));
- pcap_close(pcap);
- exit(EXIT_CODE_CANNOT_SAVE_LIBPCAP_DUMP);
- }
- extcap_dumper.encap = encap;
- if (pcap_dump_flush(extcap_dumper.dumper.pcap) == -1) {
-- g_warning("Write to %s failed: %s", g_strerror(errno));
-+ g_warning("Write to %s failed: %s", fifo, g_strerror(errno));
- }
- #else
- 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) {
-- g_warning("Write to %s failed: %s", g_strerror(errno));
-+ g_warning("Write to %s failed: %s", fifo, g_strerror(errno));
- }
- #else
- int err = 0;
diff --git a/net-analyzer/wireshark/files/wireshark-2.9.0-tfshark-libm.patch b/net-analyzer/wireshark/files/wireshark-2.9.0-tfshark-libm.patch
deleted file mode 100644
index 40082c43501..00000000000
--- a/net-analyzer/wireshark/files/wireshark-2.9.0-tfshark-libm.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -2314,6 +2314,7 @@
-
- if(BUILD_tfshark)
- set(tfshark_LIBS
-+ m
- ui
- wiretap
- epan
diff --git a/net-analyzer/wireshark/files/wireshark-99999999-androiddump-wsutil.patch b/net-analyzer/wireshark/files/wireshark-99999999-androiddump-wsutil.patch
deleted file mode 100644
index 3d3a2a9c932..00000000000
--- a/net-analyzer/wireshark/files/wireshark-99999999-androiddump-wsutil.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/extcap/CMakeLists.txt
-+++ b/extcap/CMakeLists.txt
-@@ -91,6 +91,8 @@ if(BUILD_androiddump)
- if(HAVE_LIBPCAP)
- set(androiddump_LIBS
- ui
-+ wiretap
-+ wsutil
- ${GLIB2_LIBRARIES}
- ${WIN_WS2_32_LIBRARY}
- $<$<BOOL:${PCAP_FOUND}>:pcap::pcap>
-@@ -102,6 +104,7 @@ if(BUILD_androiddump)
- set(androiddump_LIBS
- ui
- wiretap
-+ wsutil
- ${GLIB2_LIBRARIES}
- ${ZLIB_LIBRARIES}
- ${CMAKE_DL_LIBS}
diff --git a/net-analyzer/wireshark/files/wireshark-99999999-qtsvg.patch b/net-analyzer/wireshark/files/wireshark-99999999-qtsvg.patch
deleted file mode 100644
index 8cff4bdd075..00000000000
--- a/net-analyzer/wireshark/files/wireshark-99999999-qtsvg.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1058,7 +1058,6 @@
- Qt5LinguistTools
- Qt5Multimedia
- Qt5PrintSupport
-- Qt5Svg
- Qt5Widgets
- )
- if(APPLE)