pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/sysutils/tenshi The SMF default signaling method, :kil...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/f3d120edb7fa
branches:  trunk
changeset: 645314:f3d120edb7fa
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Mon Jan 26 23:03:37 2015 +0000

description:
The SMF default signaling method, :kill, sends a signal to all
processes associated with the service. In the case of tenshi, the
refresh method currently uses :kill -HUP, which sends a HUP to the
spawned tail process as well as the tenshi process, killing the
tail and breaking tenshi.

Fix this problem. Bump PKGREVISION.

>From Paul B. Henson in PR 49607.

diffstat:

 sysutils/tenshi/Makefile               |  3 ++-
 sysutils/tenshi/files/smf/manifest.xml |  2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diffs (25 lines):

diff -r 9066e87f1100 -r f3d120edb7fa sysutils/tenshi/Makefile
--- a/sysutils/tenshi/Makefile  Mon Jan 26 23:00:30 2015 +0000
+++ b/sysutils/tenshi/Makefile  Mon Jan 26 23:03:37 2015 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2015/01/13 22:20:03 bsiegert Exp $
+# $NetBSD: Makefile,v 1.2 2015/01/26 23:03:37 wiz Exp $
 #
 
 DISTNAME=      tenshi-0.15
+PKGREVISION=   1
 CATEGORIES=    sysutils
 MASTER_SITES=  http://dev.inversepath.com/download/tenshi/
 
diff -r 9066e87f1100 -r f3d120edb7fa sysutils/tenshi/files/smf/manifest.xml
--- a/sysutils/tenshi/files/smf/manifest.xml    Mon Jan 26 23:00:30 2015 +0000
+++ b/sysutils/tenshi/files/smf/manifest.xml    Mon Jan 26 23:03:37 2015 +0000
@@ -15,7 +15,7 @@
     </dependency>
     <exec_method name='start' type='method' exec='@PREFIX@/sbin/tenshi -c @PKG_SYSCONFDIR@/tenshi/tenshi.conf -P @VARBASE@/lib/tenshi/tenshi.pid' timeout_seconds='60' />
     <exec_method name='stop' type='method' exec=':kill' timeout_seconds='60' />
-    <exec_method name='refresh' type='method' exec=':kill -HUP' timeout_seconds='60' />
+    <exec_method name='refresh' type='method' exec='pkill -HUP -c %{restarter/contract} -n' timeout_seconds='60' />
     <property_group name='startd' type='framework'>
         <propval name='ignore_error' type='astring' value='signal' />
     </property_group>



Home | Main Index | Thread Index | Old Index