rpms/wireshark
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Use systemd sysusers config to greate groups

Browse Source 
See: https://docs.fedoraproject.org/en-US/packaging-guidelines/UsersAndGroups/#_dynamic_allocation
This commit is contained in:
Timothée Ravier 2021-09-06 16:41:11 +02:00
parent d08cc9725c
commit 5759920a85
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
wireshark.spec
View File

@ -8,7 +8,7 @@
Summary: Network traffic analyzer Summary: Network traffic analyzer
Name: wireshark Name: wireshark
Version: 3.4.8 Version: 3.4.8
Release: 1%{?dist} Release: 2%{?dist}
Epoch: 1 Epoch: 1
License: GPL+ License: GPL+
Url: http://www.wireshark.org/ Url: http://www.wireshark.org/
@ -16,6 +16,7 @@ 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 Source2: 90-wireshark-usbmon.rules
Source3: wireshark.sysusers
# Fedora-specific # Fedora-specific
Patch2: wireshark-0002-Customize-permission-denied-error.patch Patch2: wireshark-0002-Customize-permission-denied-error.patch
@ -82,6 +83,7 @@ Buildrequires: cmake
#needed for sdjournal external capture interface #needed for sdjournal external capture interface
BuildRequires: systemd-devel BuildRequires: systemd-devel
BuildRequires: libnghttp2-devel BuildRequires: libnghttp2-devel
BuildRequires: systemd-rpm-macros
Obsoletes: wireshark-qt, wireshark-gtk 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 wsutil/*.h "${IDIR}/wsutil"
install -m 644 ws_diag_control.h "${IDIR}/" install -m 644 ws_diag_control.h "${IDIR}/"
install -m 644 %{SOURCE2} %{buildroot}%{_udevrulesdir} install -m 644 %{SOURCE2} %{buildroot}%{_udevrulesdir}
install -Dpm 644 %{SOURCE3} %{buildroot}%{_sysusersdir}/%{name}.conf
touch %{buildroot}%{_bindir}/%{name} touch %{buildroot}%{_bindir}/%{name}
@ -180,8 +183,7 @@ touch %{buildroot}%{_bindir}/%{name}
find %{buildroot} -type f -name "*.la" -delete find %{buildroot} -type f -name "*.la" -delete
%pre cli %pre cli
getent group wireshark >/dev/null || groupadd -r wireshark %sysusers_create_compat %{SOURCE3}
getent group usbmon >/dev/null || groupadd -r usbmon
%post cli %post cli
%{?ldconfig} %{?ldconfig}
@ -201,6 +203,7 @@ fi
%{_datadir}/mime/packages/wireshark.xml %{_datadir}/mime/packages/wireshark.xml
%{_bindir}/wireshark %{_bindir}/wireshark
%{_mandir}/man1/wireshark.* %{_mandir}/man1/wireshark.*
%{_sysusersdir}/%{name}.conf
%files cli %files cli
%license COPYING %license COPYING
@ -274,6 +277,9 @@ fi
%{_libdir}/pkgconfig/%{name}.pc %{_libdir}/pkgconfig/%{name}.pc
%changelog %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 * Tue Aug 31 2021 Michal Ruprich <mruprich@redhat.com> - 1:3.4.8-1
- New version 3.4.8 - New version 3.4.8

2
wireshark.sysusers Normal file
View File

@ -0,0 +1,2 @@
g wireshark - -
g usbmon - -