Add checkpath to initscript to fix /var/run dir handling issue, wrt bug #442974, revbump

(Portage version: 2.2.0_alpha159/cvs/Linux x86_64, unsigned Manifest commit)

5 files changed, 28 insertions, 10 deletions

diff --git a/dev-db/firebird/ChangeLog b/dev-db/firebird/ChangeLog
index 00a043f17ab0..083777c86c99 100644
--- a/dev-db/firebird/ChangeLog
+++ b/dev-db/firebird/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-db/firebird
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/ChangeLog,v 1.110 2012/06/04 06:30:31 zmedico Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/ChangeLog,v 1.111 2013/01/24 04:52:12 pinkbyte Exp $
+
+*firebird-2.5.1.26351.0-r1 (24 Jan 2013)
+*firebird-2.1.3.18185.0-r1 (24 Jan 2013)
+
+  24 Jan 2013; Sergey Popov <pinkbyte@gentoo.org>
+  -firebird-2.1.3.18185.0.ebuild, +firebird-2.1.3.18185.0-r1.ebuild,
+  -firebird-2.5.1.26351.0.ebuild, +firebird-2.5.1.26351.0-r1.ebuild,
+  files/firebird.init.d, files/firebird.init.d.2.5:
+  Add checkpath to initscript to fix /var/run dir handling issue, wrt bug
+  #442974, revbump
 
   04 Jun 2012; Zac Medico <zmedico@gentoo.org> firebird-2.0.3.12981.0-r6.ebuild,
   firebird-2.1.3.18185.0.ebuild, firebird-2.5.1.26351.0.ebuild:
diff --git a/dev-db/firebird/files/firebird.init.d b/dev-db/firebird/files/firebird.init.d
index dae68cf40735..6094d9bc0198 100644
--- a/dev-db/firebird/files/firebird.init.d
+++ b/dev-db/firebird/files/firebird.init.d
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/files/firebird.init.d,v 1.4 2008/04/10 23:00:00 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/files/firebird.init.d,v 1.5 2013/01/24 04:52:12 pinkbyte Exp $
 
 pidfile=/var/run/firebird/firebird.pid
 FB_OPTS="-pidfile $pidfile -start -forever"
@@ -12,6 +12,10 @@ depend() {
 	need net
 }
 
+start_pre() {
+	checkpath -d -o $FBRunUser "$(dirname $pidfile)"
+}
+
 start(){
 	ebegin "Starting Firebird server"
 	start-stop-daemon --oknodo --start --pidfile $pidfile --chuid $FBRunUser --startas $MANAGER -- $FB_OPTS
diff --git a/dev-db/firebird/files/firebird.init.d.2.5 b/dev-db/firebird/files/firebird.init.d.2.5
index 8f2c0d65d76a..20791f7bd25e 100644
--- a/dev-db/firebird/files/firebird.init.d.2.5
+++ b/dev-db/firebird/files/firebird.init.d.2.5
@@ -1,12 +1,16 @@
 #!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/files/firebird.init.d.2.5,v 1.2 2011/05/12 18:42:35 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/files/firebird.init.d.2.5,v 1.3 2013/01/24 04:52:13 pinkbyte Exp $
 
 depend() {
 	need net
 }
 
+start_pre() {
+	checkpath -d -o $FBUSER "$(dirname $PIDFILE)"
+}
+
 start(){
 	ebegin "Starting Firebird server"
 	start-stop-daemon --start --pidfile $PIDFILE --user $FBUSER --group $FBGROUP --exec $FBGUARD -- $FB_OPTS
diff --git a/dev-db/firebird/firebird-2.1.3.18185.0.ebuild b/dev-db/firebird/firebird-2.1.3.18185.0-r1.ebuild
index 188c3ea69bc4..7d4b9491c8b5 100644
--- a/dev-db/firebird/firebird-2.1.3.18185.0.ebuild
+++ b/dev-db/firebird/firebird-2.1.3.18185.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-2.1.3.18185.0.ebuild,v 1.4 2012/06/04 06:30:31 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-2.1.3.18185.0-r1.ebuild,v 1.1 2013/01/24 04:52:12 pinkbyte Exp $
 
 inherit flag-o-matic eutils autotools user versionator
 
diff --git a/dev-db/firebird/firebird-2.5.1.26351.0.ebuild b/dev-db/firebird/firebird-2.5.1.26351.0-r1.ebuild
index 4993116ce8bc..45073b33c129 100644
--- a/dev-db/firebird/firebird-2.5.1.26351.0.ebuild
+++ b/dev-db/firebird/firebird-2.5.1.26351.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-2.5.1.26351.0.ebuild,v 1.2 2012/06/04 06:30:31 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-2.5.1.26351.0-r1.ebuild,v 1.1 2013/01/24 04:52:12 pinkbyte Exp $
 
 EAPI=4