Fixing 8.5 init scripts, adding PG_EXTRA_OPTS to 8.4 for #273867

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

6 files changed, 23 insertions, 15 deletions

diff --git a/dev-db/postgresql-server/ChangeLog b/dev-db/postgresql-server/ChangeLog
index 0928b6c6302b..26c4ab6d0ba3 100644
--- a/dev-db/postgresql-server/ChangeLog
+++ b/dev-db/postgresql-server/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/postgresql-server
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/ChangeLog,v 1.51 2010/01/26 19:26:32 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/ChangeLog,v 1.52 2010/01/26 21:04:57 patrick Exp $
+
+  26 Jan 2010; Patrick Lauer <patrick@gentoo.org> files/postgresql.conf-8.4,
+  files/postgresql.init-8.4, files/postgresql.conf-8.5,
+  files/postgresql.init-8.5:
+  Fixing 8.5 init scripts, adding PG_EXTRA_OPTS to 8.4 for #273867
 
 *postgresql-server-8.5_alpha3 (26 Jan 2010)
 
diff --git a/dev-db/postgresql-server/Manifest b/dev-db/postgresql-server/Manifest
index f4f74c75a12e..7682ec56f023 100644
--- a/dev-db/postgresql-server/Manifest
+++ b/dev-db/postgresql-server/Manifest
@@ -32,16 +32,16 @@ AUX postgresql.conf-8.0 1532 RMD160 de03805c18ac079b830bcc412c838eb67cbf4f2b SHA
 AUX postgresql.conf-8.1 1532 RMD160 69ce81cb490d73b1c6fd373ff6d4f76abbaec4f9 SHA1 6120fcbc61cce8da2b02eb5608def3e65a6ff04d SHA256 e28635d2abb43a30fe58d0d35c7266e40cb323c94797b8a98a0b7f2a4caf507d
 AUX postgresql.conf-8.2 1725 RMD160 9f52e0262bdbc42bef1847e986a303b4462d3b2e SHA1 7f3765371e38b6a3c14c7a89bdc7cb548b3b98bb SHA256 e0101dfd82cb3e4362a2563cc75b76cb822b0ccc1b5958b92bdc16b4e1af9aea
 AUX postgresql.conf-8.3 1725 RMD160 5bdd027b82013feddcba5d68c09e4122e219ecd2 SHA1 c1bc9ba72623efa12bfad55a0e12a57350955409 SHA256 15cb0f8052d0ecc1bced449777f76875c06ab088f67c1f7f3148b84e97082233
