diff --git a/memcached-1.6.38.tar.gz b/memcached-1.6.38.tar.gz deleted file mode 100644 index 00133bbb2581811573ee68e395394a60d0bccd86..0000000000000000000000000000000000000000 Binary files a/memcached-1.6.38.tar.gz and /dev/null differ diff --git a/memcached-1.6.39.tar.gz b/memcached-1.6.39.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..8b725db0c7634139cfef12009473f1378685ccba Binary files /dev/null and b/memcached-1.6.39.tar.gz differ diff --git a/memcached-selinux-1.0.2.tar.gz b/memcached-selinux-1.0.3.tar.gz similarity index 66% rename from memcached-selinux-1.0.2.tar.gz rename to memcached-selinux-1.0.3.tar.gz index ab11640dd58f8282ea054b1d22a8bc92dce073da..ab6c37316d26d7fbc759cbd972bee0ab53e29865 100644 Binary files a/memcached-selinux-1.0.2.tar.gz and b/memcached-selinux-1.0.3.tar.gz differ diff --git a/memcached.spec b/memcached.spec index 367af577a35b406725643cfe15ec52a409d54b3d..f11888faaa48db5f46ed17ba653e63fa506216d3 100644 --- a/memcached.spec +++ b/memcached.spec @@ -6,15 +6,16 @@ %bcond_with tests Name: memcached -Version: 1.6.38 +Version: 1.6.39 Release: 1 Epoch: 0 Summary: A high-performance, distributed memory object caching system License: BSD-3-clause AND Zlib AND BSD-2-Clause URL: https://www.memcached.org/ Source0: https://www.memcached.org/files/memcached-%{version}.tar.gz -Source1: https://releases.pagure.org/memcached-selinux/memcached-selinux-1.0.2.tar.gz +Source1: https://pagure.io/memcached-selinux/blob/master/f/memcached-selinux-1.0.3.tar.gz Source2: memcached.sysconfig +Source3: memcached.sysusers Patch0001: memcached-unit.patch Patch0002: CVE-2022-28805.patch @@ -26,9 +27,10 @@ BuildRequires: selinux-policy-devel libevent-devel make gcc %{?with_seccomp:BuildRequires: libseccomp-devel} %{?with_tls:BuildRequires: openssl-devel} Requires: %{name}-help = %{version}-%{release} -Requires(pre): shadow-utils Requires: (%{name}-selinux if selinux-policy-targeted) +%{?sysusers_requires_compat} %{?systemd_requires} + %description memcached is a high-performance, distributed memory object caching system, generic in nature, but intended for use in speeding up dynamic @@ -69,7 +71,7 @@ optimised for use with this version of memcached. %{?with_seccomp: --enable-seccomp} \ %{?with_tls: --enable-tls} %make_build -pushd ../memcached-selinux-1.0.2 +pushd ../memcached-selinux-1.0.3 make %check @@ -88,17 +90,14 @@ install -D -p -m 755 scripts/memcached-tool %{buildroot}%{_bindir}/memcached install -D -p -m 644 scripts/memcached-tool.1 %{buildroot}%{_mandir}/man1/memcached-tool.1 install -D -p -m 644 scripts/memcached.service %{buildroot}%{_unitdir}/memcached.service install -D -p -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/memcached -cd ../memcached-selinux-1.0.2 +cd ../memcached-selinux-1.0.3 install -d %{buildroot}%{_datadir}/selinux/packages install -d -p %{buildroot}%{_datadir}/selinux/devel/include/contrib install -m 644 memcached.pp.bz2 %{buildroot}%{_datadir}/selinux/packages +install -p -D -m 0644 %{SOURCE3} %{buildroot}%{_sysusersdir}/memcached.conf %pre -getent group %{groupname} >/dev/null || groupadd -r %{groupname} -getent passwd %{username} >/dev/null || \ -useradd -r -g %{groupname} -d /run/memcached \ - -s /sbin/nologin -c "Memcached daemon" %{username} -exit 0 +%sysusers_create_compat %{S:3} %pre selinux %selinux_relabel_pre -s targeted @@ -129,6 +128,7 @@ fi %{_bindir}/memcached-tool %{_bindir}/memcached %{_unitdir}/memcached.service +%{_sysusersdir}/memcached.conf %files devel %{_includedir}/memcached/* @@ -144,6 +144,9 @@ fi %{_mandir}/man1/memcached.1* %changelog +* Wed Jul 30 2025 Funda Wang - 0:1.6.39-1 +- update to 1.6.39 + * Fri Mar 21 2025 Funda Wang - 0:1.6.38-1 - update to 1.6.38 diff --git a/memcached.sysusers b/memcached.sysusers new file mode 100644 index 0000000000000000000000000000000000000000..61482053189cf371b03371865f10ab2103460ad5 --- /dev/null +++ b/memcached.sysusers @@ -0,0 +1 @@ +u memcached - "memcached daemon" -