Resolves: rhbz#2096850

This commit is contained in:
Tomas Korbar 2022-06-14 15:56:05 +02:00
parent cc86f0ffb9
commit c9c4ac153e
2 changed files with 11 additions and 7 deletions

1
memcached.conf Normal file
View File

@ -0,0 +1 @@
u memcached - "memcached daemon" -

View File

@ -12,7 +12,7 @@
Name: memcached Name: memcached
Version: 1.6.15 Version: 1.6.15
Release: 1%{?dist} Release: 2%{?dist}
Epoch: 0 Epoch: 0
Summary: High Performance, Distributed Memory Object Cache Summary: High Performance, Distributed Memory Object Cache
@ -22,6 +22,7 @@ Source0: https://www.memcached.org/files/%{name}-%{version}.tar.gz
Source1: memcached.sysconfig Source1: memcached.sysconfig
# SELinux policy sources: https://pagure.io/memcached-selinux/tree/master # SELinux policy sources: https://pagure.io/memcached-selinux/tree/master
Source2: https://releases.pagure.org/memcached-selinux/memcached-selinux-1.0.2.tar.gz Source2: https://releases.pagure.org/memcached-selinux/memcached-selinux-1.0.2.tar.gz
Source3: memcached.conf
Patch1: memcached-unit.patch Patch1: memcached-unit.patch
@ -32,6 +33,7 @@ BuildRequires: perl(Test::More), perl(Test::Harness)
%{?with_sasl:BuildRequires: cyrus-sasl-devel} %{?with_sasl:BuildRequires: cyrus-sasl-devel}
%{?with_seccomp:BuildRequires: libseccomp-devel} %{?with_seccomp:BuildRequires: libseccomp-devel}
%{?with_tls:BuildRequires: openssl-devel} %{?with_tls:BuildRequires: openssl-devel}
BuildRequires: systemd-rpm-macros
Requires(pre): shadow-utils Requires(pre): shadow-utils
# Rich dependency syntax - require selinux policy subpackage # Rich dependency syntax - require selinux policy subpackage
@ -123,12 +125,10 @@ install -d -p %{buildroot}%{_datadir}/selinux/devel/include/%{selinuxmoduletype}
install -m 0644 %{selinuxmodulename}.pp.bz2 %{buildroot}%{_datadir}/selinux/packages install -m 0644 %{selinuxmodulename}.pp.bz2 %{buildroot}%{_datadir}/selinux/packages
popd popd
install -p -D -m 0644 %{SOURCE3} %{buildroot}%{_sysusersdir}/memcached.conf
%pre %pre
getent group %{groupname} >/dev/null || groupadd -r %{groupname} %sysusers_create_compat %{SOURCE3}
getent passwd %{username} >/dev/null || \
useradd -r -g %{groupname} -d /run/memcached \
-s /sbin/nologin -c "Memcached daemon" %{username}
exit 0
%pre selinux %pre selinux
%selinux_relabel_pre -s %{selinuxtype} %selinux_relabel_pre -s %{selinuxtype}
@ -163,7 +163,7 @@ fi
%{_mandir}/man1/memcached-tool.1* %{_mandir}/man1/memcached-tool.1*
%{_mandir}/man1/memcached.1* %{_mandir}/man1/memcached.1*
%{_unitdir}/memcached.service %{_unitdir}/memcached.service
%{_sysusersdir}/memcached.conf
%files devel %files devel
%{_includedir}/memcached/* %{_includedir}/memcached/*
@ -174,6 +174,9 @@ fi
%license ../%{selinuxmoduledir}/COPYING %license ../%{selinuxmoduledir}/COPYING
%changelog %changelog
* Tue Jun 14 2022 Tomas Korbar <tkorbar@redhat.com> - 1.6.15-2
- Resolves: rhbz#2096850
* Fri Apr 08 2022 Tomas Korbar <tkorbar@redhat.com> - 1.6.15-1 * Fri Apr 08 2022 Tomas Korbar <tkorbar@redhat.com> - 1.6.15-1
- Update to 1.6.15 - Update to 1.6.15
- Resolves: rhbz#2070493 - Resolves: rhbz#2070493