-AUX postgresql.conf-8.4 1725 RMD160 31336d319b654ccaada3eae51ce09f2cafb37fc5 SHA1 c05de3c88e44ec9f71774c2c129f31013ca723d7 SHA256 0e1e9ffaf563f6d9f653575ec5938329644fc68aeb414d926d3b465872b40162
-AUX postgresql.conf-8.5 1725 RMD160 31336d319b654ccaada3eae51ce09f2cafb37fc5 SHA1 c05de3c88e44ec9f71774c2c129f31013ca723d7 SHA256 0e1e9ffaf563f6d9f653575ec5938329644fc68aeb414d926d3b465872b40162
+AUX postgresql.conf-8.4 1778 RMD160 af385f29e70e0c099f296bd2fca67a7334ecbe74 SHA1 e353169183036a2357634a5747ab971034626b14 SHA256 6a0925c360afec504ab41e04965740bb0d5371d592fabb632e2eae1e08bcbee1
+AUX postgresql.conf-8.5 1725 RMD160 620fde38312b8715dd88b636fad0e34f6d3e39ec SHA1 65dc68731be671d1540380041c2aa77716981f1a SHA256 fb57a93a6c0707b9fef13f2e70ae82bc08b7741f546062111d3ef2b2e863b96c
 AUX postgresql.init-7.3 3024 RMD160 69b72ee54bd1ace1fcd4db99048ed45ed574836a SHA1 ea34e7a4606f83fcdbb66c671bcb60a8b97f681e SHA256 1f1c68486601699d87406ef8825fe477b662494e311baaaaa34d145eb94b8795
 AUX postgresql.init-7.4 3024 RMD160 703bb92dcc61ebecd97751a68161fd66183b4d4a SHA1 05dc261ec8ff642206b35eb42c8c5c29c4c9ed7b SHA256 0a5b0f9998b848bf9bdf2b1180d7c07280aeaf02012b97a0f096ad199b7ee6be
 AUX postgresql.init-8.0 2979 RMD160 5abb830974a5b4287a7768479488d8ee6ed872c1 SHA1 c6dfa1846609abbcb96d88998d34e60d0b84d360 SHA256 383b22086c931cad33a7b04b2bc9269e18e54e8dc1756f8b61a54d0801bd4d6c
 AUX postgresql.init-8.1 2979 RMD160 da0119c95bcf29f295a94a21be8e711d83953b90 SHA1 c0ad473f8670a3a262b8d14cbe2d3ff2dae88474 SHA256 136eb2d2ba8db0fc0a5018c2093e6cc665c536d4347837c574888f8a54ebeb33
 AUX postgresql.init-8.2 3033 RMD160 9f063a0521bacabcf8b0b30d22b101dcde967769 SHA1 039acfdda06a25b999869422d9e388ecbc7250f0 SHA256 678c7627a26a5cf2875054138757e8b8d7a4ee80bfc659de86242b4e40e90802
 AUX postgresql.init-8.3 3033 RMD160 b1a666473a03860d509c21d3a00f23f2134a0c18 SHA1 af5852d5b3d8895331d1a960d55f1d795c662460 SHA256 4ced52dcbfc35483346764a9fff641320477b7d8a70f4e16b733b8a96eee7da1
-AUX postgresql.init-8.4 3033 RMD160 d7bd09bd772ebee3e4be43ee2d60ec1bcf2ff46a SHA1 cbf9ff64fcc18189a529c6227d9847bd13646dac SHA256 0dfd99a911dab1edaa483ac6c53555b8078218a7ecc00d101c104ee9d4bec420
-AUX postgresql.init-8.5 3033 RMD160 655c294ce1474d4ab897bb9183cc63e22e670a47 SHA1 4572a0aff394ae8e4ef9db5b0329a5a9db322e67 SHA256 32ccdf5184e255848c12d0d783a1b88b177d6e2bb6d96273180c5cd0822d86bb
+AUX postgresql.init-8.4 3053 RMD160 c6e7949a70073f09b9addf59a706e8e20a33a38b SHA1 998acae3520310542f41ede95ecee67f17ec1345 SHA256 983eedb22509f1f801260eae8ae061e9d90b3522e038661d665a0edc3cbcba59
+AUX postgresql.init-8.5 3033 RMD160 77ab51fc309d5cd8d7b2347fb495af2481da77e3 SHA1 6411a07c61e089be31eb437b4b06d975919dad54 SHA256 33079f4870a985a96b95823fddba3b11c9781a04c92d6ffb0849bb758edb16e9
 DIST postgresql-7.3.21.tar.bz2 9284558 RMD160 f9de4676b4fbe3d96e6d1462b8bc3c05600d6525 SHA1 bdfa3bddc483c6642cc2ee271d076bfaa4c20c92 SHA256 bf44e0ac259e9f6e14ac102f2977496b6996ecea2fd227fbdcea5fa70e342888
 DIST postgresql-7.4.26.tar.bz2 10340993 RMD160 c92093ffee634ba140ac176182ad80f7226eaa52 SHA1 cb7638b492aeb5a44ce071862bf9f1c2fdcc5515 SHA256 ae91cdcf8cd57336634a40d73a194fafd7128f6a98e61e5f183743abd1100a64
 DIST postgresql-7.4.27.tar.bz2 10348758 RMD160 4888672ba15a8041097ed20d80a81716e6ac7074 SHA1 bb35cc844157b8a0d0b2e9e1ab25b6597c82dd1c SHA256 24453f07d325d77884d43c42868685e0d2c1b63fa5b9ad641252ffcb49a39425
