6 files changed, 33 insertions, 15 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/Manifest b/dev-db/firebird/Manifest
index 042455a93c58..853e38498202 100644
--- a/dev-db/firebird/Manifest
+++ b/dev-db/firebird/Manifest
@@ -19,8 +19,8 @@ AUX firebird-update-valgrind.patch 507 SHA256 cc1f64d8263ed6ff32f441e4cc5a80654e
 AUX firebird.conf.d 73 SHA256 7c430ddf7aa8fdf6b68ef88e44ad0d7d546469f6fdc156bdc340fffefa85408c SHA512 e5fa93d2e1cebef37c297ccdeb81b9d4d7b5dff66871d5f09b74b014933a5ac4077721f55a431d413f05ffb2fb83f9f0e38458a5a53b99558678314f55c7efb1 WHIRLPOOL d62ee8b1cb5c88b3cbf2e2972ab83e036e6a80ccc620db8bd87e43273c72c1d97accc7768475376610b932d4e1a83e13cff3819f4289953a7f725417330fac30
 AUX firebird.conf.d.2 105 SHA256 032e26a957572718c3fb9ffbb1a83fac16a00cd41a027732e8cfbbe0f1a2ab61 SHA512 c77bf56a9e954788d420497e33f19e3e1a80d71d75ead58c6a106bca08b15a5c708fb76e7a045b143103a03f056fce6095a1f3497ceb9ec2ce655a274c90d018 WHIRLPOOL d41fc7bc899ee02ae3222315ef1a2c44360c1e9000cdff46585cbc51012d4bab9e3191e7a68c73609cf52b03eda80d31a982ea76e1e0a9c69a48d85e757824bc
 AUX firebird.conf.d.2.5 270 SHA256 c95575949a2509f61dfdad0b311319c15bc4fcf98397dbf86849a208e8e49cea SHA512 ac1410f45accae1beb845eb895592524be22fd0afb457aac4146dc6dc0a79c74c7e62eb814477797a10661a57bb731ade02a2a3b3fd8f5c5ef0c3b80e809bb64 WHIRLPOOL 3a842eb9ea3ab4c97e01eb24fc04f3f46ec4f60ceeda7b6e23d27b59cfde092ae5795790c3687aa41940837b215a358943c39e616804a3529e8f48014a560920
