diff options
| -rw-r--r-- | memcached-build.patch | 4 | ||||
| -rw-r--r-- | memcached.spec | 63 | ||||
| -rw-r--r-- | upstream.patch | 52 |
3 files changed, 32 insertions, 87 deletions
diff --git a/memcached-build.patch b/memcached-build.patch index 9d4f40b..43f6273 100644 --- a/memcached-build.patch +++ b/memcached-build.patch @@ -1,12 +1,10 @@ diff -up vendor/Makefile.old vendor/Makefile --- vendor/Makefile.old 2024-01-10 15:37:23.308921592 +0100 +++ vendor/Makefile 2024-01-10 15:37:45.820751910 +0100 -@@ -1,6 +1,6 @@ +@@ -1,5 +1,5 @@ all: - cd lua && $(MAKE) all MYCFLAGS="-g" && cd .. -- cd mcmc && $(MAKE) all && cd .. + cd lua && $(MAKE) all MYCFLAGS="@CFLAGS@" && cd .. -+ cd mcmc && $(MAKE) all MYCFLAGS="@CFLAGS@" && cd .. clean: cd lua && $(MAKE) clean && cd .. diff --git a/memcached.spec b/memcached.spec index 2db0780..ad1a6cc 100644 --- a/memcached.spec +++ b/memcached.spec @@ -1,5 +1,5 @@ # remirepo spec file for memcached -# lastest version with SASL, TLS and extstore support enabled, from: +# lastest version with SASL, TLS, extstore and proxy support enabled, from: # # Fedora spec file for memcached # @@ -19,23 +19,18 @@ %bcond_without proxy %bcond_without tls %bcond_without selinux -%if 0%{?fedora} >= 35 || 0%{?rhel} >= 9 -%bcond_without sysusers -%else -%bcond_with sysusers -%endif # disable testing as it is unreliable on build systems %bcond_with tests %global selinuxtype targeted %global selinuxmoduletype contrib %global selinuxmodulename memcached -%global selinuxmodulever 1.0.2 +%global selinuxmodulever 1.0.3 %global selinuxmoduledir %{selinuxmodulename}-selinux-%{selinuxmodulever} Name: memcached -Version: 1.6.32 -Release: 2%{?dist} +Version: 1.6.38 +Release: 1%{?dist} Epoch: 0 Summary: High Performance, Distributed Memory Object Cache @@ -44,7 +39,7 @@ URL: https://www.memcached.org/ Source0: https://www.memcached.org/files/%{name}-%{version}.tar.gz Source1: memcached.sysconfig # 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://pagure.io/memcached-selinux/blob/master/f/memcached-selinux-%{selinuxmodulever}.tar.gz # systemd users Source3: memcached.conf # custom unit file (EL-7) @@ -53,8 +48,6 @@ Source4: memcached.service Patch1: memcached-unit.patch # honors system CFLAGS for bundled libraries (lua, mcmc) Patch2: memcached-build.patch -# Upstream -Patch3: upstream.patch BuildRequires: gcc BuildRequires: pkgconfig(libevent) >= 2 @@ -70,12 +63,8 @@ BuildRequires: libseccomp-devel %if %{with tls} BuildRequires: openssl-devel >= 1.1 %endif -%if %{with sysusers} %sysusers_requires_compat BuildRequires: systemd-rpm-macros -%else -Requires(pre): shadow-utils -%endif %{?systemd_requires} %if %{with selinux} @@ -94,10 +83,13 @@ Provides: bundled(mcmc) %if %{with selinux} %package selinux -Summary: Selinux policy module -License: GPL-2.0-only -BuildRequires: selinux-policy -%{?selinux_requires} +Summary: Selinux policy module +License: GPL-2.0-only +BuildArch: noarch +BuildRequires: selinux-policy-devel +Requires: %{name} = %{version}-%{release} +Requires: selinux-policy-%{selinuxtype} +Requires(post): selinux-policy-%{selinuxtype} %description selinux Install memcached-selinux to ensure your system contains the latest SELinux policy @@ -130,7 +122,6 @@ access to the memcached binary include files. %if %{with proxy} %patch -P2 -p0 -b .fixbuild sed -e 's:@CFLAGS@:%{build_cflags}:' -i vendor/Makefile -%patch -P3 -p1 -b .up %endif @@ -208,9 +199,8 @@ popd # Default configs install -Dp -m0644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/sysconfig/%{name} -%if %{with sysusers} +# Systemd users install -p -D -m 0644 %{SOURCE3} %{buildroot}%{_sysusersdir}/memcached.conf -%endif %if %{with selinux} @@ -231,14 +221,7 @@ fi %endif %pre -%if %{with sysusers} %sysusers_create_compat %{SOURCE3} -%else -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} -%endif exit 0 @@ -264,9 +247,7 @@ exit 0 %{_mandir}/man1/memcached.1* %{_unitdir}/memcached.service %{_unitdir}/memcached@.service -%if %{with sysusers} %{_sysusersdir}/memcached.conf -%endif %files devel @@ -283,6 +264,24 @@ exit 0 %changelog +* Thu Mar 20 2025 Remi Collet <remi@remirepo.net> - 1.6.38-1 +- update to 1.6.38 (2025-03-19) + +* Fri Feb 21 2025 Remi Collet <remi@remirepo.net> - 1.6.37-1 +- update to 1.6.37 (2025-02-20) + +* Wed Feb 5 2025 Remi Collet <remi@remirepo.net> - 1.6.36-1 +- update to 1.6.36 (2025-02-04) + +* Sun Feb 2 2025 Remi Collet <remi@remirepo.net> - 1.6.35-1 +- update to 1.6.35 (2025-02-01) + +* Mon Dec 23 2024 Remi Collet <remi@remirepo.net> - 1.6.34-1 +- update to 1.6.34 (2024-12-22) + +* Thu Dec 5 2024 Remi Collet <remi@remirepo.net> - 1.6.33-1 +- update to 1.6.33 (2024-12-04) + * Fri Nov 15 2024 Remi Collet <remi@remirepo.net> - 1.6.32-2 - test build for upstream patch fixing build failure on EL-10 https://github.com/memcached/memcached/issues/1186 diff --git a/upstream.patch b/upstream.patch deleted file mode 100644 index 6cac41c..0000000 --- a/upstream.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 08b00579fd9d2abd5d5116bbda27f8eceaba6038 Mon Sep 17 00:00:00 2001 -From: dormando <dormando@rydia.net> -Date: Thu, 14 Nov 2024 10:04:12 -0800 -Subject: [PATCH] proxy: fix compilation issue on beta RHEL/GCC - -Apparently _rotl no-go as a function name. no idea why but we generally -use the mcp_ and _mcp namespace anyway. - -Fixes #1186 ---- - proxy_lua.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/proxy_lua.c b/proxy_lua.c -index 8a579d7ab..4309f0167 100644 ---- a/proxy_lua.c -+++ b/proxy_lua.c -@@ -1409,13 +1409,13 @@ static int mcplib_log_req(lua_State *L) { - return 0; - } - --static inline uint32_t _rotl(const uint32_t x, int k) { -+static inline uint32_t _mcp_rotl(const uint32_t x, int k) { - return (x << k) | (x >> (32 - k)); - } - - // xoroshiro128++ 32bit version. --static uint32_t _nextrand(uint32_t *s) { -- const uint32_t result = _rotl(s[0] + s[3], 7) + s[0]; -+static uint32_t _mcp_nextrand(uint32_t *s) { -+ const uint32_t result = _mcp_rotl(s[0] + s[3], 7) + s[0]; - - const uint32_t t = s[1] << 9; - -@@ -1426,7 +1426,7 @@ static uint32_t _nextrand(uint32_t *s) { - - s[2] ^= t; - -- s[3] = _rotl(s[3], 11); -+ s[3] = _mcp_rotl(s[3], 11); - - return result; - } -@@ -1474,7 +1474,7 @@ static int mcplib_log_reqsample(lua_State *L) { - } else if (rate > 0) { - // slightly biased random-to-rate without adding a loop, which is - // completely fine for this use case. -- uint32_t rnd = (uint64_t)_nextrand(t->proxy_rng) * (uint64_t)rate >> 32; -+ uint32_t rnd = (uint64_t)_mcp_nextrand(t->proxy_rng) * (uint64_t)rate >> 32; - if (rnd == 0) { - do_log = true; - } |