diff --git a/memcached.changes b/memcached.changes index 1a9949b..87dd489 100644 --- a/memcached.changes +++ b/memcached.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Oct 3 10:30:22 UTC 2022 - Dirk Müller + +- remove sysv init case +- move memcache binary to %{_bindir} like on Debian and RHEL like + distributions + ------------------------------------------------------------------- Mon Sep 5 13:13:33 UTC 2022 - Dirk Müller diff --git a/memcached.init b/memcached.init deleted file mode 100644 index 5d87a4f..0000000 --- a/memcached.init +++ /dev/null @@ -1,282 +0,0 @@ -#! /bin/sh -# Copyright (c) 1995-2004 SUSE Linux AG, Nuernberg, Germany. -# All rights reserved. -# -# Author: Kurt Garloff -# Please send feedback to http://www.suse.de/feedback/ -# -# /etc/init.d/memcached -# and its symbolic link -# /(usr/)sbin/rcmemcached -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -# -# Template system startup script for some example service/daemon memcached -# -# LSB compatible service control script; see http://www.linuxbase.org/spec/ -# -# Note: This template uses functions rc_XXX defined in /etc/rc.status on -# UnitedLinux (UL) based Linux distributions. If you want to base your -# script on this template and ensure that it works on non UL based LSB -# compliant Linux distributions, you either have to provide the rc.status -# functions from UL or change the script to work without them. -# -### BEGIN INIT INFO -# Provides: memcached -# Required-Start: $remote_fs -# Should-Start: $time ypbind sendmail -# Required-Stop: $remote_fs -# Should-Stop: $time ypbind sendmail -# Default-Start: 3 5 -# Default-Stop: 0 1 2 6 -# Short-Description: memcached XYZ daemon providing ZYX -# Description: Start memcached to allow XY and provide YZ -# continued on second line by '#' -# should contain enough info for the runlevel editor -# to give admin some idea what this service does and -# what it's needed for ... -# (The Short-Description should already be a good hint.) -### END INIT INFO -# -# Any extensions to the keywords given above should be preceeded by -# X-VendorTag- (X-UnitedLinux- X-SuSE- for us) according to LSB. -# -# Notes on Required-Start/Should-Start: -# * There are two different issues that are solved by Required-Start -# and Should-Start -# (a) Hard dependencies: This is used by the runlevel editor to determine -# which services absolutely need to be started to make the start of -# this service make sense. Example: nfsserver should have -# Required-Start: $portmap -# Also, required services are started before the dependent ones. -# The runlevel editor will warn about such missing hard dependencies -# and suggest enabling. During system startup, you may expect an error, -# if the dependency is not fulfilled. -# (b) Specifying the init script ordering, not real (hard) dependencies. -# This is needed by insserv to determine which service should be -# started first (and at a later stage what services can be started -# in parallel). The tag Should-Start: is used for this. -# It tells, that if a service is available, it should be started -# before. If not, never mind. -# * When specifying hard dependencies or ordering requirements, you can -# use names of services (contents of their Provides: section) -# or pseudo names starting with a $. The following ones are available -# according to LSB (1.1): -# $local_fs all local file systems are mounted -# (most services should need this!) -# $remote_fs all remote file systems are mounted -# (note that /usr may be remote, so -# many services should Require this!) -# $syslog system logging facility up -# $network low level networking (eth card, ...) -# $named hostname resolution available -# $netdaemons all network daemons are running -# The $netdaemons pseudo service has been removed in LSB 1.2. -# For now, we still offer it for backward compatibility. -# These are new (LSB 1.2): -# $time the system time has been set correctly -# $portmap SunRPC portmapping service available -# UnitedLinux extensions: -# $ALL indicates that a script should be inserted -# at the end -# * The services specified in the stop tags -# (Required-Stop/Should-Stop) -# specify which services need to be still running when this service -# is shut down. Often the entries there are just copies or a subset -# from the respective start tag. -# * Should-Start/Stop are now part of LSB as of 2.0, -# formerly SUSE/Unitedlinux used X-UnitedLinux-Should-Start/-Stop. -# insserv does support both variants. -# * X-UnitedLinux-Default-Enabled: yes/no is used at installation time -# (%fillup_and_insserv macro in %post of many RPMs) to specify whether -# a startup script should default to be enabled after installation. -# It's not used by insserv. -# -# Note on runlevels: -# 0 - halt/poweroff 6 - reboot -# 1 - single user 2 - multiuser without network exported -# 3 - multiuser w/ network (text mode) 5 - multiuser w/ network and X11 (xdm) -# -# Note on script names: -# http://www.linuxbase.org/spec/refspecs/LSB_1.3.0/gLSB/gLSB/scrptnames.html -# A registry has been set up to manage the init script namespace. -# http://www.lanana.org/ -# Please use the names already registered or register one or use a -# vendor prefix. - - -# Check for missing binaries (stale symlinks should not happen) -# Note: Special treatment of stop for LSB conformance -MEMCACHED_BIN=/usr/sbin/memcached -test -x $MEMCACHED_BIN || { echo "$MEMCACHED_BIN not installed"; - if [ "$1" = "stop" ]; then exit 0; - else exit 5; fi; } - -# Check for existence of needed config file and read it -MEMCACHED_CONFIG=/etc/sysconfig/memcached -test -r $MEMCACHED_CONFIG || { echo "$MEMCACHED_CONFIG not existing"; - if [ "$1" = "stop" ]; then exit 0; - else exit 6; fi; } - -# Read config -. $MEMCACHED_CONFIG - -# Source LSB init functions -# providing start_daemon, killproc, pidofproc, -# log_success_msg, log_failure_msg and log_warning_msg. -# This is currently not used by UnitedLinux based distributions and -# not needed for init scripts for UnitedLinux only. If it is used, -# the functions from rc.status should not be sourced or used. -#. /lib/lsb/init-functions - -# Shell functions sourced from /etc/rc.status: -# rc_check check and set local and overall rc status -# rc_status check and set local and overall rc status -# rc_status -v be verbose in local rc status and clear it afterwards -# rc_status -v -r ditto and clear both the local and overall rc status -# rc_status -s display "skipped" and exit with status 3 -# rc_status -u display "unused" and exit with status 3 -# rc_failed set local and overall rc status to failed -# rc_failed set local and overall rc status to -# rc_reset clear both the local and overall rc status -# rc_exit exit appropriate to overall rc status -# rc_active checks whether a service is activated by symlinks -. /etc/rc.status - -# Reset status of this service -rc_reset - -# Return values acc. to LSB for all commands but status: -# 0 - success -# 1 - generic or unspecified error -# 2 - invalid or excess argument(s) -# 3 - unimplemented feature (e.g. "reload") -# 4 - user had insufficient privileges -# 5 - program is not installed -# 6 - program is not configured -# 7 - program is not running -# 8--199 - reserved (8--99 LSB, 100--149 distrib, 150--199 appl) -# -# Note that starting an already running service, stopping -# or restarting a not-running service as well as the restart -# with force-reload (in case signaling is not supported) are -# considered a success. - -case "$1" in - start) - echo -n "Starting memcached " - ## Start daemon with startproc(8). If this fails - ## the return value is set appropriately by startproc. - startproc -u $MEMCACHED_USER -g $MEMCACHED_GROUP $MEMCACHED_BIN -d $MEMCACHED_PARAMS - - # Remember status and be verbose - rc_status -v - ;; - stop) - echo -n "Shutting down memcached " - ## Stop daemon with killproc(8) and if this fails - ## killproc sets the return value according to LSB. - - killproc -TERM $MEMCACHED_BIN - - # Remember status and be verbose - rc_status -v - ;; - try-restart|condrestart) - ## Do a restart only if the service was active before. - ## Note: try-restart is now part of LSB (as of 1.9). - ## RH has a similar command named condrestart. - if test "$1" = "condrestart"; then - echo "${attn} Use try-restart ${done}(LSB)${attn} rather than condrestart ${warn}(RH)${norm}" - fi - $0 status - if test $? = 0; then - $0 restart - else - rc_reset # Not running is not a failure. - fi - # Remember status and be quiet - rc_status - ;; - restart) - ## Stop the service and regardless of whether it was - ## running or not, start it again. - $0 stop - $0 start - - # Remember status and be quiet - rc_status - ;; - force-reload) - ## Signal the daemon to reload its config. Most daemons - ## do this on signal 1 (SIGHUP). - ## If it does not support it, restart. - - echo -n "Reload service memcached " - ## if it supports it: - killproc -HUP $MEMCACHED_BIN - #touch /var/run/memcached.pid - rc_status -v - - ## Otherwise: - #$0 try-restart - #rc_status - ;; - reload) - ## Like force-reload, but if daemon does not support - ## signaling, do nothing (!) - - # If it supports signaling: - echo -n "Reload service memcached " - killproc -HUP $MEMCACHED_BIN - #touch /var/run/memcached.pid - rc_status -v - - ## Otherwise if it does not support reload: - #rc_failed 3 - #rc_status -v - ;; - status) - echo -n "Checking for service memcached " - ## Check status with checkproc(8), if process is running - ## checkproc will return with exit status 0. - - # Return value is slightly different for the status command: - # 0 - service up and running - # 1 - service dead, but /var/run/ pid file exists - # 2 - service dead, but /var/lock/ lock file exists - # 3 - service not running (unused) - # 4 - service status unknown :-( - # 5--199 reserved (5--99 LSB, 100--149 distro, 150--199 appl.) - - # NOTE: checkproc returns LSB compliant status values. - checkproc $MEMCACHED_BIN - # NOTE: rc_status knows that we called this init script with - # "status" option and adapts its messages accordingly. - rc_status -v - ;; - probe) - ## Optional: Probe for the necessity of a reload, print out the - ## argument to this init script which is required for a reload. - ## Note: probe is not (yet) part of LSB (as of 1.9) - - test /etc/sysconfig/memcached -nt /var/run/memcached.pid && echo reload - ;; - *) - echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload|probe}" - exit 1 - ;; -esac -rc_exit diff --git a/memcached.service b/memcached.service index 532a8e6..4b0fcc6 100644 --- a/memcached.service +++ b/memcached.service @@ -17,7 +17,7 @@ ProtectControlGroups=true RestrictRealtime=true # end of automatic additions EnvironmentFile=/etc/sysconfig/memcached -ExecStart=/usr/sbin/memcached -u $MEMCACHED_USER $MEMCACHED_PARAMS +ExecStart=/usr/bin/memcached -u $MEMCACHED_USER $MEMCACHED_PARAMS [Install] WantedBy=multi-user.target diff --git a/memcached.spec b/memcached.spec index 29d93c2..bd19ea6 100644 --- a/memcached.spec +++ b/memcached.spec @@ -20,13 +20,11 @@ %if ! %{defined _fillupdir} %define _fillupdir %{_localstatedir}/adm/fillup-templates %endif - %if 0%{?suse_version} > 1500 %bcond_without tls %else %bcond_with tls %endif - Name: memcached Version: 1.6.17 Release: 0 @@ -35,7 +33,6 @@ License: BSD-3-Clause Group: Productivity/Networking/Other URL: https://memcached.org/ Source: https://www.memcached.org/files/%{name}-%{version}.tar.gz -Source1: %{name}.init Source2: %{name}.sysconfig Source3: memcached-rpmlintrc Source4: memcached.service @@ -46,14 +43,15 @@ BuildRequires: automake BuildRequires: cyrus-sasl-devel BuildRequires: libevent-devel >= 2.0 BuildRequires: libtool +BuildRequires: pkgconfig +Requires(pre): %fillup_prereq +Conflicts: memcached-unstable %if %{with tls} BuildRequires: openssl-devel >= 1.1.0 BuildRequires: perl BuildRequires: perl-IO-Socket-SSL BuildRequires: perl-Net-SSLeay %endif -BuildRequires: pkgconfig -Requires(pre): %fillup_prereq %if 0%{?suse_version} >= 1500 BuildRequires: sysuser-tools %sysusers_requires @@ -61,7 +59,6 @@ BuildRequires: sysuser-tools Requires(pre): %{_sbindir}/groupadd Requires(pre): %{_sbindir}/useradd %endif -Conflicts: memcached-unstable %if 0%{?suse_version} > 1210 BuildRequires: systemd-rpm-macros %{?systemd_ordering} @@ -101,34 +98,29 @@ autoreconf -fi --enable-seccomp \ --disable-coverage \ %ifarch s390 s390x ppc ppc64 - --disable-extstore \ + --disable-extstore %endif - --bindir=%{_sbindir} -make %{?_smp_mflags} +%make_build %if 0%{?suse_version} >= 1500 %sysusers_generate_pre %{SOURCE5} memcached system-user-memcached.conf %endif %install %make_install -install -D -m 0755 scripts/memcached-tool %{buildroot}%{_sbindir}/memcached-tool +install -D -m 0755 scripts/memcached-tool %{buildroot}%{_bindir}/memcached-tool install -Dd -m 0751 %{buildroot}%{_localstatedir}/lib/%{name} install -D -m 0644 %{SOURCE2} %{buildroot}%{_fillupdir}/sysconfig.%{name} -%if 0%{?suse_version} > 1210 +install -d -m 755 %{buildroot}%{_sbindir} ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name} install -D -m 0644 %{SOURCE4} %{buildroot}%{_unitdir}/%{name}.service -%else -install -D -m 0755 %{SOURCE1} %{buildroot}%{_sysconfdir}/init.d/%{name} -ln -s ../..%{_sysconfdir}/init.d/%{name} %{buildroot}%{_sbindir}/rc%{name} -%endif %if 0%{?suse_version} >= 1500 mkdir -p %{buildroot}%{_sysusersdir} install -m 0644 %{SOURCE5} %{buildroot}%{_sysusersdir}/ %endif %check -make %{?_smp_mflags} test +%make_build test %if 0%{?suse_version} >= 1500 %pre -f memcached.pre @@ -141,45 +133,26 @@ getent passwd %{name} >/dev/null || \ %{_sbindir}/useradd -g %{name} -s /bin/false -r \ -c "user for %{name}" -d %{_localstatedir}/lib/%{name} %{name} %endif -%if 0%{?suse_version} > 1210 %service_add_pre %{name}.service -%endif %post -%if 0%{?suse_version} > 1210 %service_add_post %{name}.service %fillup_only %{name} -%else -%fillup_and_insserv %{name} -%endif %preun -%if 0%{?suse_version} > 1210 %service_del_preun %{name}.service -%else -%stop_on_removal %{name} -%endif %postun -%if 0%{?suse_version} > 1210 %service_del_postun %{name}.service -%else -%restart_on_update %{name} -%insserv_cleanup -%endif %files %doc AUTHORS ChangeLog NEWS %license COPYING -%{_sbindir}/%{name} -%{_sbindir}/memcached-tool +%{_bindir}/%{name} +%{_bindir}/memcached-tool %{_sbindir}/rc%{name} %{_mandir}/man1/%{name}.* -%if 0%{?suse_version} > 1210 %{_unitdir}/%{name}.service -%else -%{_sysconfdir}/init.d/%{name} -%endif %{_fillupdir}/sysconfig.%{name} %dir %attr(751,root,root) %{_localstatedir}/lib/%{name} %if 0%{?suse_version} >= 1500