Create pid directory in initscript, wrt bug #464130. Thanks to parafin <help AT imtrappedininter.net> for discovering this issue

(Portage version: 2.2.0_alpha188/cvs/Linux x86_64, signed Manifest commit with key 0x1F357D42)

4 files changed, 20 insertions, 7 deletions

diff --git a/net-im/jabberd2/ChangeLog b/net-im/jabberd2/ChangeLog
index 970883680bb7..ba9f22a7a7c0 100644
--- a/net-im/jabberd2/ChangeLog
+++ b/net-im/jabberd2/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-im/jabberd2
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd2/ChangeLog,v 1.37 2013/07/23 09:56:13 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd2/ChangeLog,v 1.38 2013/07/23 10:01:35 pinkbyte Exp $
+
+  23 Jul 2013; Sergey Popov <pinkbyte@gentoo.org> files/jabberd2-2.2.4.init,
+  files/jabberd2-2.2.8.init, jabberd2-2.2.14-r1.ebuild:
+  Create pid directory in initscript, wrt bug #464130. Thanks to parafin <help
+  AT imtrappedininter.net> for discovering this issue
 
 *jabberd2-2.2.14-r1 (23 Jul 2013)
 
diff --git a/net-im/jabberd2/files/jabberd2-2.2.4.init b/net-im/jabberd2/files/jabberd2-2.2.4.init
index 8d40b606428b..aa4b88876285 100644
--- a/net-im/jabberd2/files/jabberd2-2.2.4.init
+++ b/net-im/jabberd2/files/jabberd2-2.2.4.init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd2/files/jabberd2-2.2.4.init,v 1.1 2008/09/15 01:33:55 gentoofan23 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd2/files/jabberd2-2.2.4.init,v 1.2 2013/07/23 10:01:35 pinkbyte Exp $
 
 depend() {
 	need net
@@ -26,6 +26,10 @@ stopJabberServices() {
 
 }
 
+start_pre() {
+	checkpath -d -o jabber /var/run/jabber
+}
+
 start() {
 
 	einfo "Starting Jabber Server ..."
diff --git a/net-im/jabberd2/files/jabberd2-2.2.8.init b/net-im/jabberd2/files/jabberd2-2.2.8.init
index 0c64021a449a..2a838267e300 100644
--- a/net-im/jabberd2/files/jabberd2-2.2.8.init
+++ b/net-im/jabberd2/files/jabberd2-2.2.8.init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd2/files/jabberd2-2.2.8.init,v 1.1 2009/05/08 15:24:09 gentoofan23 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd2/files/jabberd2-2.2.8.init,v 1.2 2013/07/23 10:01:35 pinkbyte Exp $
 
 depend() {
 	need net
@@ -26,6 +26,10 @@ stopJabberServices() {
 
 }
 
+start_pre() {
+	checkpath -d -o jabber /run/jabber
+}
+
 start() {
 
 	einfo "Starting Jabber Server ..."
diff --git a/net-im/jabberd2/jabberd2-2.2.14-r1.ebuild b/net-im/jabberd2/jabberd2-2.2.14-r1.ebuild
index 72c8eeeccd51..69f023f7186c 100644
--- a/net-im/jabberd2/jabberd2-2.2.14-r1.ebuild
+++ b/net-im/jabberd2/jabberd2-2.2.14-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd2/jabberd2-2.2.14-r1.ebuild,v 1.1 2013/07/23 09:56:13 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd2/jabberd2-2.2.14-r1.ebuild,v 1.2 2013/07/23 10:01:35 pinkbyte Exp $
 
 EAPI=5
 
@@ -76,7 +76,7 @@ src_install() {
 
 	pushd "${D}/etc/jabber/" &>/dev/null || die
 	sed -i \
-		-e 's,/var/lib/jabberd/pid/,/var/run/jabber/,g' \
+		-e 's,/var/lib/jabberd/pid/,/run/jabber/,g' \
 		-e 's,/var/lib/jabberd/log/,/var/log/jabber/,g' \
 		-e 's,/var/lib/jabberd/db,/var/spool/jabber/,g' \
 		*.xml *.xml.dist || die "sed failed"