wireshark: delete some patches

This commit is contained in:
Grooooot 2020-01-15 21:21:50 +08:00
parent 5009965545
commit c7715c8fad
3 changed files with 2 additions and 33 deletions

View File

@ -1,6 +0,0 @@
<constraints>
<linux><version>
<min>4.0</min>
</version></linux>
</constraints>

View File

@ -1,18 +0,0 @@
From: =?UTF-8?q?Radek=20Vok=C3=A1l?= <rvokal@fedoraproject.org>
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

View File

@ -7,14 +7,9 @@ License: GPL+
URL: http://www.wireshark.org/ URL: http://www.wireshark.org/
Source0: https://wireshark.org/download/src/%{name}-%{version}.tar.xz Source0: https://wireshark.org/download/src/%{name}-%{version}.tar.xz
Source1: https://www.wireshark.org/download/src/all-versions/SIGNATURES-%{version}.txt 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 Patch0001: wireshark-0006-Move-tmp-to-var-tmp.patch
Patch0002: wireshark-0003-fix-string-overrun-in-plugins-profinet.patch Patch0002: wireshark-0007-cmakelists.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
Patch6000: wireshark-CVE-2018-16057.patch Patch6000: wireshark-CVE-2018-16057.patch
Patch6001: wireshark-CVE-2018-16058.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 epan/wmem/*.h "${IDIR}/epan/wmem"
install -m 644 wiretap/*.h "${IDIR}/wiretap" install -m 644 wiretap/*.h "${IDIR}/wiretap"
install -m 644 wsutil/*.h "${IDIR}/wsutil" install -m 644 wsutil/*.h "${IDIR}/wsutil"
install -m 644 %{SOURCE2} %{buildroot}%{_udevrulesdir}
touch %{buildroot}%{_bindir}/%{name} touch %{buildroot}%{_bindir}/%{name}
%delete_la %delete_la
@ -127,7 +121,6 @@ getent group usbmon >/dev/null || groupadd -r usbmon
%doc COPYING %doc COPYING
%attr(0750, root, wireshark) %caps(cap_net_raw,cap_net_admin=ep) %{_bindir}/dumpcap %attr(0750, root, wireshark) %caps(cap_net_raw,cap_net_admin=ep) %{_bindir}/dumpcap
%{_bindir}/* %{_bindir}/*
%{_udevrulesdir}/90-wireshark-usbmon.rules
%{_libdir}/lib*.so.* %{_libdir}/lib*.so.*
%{_libdir}/wireshark/extcap/* %{_libdir}/wireshark/extcap/*
%{_libdir}/wireshark/*.cmake %{_libdir}/wireshark/*.cmake