Accepting request 1151132 from network:utilities
OBS-URL: https://build.opensuse.org/request/show/1151132 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/memcached?expand=0&rev=64
This commit is contained in:
commit
0869354dd6
@ -1 +0,0 @@
|
|||||||
addFilter("incoherent-init-script-name")
|
|
1
memcached-sysusers.conf
Normal file
1
memcached-sysusers.conf
Normal file
@ -0,0 +1 @@
|
|||||||
|
u memcached - "user for memcached" /var/lib/memcached -
|
1
memcached-tmpfiles.conf
Normal file
1
memcached-tmpfiles.conf
Normal file
@ -0,0 +1 @@
|
|||||||
|
D /run/memcached 0750 memcached memcached
|
@ -1,3 +1,14 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Feb 19 01:06:31 UTC 2024 - Georg Pfuetzenreuter <georg.pfuetzenreuter@suse.com>
|
||||||
|
|
||||||
|
- Drop obsolete rpmlint filter
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Feb 19 00:10:25 UTC 2024 - Georg Pfuetzenreuter <georg.pfuetzenreuter@suse.com>
|
||||||
|
|
||||||
|
- Create /run/memcached as a location for sockets
|
||||||
|
- Use conditionals for sysusers/tmpfiles
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Jan 29 14:22:08 UTC 2024 - Dirk Müller <dmueller@suse.com>
|
Mon Jan 29 14:22:08 UTC 2024 - Dirk Müller <dmueller@suse.com>
|
||||||
|
|
||||||
|
@ -25,6 +25,13 @@
|
|||||||
%else
|
%else
|
||||||
%bcond_with tls
|
%bcond_with tls
|
||||||
%endif
|
%endif
|
||||||
|
%if 0%{?suse_version} >= 1500
|
||||||
|
%bcond_without sysusers
|
||||||
|
%bcond_without tmpfiles
|
||||||
|
%else
|
||||||
|
%bcond_with sysusers
|
||||||
|
%bcond_with tmpfiles
|
||||||
|
%endif
|
||||||
Name: memcached
|
Name: memcached
|
||||||
Version: 1.6.23
|
Version: 1.6.23
|
||||||
Release: 0
|
Release: 0
|
||||||
@ -34,9 +41,9 @@ Group: Productivity/Networking/Other
|
|||||||
URL: https://memcached.org/
|
URL: https://memcached.org/
|
||||||
Source: https://www.memcached.org/files/%{name}-%{version}.tar.gz
|
Source: https://www.memcached.org/files/%{name}-%{version}.tar.gz
|
||||||
Source2: %{name}.sysconfig
|
Source2: %{name}.sysconfig
|
||||||
Source3: memcached-rpmlintrc
|
|
||||||
Source4: memcached.service
|
Source4: memcached.service
|
||||||
Source5: system-user-memcached.conf
|
Source5: %{name}-sysusers.conf
|
||||||
|
Source6: %{name}-tmpfiles.conf
|
||||||
Patch0: harden_memcached.service.patch
|
Patch0: harden_memcached.service.patch
|
||||||
BuildRequires: autoconf
|
BuildRequires: autoconf
|
||||||
BuildRequires: automake
|
BuildRequires: automake
|
||||||
@ -52,7 +59,7 @@ BuildRequires: perl
|
|||||||
BuildRequires: perl-IO-Socket-SSL
|
BuildRequires: perl-IO-Socket-SSL
|
||||||
BuildRequires: perl-Net-SSLeay
|
BuildRequires: perl-Net-SSLeay
|
||||||
%endif
|
%endif
|
||||||
%if 0%{?suse_version} >= 1500
|
%if %{with sysusers}
|
||||||
BuildRequires: sysuser-tools
|
BuildRequires: sysuser-tools
|
||||||
%sysusers_requires
|
%sysusers_requires
|
||||||
%else
|
%else
|
||||||
@ -102,8 +109,8 @@ autoreconf -fi
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%make_build
|
%make_build
|
||||||
%if 0%{?suse_version} >= 1500
|
%if %{with sysusers}
|
||||||
%sysusers_generate_pre %{SOURCE5} memcached system-user-memcached.conf
|
%sysusers_generate_pre %{SOURCE5} %{name} %{name}-user.conf
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%install
|
%install
|
||||||
@ -114,15 +121,17 @@ install -D -m 0644 %{SOURCE2} %{buildroot}%{_fillupdir}/sysconfig.%{name}
|
|||||||
install -d -m 755 %{buildroot}%{_sbindir}
|
install -d -m 755 %{buildroot}%{_sbindir}
|
||||||
ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}
|
ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}
|
||||||
install -D -m 0644 %{SOURCE4} %{buildroot}%{_unitdir}/%{name}.service
|
install -D -m 0644 %{SOURCE4} %{buildroot}%{_unitdir}/%{name}.service
|
||||||
%if 0%{?suse_version} >= 1500
|
%if %{with sysusers}
|
||||||
mkdir -p %{buildroot}%{_sysusersdir}
|
install -D -m 0644 %{SOURCE5} %{buildroot}%{_sysusersdir}/%{name}-user.conf
|
||||||
install -m 0644 %{SOURCE5} %{buildroot}%{_sysusersdir}/
|
%endif
|
||||||
|
%if %{with tmpfiles}
|
||||||
|
install -D -m 0644 %{SOURCE6} %{buildroot}%{_tmpfilesdir}/%{name}.conf
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%check
|
%check
|
||||||
%make_build test
|
%make_build test
|
||||||
|
|
||||||
%if 0%{?suse_version} >= 1500
|
%if %{with sysusers}
|
||||||
%pre -f memcached.pre
|
%pre -f memcached.pre
|
||||||
%else
|
%else
|
||||||
|
|
||||||
@ -138,6 +147,9 @@ getent passwd %{name} >/dev/null || \
|
|||||||
%post
|
%post
|
||||||
%service_add_post %{name}.service
|
%service_add_post %{name}.service
|
||||||
%fillup_only %{name}
|
%fillup_only %{name}
|
||||||
|
%if %{with tmpfiles}
|
||||||
|
%tmpfiles_create %{_tmpfilesdir}/%{name}.conf
|
||||||
|
%endif
|
||||||
|
|
||||||
%preun
|
%preun
|
||||||
%service_del_preun %{name}.service
|
%service_del_preun %{name}.service
|
||||||
@ -155,8 +167,12 @@ getent passwd %{name} >/dev/null || \
|
|||||||
%{_unitdir}/%{name}.service
|
%{_unitdir}/%{name}.service
|
||||||
%{_fillupdir}/sysconfig.%{name}
|
%{_fillupdir}/sysconfig.%{name}
|
||||||
%dir %attr(751,root,root) %{_localstatedir}/lib/%{name}
|
%dir %attr(751,root,root) %{_localstatedir}/lib/%{name}
|
||||||
%if 0%{?suse_version} >= 1500
|
%if %{with sysusers}
|
||||||
%{_sysusersdir}/system-user-memcached.conf
|
%{_sysusersdir}/%{name}-user.conf
|
||||||
|
%endif
|
||||||
|
%if %{with tmpfiles}
|
||||||
|
%{_tmpfilesdir}/%{name}.conf
|
||||||
|
%dir %ghost %{_rundir}/%{name}
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%files devel
|
%files devel
|
||||||
|
@ -1,2 +0,0 @@
|
|||||||
#Type Name ID GECOS Home directory Shell
|
|
||||||
u memcached - "user for memcached" /var/lib/memcached -
|
|
Loading…
Reference in New Issue
Block a user