Update init and con scripts for 8.2 to match the changes from 8.3

Package-Manager: portage-2.2_rc23/cvs/Linux i686

4 files changed, 26 insertions, 14 deletions

diff --git a/dev-db/postgresql-server/ChangeLog b/dev-db/postgresql-server/ChangeLog
index 3761e9858a69..a5c5c608cc71 100644
--- a/dev-db/postgresql-server/ChangeLog
+++ b/dev-db/postgresql-server/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/postgresql-server
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/ChangeLog,v 1.15 2008/12/03 19:27:06 caleb Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/ChangeLog,v 1.16 2009/01/28 22:26:31 caleb Exp $
+
+  28 Jan 2009; Caleb Tennis <caleb@gentoo.org> files/postgresql.conf-8.2,
+  files/postgresql.init-8.2:
+  Update init and conf scripts for 8.2 to match the changes from 8.3
 
 *postgresql-server-8.2.11 (03 Dec 2008)
 
diff --git a/dev-db/postgresql-server/Manifest b/dev-db/postgresql-server/Manifest
index dd3d476c8196..0c4fb2e435b2 100644
--- a/dev-db/postgresql-server/Manifest
+++ b/dev-db/postgresql-server/Manifest
@@ -21,13 +21,13 @@ AUX postgresql.conf-7.3 1532 RMD160 fa088eb5742efbce852d6dcff1dba420857aa67e SHA
 AUX postgresql.conf-7.4 1532 RMD160 8897005145112dc1782174fcac512531a32ce88a SHA1 f7e1e1c6cac39d1c7ecc371c9391214d6a8c8055 SHA256 4084c99ad0fff027876c82375c4d99d1669090398137ef5ed19c8e74cecb6e0c
 AUX postgresql.conf-8.0 1532 RMD160 de03805c18ac079b830bcc412c838eb67cbf4f2b SHA1 a7e288d80b0fd24ddf55bdd560f1e8b216b1f540 SHA256 471cd40a0f9100789d238722e5e5efb923dd4f526b564341a5401b3df236721a
 AUX postgresql.conf-8.1 1532 RMD160 69ce81cb490d73b1c6fd373ff6d4f76abbaec4f9 SHA1 6120fcbc61cce8da2b02eb5608def3e65a6ff04d SHA256 e28635d2abb43a30fe58d0d35c7266e40cb323c94797b8a98a0b7f2a4caf507d
-AUX postgresql.conf-8.2 1532 RMD160 8712059a8898ff65aff6d8dd6287726ebfc7719f SHA1 ca6547ac197a81a84b3de5c6f41d1b824fa6cef4 SHA256 775d1aa953c1d5a82f16e013249c6c29c4907f810536bfc4852eca72a2228780
+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.init-7.3 3030 RMD160 9d1415fb380e98ceee0f98787eb4382b098bd026 SHA1 921001624a4bf1078e47353bcec455c6f373e143 SHA256 5b68d9efeebf580fc73dc66e67c02e492333862ae461c88318f3a53ac3c83f27
 AUX postgresql.init-7.4 3030 RMD160 cd3bc7d664c7915c2aff26f85bed21229ab08257 SHA1 4008e04a96d6b5428a34317e3226d00f7205b7a8 SHA256 24352a912932ba1f2cc986a1bea5057ee81afe1b24b72d1590cd75ccd266029d
 AUX postgresql.init-8.0 2985 RMD160 b8de6ed3eea1257208db3547ddc517f1c4ba6741 SHA1 7a13f40bc5d48503d82339ba292001b007b1a6a2 SHA256 15a03eaf147523b93623e42a63ef9497778087776932c1b83cf32da562774002
 AUX postgresql.init-8.1 2985 RMD160 7b5de722b8d8cefab543de1c22465135bb2c8014 SHA1 6717f2efffd5ec9c8b702879a1f08843860d8ef5 SHA256 80547d814c9342f06bf2db1f7d4e1b97ee703bc5d2d3457187817840e4885786
