Fix variable name in init.d script by Malte Starostik (bug #366493).

Package-Manager: portage-2.2.0_alpha32/cvs/Linux i686

4 files changed, 25 insertions, 9 deletions

diff --git a/dev-db/firebird/ChangeLog b/dev-db/firebird/ChangeLog
index d4148a5abe2f..a8c0b7680e96 100644
--- a/dev-db/firebird/ChangeLog
+++ b/dev-db/firebird/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/firebird
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/ChangeLog,v 1.105 2011/03/01 20:15:08 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/ChangeLog,v 1.106 2011/05/12 18:42:35 jer Exp $
+
+*firebird-2.5.0.26074.0-r1 (12 May 2011)
+
+  12 May 2011; Jeroen Roovers <jer@gentoo.org> -firebird-2.5.0.26074.0.ebuild,
+  +firebird-2.5.0.26074.0-r1.ebuild, files/firebird.init.d.2.5:
+  Fix variable name in init.d script by Malte Starostik (bug #366493).
 
   01 Mar 2011; Christian Ruppert <idl0r@gentoo.org>
   -files/firebird-2.0.4.13130.1-deps-flags-libs.patch,
diff --git a/dev-db/firebird/Manifest b/dev-db/firebird/Manifest
index adef0a20ab11..a164196e2fd8 100644
--- a/dev-db/firebird/Manifest
+++ b/dev-db/firebird/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 70firebird 50 RMD160 ebfc2e7a38dbd95b3df0dc4c8a757bd089f69807 SHA1 71b414835ed7c66f94b2908b7793da817d3c4438 SHA256 ca3ca56c53490ac6f849ce78cd1240fc52334f25c8d3841eef1560bed2a80d03
 AUX firebird-2.0.3.12981.0-CVE-2008-0387.patch 3279 RMD160 462a32e8bc64c2ede4852901a9ff7036a7c3b52a SHA1 7c87e7f41e8c408b190d84e80f7c6aa1a5c0753c SHA256 62dd30ec1a785578a4686ba37e82fedbc0b00d0e95735b4aab9b056b5b82ad4b
 AUX firebird-2.0.3.12981.0-CVE-2008-0467.patch 16005 RMD160 2bfd332b7d551402a1c9bed8b4706fc57cc80ec0 SHA1 38bc58cec68a4b9b12315846c3eb5f8c967e83e3 SHA256 f4de4b4b988669378b09fcbba59dac96b22a3b4cfeb6bdf7db45c4a16f81fd05
@@ -13,7 +16,7 @@ AUX firebird.conf.d 73 RMD160 3ed3f866ee37d8e99b5dd32132ae78889ddeef66 SHA1 a5f9
 AUX firebird.conf.d.2 105 RMD160 a047ffded75ed5f055949993fd794941eee8fe25 SHA1 d10907676a706bdecae27321861ccd0e89bc7993 SHA256 032e26a957572718c3fb9ffbb1a83fac16a00cd41a027732e8cfbbe0f1a2ab61
 AUX firebird.conf.d.2.5 270 RMD160 73f0bfd7d98828cf91d8c7937e627bf537f997a6 SHA1 1bf31f9192ec4baf194e54f9620a1f3194a77055 SHA256 c95575949a2509f61dfdad0b311319c15bc4fcf98397dbf86849a208e8e49cea
 AUX firebird.init.d 692 RMD160 fd32d3ca38f149df1c6c46697a9c043b22bf25dd SHA1 379f3dd8e768e958ab3faff203d0d7a502c8f120 SHA256 7602d5030abaa7414cbe10f3223c38861742807bbe92f9af5693d28520398f6e
-AUX firebird.init.d.2.5 569 RMD160 296058573c76212642d5b9d0688f6e149931dd0f SHA1 cb92fd4521e17ad9754bcb5d02744fe78bbb87ac SHA256 7f42ab0f98d8f5a026aa8191633ae4515363e41902643005a0db20e9cc6177ee
+AUX firebird.init.d.2.5 565 RMD160 3164b8866296ae399a9041e382f0775098a1ded9 SHA1 2a70cb7e4c91dfe01d46b4c2de1a8ec88832bf32 SHA256 916b9bfe93d76c0a9a6a3fd8e83bd6a10e8324159de51e8888e0e3dd307a6121
 AUX firebird.logrotate 169 RMD160 5d4486e41421d03d27c337bd982eb89b3ddc8cd8 SHA1 7883786b79aad6098a91641e2781a8a320125826 SHA256 462a7273c4881b66d31fe44349aae45d1f7085ff4db848eebc5e50b2bcb7f6da
 AUX firebird.xinetd.2 199 RMD160 97baaf905714cdfe2c062a05869ed7bf02ab0e08 SHA1 1186bbc61ecd17adeb598442d78abfaa3ac54194 SHA256 c0ea0c66e17c41633c19f7bed8cc8f818a3e1afad796d8d493c3b532b498da48
 AUX xinetd.2 199 RMD160 97baaf905714cdfe2c062a05869ed7bf02ab0e08 SHA1 1186bbc61ecd17adeb598442d78abfaa3ac54194 SHA256 c0ea0c66e17c41633c19f7bed8cc8f818a3e1afad796d8d493c3b532b498da48
@@ -23,6 +26,13 @@ DIST Firebird-2.5.0.26074-0.tar.bz2 13579819 RMD160 b64a2bad70664dc438a03490b91f
 DIST ib_b60_doc.zip 10530848 RMD160 c64b4b6bc9125929928517ba072558a58ddf577d SHA1 5e94fb89e15f738aa8605c913e75ec212fa163ef SHA256 8c0158678b2a2fe3ba3abfea1f5487fc5af2644d66837ab8a558f5ad6b6cfd6d
 EBUILD firebird-2.0.3.12981.0-r6.ebuild 9996 RMD160 45e38ad5115b01a2f90b8a6b2a6871509830d960 SHA1 8dd4b923a93b92d1d61f248f41c3230f0a36adbc SHA256 dc135be695e8f5fff58899c39aa85237891965dc9c77c4281ac86bbbddf28d6c
 EBUILD firebird-2.1.3.18185.0.ebuild 10266 RMD160 a816e0cf73e27aaecd74e1dd4a07f9b0a45252d8 SHA1 88fc465b2dab15bc8de1ddd10522b12c1ae05c7a SHA256 defcca6e5382a1646136a5b7b42d147f365f4a60d0f7e25e7808e21f2b6d7141
-EBUILD firebird-2.5.0.26074.0.ebuild 8550 RMD160 6d66d90f790154eac14f7fd2016a3324fcf5f2f1 SHA1 e33d41e8689ebe5cb18993093ad2c38257442d96 SHA256 3027f080cf0e00a407b67cfe746874e2691628c8ac867cd57fda57d315b41d1c
-MISC ChangeLog 23484 RMD160 81d50c96e266da9e9edda588d5cd32b0eb97e070 SHA1 83d55a20eae814d17d436a850cd7e445b35a530b SHA256 528b726c036e1f8bf63f76e9da4eaec8fcd1f513316cc7691c7bfed40087f81c
+EBUILD firebird-2.5.0.26074.0-r1.ebuild 8549 RMD160 c7835bf09d2637cff6d25c28bc89851005c31de8 SHA1 ca5b298ce242722ce8d30f4c88a385ccfc0cc056 SHA256 d0a47ea795d879d4263e84cfa14a3278475fbdd095aea8f75a3ea36018278894
+MISC ChangeLog 23739 RMD160 89b6c5058bf8a8d3e7d6b4fa8cbe0afff99ae735 SHA1 9f41025a444c157d5983f9a4724de0e940dcdf4f SHA256 65a4c53d1eee9841b58f2070ad548a8a3e0e10e734a870d358ac4a3ffb576065
 MISC metadata.xml 813 RMD160 8b53b8cd6708adba4d58d1f3f74995c27ba75c54 SHA1 e8bb87ce727a001c7fa55979d0ed18275e8a6058 SHA256 465ceb3f7c3932611ec0a9ceda264b32a9f5aa3c96ca581273d266898c82ec58
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk3MKiUACgkQVWmRsqeSphPjaQCeIQPZ2MH8xnlnESdEWhuej2Kf
+2XcAnA3XWTyiX50PS0FDe29jBUZEmEv3
+=p1PS
+-----END PGP SIGNATURE-----
diff --git a/dev-db/firebird/files/firebird.init.d.2.5 b/dev-db/firebird/files/firebird.init.d.2.5
index 1a6d6d497a43..8f2c0d65d76a 100644
--- a/dev-db/firebird/files/firebird.init.d.2.5
+++ b/dev-db/firebird/files/firebird.init.d.2.5
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 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.1 2010/11/18 20:01:23 patrick Exp $
+# $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 $
 
 depend() {
 	need net
@@ -9,7 +9,7 @@ depend() {
 
 start(){
 	ebegin "Starting Firebird server"
-	start-stop-daemon --start --pidfile $pidfile --user $FBUSER --group $FBGROUP --exec $FBGUARD -- $FB_OPTS
+	start-stop-daemon --start --pidfile $PIDFILE --user $FBUSER --group $FBGROUP --exec $FBGUARD -- $FB_OPTS
 	eend $?
 }
 
diff --git a/dev-db/firebird/firebird-2.5.0.26074.0.ebuild b/dev-db/firebird/firebird-2.5.0.26074.0-r1.ebuild
index 11b5121bf54d..87c0329e2747 100644
--- a/dev-db/firebird/firebird-2.5.0.26074.0.ebuild
+++ b/dev-db/firebird/firebird-2.5.0.26074.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-2.5.0.26074.0.ebuild,v 1.1 2010/11/18 20:01:23 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-2.5.0.26074.0-r1.ebuild,v 1.1 2011/05/12 18:42:35 jer Exp $
 
 inherit flag-o-matic eutils autotools multilib versionator