CVS commit: pkgsrc/chat/jabberd2/files

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Fri Jan  6 01:52:20 UTC 2017

Modified Files:
        pkgsrc/chat/jabberd2/files: c2s.sh router.sh s2s.sh sm.sh

Log Message:
Change sub-daemon start order

Drop dependency of router, sm, s2s on c2s.  This did not make sense --
none of them care if c2s runs.

c2s, s2s, and sm all connect to router.  So make them depend on
router, even though in theory they should retry.

Make c2s depend on sm, because if someone tries to log in before sm is
running, they will get a failure, and some clients do not retry
correctly.  Getting ECONNREFUSED connecting to c2s is more likely to
be handled correctly.

No PKGREVISION; riding the impending update.

(Tested on netbsd-6 i386 in a domU.)


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/chat/jabberd2/files/c2s.sh \
    pkgsrc/chat/jabberd2/files/sm.sh
cvs rdiff -u -r1.2 -r1.3 pkgsrc/chat/jabberd2/files/router.sh \
    pkgsrc/chat/jabberd2/files/s2s.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/chat/jabberd2/files/c2s.sh
diff -u pkgsrc/chat/jabberd2/files/c2s.sh:1.4 pkgsrc/chat/jabberd2/files/c2s.sh:1.5
--- pkgsrc/chat/jabberd2/files/c2s.sh:1.4       Thu Jun 10 10:36:22 2010
+++ pkgsrc/chat/jabberd2/files/c2s.sh   Fri Jan  6 01:52:20 2017
@@ -1,9 +1,9 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: c2s.sh,v 1.4 2010/06/10 10:36:22 adam Exp $
+# $NetBSD: c2s.sh,v 1.5 2017/01/06 01:52:20 gdt Exp $
 #
 # PROVIDE: c2s
-# REQUIRE: DAEMON
+# REQUIRE: DAEMON router sm
 
 if [ -f /etc/rc.subr ]; then
        . /etc/rc.subr
Index: pkgsrc/chat/jabberd2/files/sm.sh
diff -u pkgsrc/chat/jabberd2/files/sm.sh:1.4 pkgsrc/chat/jabberd2/files/sm.sh:1.5
--- pkgsrc/chat/jabberd2/files/sm.sh:1.4        Fri Aug 21 02:28:12 2009
+++ pkgsrc/chat/jabberd2/files/sm.sh    Fri Jan  6 01:52:20 2017
@@ -1,9 +1,9 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: sm.sh,v 1.4 2009/08/21 02:28:12 schnoebe Exp $
+# $NetBSD: sm.sh,v 1.5 2017/01/06 01:52:20 gdt Exp $
 #
 # PROVIDE: sm
-# REQUIRE: DAEMON c2s
+# REQUIRE: DAEMON router
 
 if [ -f /etc/rc.subr ]; then
        . /etc/rc.subr

Index: pkgsrc/chat/jabberd2/files/router.sh
diff -u pkgsrc/chat/jabberd2/files/router.sh:1.2 pkgsrc/chat/jabberd2/files/router.sh:1.3
--- pkgsrc/chat/jabberd2/files/router.sh:1.2    Sat Jun 26 11:21:46 2004
+++ pkgsrc/chat/jabberd2/files/router.sh        Fri Jan  6 01:52:20 2017
@@ -1,9 +1,9 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: router.sh,v 1.2 2004/06/26 11:21:46 abs Exp $
+# $NetBSD: router.sh,v 1.3 2017/01/06 01:52:20 gdt Exp $
 #
 # PROVIDE: router
-# REQUIRE: DAEMON c2s
+# REQUIRE: DAEMON
 
 if [ -f /etc/rc.subr ]; then
        . /etc/rc.subr
Index: pkgsrc/chat/jabberd2/files/s2s.sh
diff -u pkgsrc/chat/jabberd2/files/s2s.sh:1.2 pkgsrc/chat/jabberd2/files/s2s.sh:1.3
--- pkgsrc/chat/jabberd2/files/s2s.sh:1.2       Sat Jun 26 11:21:46 2004
+++ pkgsrc/chat/jabberd2/files/s2s.sh   Fri Jan  6 01:52:20 2017
@@ -1,9 +1,9 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: s2s.sh,v 1.2 2004/06/26 11:21:46 abs Exp $
+# $NetBSD: s2s.sh,v 1.3 2017/01/06 01:52:20 gdt Exp $
 #
 # PROVIDE: s2s
-# REQUIRE: DAEMON c2s
+# REQUIRE: DAEMON router
 
 if [ -f /etc/rc.subr ]; then
        . /etc/rc.subr