[rpms/inn] epel10.3: added dist tag, added patch from #204371 - innd.init script should use

[rpms/inn] epel10.3: added dist tag, added patch from #204371 - innd.init script should use

[Martin Stransky]

        A new commit has been pushed.

        Repo   : rpms/inn
        Branch : epel10.3
        Commit : 20d17b23a0f5d3eb2f0464553b47f8330b8df684
        Author : Martin Stransky <stransky@fedoraproject.org>
        Date   : 2006-08-29T12:00:15+00:00
        Stats  : +16/-3 in 2 file(s)
        URL    : https://src.fedoraproject.org/rpms/inn/c/20d17b23a0f5d3eb2f0464553b47f8330b8df684?branch=epel10.3

        Log:
        added dist tag, added patch from #204371 - innd.init script should use
ctlinnd to stop the server

---
diff --git a/inn.spec b/inn.spec
index dce9aac..e4349a2 100644
--- a/inn.spec
+++ b/inn.spec
@@ -1,7 +1,7 @@
 Summary: The InterNetNews (INN) system, an Usenet news server.
 Name: inn
 Version: 2.4.3
-Release: 5
+Release: 6%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source0: ftp://ftp.isc.org/isc/inn/inn-%{version}.tar.gz
@@ -291,6 +291,11 @@ exit 0
 %{_mandir}/man1/inews*
 
 %changelog
+* Tue Aug 29 2006 Martin Stransky <stransky@redhat.com> 2.4.3-6
+- added dist tag
+- added patch from #204371 - innd.init script should use 
+  ctlinnd to stop the server
+
 * Mon Jul 17 2006 Jesse Keating <jkeating@redhat.com> - 2.4.3-5
 - rebuild
 

diff --git a/innd.init b/innd.init
index 1bec865..0d8bcd6 100644
--- a/innd.init
+++ b/innd.init
@@ -42,8 +42,16 @@ start() {
 
 stop() {
         if [ -f /var/run/news/innd.pid ]; then
-                echo -n $"Stopping INND service: "
-                killproc innd
+                echo -n $"Stopping INND service (gently): "
+		if "${NEWSBIN}/ctlinnd" -s -t 60 throttle shutting down &&
+		   sleep 30 &&
+		   "${NEWSBIN}/ctlinnd" -s -t 60 shutdown shutting down; then
+			success $"innd shutdown"
+		else
+			failure $"innd shutdown"
+	                echo -n $"Stopping INND service (the hard way): "
+	                killproc innd
+		fi
                 RETVAL=$?
                 [ $RETVAL -eq 0 ] && rm -f /var/run/news/innd.pid
                 echo