Mergbe fix.

Merge branch 'f31' into f30
Merge branch 'f32' into f31
2020-04-13 11:21:21 -05:00 · 2020-04-13 11:20:18 -05:00 · 2020-04-13 11:19:16 -05:00 · 2020-04-13 11:18:02 -05:00 · 2020-04-06 14:58:41 +02:00 · 2020-04-06 14:56:50 +02:00
1 changed files with 6 additions and 0 deletions
--- a/wireshark.spec
+++ b/wireshark.spec
@ -77,6 +77,8 @@ Buildrequires: cmake
 #needed for sdjournal external capture interface
 BuildRequires: systemd-devel
 BuildRequires: libnghttp2-devel
+#needed for sdjournal external capture interface
+BuildRequires: systemd-devel

 Obsoletes: wireshark-qt, wireshark-gtk

@ -133,6 +135,7 @@ and plugins.
  -DENABLE_PLUGINS=ON \
  -DENABLE_NETLINK=ON \
  -DBUILD_dcerpcidl2wrs=OFF \
+  -DENABLE_sdjournal=ON \
  -DBUILD_sdjournal=ON \
  .

@ -278,9 +281,12 @@ getent group usbmon >/dev/null || groupadd -r usbmon
 - New version 3.0.3
 - Fixes CVE-2019-13619

+<<<<<<< HEAD
+=======
 * Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.0.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

+>>>>>>> f31
 * Tue Apr 09 2019 Michal Ruprich <mruprich@redhat.com> - 1:3.0.1-1
 - New version 3.0.1
 - Fixes CVE-2019-10894, CVE-2019-10895, CVE-2019-10896, CVE-2019-10897, CVE-2019-10898, CVE-2019-10899, CVE-2019-10900, CVE-2019-10901, CVE-2019-10902, CVE-2019-10903
Author	SHA1	Message	Date
Gwyn Ciesla	52f9c0b447	Mergbe fix.	2020-04-13 11:21:21 -05:00
Gwyn Ciesla	a018f82fca	Merge branch 'f31' into f30	2020-04-13 11:20:18 -05:00
Gwyn Ciesla	06d5d008d1	Merge branch 'f32' into f31	2020-04-13 11:19:16 -05:00
Gwyn Ciesla	aa73d093f7	Merge branch 'master' into f32	2020-04-13 11:18:02 -05:00
Michal Ruprich	13b2d1d820	New version 3.2.2	2020-04-06 14:58:41 +02:00
Michal Ruprich	67f641e2d7	New version 3.2.2	2020-04-06 14:56:50 +02:00
Michal Ruprich	14c3a4d978	New version 3.2.2	2020-04-06 14:55:04 +02:00
Michal Ruprich	9b5f44075f	Changing version of plugins for build	2019-12-19 10:14:28 +01:00
Michal Ruprich	586fed2c4a	New version 3.2.0	2019-12-19 10:03:19 +01:00
Michal Ruprich	6eb8802f02	New version 3.2.0	2019-12-19 10:00:43 +01:00
Michal Ruprich	fdb1e794f8	New version 3.0.5	2019-10-30 14:55:52 +01:00
Michal Ruprich	7d61567722	New version 3.0.5	2019-10-30 13:36:23 +01:00
Michal Ruprich	5db0d81732	New version 3.0.3 Fixes CVE-2019-13619	2019-08-20 14:10:53 +02:00
Michal Ruprich	3e85601c1c	New version 3.0.3 Fixes CVE-2019-13619	2019-08-20 14:08:21 +02:00
Michal Ruprich	ba2ce0a5e8	New version 3.0.1 Fixes CVE-2019-10894, CVE-2019-10895, CVE-2019-10896, CVE-2019-10897, CVE-2019-10898, CVE-2019-10899, CVE-2019-10900, CVE-2019-10901, CVE-2019-10902, CVE-2019-10903	2019-04-09 10:35:16 +02:00
Michal Ruprich	a1462cae0f	New version 3.0.0	2019-03-11 17:03:39 +01:00