support multiple pids in pidfile with start-stop-daemon

diff --git a/95229.patch b/95229.patch
new file mode 100644 (file)
index 0000000..4945bca
--- /dev/null
+++ b/95229.patch
@@ -0,0 +1,28 @@
+--- /etc/init.d/functions~     2018-09-07 16:57:25.000000000 +0300
++++ /etc/init.d/functions      2018-09-07 17:02:41.443552246 +0300
+@@ -884,12 +883,19 @@
+                       # 3. kill with KILL, wait $waitretry
+                       retry="--retry ${sig#-}/${delay}/${sig#-}/${waittime}/KILL/${waitretry}"
+               fi
+-              /sbin/start-stop-daemon -q --stop \
+-                      $retry \
+-                      ${waitname:+--name $waitname} \
+-                      -s ${sig#-} \
+-                      ${pidfile:+--pidfile $pidfile}
+-              result=$?
++
++              # expand if pidfile has multiple pids
++              result=0
++              local pid
++
++              for pid in $(cat $pidfile); do
++                      /sbin/start-stop-daemon -q --stop \
++                              $retry \
++                              ${waitname:+--name $waitname} \
++                              -s ${sig#-} \
++                              --pid $pid || result=$?
++              done
++
+               if [ "$result" -eq 0 ]; then
+                       ok
+               else

diff --git a/rc-scripts.spec b/rc-scripts.spec
index 405c0e00f3de8ab46917660457e0d39b6e781d27..138914699255729e6d3cdc63cd3a8a7912a7487f 100644 (file)
--- a/rc-scripts.spec
+++ b/rc-scripts.spec
@@ -20,6 +20,7 @@ Source0:      %{name}-%{version}.tar.gz
 Source1:       rc-local.service
 Source2:       sys-chroots.service
 Source3:       %{name}.tmpfiles
+Patch0:        95229.patch
 URL:           http://svn.pld-linux.org/trac/svn/wiki/packages/rc-scripts
 BuildRequires: autoconf
 BuildRequires: automake
@@ -137,6 +138,7 @@ po cichu ignorowane.
 
 %prep
 %setup -q
+%patch0 -p3 -d lib
 
 # hack, currently this results in errno@@GLIBC_PRIVATE symbol in ppp-watch:
 #GLIB_LIBS="-Wl,-static `$PKG_CONFIG --libs --static glib-2.0` -Wl,-Bdynamic"