summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCoprDistGit <infra@openeuler.org>2023-10-18 01:26:46 +0000
committerCoprDistGit <infra@openeuler.org>2023-10-18 01:26:46 +0000
commitc18cfecf369ee2292787bd497d5d0b7cd7c513c7 (patch)
tree99e2a9739abad9139110231d1897d2db0b40c919
parent1b85b172b263015c286d96f9a9da6b4c657fac36 (diff)
automatic import of wiresharkopeneuler22.03_LTS_SP2
-rw-r--r--Fix-libvirt-build-fail.patch11
-rw-r--r--wireshark.spec28
2 files changed, 15 insertions, 24 deletions
diff --git a/Fix-libvirt-build-fail.patch b/Fix-libvirt-build-fail.patch
deleted file mode 100644
index 84c4204..0000000
--- a/Fix-libvirt-build-fail.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/wireshark.pc.in b/wireshark.pc.in
-index 5889178..e755614 100644
---- a/wireshark.pc.in
-+++ b/wireshark.pc.in
-@@ -10,5 +10,5 @@ Description: Network Packet Dissection Library
- Version: @VERSION@
-
- Requires: glib-2.0, gmodule-2.0, gthread-2.0
--Libs: -L${libdir} -lwireshark
-+Libs: -L${libdir} -lwireshark -lwsutil
- Cflags: -I${includedir}/wireshark
diff --git a/wireshark.spec b/wireshark.spec
index 3229782..665aa54 100644
--- a/wireshark.spec
+++ b/wireshark.spec
@@ -5,13 +5,13 @@
Summary: Network traffic analyzer
Name: wireshark
Version: 3.6.14
-Release: 5
+Release: 4
Epoch: 1
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
+Source1: https://www.wireshark.org/download/src/all-versions/SIGNATURES-%{version}.txt
Source2: 90-wireshark-usbmon.rules
Source3: wireshark.sysusers
@@ -28,7 +28,6 @@ Patch11: CVE-2023-4513-1.patch
Patch12: CVE-2023-4513-2.patch
Patch13: CVE-2023-4511.patch
Patch14: CVE-2023-5371.patch
-Patch15: Fix-libvirt-build-fail.patch
Requires: xdg-utils
Requires: hicolor-icon-theme
@@ -203,9 +202,6 @@ exit 0
%{_mandir}/man?/*
%changelog
-* Mon Oct 16 2023 zhengting <zhengting13@huawei.com> -1:3.6.15-5
-- Fix libvirt build fail problem
-
* Sat Oct 07 2023 wangkai <13474090681@163.com> - 1:3.6.14-4
- Fix CVE-2023-5371
@@ -230,17 +226,23 @@ exit 0
* Tue Feb 14 2023 liyuxiang<liyuxiang@ncti-gba.cn> - 1:3.6.11-1
- Update to 3.6.11
-* Wed Nov 09 2022 liyuxiang<liyuxiang@ncti-gba.cn> - 1:3.6.3-3
+* Wed Nov 09 2022 liyuxiang<liyuxiang@ncti-gba.cn> - 1:3.6.3-2
- fix CVE-2022-3725
-* Tue Sep 27 2022 liyuxiang<liyuxiang@ncti-gba.cn> - 1:3.6.3-2
-- fix CVE-2022-3190
-
-* Tue Apr 19 2022 wangkai <wangkai385@huawei.com> - 3.6.3-1
+* Wed Oct 26 2022 wangkai <wangkai385@h-partners.com> - 1:3.6.3-1
- Update to 3.6.3
-* Fri Apr 1 2022 yaoxin <yaoxin30@huawei.com> - 2.6.2-21
-- Fix CVE-2021-22191 CVE-2021-22207 CVE-2021-4181 CVE-2021-4185
+* Wed Mar 09 2022 wangkai <wangkai385@huawei.com> - 3.6.2-1
+- Update to 3.6.2 for fix CVE-2022-0581 CVE-2022-0582 CVE-2022-0583 CVE-2022-0585 CVE-2022-0586
+
+* Tue Feb 15 2022 xu_ping <xuping33n@huawei.com> - 3.6.0-3
+- fix install warning group wireshark does not exist -using root
+
+* Wed Jan 19 2022 Chen Chen <chen_aka_jan@163.com> - 3.6.0-2
+- fix update error for add wireshark-cli Provides&Obsoletes
+
+* Thu Dec 30 2021 Chen Chen <chen_aka_jan@163.com> - 3.6.0-1
+- Update to 3.6.0
* Tue Jul 27 2021 wangyue <wangyue92@huawei.com> - 2.6.2-20
- fix CVE-2019-12295