-AUX postgresql.init-8.2 2985 RMD160 2da04989bf124326a34a7fd718f06bf9fd9beae9 SHA1 eb8e87fa7174563191f2789a2e8bd0147164b75f SHA256 008083715fa7237ae5d87bf05603b8d597d1cfe3c5e34d6995ac67cfe9964924
+AUX postgresql.init-8.2 3036 RMD160 8f2e4612671ef4bc2bdc19a2149078c2ab4f6ced SHA1 1cf446d1bc39fc84c312a9a8e18a892a745d4843 SHA256 1d2dcca2aadf01adbd41c36e4fc928a663f21126d8b6087d9e95033adaa80264
 AUX postgresql.init-8.3 3036 RMD160 9a6e0eab7413b82ccf4bfaf6494b3eaa1abf3c4c SHA1 8896cd60d669bdbc5b76649ee26bb23e2c5c9654 SHA256 0685e2e5ff9b97ff22cdbf590fed0c76cb13b4c087bb961a751fdb4e03fb3dea
 DIST postgresql-7.3.21.tar.bz2 9284558 RMD160 f9de4676b4fbe3d96e6d1462b8bc3c05600d6525 SHA1 bdfa3bddc483c6642cc2ee271d076bfaa4c20c92 SHA256 bf44e0ac259e9f6e14ac102f2977496b6996ecea2fd227fbdcea5fa70e342888
 DIST postgresql-7.4.19.tar.bz2 10307396 RMD160 c9a1c7dc8e7bf9ce93c3b4f061af0563b1cc2627 SHA1 19c563d47b0d5deeef03b5ca7707c9f1917853ce SHA256 447ac7070aa0a547f17a307e842734fc27e2716cb4a251fa9a810b178d44c389
@@ -51,5 +51,5 @@ EBUILD postgresql-server-8.2.10.ebuild 9503 RMD160 5c9ede0483ec0f2b6d4837588cd65
 EBUILD postgresql-server-8.2.11.ebuild 9503 RMD160 ab50f245437019140ed14d190f162c236dbd3bba SHA1 4dac9868f849ce2788e8ad7434269a8e63a645b1 SHA256 f14e58e24302b972c7394b34d372a7ff3d3400a3429170f19d44714fc758101f
 EBUILD postgresql-server-8.2.9.ebuild 9505 RMD160 55374d201f8f7fcd5c856652216ca5ee6053b5fc SHA1 5d633cb7725758fc4b96053735952b1287fd388f SHA256 3cab96dae890fe4e47b843b43102f58fa328b5f3df84043bbe03c94974700be8
 EBUILD postgresql-server-8.3.5.ebuild 9662 RMD160 48e9383552053aca0728635ba977412fedbcfc73 SHA1 8a2076011865de5e03e75f80fc64d61bff70ec92 SHA256 8c6e0a3732d8ce8460155d9862fb8e6720fec95a2e62388ed8011eab9113e2e2
-MISC ChangeLog 12421 RMD160 ab4227c66ff5c12acc6ac4d3d641ffdcab7dfd41 SHA1 8976820e389b4cfbe328e8b05da4f813245b2151 SHA256 bcef953df4440ef274ce3ace7af6cc9bbc11452d590ed75f2eaed714e6d1772c
+MISC ChangeLog 12594 RMD160 1e8ee8890d2519eda2b6c4d98940503f74899dc0 SHA1 2537a6c8ccc288167a8a1e68b38e5db101ea6cd1 SHA256 2f7e06db36c6d69ff600fb1b4225c22d88fa8aafae6380390457a33685772d11
 MISC metadata.xml 278 RMD160 70d8f6a6bc3d6619380cee3c0bc2179cf6a5bf28 SHA1 ca266604cf761d9ea76b5ec298ac553156c1c21e SHA256 0ec3e7bdc08e61c19df6ef7f5a1a5a2d2aeabb001c2efca4bdfe947e71a450b0