@@ -72,5 +72,5 @@ EBUILD postgresql-server-8.4.1.ebuild 9212 RMD160 d6ca51e5913bb375a13978a7e1ae88
 EBUILD postgresql-server-8.4.2-r1.ebuild 9665 RMD160 039f237855bac984e8fc84e1d1b5fa96ca701699 SHA1 6a8d8af4ad32a5e027a6960755d6713dd5e72ac5 SHA256 4dd4389363ba7754652d9293822f45a4c7477485bf4180a1aefb3e1bdec3e162
 EBUILD postgresql-server-8.4.2.ebuild 9290 RMD160 8476f8ccf7411693f7839f014264e53ce697a6d4 SHA1 4a69f21f392bd9833e86343bfe16995ad498bf41 SHA256 d318e8d111cf0ec188038a0b240959f8737dc07adc0aa970d1b3a8c0fb497721
 EBUILD postgresql-server-8.5_alpha3.ebuild 9753 RMD160 ffe5c8bf9eb255f2601716c0a3465e7eda3e7b4f SHA1 7fb23a49a9c1c80213101ed59d16448993596122 SHA256 a91518d07586303330922c73bdcabc53e78c9e3b648931c5aee3d86d6ab6deda
-MISC ChangeLog 19719 RMD160 c4c3d6b47a037ea785955a134dce9cf6cd766bdf SHA1 e137b6299df79e59fbd690ea9d45669f510bd28d SHA256 6a818e594049a3a3025319373a5276ffe228479a78e060b122b9b946f0e8701e
+MISC ChangeLog 19949 RMD160 6f9e105cf4e56b46e18d6b8adb044acf51d9851f SHA1 c1df098d789c9713c5c16094b9096e1cc4e7398e SHA256 e90c7595d23afbfacd7ecd6090a412722df4367e9b3fa5c70e2fa7e3256e9ef9
 MISC metadata.xml 420 RMD160 789f5a0ce45d05125098fd7e74a816cf08f4c39b SHA1 d308d7434a37f12cd320f74ed85e1d3ca7dabc75 SHA256 ac37a5084450a782d02510149d030bd0d4a63164f2ffb7bdda3ddf344606ca62
diff --git a/dev-db/postgresql-server/files/postgresql.conf-8.4 b/dev-db/postgresql-server/files/postgresql.conf-8.4
index 22ff61cd37d6..1f1cf1a1c898 100644
--- a/dev-db/postgresql-server/files/postgresql.conf-8.4
+++ b/dev-db/postgresql-server/files/postgresql.conf-8.4
@@ -14,6 +14,8 @@ PGGROUP="postgres"
 # can be set directly in the configuration-file.
 #PGOPTS="-N 512 -B 1024"
 
+# Pass extra environment variables 
+#PG_EXTRA_ENV=""
 
 # SERVER SHUTDOWN:
 # The server will receive 3 signals in the worst case:
diff --git a/dev-db/postgresql-server/files/postgresql.conf-8.5 b/dev-db/postgresql-server/files/postgresql.conf-8.5
index 22ff61cd37d6..957c4ab5708b 100644
--- a/dev-db/postgresql-server/files/postgresql.conf-8.5
+++ b/dev-db/postgresql-server/files/postgresql.conf-8.5
@@ -1,5 +1,5 @@
 # PostgreSQL's Database Directory
-PGDATA="/var/lib/postgresql/8.4/data"
+PGDATA="/var/lib/postgresql/8.5/data"
 
 # PostgreSQL User
 PGUSER="postgres"
diff --git a/dev-db/postgresql-server/files/postgresql.init-8.4 b/dev-db/postgresql-server/files/postgresql.init-8.4
index 5ebd3034e0ac..11ac45d8bbba 100644
--- a/dev-db/postgresql-server/files/postgresql.init-8.4
+++ b/dev-db/postgresql-server/files/postgresql.init-8.4
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/files/postgresql.init-8.4,v 1.2 2010/01/06 23:36:01 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/files/postgresql.init-8.4,v 1.3 2010/01/26 21:04:58 patrick Exp $
 
 opts="${opts} reload"
 