-AUX firebird.init.d 692 SHA256 7602d5030abaa7414cbe10f3223c38861742807bbe92f9af5693d28520398f6e SHA512 d734e41dfaa9c4c8457aafd9631e98bea525a55828712cd2544bb52aad5c56dd6f799755ae3cf0da32c1817b55be1958df5e685f96c500e480b4e5d54279798b WHIRLPOOL 97b712152384af9a7136c1e47911903424f03fad170b12d46e489b3e7f3fb1902f4f79cbc3e26b784bf3f5922f520fc25e79e3f60da83beb565fc5136c871307
-AUX firebird.init.d.2.5 565 SHA256 916b9bfe93d76c0a9a6a3fd8e83bd6a10e8324159de51e8888e0e3dd307a6121 SHA512 614599ae7ef12a5775f09c6a651501f846552ae761c3735f7aeb8dd0b20f0b2ebc7e370ca8b036208288211fec522d5c806e5757e57c2765f0c504aaedbe979b WHIRLPOOL 4624c3eddcab3f9fea99259ff8b919640002ea6f7c66950d84811fbcf0c56c76c8c438e35e1e9badc940e8d0f96f16477808839bc43f055017c2d4319c677ed5
+AUX firebird.init.d 762 SHA256 f53b06db7066431ce1d8a7480b52db5fb6916c0fa2ab02971c06ea87205575b6 SHA512 a0db382db9ceb02da3e70a82772daee22888de747197af399206e4f7d3b1bbaaeda67229235b9188c80c31b53dea51c31a4ab835d0df561f15bab8338286a301 WHIRLPOOL ffe14c64a217505942d752d25efa3d09bf7dae901714621c3e8db4a58239e75adab85a2b0f0c18f460c2f2fca6f1f06f76f81c55efde4fce22365cfbb86866f8
+AUX firebird.init.d.2.5 634 SHA256 6f542ea7a8067a101b1baae0d8b1b61d3bff65966a822e8c746838abb0890f6e SHA512 fc89029480bda6240befc4957e308656d0b13a8d840e30ce6d63953da40426b942896869ad3932ef72b9da568c95f6cebddba97f8d7d367ce8100257a1ee899d WHIRLPOOL 1afa1ae113d960557c1909cab1aa2ca18bba3860aea95bda752f3d9deef7f7bc3d5f639937886ef62c028bdb03f879d6221b97eab06803c3198c16c0372fdb90
 AUX firebird.logrotate 169 SHA256 462a7273c4881b66d31fe44349aae45d1f7085ff4db848eebc5e50b2bcb7f6da SHA512 f99edc010272af28f18e2b89e420aabc204feda918a1181e477edb56612b6af97ca6bab2e39989db401eb8296e3233a64853f824af437329e117f09aa9868823 WHIRLPOOL 0bbfe1cd410c42b137f11d3fb3b8c976c3fc89990650275dab135c66dcd78b35b6d4f73a2a767a56338a519393a33be6f64887f293528878ebe139896e3da49d
 AUX firebird.xinetd 199 SHA256 c0ea0c66e17c41633c19f7bed8cc8f818a3e1afad796d8d493c3b532b498da48 SHA512 4fc963b213e3cb13f1314129a7f5e04c44e3abd3b9cd6b28ea70219e34ecceda24995dc2f1a0a8ea342b016a897726f655604aa2ae6e7035e387d706515d1bfb WHIRLPOOL 4ac8ee679d07329143d9a98fb1acf432876c65695cd188748b3d4a2e4d693817fa6ea759f0e58ca7e75aa6cee8e902b097bcfe4a66715f825bb5379492fa8ad9
 AUX firebird.xinetd.2 199 SHA256 c0ea0c66e17c41633c19f7bed8cc8f818a3e1afad796d8d493c3b532b498da48 SHA512 4fc963b213e3cb13f1314129a7f5e04c44e3abd3b9cd6b28ea70219e34ecceda24995dc2f1a0a8ea342b016a897726f655604aa2ae6e7035e387d706515d1bfb WHIRLPOOL 4ac8ee679d07329143d9a98fb1acf432876c65695cd188748b3d4a2e4d693817fa6ea759f0e58ca7e75aa6cee8e902b097bcfe4a66715f825bb5379492fa8ad9
@@ -30,7 +30,7 @@ DIST Firebird-2.1.3.18185-0.tar.bz2 13770360 SHA256 8047cbd4bdc79928be7369bf0cdf
 DIST Firebird-2.5.1.26351-0.tar.bz2 13665242 SHA256 c4d236e7a9ab3ca00df3faca80f55175d11052637369c877b3e22cd377edb813 SHA512 876531e8ac49dbdc96cdb4d04d495fbf10d51d51138859e964d120204af02d82a7b80a2e982adc16864fb6f66e299b9f7a70274229bdc83f19edc9e7a4860d6b WHIRLPOOL 286ffe01f9583136124940da1235fef6cd4f9acb2224b58756e5d89e8f1a1851a794993030afaa122f4e884d4310b64e2bf8619c1020b95dad00245952d725f1
 DIST ib_b60_doc.zip 10530848 SHA256 8c0158678b2a2fe3ba3abfea1f5487fc5af2644d66837ab8a558f5ad6b6cfd6d SHA512 59eccf1d6b1f0410eddbc5967fd77a3d00e09749640b3f81e2f8b624f5a45461dffad4af5ec61488e941fb3d3af266fe86c0b56e6b7e023239537cb6557a145a WHIRLPOOL 5c3e17eec64d835bac8832a51acefe04c3a5ff818d1d1e69a032bae1a730fd73996a2be073d2e22bcd4ad4ee1ba2247da8271cd3a03c0326acf46eef1073033f
 EBUILD firebird-2.0.3.12981.0-r6.ebuild 10001 SHA256 33d020154ad96d7326c45a6a197eaebdc85f8d576a21518a1ad4a9d9d8dcf5f2 SHA512 3d6bb0d531d3e7a36897e86d323492009dd9eca24ceb58fd6050b107ddae374608ac8e6cdd3055ea9df6dcfe4c1cff3c5af0d6e89879ef35fafbf57bf7e3f5f6 WHIRLPOOL dcd41814c6237b037c7aba7fc61110ff44a752bac679f289ad2b3ab79f51a12b8b3b62bb6d9255bfe885b795c64c722558b840db944f14553b5d09ebc61dc437