diff --git a/dev-db/postgresql-server/files/postgresql.conf-8.2 b/dev-db/postgresql-server/files/postgresql.conf-8.2
index 2cf92587cdbb..2719fb8072f9 100644
--- a/dev-db/postgresql-server/files/postgresql.conf-8.2
+++ b/dev-db/postgresql-server/files/postgresql.conf-8.2
@@ -40,6 +40,10 @@ WAIT_FOR_CLEANUP=60
 # Set to 0 to deactivate it
 WAIT_FOR_QUIT=60
 
+# Comment this out if you don't want to wait for the server to
+# startup before continuing.  For example, if this server is a 
+# PITR log shipping based replication standby
+WAIT_FOR_START="-w"
 
 # If you have to export environment variables for the database process,
 # this can be done here.
diff --git a/dev-db/postgresql-server/files/postgresql.init-8.2 b/dev-db/postgresql-server/files/postgresql.init-8.2
index fea496e5e412..9fa6c34a4f4e 100644
--- a/dev-db/postgresql-server/files/postgresql.init-8.2
+++ b/dev-db/postgresql-server/files/postgresql.init-8.2
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2008 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.2,v 1.3 2008/05/13 07:00:36 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/files/postgresql.init-8.2,v 1.4 2009/01/28 22:26:30 caleb Exp $
 
 opts="${opts} reload"
 
@@ -34,7 +34,7 @@ start() {
 	local retval
 
 	su -l ${PGUSER} \
-		-c "env PGDATA=\"${PGDATA}\" /usr/lib/postgresql-8.2/bin/pg_ctl start -w -o '--silent-mode=true ${PGOPTS}'"
+		-c "env PGDATA=\"${PGDATA}\" /usr/lib/postgresql-8.2/bin/pg_ctl start ${WAIT_FOR_START} -o '--silent-mode=true ${PGOPTS}'"
 	retval=$?
 	[ $retval -ne 0 ] && eend $retval && return $retval
 
@@ -58,16 +58,18 @@ stop() {
 
 	local retval
 
-	start-stop-daemon --stop --pidfile "${PGDATA}/postmaster.pid" \
-		--retry -TERM/${WAIT_FOR_DISCONNECT}
+	su -l ${PGUSER} \
+		-c "env PGDATA=\"${PGDATA}\" /usr/lib/postgresql-8.2/bin/pg_ctl stop -t ${WAIT_FOR_DISCONNECT} -m smart"
+
 	retval=$?
 	[ $retval -eq 0 ] && eend $retval && return $retval
 
 	ewarn "Some clients did not disconnect within ${WAIT_FOR_DISCONNECT} seconds."
 	ewarn "Going to shutdown the server anyway."
 
-	start-stop-daemon --stop --pidfile "${PGDATA}/postmaster.pid" \
-		--retry -INT/${WAIT_FOR_CLEANUP}
+	su -l ${PGUSER} \
+		-c "env PGDATA=\"${PGDATA}\" /usr/lib/postgresql-8.2/bin/pg_ctl stop -m fast"
+
 	retval=$?
 	[ $retval -eq 0 ] && eend $retval && return $retval
 
@@ -80,8 +82,9 @@ stop() {
 	ewarn "Shutting down the server gracefully failed."
 	ewarn "Forcing it to shutdown which leads to a recover-run on next startup."
 
-	start-stop-daemon --stop --pidfile "${PGDATA}/postmaster.pid" \
-		--retry -QUIT/${WAIT_FOR_QUIT}
+	su -l ${PGUSER} \
+		-c "env PGDATA=\"${PGDATA}\" /usr/lib/postgresql-8.2/bin/pg_ctl stop -m immediate"
+
 	retval=$?
 	[ $retval -eq 0 ] && eend $retval && return $retval
 
@@ -91,6 +94,7 @@ stop() {
 
 reload() {
 	ebegin "Reloading PostgreSQL configuration"
-	start-stop-daemon --stop --pidfile "${PGDATA}/postmaster.pid" --signal HUP --oknodo
+	su -l ${PGUSER} \
+		-c "env PGDATA=\"${PGDATA}\" /usr/lib/postgresql-8.2/bin/pg_ctl reload"	
 	eend $?
 }