diff --git a/90-wireshark-usbmon.rules b/90-wireshark-usbmon.rules
deleted file mode 100644
index 10a127c3a840695d46c13a891924ec132fc4c28e..0000000000000000000000000000000000000000
--- a/90-wireshark-usbmon.rules
+++ /dev/null
@@ -1 +0,0 @@
-SUBSYSTEM=="usbmon", GROUP="usbmon", MODE="640"
diff --git a/_constraints b/_constraints
deleted file mode 100644
index e8415de8e64dc275e327b1e3e5a276690e567f97..0000000000000000000000000000000000000000
--- a/_constraints
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
- 4.0
-
-
-
diff --git a/wireshark-0001-enable-Lua-support.patch b/wireshark-0001-enable-Lua-support.patch
deleted file mode 100644
index 6963c771e42a5989527af4255e31db0d56df069a..0000000000000000000000000000000000000000
--- a/wireshark-0001-enable-Lua-support.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-From: =?UTF-8?q?Radek=20Vok=C3=A1l?=
-Date: Tue, 15 Dec 2009 08:36:27 +0000
-Subject: [PATCH] enable Lua support
-
-
-diff --git a/epan/wslua/template-init.lua b/epan/wslua/template-init.lua
-index 3fe2aca..2b48f9b 100644
---- a/epan/wslua/template-init.lua
-+++ b/epan/wslua/template-init.lua
-@@ -41,7 +41,7 @@ if running_superuser then
- local disabled_lib = {}
- setmetatable(disabled_lib,{ __index = function() error("this package ".. hint) end } );
-
-- dofile = function() error("dofile " .. hint) end
-+-- dofile = function() error("dofile " .. hint) end
- loadfile = function() error("loadfile " .. hint) end
- loadlib = function() error("loadlib " .. hint) end
- require = function() error("require " .. hint) end
diff --git a/wireshark-0002-Customize-permission-denied-error.patch b/wireshark-0002-Customize-permission-denied-error.patch
deleted file mode 100644
index 9b3451ff8a4a965670c7deecf0432d080875d939..0000000000000000000000000000000000000000
--- a/wireshark-0002-Customize-permission-denied-error.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From: Jan Safranek
-Date: Fri, 26 Nov 2010 14:30:45 +0300
-Subject: [PATCH] Customize 'permission denied' error.
-
-Add Fedora-specific message to error output when dumpcap cannot be started
-because of permissions.
-
-Signed-off-by: Jan Safranek
-
-diff --git a/capchild/capture_sync.c b/capchild/capture_sync.c
-index 2f9d2cc..b18e47f 100644
---- a/capchild/capture_sync.c
-+++ b/capchild/capture_sync.c
-@@ -375,6 +375,7 @@ sync_pipe_start(capture_options *capture_opts, capture_session *cap_session, voi
- gchar *signal_pipe_name;
- #else
- char errmsg[1024+1];
-+ const char *securitymsg = "";
- int sync_pipe[2]; /* pipe used to send messages from child to parent */
- enum PIPES { PIPE_READ, PIPE_WRITE }; /* Constants 0 and 1 for PIPE_READ and PIPE_WRITE */
- #endif
-@@ -728,8 +729,11 @@ sync_pipe_start(capture_options *capture_opts, capture_session *cap_session, voi
- dup2(sync_pipe[PIPE_WRITE], 2);
- ws_close(sync_pipe[PIPE_READ]);
- execv(argv[0], argv);
-- g_snprintf(errmsg, sizeof errmsg, "Couldn't run %s in child process: %s",
-- argv[0], g_strerror(errno));
-+ if (errno == EPERM || errno == EACCES)
-+ securitymsg = "\nAre you a member of the 'wireshark' group? Try running\n'usermod -a -G wireshark _your_username_' as root.";
-+ g_snprintf(errmsg, sizeof errmsg, "Couldn't run %s in child process: %s%s",
-+ argv[0], g_strerror(errno), securitymsg);
-+
- sync_pipe_errmsg_to_parent(2, errmsg, "");
-
- /* Exit with "_exit()", so that we don't close the connection
-@@ -826,6 +830,7 @@ sync_pipe_open_command(char** argv, int *data_read_fd,
- int i;
- #else
- char errmsg[1024+1];
-+ const char *securitymsg = "";
- int sync_pipe[2]; /* pipe used to send messages from child to parent */
- int data_pipe[2]; /* pipe used to send data from child to parent */
- #endif
-@@ -1003,8 +1008,11 @@ sync_pipe_open_command(char** argv, int *data_read_fd,
- ws_close(sync_pipe[PIPE_READ]);
- ws_close(sync_pipe[PIPE_WRITE]);
- execv(argv[0], argv);
-- g_snprintf(errmsg, sizeof errmsg, "Couldn't run %s in child process: %s",
-- argv[0], g_strerror(errno));
-+ execv(argv[0], (gpointer)argv);
-+ if (errno == EPERM || errno == EACCES)
-+ securitymsg = "\nAre you a member of the 'wireshark' group? Try running\n'usermod -a -G wireshark _your_username_' as root.";
-+ g_snprintf(errmsg, sizeof errmsg, "Couldn't run %s in child process: %s%s",
-+ argv[0], g_strerror(errno), securitymsg);
- sync_pipe_errmsg_to_parent(2, errmsg, "");
-
- /* Exit with "_exit()", so that we don't close the connection
diff --git a/wireshark-0003-fix-string-overrun-in-plugins-profinet.patch b/wireshark-0003-fix-string-overrun-in-plugins-profinet.patch
deleted file mode 100644
index 8277a8c40ce7d777f7ec33cb734247a8fde79218..0000000000000000000000000000000000000000
--- a/wireshark-0003-fix-string-overrun-in-plugins-profinet.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-From: Peter Hatina
-Date: Wed, 4 Sep 2013 10:03:57 +0200
-Subject: [PATCH] fix string overrun in plugins/profinet
-
-
-diff --git a/plugins/epan/profinet/packet-dcom-cba.c b/plugins/epan/profinet/packet-dcom-cba.c
-index 0f1658a..f7fd322 100644
---- a/plugins/epan/profinet/packet-dcom-cba.c
-+++ b/plugins/epan/profinet/packet-dcom-cba.c
-@@ -555,7 +555,7 @@ dissect_ICBAPhysicalDevice_get_LogicalDevice_rqst(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, dcerpc_info *di, guint8 *drep)
- {
- guint32 u32Pointer;
-- gchar szStr[1000];
-+ gchar szStr[1000] = "";
- guint32 u32MaxStr = sizeof(szStr);
- gchar *call;
-
diff --git a/wireshark-0004-Restore-Fedora-specific-groups.patch b/wireshark-0004-Restore-Fedora-specific-groups.patch
deleted file mode 100644
index 2cdf2eaa06a52c50af6c6e6b896d08cb67e8e0c8..0000000000000000000000000000000000000000
--- a/wireshark-0004-Restore-Fedora-specific-groups.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-From: Peter Lemenkov
-Date: Fri, 13 Sep 2013 14:36:55 +0400
-Subject: [PATCH] Restore Fedora-specific groups
-
-Signed-off-by: Peter Lemenkov
-diff --git a/wireshark.desktop b/wireshark.desktop
-index 334db48..669c6f1 100644
---- a/wireshark.desktop
-+++ b/wireshark.desktop
-@@ -108,4 +108,4 @@ Terminal=false
- MimeType=application/vnd.tcpdump.pcap;application/x-pcapng;application/x-snoop;application/x-iptrace;application/x-lanalyzer;application/x-nettl;application/x-radcom;application/x-etherpeek;application/x-visualnetworks;application/x-netinstobserver;application/x-5view;application/x-tektronix-rf5;application/x-micropross-mplog;application/x-apple-packetlogger;application/x-endace-erf;application/ipfix;application/x-ixia-vwr;
- # Category entry according to:
- # http://standards.freedesktop.org/menu-spec/1.0/
--Categories=Network;Monitor;Qt;
-+Categories=Application;Network;Monitor;Qt;
diff --git a/wireshark-0005-Fix-paths-in-a-wireshark.desktop-file.patch b/wireshark-0005-Fix-paths-in-a-wireshark.desktop-file.patch
deleted file mode 100644
index a762194224117e0e7f8b0ffce735fa655e9bd448..0000000000000000000000000000000000000000
--- a/wireshark-0005-Fix-paths-in-a-wireshark.desktop-file.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Kenneth Soerensen
-Date: Wed, 29 Jan 2014 16:04:12 +0400
-Subject: [PATCH] Fix paths in a wireshark.desktop file
-
-
-diff --git a/wireshark.desktop b/wireshark.desktop
-index 669c6f1..f7df1f3 100644
---- a/wireshark.desktop
-+++ b/wireshark.desktop
-@@ -102,8 +102,8 @@ Comment[tr]=Ağ trafiği çözümleyicisi
- Comment[vi]=Trình phân tích giao thông mạng
- Comment[uk]=Аналізатор мережевого трафіку
- Icon=wireshark
--TryExec=wireshark
--Exec=wireshark %f
-+TryExec=/usr/bin/wireshark
-+Exec=/usr/bin/wireshark %f
- Terminal=false
- MimeType=application/vnd.tcpdump.pcap;application/x-pcapng;application/x-snoop;application/x-iptrace;application/x-lanalyzer;application/x-nettl;application/x-radcom;application/x-etherpeek;application/x-visualnetworks;application/x-netinstobserver;application/x-5view;application/x-tektronix-rf5;application/x-micropross-mplog;application/x-apple-packetlogger;application/x-endace-erf;application/ipfix;application/x-ixia-vwr;
- # Category entry according to:
diff --git a/wireshark.spec b/wireshark.spec
index 418f31d92cad7bc172adf73cf51aedbb6ff2e8e0..89fc14fa94ce524644f9943590513969967e3f41 100644
--- a/wireshark.spec
+++ b/wireshark.spec
@@ -7,14 +7,9 @@ License: GPL+
URL: http://www.wireshark.org/
Source0: https://wireshark.org/download/src/%{name}-%{version}.tar.xz
Source1: https://www.wireshark.org/download/src/all-versions/SIGNATURES-%{version}.txt
-Source2: 90-wireshark-usbmon.rules
-Patch0001: wireshark-0002-Customize-permission-denied-error.patch
-Patch0002: wireshark-0003-fix-string-overrun-in-plugins-profinet.patch
-Patch0003: wireshark-0004-Restore-Fedora-specific-groups.patch
-Patch0004: wireshark-0005-Fix-paths-in-a-wireshark.desktop-file.patch
-Patch0005: wireshark-0006-Move-tmp-to-var-tmp.patch
-Patch0006: wireshark-0007-cmakelists.patch
+Patch0001: wireshark-0006-Move-tmp-to-var-tmp.patch
+Patch0002: wireshark-0007-cmakelists.patch
Patch6000: wireshark-CVE-2018-16057.patch
Patch6001: wireshark-CVE-2018-16058.patch
@@ -103,7 +98,6 @@ install -m 644 epan/dissectors/*.h "${IDIR}/epan/dissectors"
install -m 644 epan/wmem/*.h "${IDIR}/epan/wmem"
install -m 644 wiretap/*.h "${IDIR}/wiretap"
install -m 644 wsutil/*.h "${IDIR}/wsutil"
-install -m 644 %{SOURCE2} %{buildroot}%{_udevrulesdir}
touch %{buildroot}%{_bindir}/%{name}
%delete_la
@@ -127,7 +121,6 @@ getent group usbmon >/dev/null || groupadd -r usbmon
%doc COPYING
%attr(0750, root, wireshark) %caps(cap_net_raw,cap_net_admin=ep) %{_bindir}/dumpcap
%{_bindir}/*
-%{_udevrulesdir}/90-wireshark-usbmon.rules
%{_libdir}/lib*.so.*
%{_libdir}/wireshark/extcap/*
%{_libdir}/wireshark/*.cmake