@@ -34,7 +34,8 @@ start() {
 	local retval
 
 	su -l ${PGUSER} \
-		-c "env PGDATA=\"${PGDATA}\" /usr/lib/postgresql-8.4/bin/pg_ctl start ${WAIT_FOR_START} -o '--silent-mode=true ${PGOPTS}'"
+		-c "env PGDATA=\"${PGDATA}\" /usr/lib/postgresql-8.4/bin/pg_ctl start ${WAIT_FOR_START} \
+		-o '--silent-mode=true ${PGOPTS}'" ${PG_EXTRA_ENV}
 	retval=$?
 	[ $retval -ne 0 ] && eend $retval && return $retval
 
diff --git a/dev-db/postgresql-server/files/postgresql.init-8.5 b/dev-db/postgresql-server/files/postgresql.init-8.5
index 890582496052..ce5055af4965 100644
--- a/dev-db/postgresql-server/files/postgresql.init-8.5
+++ b/dev-db/postgresql-server/files/postgresql.init-8.5
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/files/postgresql.init-8.5,v 1.1 2010/01/26 19:26:33 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/files/postgresql.init-8.5,v 1.2 2010/01/26 21:04:58 patrick Exp $
 
 opts="${opts} reload"
 
@@ -34,7 +34,7 @@ start() {
 	local retval
 
 	su -l ${PGUSER} \
-		-c "env PGDATA=\"${PGDATA}\" /usr/lib/postgresql-8.4/bin/pg_ctl start ${WAIT_FOR_START} -o '--silent-mode=true ${PGOPTS}'"
+		-c "env PGDATA=\"${PGDATA}\" /usr/lib/postgresql-8.5/bin/pg_ctl start ${WAIT_FOR_START} -o '--silent-mode=true ${PGOPTS}'"
 	retval=$?
 	[ $retval -ne 0 ] && eend $retval && return $retval
 
@@ -59,7 +59,7 @@ stop() {
 	local retval
 
 	su -l ${PGUSER} \
-		-c "env PGDATA=\"${PGDATA}\" /usr/lib/postgresql-8.4/bin/pg_ctl stop -t ${WAIT_FOR_DISCONNECT} -m smart"
+		-c "env PGDATA=\"${PGDATA}\" /usr/lib/postgresql-8.5/bin/pg_ctl stop -t ${WAIT_FOR_DISCONNECT} -m smart"
 
 	retval=$?
 	[ $retval -eq 0 ] && eend $retval && return $retval
@@ -68,7 +68,7 @@ stop() {
 	ewarn "Going to shutdown the server anyway."
 
 	su -l ${PGUSER} \
-		-c "env PGDATA=\"${PGDATA}\" /usr/lib/postgresql-8.4/bin/pg_ctl stop -m fast"
+		-c "env PGDATA=\"${PGDATA}\" /usr/lib/postgresql-8.5/bin/pg_ctl stop -m fast"
 
 	retval=$?
 	[ $retval -eq 0 ] && eend $retval && return $retval
@@ -83,7 +83,7 @@ stop() {
 	ewarn "Forcing it to shutdown which leads to a recover-run on next startup."
 
 	su -l ${PGUSER} \
-		-c "env PGDATA=\"${PGDATA}\" /usr/lib/postgresql-8.4/bin/pg_ctl stop -m immediate"
+		-c "env PGDATA=\"${PGDATA}\" /usr/lib/postgresql-8.5/bin/pg_ctl stop -m immediate"
 
 	retval=$?
 	[ $retval -eq 0 ] && eend $retval && return $retval
@@ -95,6 +95,6 @@ stop() {
 reload() {
 	ebegin "Reloading PostgreSQL configuration"
 	su -l ${PGUSER} \
-		-c "env PGDATA=\"${PGDATA}\" /usr/lib/postgresql-8.4/bin/pg_ctl reload"	
+		-c "env PGDATA=\"${PGDATA}\" /usr/lib/postgresql-8.5/bin/pg_ctl reload"	
 	eend $?
 }