From 5759920a852b499dc4b7e7969422772bc5c10da3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= <tim@siosm.fr>
Date: Mon, 6 Sep 2021 16:41:11 +0200
Subject: [PATCH] Use systemd sysusers config to greate groups

See: https://docs.fedoraproject.org/en-US/packaging-guidelines/UsersAndGroups/#_dynamic_allocation
---
 wireshark.spec     | 12 +++++++++---
 wireshark.sysusers |  2 ++
 2 files changed, 11 insertions(+), 3 deletions(-)
 create mode 100644 wireshark.sysusers

diff --git a/wireshark.spec b/wireshark.spec
index 2bf7e56..2d605f2 100644
--- a/wireshark.spec
+++ b/wireshark.spec
@@ -8,7 +8,7 @@
 Summary:	Network traffic analyzer
 Name:		wireshark
 Version:	3.4.8
-Release:	1%{?dist}
+Release:	2%{?dist}
 Epoch:		1
 License:	GPL+
 Url:		http://www.wireshark.org/
@@ -16,6 +16,7 @@ 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
+Source3:	wireshark.sysusers
 
 # Fedora-specific
 Patch2:		wireshark-0002-Customize-permission-denied-error.patch
@@ -82,6 +83,7 @@ Buildrequires: cmake
 #needed for sdjournal external capture interface
 BuildRequires: systemd-devel
 BuildRequires: libnghttp2-devel
+BuildRequires: systemd-rpm-macros
 
 Obsoletes: wireshark-qt, wireshark-gtk
 
@@ -173,6 +175,7 @@ install -m 644 wiretap/*.h		"${IDIR}/wiretap"
 install -m 644 wsutil/*.h		"${IDIR}/wsutil"
 install -m 644 ws_diag_control.h	"${IDIR}/"
 install -m 644 %{SOURCE2}		%{buildroot}%{_udevrulesdir}
+install -Dpm 644 %{SOURCE3}		%{buildroot}%{_sysusersdir}/%{name}.conf
 
 touch %{buildroot}%{_bindir}/%{name}
 
@@ -180,8 +183,7 @@ touch %{buildroot}%{_bindir}/%{name}
 find %{buildroot} -type f -name "*.la" -delete
 
 %pre cli
-getent group wireshark >/dev/null || groupadd -r wireshark
-getent group usbmon >/dev/null || groupadd -r usbmon
+%sysusers_create_compat %{SOURCE3}
 
 %post cli
 %{?ldconfig}
@@ -201,6 +203,7 @@ fi
 %{_datadir}/mime/packages/wireshark.xml
 %{_bindir}/wireshark
 %{_mandir}/man1/wireshark.*
+%{_sysusersdir}/%{name}.conf
 
 %files cli
 %license COPYING
@@ -274,6 +277,9 @@ fi
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Mon Sep 06 2021 Timothée Ravier <tim@siosm.fr> - 1:3.4.8-2
+- Use system sysusers config to create groups
+
 * Tue Aug 31 2021 Michal Ruprich <mruprich@redhat.com> - 1:3.4.8-1
 - New version 3.4.8
 
diff --git a/wireshark.sysusers b/wireshark.sysusers
new file mode 100644
index 0000000..b035d11
--- /dev/null
+++ b/wireshark.sysusers
@@ -0,0 +1,2 @@
+g wireshark - -
+g usbmon    - -