-EBUILD firebird-2.1.3.18185.0.ebuild 10271 SHA256 0e60b870f9c679051961b83c53b0d289d324c44130af08b0a667372a43849078 SHA512 c6d91d339f667fab47c763cda3e891232c4e8bc2f90f1e3481863c25499c1e455dab9f34790f983e1980785fab83320a3e0ad99d67aa8e1e6ff5a1cedb7a11c3 WHIRLPOOL e038a8a749ce504945a0e3d52daee88ba1ff77c02c02e807faf9e6fdb637f506e92be86f6849a3eec75d238f2eb7f54206b01743227217a1b31cd0c46930d147
-EBUILD firebird-2.5.1.26351.0.ebuild 8852 SHA256 d465f061d56fe6e5eaa00b0150a034cdcd2c28278732a6b86f7957d344429a71 SHA512 7a4f993f280c0cca829ac70eded3010a77bdd8893d23085690f16cf33b2341ad7846a1130985fc79dfb6ebba0a55b6e46a9b34acd4980f1f611ab656f862c4eb WHIRLPOOL 5c3e53b1b2fdb2a5fb03177f890ef29ac50b7a84eccea410ff66036857a401174cf67f200116737583417814e873096fbe7f6e268bebc85eeff89b1857a3ebec
-MISC ChangeLog 24861 SHA256 3e1bbf7d8cf0518ff7d33a492abb21a392665c79ce554c9a42fb344d0c95fcd9 SHA512 9ee4cee6c1babe08957e8fad594e54425c0cd45b991bbb7a1de4d03624cc12cd2ac2486ed497aef7412e83c7310458f47e1e799a17ec442afc8c886c460c14c5 WHIRLPOOL e0be4291655262963050b82fa2323f3f1ce229346ca41e361d50093b52771a277c06bf0a295cf94cf036ae64a0c03ec5fb7124c8fdb981822946a16933ebce1d
+EBUILD firebird-2.1.3.18185.0-r1.ebuild 10275 SHA256 74b84e73179ae743e7aebe42e4667124f74f8c362403330a3d0277456d4fc23c SHA512 0a0e4f2e081b9d0f11dcb67fc77b29efbdb8377d66eeb6ecd4c09e964a3ac180053c54c2fe2c530ec10b260d24cc66f697e551f8835c48420b14880f8e3dfe98 WHIRLPOOL aecf65fa3b5c8c35ebc9436d03344cb9a106912f069d85227b38a9d61cbc85edfb259651696b1632b9b002f09792a7afecef62fc9538a63e5d13ab9314536277
+EBUILD firebird-2.5.1.26351.0-r1.ebuild 8856 SHA256 5f5726fb5a45b897704dce853e066441bc0dee3951cad526fe33615772a1c0a8 SHA512 0f26f6137085b4775d9f245ea6363d46a447ecaa36b95b320648d5127764181b56e37976667c4f6b8518d14a1646169612ad63d34f700c8b02cf4d0296559e57 WHIRLPOOL e46cf53d22c992e740a8c1c8260281ba1634abcc18114f2c6060d9f7084545200a0a39be9d2204b080154cb7aceb59f793dde703fbf33433830881d17d855e3c
+MISC ChangeLog 25279 SHA256 97ff89bf640b66c7d7f6095aa5dad4c517a39baf953784075cfd956b641a816b SHA512 f15a0d84358567b35b58c548f9063301666fb3a53c5098687dea29ff2f8428b55ab0d51f99e23ed2805cd54244a252e6c9667b380d7ef0f109ee7c83f4ad3c7a WHIRLPOOL 3c6e0fa5292fe6ef0d4b036688f5f34306b0f1a2e448df6a3ac00a010e7997df0532b569f87a3490784599652608509369dbc7a6fe4b27749e0024ac255ce33e
 MISC metadata.xml 1020 SHA256 7f42f4de8b12a9e43d885973743aea92783fbac0fa90e4fbff77cd9cbfcce6c5 SHA512 0bc255188ca1915df02f4a8d6efcd598be9e4c288bdae6a9e3153aa1e684457629d9682b7d5436eb886d9119c1935bd52dde858161144d44dc259c0259c407fc WHIRLPOOL 2f20df045a8eae9b392f8dc6af0e14d558067694ee2f68627c2a6f45c3b5b5cb711cff9a17e63ca6f05771b40126acaa49ff633e2ae8e1bfef3a0f83c8878b98
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