2106390 - [RFE] sane-backends use systems-sysusers, the patch written by Pat Riehecky <riehecky@fnal.gov>

This commit is contained in:
Zdenek Dohnal 2022-07-20 15:10:06 +02:00
parent b1c65fdf2c
commit 0458d23051
2 changed files with 15 additions and 13 deletions

View File

@ -14,7 +14,7 @@
Summary: Scanner access software
Name: sane-backends
Version: 1.1.1
Release: 5%{?dist}
Release: 6%{?dist}
# lib/ is LGPLv2+, backends are GPLv2+ with exceptions
# Tools are GPLv2+, docs are public domain
# see LICENSE for details
@ -27,6 +27,7 @@ Source2: saned.socket
Source3: saned@.service.in
Source4: README.Fedora
Source5: 66-saned.rules
Source6: sane-backends.sysusers
# Fedora-specific, probably not generally applicable:
Patch0: sane-backends-1.0.25-udev.patch
@ -153,8 +154,6 @@ Summary: Scanner network daemon
Requires: sane-backends = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: sane-backends-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
Requires(pre): shadow-utils
%description daemon
This package contains saned which is the daemon that allows remote clients to
access image acquisition devices available on the local host.
@ -199,6 +198,8 @@ popd
%install
%make_install
install -p -D -m 0644 %{SOURCE6} %{buildroot}%{_sysusersdir}/sane-backends.conf
mkdir -p %{buildroot}%{_datadir}/pixmaps
install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/pixmaps
rm -f %{buildroot}%{_bindir}/gamma4scanimage
@ -265,11 +266,7 @@ udevadm hwdb --update >/dev/null 2>&1 || :
%ldconfig_scriptlets libs
%pre daemon
getent group saned >/dev/null || groupadd -r saned
getent passwd saned >/dev/null || \
useradd -r -g saned -d %{_datadir}/sane -s /sbin/nologin \
-c "SANE scanner daemon user" saned
exit 0
%sysusers_create_compat %{SOURCE6}
%post daemon
%systemd_post saned.socket
@ -289,9 +286,10 @@ exit 0
%doc %{_maindocdir}/README*
%license %{_maindocdir}/COPYING
%license %{_maindocdir}/LICENSE
%dir /etc/sane.d
%dir /etc/sane.d/dll.d
%config(noreplace) /etc/sane.d/*.conf
%dir %{_sysconfdir}/sane.d
%dir %{_sysconfdir}/sane.d/dll.d
%exclude %config(noreplace) %{_sysconfdir}/sane.d/saned.conf
%config(noreplace) %{_sysconfdir}/sane.d/*.conf
%{_udevrulesdir}/65-sane-backends.rules
%{_udevhwdbdir}/20-sane-backends.hwdb
%{_datadir}/pixmaps/sane.png
@ -426,8 +424,6 @@ exit 0
%{_libdir}/sane/libsane-dc25.so
%{_libdir}/sane/libsane-dmc.so
%{_libdir}/sane/libsane-gphoto2.so
%{_libdir}/sane/libsane-gphoto2.so.1
%{_libdir}/sane/libsane-gphoto2.so.1.1.1
# qcam is not on aarch64, ppc64le and s390x. SANE needs
# ioperm, inb and outb functions or portaccess function
# to support qcam backend. Those functions are only in
@ -445,11 +441,16 @@ exit 0
%files daemon
%{_sbindir}/saned
%{_mandir}/man8/saned*
%config(noreplace) %{_sysconfdir}/sane.d/saned.conf
%{_sysusersdir}/sane-backends.conf
%{_udevrulesdir}/66-saned.rules
%{_unitdir}/saned.socket
%{_unitdir}/saned@.service
%changelog
* Wed Jul 20 2022 Zdenek Dohnal <zdohnal@redhat.com> - 1.1.1-6
- 2106390 - [RFE] sane-backends use systems-sysusers, the patch written by Pat Riehecky <riehecky@fnal.gov>
* Thu Mar 24 2022 Zdenek Dohnal <zdohnal@redhat.com> - 1.1.1-5
- epoch is not defined by default, so remove it from conflicting NVR

1
sane-backends.sysusers Normal file
View File

@ -0,0 +1 @@
u saned - "SANE scanner daemon user" /usr/share/sane /sbin/nologin