diff options
Diffstat (limited to 'dev-db')
23 files changed, 1735 insertions, 64 deletions
diff --git a/dev-db/postgresql/ChangeLog b/dev-db/postgresql/ChangeLog index 93a73dcf9df5..1c7e98c67560 100644 --- a/dev-db/postgresql/ChangeLog +++ b/dev-db/postgresql/ChangeLog @@ -1,6 +1,23 @@ # ChangeLog for dev-db/postgresql # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.239 2005/10/08 17:29:18 axxo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.240 2005/10/08 23:06:23 nakano Exp $ + +*postgresql-8.0.4 (09 Oct 2005) +*postgresql-7.4.9 (09 Oct 2005) +*postgresql-7.3.11 (09 Oct 2005) + + 09 Oct 2005; <masatomo@gentoo.org> +files/postgresql.init-7.3.11, + +files/postgresql-7.3.11-gentoo.patch, +files/pg_autovacuum.conf-7.4.9, + +files/pg_autovacuum.init-7.4.9, +files/postgresql.conf-7.4.9, + +files/postgresql.init-7.4.9, +files/postgresql-7.4.9-gentoo.patch, + +files/postgresql-7.4.9-hppa-testandset.patch, + +files/postgresql-7.4.9-vacuum-delay.patch, + +files/pg_autovacuum.conf-8.0.4, +files/pg_autovacuum.init-8.0.4, + +files/postgresql.conf-8.0.4, +files/postgresql.init-8.0.4, + +files/postgresql-8.0.4-gentoo.patch, +files/postgresql-8.0.4-sh.patch, + +postgresql-7.3.11.ebuild, +postgresql-7.4.9.ebuild, + +postgresql-8.0.4.ebuild: + version bump 08 Oct 2005; Thomas Matthijs <axxo@gentoo.org> postgresql-7.3.6-r2.ebuild: use java-pkg_dojar not dojar diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest index 548684007b1a..8ed3997b1535 100644 --- a/dev-db/postgresql/Manifest +++ b/dev-db/postgresql/Manifest @@ -1,80 +1,91 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - +MD5 cfc0f78c9c0a6f8930692cd74295f3c9 postgresql-8.0.1-r3.ebuild 7782 +MD5 ff3f6f1b070d27617253ceb0703d0cdf postgresql-7.4.9.ebuild 10621 +MD5 7df0eb9c1b199df87cf6a16309fdba7c postgresql-7.4.7-r1.ebuild 10750 +MD5 dcf70d0e2ecf5f034659bf6eff790ef8 postgresql-8.0.4.ebuild 7568 +MD5 fa34b8b5457f7857ff00db8a8c1d83f8 postgresql-7.3.10.ebuild 8186 +MD5 1bf725f1e46685699f62d97f7ca0e821 postgresql-7.3.9-r1.ebuild 8078 +MD5 57b51c540a66192d429fa37f77d3ba0d postgresql-8.1_beta2.ebuild 7580 +MD5 24870c05d37481f1938ce4cc551e95ba postgresql-7.4.8.ebuild 10616 +MD5 2390b8f1126086636289c0c7a8c37af5 postgresql-8.0.3.ebuild 7557 +MD5 6974c8ce8289f43d19c4ea715a1b8ec3 postgresql-8.0.1-r4.ebuild 7871 +MD5 2e8cb4fb57a0620f97ed47decce6bb61 postgresql-7.4.7-r2.ebuild 10900 +MD5 4caca7094f3674f83cf42609400d5349 postgresql-7.3.6-r2.ebuild 7883 +MD5 9aca70437786ac31747055d13c19f642 postgresql-8.1_beta1.ebuild 7580 MD5 6c17c3cc5d82cb068de6cfa97cc02ad6 ChangeLog 44331 -MD5 8ca6301197c0d45d7530d4117d087b15 files/CAN-2005-1409-doc.patch 1749 +MD5 a7e152e3d696c760781b396e5ed42a18 postgresql-7.3.11.ebuild 8187 +MD5 f8d3d207746da2a3cd14dcaab8daab76 metadata.xml 163 MD5 90acacf5efb7b8a73ec5d34128358c32 files/CAN-2005-1409.patch 1698 +MD5 1111542635fa3a360dd148690cff0fef files/postgresql-8.1_beta2-gentoo.patch 1224 +MD5 fa95ac5bd802d7220fe9196de93fbe97 files/postgresql-8.1_beta1-sh.patch 618 +MD5 2e87af398df0a957bf2f2dff754ac174 files/postgresql-7.4.7-vacuum-delay.patch 8918 +MD5 df4fedbfa30df690a6f78da9f5a44196 files/postgresql-7.4.7-securityfix.patch 1773 +MD5 fa95ac5bd802d7220fe9196de93fbe97 files/postgresql-8.0.4-sh.patch 618 +MD5 3273c43da88db8e7fa5fd9c413f651c5 files/postgresql.init-7.3.10 1280 +MD5 3273c43da88db8e7fa5fd9c413f651c5 files/postgresql.init-7.3.11 1280 +MD5 8ca6301197c0d45d7530d4117d087b15 files/CAN-2005-1409-doc.patch 1749 +MD5 2e87af398df0a957bf2f2dff754ac174 files/postgresql-7.4.8-vacuum-delay.patch 8918 +MD5 61b463e796709e035216374cb149d614 files/postgresql-7.3.10-gentoo.patch 1741 +MD5 01f69b667825048f2e9807555b79b73d files/postgresql-8.0.3-gentoo.patch 1200 +MD5 1111542635fa3a360dd148690cff0fef files/postgresql-8.1_beta1-gentoo.patch 1224 +MD5 64cac596c308b19865f5738cc5af02b1 files/postgresql-7.4.9-gentoo.patch 1729 +MD5 fa95ac5bd802d7220fe9196de93fbe97 files/postgresql-8.1_beta2-sh.patch 618 MD5 3c53278e59e16caa55429700c0da42f9 files/CAN-2005-1410.patch 2843 -MD5 314c9147f25d4676c60a4761bbe500e2 files/digest-postgresql-7.3.10 226 -MD5 3b4cbf59561d655b882ab335b892909d files/digest-postgresql-7.3.6-r2 223 -MD5 f96713c7df9eb83197d57a6e22cdeedf files/digest-postgresql-7.3.9-r1 223 -MD5 b6200bc7bb2b1078ce182692c618f8a5 files/digest-postgresql-7.4.7-r1 290 -MD5 b6200bc7bb2b1078ce182692c618f8a5 files/digest-postgresql-7.4.7-r2 290 -MD5 4d7967107d2e9dbb6c097c637625023b files/digest-postgresql-7.4.8 290 +MD5 2e87af398df0a957bf2f2dff754ac174 files/postgresql-7.4.9-vacuum-delay.patch 8918 MD5 80e1a39d06466a396d8a2a1a5ff3b04a files/digest-postgresql-8.0.1-r3 293 MD5 80e1a39d06466a396d8a2a1a5ff3b04a files/digest-postgresql-8.0.1-r4 293 +MD5 6237c18ae647e118e23425e3cb28c8aa files/postgresql.init-7.3.6 1279 +MD5 5d90779b8c5b7d63ea0846f2a534fc87 files/postgresql.init-7.3.9 1279 +MD5 8b2a2b4c8f40a1fdbe73d7a6fbcfb6fe files/postgresql.init-7.4.7 1279 +MD5 eae31db55e9908de6d955d3efc931bbc files/postgresql.init-7.4.8 1279 +MD5 eae31db55e9908de6d955d3efc931bbc files/postgresql.init-7.4.9 1279 +MD5 fe44693b90eef9cf0b6118edb258da16 files/postgresql.init-8.0.1 1279 +MD5 b7252dad787e4e9f4d645a47d7f74ad8 files/postgresql.init-8.0.3 1279 +MD5 b7252dad787e4e9f4d645a47d7f74ad8 files/postgresql.init-8.0.4 1279 +MD5 9787933dfca9cc3858468186231a9df1 files/postgresql.conf-7.4.7 390 +MD5 9787933dfca9cc3858468186231a9df1 files/postgresql.conf-7.4.8 390 +MD5 9787933dfca9cc3858468186231a9df1 files/postgresql.conf-7.4.9 390 +MD5 9787933dfca9cc3858468186231a9df1 files/postgresql.conf-8.0.1 390 +MD5 9787933dfca9cc3858468186231a9df1 files/postgresql.conf-8.0.3 390 +MD5 9787933dfca9cc3858468186231a9df1 files/postgresql.conf-8.0.4 390 +MD5 4591d7bc6524b885854c18bb9b9ce23a files/postgresql-8.0.1-securityfix.patch 1850 +MD5 4d7967107d2e9dbb6c097c637625023b files/digest-postgresql-7.4.8 290 +MD5 ce73b682ac7e67c26c1857a737797ef5 files/digest-postgresql-7.4.9 290 MD5 6eaf9ba52385d9fc515d84cc4246db62 files/digest-postgresql-8.0.3 293 -MD5 7187dbff46912a9355acdbd7509eec3c files/digest-postgresql-8.1_beta1 232 -MD5 d1703acddcbd6eac1bc2fea225594245 files/digest-postgresql-8.1_beta2 232 -MD5 999379432735e7e6a71ec6ccd5a784e1 files/pg_autovacuum.conf-7.4.7 302 -MD5 999379432735e7e6a71ec6ccd5a784e1 files/pg_autovacuum.conf-7.4.8 302 -MD5 999379432735e7e6a71ec6ccd5a784e1 files/pg_autovacuum.conf-8.0.1 302 -MD5 999379432735e7e6a71ec6ccd5a784e1 files/pg_autovacuum.conf-8.0.3 302 +MD5 6b8a3129c9f85d8e97c5ee384c4c489b files/digest-postgresql-8.0.4 293 MD5 ffe7e2e6a0ae65238f2addcbbbba59d0 files/pg_autovacuum.init-7.4.7 1414 MD5 50be58ef7b752834f53ae86c70f75d9a files/pg_autovacuum.init-7.4.8 1414 +MD5 50be58ef7b752834f53ae86c70f75d9a files/pg_autovacuum.init-7.4.9 1414 MD5 62959a2ffd56e0e360b1437467c573a7 files/pg_autovacuum.init-8.0.1 1414 MD5 9b0d09ffaaa125d93a200e3783af23cc files/pg_autovacuum.init-8.0.3 1414 -MD5 61b463e796709e035216374cb149d614 files/postgresql-7.3.10-gentoo.patch 1741 -MD5 4501816025cc701e272b5e57937d0de0 files/postgresql-7.3.9-gentoo.patch 529 +MD5 9b0d09ffaaa125d93a200e3783af23cc files/pg_autovacuum.init-8.0.4 1414 +MD5 999379432735e7e6a71ec6ccd5a784e1 files/pg_autovacuum.conf-7.4.7 302 +MD5 999379432735e7e6a71ec6ccd5a784e1 files/pg_autovacuum.conf-7.4.8 302 +MD5 999379432735e7e6a71ec6ccd5a784e1 files/pg_autovacuum.conf-7.4.9 302 +MD5 999379432735e7e6a71ec6ccd5a784e1 files/pg_autovacuum.conf-8.0.1 302 +MD5 999379432735e7e6a71ec6ccd5a784e1 files/pg_autovacuum.conf-8.0.3 302 +MD5 999379432735e7e6a71ec6ccd5a784e1 files/pg_autovacuum.conf-8.0.4 302 MD5 dbe0601754b798a4d08f080137a57c43 files/postgresql-7.3.9-securityfix.patch 1443 +MD5 4501816025cc701e272b5e57937d0de0 files/postgresql-7.3.9-gentoo.patch 529 +MD5 1b27a8ad9d652b6d292ff34ad385b208 files/postgresql-7.4.8-gentoo.patch 1729 +MD5 7187dbff46912a9355acdbd7509eec3c files/digest-postgresql-8.1_beta1 232 +MD5 d1703acddcbd6eac1bc2fea225594245 files/digest-postgresql-8.1_beta2 232 +MD5 8e8ce270d164b11f885b57ba960e8fca files/postgresql.init-8.1_beta1 1283 +MD5 65e0d2c7e6e51b6d8042b9d27a073843 files/postgresql.init-8.1_beta2 1283 +MD5 3665230043dd69d562482d92f2d08286 files/postgresql-8.0.1-gentoo.patch 808 +MD5 3b4cbf59561d655b882ab335b892909d files/digest-postgresql-7.3.6-r2 223 +MD5 f96713c7df9eb83197d57a6e22cdeedf files/digest-postgresql-7.3.9-r1 223 +MD5 b6200bc7bb2b1078ce182692c618f8a5 files/digest-postgresql-7.4.7-r1 290 +MD5 b6200bc7bb2b1078ce182692c618f8a5 files/digest-postgresql-7.4.7-r2 290 MD5 e91e3b293273f041b209aa65ff6ceebc files/postgresql-7.4.7-gentoo.patch 1160 MD5 bd8092be6ccc6918973d9654caacbfab files/postgresql-7.4.7-hppa-testandset.patch 1596 -MD5 df4fedbfa30df690a6f78da9f5a44196 files/postgresql-7.4.7-securityfix.patch 1773 -MD5 2e87af398df0a957bf2f2dff754ac174 files/postgresql-7.4.7-vacuum-delay.patch 8918 -MD5 1b27a8ad9d652b6d292ff34ad385b208 files/postgresql-7.4.8-gentoo.patch 1729 -MD5 bd8092be6ccc6918973d9654caacbfab files/postgresql-7.4.8-hppa-testandset.patch 1596 -MD5 2e87af398df0a957bf2f2dff754ac174 files/postgresql-7.4.8-vacuum-delay.patch 8918 MD5 8ec4fecf36cf856f2d3afc97419c2f93 files/postgresql-8.0.1-gentoo-libpq.patch 1200 -MD5 3665230043dd69d562482d92f2d08286 files/postgresql-8.0.1-gentoo.patch 808 -MD5 4591d7bc6524b885854c18bb9b9ce23a files/postgresql-8.0.1-securityfix.patch 1850 -MD5 01f69b667825048f2e9807555b79b73d files/postgresql-8.0.3-gentoo.patch 1200 -MD5 fa95ac5bd802d7220fe9196de93fbe97 files/postgresql-8.0.3-sh.patch 618 -MD5 1111542635fa3a360dd148690cff0fef files/postgresql-8.1_beta1-gentoo.patch 1224 -MD5 fa95ac5bd802d7220fe9196de93fbe97 files/postgresql-8.1_beta1-sh.patch 618 -MD5 1111542635fa3a360dd148690cff0fef files/postgresql-8.1_beta2-gentoo.patch 1224 -MD5 fa95ac5bd802d7220fe9196de93fbe97 files/postgresql-8.1_beta2-sh.patch 618 MD5 2b0c84d2c26622573d4e2b7e0518fdad files/postgresql.conf 375 -MD5 9787933dfca9cc3858468186231a9df1 files/postgresql.conf-7.4.7 390 -MD5 9787933dfca9cc3858468186231a9df1 files/postgresql.conf-7.4.8 390 -MD5 9787933dfca9cc3858468186231a9df1 files/postgresql.conf-8.0.1 390 -MD5 9787933dfca9cc3858468186231a9df1 files/postgresql.conf-8.0.3 390 +MD5 fa95ac5bd802d7220fe9196de93fbe97 files/postgresql-8.0.3-sh.patch 618 MD5 9787933dfca9cc3858468186231a9df1 files/postgresql.conf-8.1_beta1 390 MD5 9787933dfca9cc3858468186231a9df1 files/postgresql.conf-8.1_beta2 390 -MD5 3273c43da88db8e7fa5fd9c413f651c5 files/postgresql.init-7.3.10 1280 -MD5 6237c18ae647e118e23425e3cb28c8aa files/postgresql.init-7.3.6 1279 -MD5 5d90779b8c5b7d63ea0846f2a534fc87 files/postgresql.init-7.3.9 1279 -MD5 8b2a2b4c8f40a1fdbe73d7a6fbcfb6fe files/postgresql.init-7.4.7 1279 -MD5 eae31db55e9908de6d955d3efc931bbc files/postgresql.init-7.4.8 1279 -MD5 fe44693b90eef9cf0b6118edb258da16 files/postgresql.init-8.0.1 1279 -MD5 b7252dad787e4e9f4d645a47d7f74ad8 files/postgresql.init-8.0.3 1279 -MD5 8e8ce270d164b11f885b57ba960e8fca files/postgresql.init-8.1_beta1 1283 -MD5 65e0d2c7e6e51b6d8042b9d27a073843 files/postgresql.init-8.1_beta2 1283 -MD5 f8d3d207746da2a3cd14dcaab8daab76 metadata.xml 163 -MD5 fa34b8b5457f7857ff00db8a8c1d83f8 postgresql-7.3.10.ebuild 8186 -MD5 4caca7094f3674f83cf42609400d5349 postgresql-7.3.6-r2.ebuild 7883 -MD5 1bf725f1e46685699f62d97f7ca0e821 postgresql-7.3.9-r1.ebuild 8078 -MD5 7df0eb9c1b199df87cf6a16309fdba7c postgresql-7.4.7-r1.ebuild 10750 -MD5 2e8cb4fb57a0620f97ed47decce6bb61 postgresql-7.4.7-r2.ebuild 10900 -MD5 24870c05d37481f1938ce4cc551e95ba postgresql-7.4.8.ebuild 10616 -MD5 cfc0f78c9c0a6f8930692cd74295f3c9 postgresql-8.0.1-r3.ebuild 7782 -MD5 6974c8ce8289f43d19c4ea715a1b8ec3 postgresql-8.0.1-r4.ebuild 7871 -MD5 2390b8f1126086636289c0c7a8c37af5 postgresql-8.0.3.ebuild 7557 -MD5 9aca70437786ac31747055d13c19f642 postgresql-8.1_beta1.ebuild 7580 -MD5 57b51c540a66192d429fa37f77d3ba0d postgresql-8.1_beta2.ebuild 7580 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.2 (GNU/Linux) - -iD8DBQFDSAIf/rLF9B432nYRAgBlAKDPdxEEYUPSLdhZaf+A81qY7yj/lACfU2EH -eJD4O/SwZTirGvlWrYa0Uyk= -=Oc13 ------END PGP SIGNATURE----- +MD5 314c9147f25d4676c60a4761bbe500e2 files/digest-postgresql-7.3.10 226 +MD5 419268f051162aee7f36e9c0b384fcc1 files/digest-postgresql-7.3.11 226 +MD5 bd8092be6ccc6918973d9654caacbfab files/postgresql-7.4.8-hppa-testandset.patch 1596 +MD5 7fad73889572ccdf114ce0024e7170c6 files/postgresql-7.3.11-gentoo.patch 1741 +MD5 01f69b667825048f2e9807555b79b73d files/postgresql-8.0.4-gentoo.patch 1200 +MD5 bd8092be6ccc6918973d9654caacbfab files/postgresql-7.4.9-hppa-testandset.patch 1596 diff --git a/dev-db/postgresql/files/digest-postgresql-7.3.11 b/dev-db/postgresql/files/digest-postgresql-7.3.11 new file mode 100644 index 000000000000..05e5831b78f5 --- /dev/null +++ b/dev-db/postgresql/files/digest-postgresql-7.3.11 @@ -0,0 +1,3 @@ +MD5 b72b5a505e87e994c27a85b1efb9744c postgresql-base-7.3.11.tar.bz2 5666278 +MD5 5bfb2e5386332d00ad00f7631831cb0e postgresql-docs-7.3.11.tar.bz2 2347416 +MD5 cb9ffad14fa603021085c524ecafec09 postgresql-opt-7.3.11.tar.bz2 340624 diff --git a/dev-db/postgresql/files/digest-postgresql-7.4.9 b/dev-db/postgresql/files/digest-postgresql-7.4.9 new file mode 100644 index 000000000000..2256e0178a55 --- /dev/null +++ b/dev-db/postgresql/files/digest-postgresql-7.4.9 @@ -0,0 +1,4 @@ +MD5 174761481d118d89f198d36afd1ca27d postgresql-base-7.4.9.tar.bz2 6601210 +MD5 c772b28f6b86efa10f707cc0b12d18fc postgresql-opt-7.4.9.tar.bz2 332379 +MD5 58da72c07bfbbcefb83fe96d701c3c2f postgresql-docs-7.4.9.tar.bz2 2426803 +MD5 16d037213b879963724da7809a0a1589 hier-Pg7.4-0.5.3.tar.gz 34662 diff --git a/dev-db/postgresql/files/digest-postgresql-8.0.4 b/dev-db/postgresql/files/digest-postgresql-8.0.4 new file mode 100644 index 000000000000..bf2bfb9be670 --- /dev/null +++ b/dev-db/postgresql/files/digest-postgresql-8.0.4 @@ -0,0 +1,4 @@ +MD5 1d410cfb38253675fee36c8f9ee655e2 hier-Pg8.0.1-0.5.4.diff.gz 30662 +MD5 ece2604b7bc6c4c460d34113b1542725 postgresql-base-8.0.4.tar.bz2 7825300 +MD5 37580606f2ca2ed2deacc65461693391 postgresql-docs-8.0.4.tar.bz2 2227623 +MD5 27b8817f6ad1b81b55cdc8da55ed8295 postgresql-opt-8.0.4.tar.bz2 133881 diff --git a/dev-db/postgresql/files/pg_autovacuum.conf-7.4.9 b/dev-db/postgresql/files/pg_autovacuum.conf-7.4.9 new file mode 100644 index 000000000000..f342ebfd2a47 --- /dev/null +++ b/dev-db/postgresql/files/pg_autovacuum.conf-7.4.9 @@ -0,0 +1,14 @@ +# The PostgreSQL user is: +PGUSER=postgres + +# LOG file is: +PG_AUTOVACUUM_LOG=/var/lib/postgresql/data/pg_autovacuum.log + +# See the pg_autovacuum documentation for the details of how these +# parameters affect pg_autovacuum's aggressiveness. + +VACUUM_BASE=1000 +VACUUM_SCALE=2 + +SLEEP_BASE=300 +SLEEP_SCALE=2 diff --git a/dev-db/postgresql/files/pg_autovacuum.conf-8.0.4 b/dev-db/postgresql/files/pg_autovacuum.conf-8.0.4 new file mode 100644 index 000000000000..f342ebfd2a47 --- /dev/null +++ b/dev-db/postgresql/files/pg_autovacuum.conf-8.0.4 @@ -0,0 +1,14 @@ +# The PostgreSQL user is: +PGUSER=postgres + +# LOG file is: +PG_AUTOVACUUM_LOG=/var/lib/postgresql/data/pg_autovacuum.log + +# See the pg_autovacuum documentation for the details of how these +# parameters affect pg_autovacuum's aggressiveness. + +VACUUM_BASE=1000 +VACUUM_SCALE=2 + +SLEEP_BASE=300 +SLEEP_SCALE=2 diff --git a/dev-db/postgresql/files/pg_autovacuum.init-7.4.9 b/dev-db/postgresql/files/pg_autovacuum.init-7.4.9 new file mode 100644 index 000000000000..77f918be80c3 --- /dev/null +++ b/dev-db/postgresql/files/pg_autovacuum.init-7.4.9 @@ -0,0 +1,51 @@ +#!/sbin/runscript +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/files/pg_autovacuum.init-7.4.9,v 1.1 2005/10/08 23:06:24 nakano Exp $ + +depend() { + need postgresql logger +} + +start() { + ebegin "Starting pg_autovacuum" + echo "" + echo -n "Waiting max. 10 sec. for postgresql to start " + CONTINUE=0 + TOO_LONG=0 + while [ "$CONTINUE" -eq 0 ] && [ $TOO_LONG -lt 10 ] + do + psql -U $PGUSER -d template1 -c "SELECT 1" 1> /dev/null 2> /dev/null + if [ "$?" -eq 0 ] + then + CONTINUE=1 + else + echo -n "." + TOO_LONG=`expr $TOO_LONG + 1` + sleep 1 + fi + done + start-stop-daemon -o --chuid $PGUSER --start --quiet --exec /usr/bin/pg_autovacuum -- -D -v $VACUUM_BASE -V $VACUUM_SCALE -s $SLEEP_BASE -S $SLEEP_SCALE -L $PG_AUTOVACUUM_LOG + + sleep 1 + pidof /usr/bin/pg_autovacuum > /dev/null + if [ $? -eq 0 ]; then + eend 0 + else + eerror "" + eerror "Please see log file: $PG_AUTOVACUUM_LOG" + eerror "You may need to add following lines in /var/lib/postgresql/data/postgresql.conf and restart PostgreSQL." + eerror " stats_start_collector = true" + eerror " stats_row_level = true" + + eerror "Please read ___DOCDIR___/contrib/README.pg_autovacuum for details." + eend 1 + fi +} + +stop() { + ebegin "Stopping pg_autovacuum" + start-stop-daemon --stop --quiet --exec /usr/bin/pg_autovacuum + result=$? + eend $result +} diff --git a/dev-db/postgresql/files/pg_autovacuum.init-8.0.4 b/dev-db/postgresql/files/pg_autovacuum.init-8.0.4 new file mode 100644 index 000000000000..494dd3e2f538 --- /dev/null +++ b/dev-db/postgresql/files/pg_autovacuum.init-8.0.4 @@ -0,0 +1,51 @@ +#!/sbin/runscript +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/files/pg_autovacuum.init-8.0.4,v 1.1 2005/10/08 23:06:24 nakano Exp $ + +depend() { + need postgresql logger +} + +start() { + ebegin "Starting pg_autovacuum" + echo "" + echo -n "Waiting max. 10 sec. for postgresql to start " + CONTINUE=0 + TOO_LONG=0 + while [ "$CONTINUE" -eq 0 ] && [ $TOO_LONG -lt 10 ] + do + psql -U $PGUSER -d template1 -c "SELECT 1" 1> /dev/null 2> /dev/null + if [ "$?" -eq 0 ] + then + CONTINUE=1 + else + echo -n "." + TOO_LONG=`expr $TOO_LONG + 1` + sleep 1 + fi + done + start-stop-daemon -o --chuid $PGUSER --start --quiet --exec /usr/bin/pg_autovacuum -- -D -v $VACUUM_BASE -V $VACUUM_SCALE -s $SLEEP_BASE -S $SLEEP_SCALE -L $PG_AUTOVACUUM_LOG + + sleep 1 + pidof /usr/bin/pg_autovacuum > /dev/null + if [ $? -eq 0 ]; then + eend 0 + else + eerror "" + eerror "Please see log file: $PG_AUTOVACUUM_LOG" + eerror "You may need to add following lines in /var/lib/postgresql/data/postgresql.conf and restart PostgreSQL." + eerror " stats_start_collector = true" + eerror " stats_row_level = true" + + eerror "Please read ___DOCDIR___/contrib/README.pg_autovacuum for details." + eend 1 + fi +} + +stop() { + ebegin "Stopping pg_autovacuum" + start-stop-daemon --stop --quiet --exec /usr/bin/pg_autovacuum + result=$? + eend $result +} diff --git a/dev-db/postgresql/files/postgresql-7.3.11-gentoo.patch b/dev-db/postgresql/files/postgresql-7.3.11-gentoo.patch new file mode 100644 index 000000000000..24b0a29ab55f --- /dev/null +++ b/dev-db/postgresql/files/postgresql-7.3.11-gentoo.patch @@ -0,0 +1,51 @@ +diff -Naru postgresql-7.3.11.org/src/interfaces/Makefile postgresql-7.3.11/src/interfaces/Makefile +--- postgresql-7.3.11.org/src/interfaces/Makefile 2004-04-20 01:33:51.000000000 +0100 ++++ postgresql-7.3.11/src/interfaces/Makefile 2005-05-09 21:59:15.000000000 +0100 +@@ -12,7 +12,7 @@ + top_builddir = ../.. + include $(top_builddir)/src/Makefile.global + +-DIRS := libpq ecpg ++DIRS := ecpg + + ALLDIRS := $(DIRS) + +diff -Naru postgresql-7.3.11.org/src/Makefile postgresql-7.3.11/src/Makefile +--- postgresql-7.3.11.org/src/Makefile 2005-01-13 18:23:21.000000000 +0000 ++++ postgresql-7.3.11/src/Makefile 2005-05-09 21:59:54.000000000 +0100 +@@ -18,7 +18,6 @@ + $(MAKE) -C timezone $@ + $(MAKE) -C backend $@ + $(MAKE) -C backend/utils/mb/conversion_procs $@ +- $(MAKE) -C include $@ + $(MAKE) -C interfaces $@ + $(MAKE) -C bin $@ + $(MAKE) -C pl $@ +@@ -47,7 +46,6 @@ + $(MAKE) -C port $@ + $(MAKE) -C timezone $@ + $(MAKE) -C backend $@ +- $(MAKE) -C include $@ + $(MAKE) -C interfaces $@ + $(MAKE) -C bin $@ + $(MAKE) -C pl $@ +@@ -61,7 +59,6 @@ + -$(MAKE) -C port $@ + -$(MAKE) -C timezone $@ + -$(MAKE) -C backend $@ +- -$(MAKE) -C include $@ + -$(MAKE) -C interfaces $@ + -$(MAKE) -C bin $@ + -$(MAKE) -C pl $@ +diff -Naru postgresql-7.3.11.org/configure postgresql-7.3.11/configure +--- postgresql-7.3.11.org/configure 2004-08-15 01:51:58.000000000 +0100 ++++ postgresql-7.3.11/configure 2004-10-03 00:24:38.477010826 +0100 +@@ -5871,7 +5871,7 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + pgac_cv_check_readline=no +-for pgac_lib in "" " -ltermcap" " -lncurses" " -lcurses" ; do ++for pgac_lib in "" " -lncurses" " -lcurses" ; do + for pgac_rllib in -lreadline -ledit ; do + pgac_save_LIBS=$LIBS + LIBS="${pgac_rllib}${pgac_lib} $LIBS" diff --git a/dev-db/postgresql/files/postgresql-7.4.9-gentoo.patch b/dev-db/postgresql/files/postgresql-7.4.9-gentoo.patch new file mode 100644 index 000000000000..cc2dc8a99b4a --- /dev/null +++ b/dev-db/postgresql/files/postgresql-7.4.9-gentoo.patch @@ -0,0 +1,51 @@ +diff -Naru postgresql-7.4.9.org/configure postgresql-7.4.9/configure +--- postgresql-7.4.9.org/configure 2004-08-18 04:11:24.000000000 +0100 ++++ postgresql-7.4.9/configure 2004-09-15 20:28:46.933631781 +0100 +@@ -6003,7 +6003,7 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + pgac_cv_check_readline=no +-for pgac_lib in "" " -ltermcap" " -lncurses" " -lcurses" ; do ++for pgac_lib in "" " -lncurses" " -lcurses" ; do + for pgac_rllib in -lreadline -ledit ; do + pgac_save_LIBS=$LIBS + LIBS="${pgac_rllib}${pgac_lib} $LIBS" +diff -Naru postgresql-7.4.9.org/src/interfaces/Makefile postgresql-7.4.9/src/interfaces/Makefile +--- postgresql-7.4.9.org/src/interfaces/Makefile 2004-04-20 01:33:51.000000000 +0100 ++++ postgresql-7.4.9/src/interfaces/Makefile 2005-05-09 21:59:15.000000000 +0100 +@@ -12,7 +12,7 @@ + top_builddir = ../.. + include $(top_builddir)/src/Makefile.global + +-DIRS := libpq ecpg ++DIRS := ecpg + + ALLDIRS := $(DIRS) + +diff -Naru postgresql-7.4.9.org/src/Makefile postgresql-7.4.9/src/Makefile +--- postgresql-7.4.9.org/src/Makefile 2005-01-13 18:23:21.000000000 +0000 ++++ postgresql-7.4.9/src/Makefile 2005-05-09 21:59:54.000000000 +0100 +@@ -18,7 +18,6 @@ + $(MAKE) -C timezone $@ + $(MAKE) -C backend $@ + $(MAKE) -C backend/utils/mb/conversion_procs $@ +- $(MAKE) -C include $@ + $(MAKE) -C interfaces $@ + $(MAKE) -C bin $@ + $(MAKE) -C pl $@ +@@ -47,7 +46,6 @@ + $(MAKE) -C port $@ + $(MAKE) -C timezone $@ + $(MAKE) -C backend $@ +- $(MAKE) -C include $@ + $(MAKE) -C interfaces $@ + $(MAKE) -C bin $@ + $(MAKE) -C pl $@ +@@ -61,7 +59,6 @@ + -$(MAKE) -C port $@ + -$(MAKE) -C timezone $@ + -$(MAKE) -C backend $@ +- -$(MAKE) -C include $@ + -$(MAKE) -C interfaces $@ + -$(MAKE) -C bin $@ + -$(MAKE) -C pl $@ diff --git a/dev-db/postgresql/files/postgresql-7.4.9-hppa-testandset.patch b/dev-db/postgresql/files/postgresql-7.4.9-hppa-testandset.patch new file mode 100644 index 000000000000..010a42a4088e --- /dev/null +++ b/dev-db/postgresql/files/postgresql-7.4.9-hppa-testandset.patch @@ -0,0 +1,52 @@ +diff -urN postgresql-7.4.1.orig/src/include/port/linux.h postgresql-7.4.1/src/include/port/linux.h +--- postgresql-7.4.1.orig/src/include/port/linux.h 2003-10-26 01:41:10.000000000 +0000 ++++ postgresql-7.4.1/src/include/port/linux.h 2004-01-09 20:22:50.000000000 +0000 +@@ -3,6 +3,11 @@ + + #define HAS_TEST_AND_SET + ++#elif defined(__hppa__) ++typedef struct { int sema[4]; } slock_t; ++ ++#define HAS_TEST_AND_SET ++ + #elif defined(__sparc__) + typedef unsigned char slock_t; + +diff -urN postgresql-7.4.1.orig/src/include/storage/s_lock.h postgresql-7.4.1/src/include/storage/s_lock.h +--- postgresql-7.4.1.orig/src/include/storage/s_lock.h 2003-11-04 09:43:56.000000000 +0000 ++++ postgresql-7.4.1/src/include/storage/s_lock.h 2004-01-09 20:12:15.000000000 +0000 +@@ -112,6 +112,33 @@ + + #endif /* __i386__ || __x86_64__ */ + ++#if defined(__hppa__) || defined(__hppa) ++#define TAS(lock) tas(lock) ++ ++#define __ldcw(a) ({ \ ++ unsigned int __ret; \ ++ __asm__ __volatile__("ldcw 0(%2),%0" \ ++ : "=r" (__ret), "=m" (*(a)) : "r" (a)); \ ++ __ret; \ ++}) ++ ++#define __PA_LDCW_ALIGNMENT 16 ++#define __ldcw_align(a) ({ \ ++ volatile unsigned int __ret = (unsigned int) a; \ ++ if ((__ret & ~(__PA_LDCW_ALIGNMENT - 1)) < (unsigned int) a) \ ++ __ret = (__ret & ~(__PA_LDCW_ALIGNMENT - 1)) + __PA_LDCW_ALIGNMENT; \ ++ (unsigned int *) __ret; \ ++}) ++ ++static __inline__ int ++tas(volatile slock_t *lock) ++{ ++ volatile unsigned int *a = __ldcw_align (lock); ++ return (__ldcw(a) == 0); ++} ++ ++#endif /* __hppa__ || __hppa */ ++ + + /* Intel Itanium */ + #if defined(__ia64__) || defined(__ia64) diff --git a/dev-db/postgresql/files/postgresql-7.4.9-vacuum-delay.patch b/dev-db/postgresql/files/postgresql-7.4.9-vacuum-delay.patch new file mode 100644 index 000000000000..e0f499859009 --- /dev/null +++ b/dev-db/postgresql/files/postgresql-7.4.9-vacuum-delay.patch @@ -0,0 +1,284 @@ + * From: Jan Wieck <JanWieck ( at ) Yahoo ( dot ) com>
+ * To: "Matthew T. O'Connor" <matthew ( at ) zeut ( dot ) net>
+ * Subject: Re: Performance features the 4th
+ * Date: Sun, 09 Nov 2003 18:42:53 -0500
+
+Matthew T. O'Connor wrote:
+
+ ----- Original Message ----- From: "Jan Wieck" <JanWieck ( at ) Yahoo ( dot ) com>
+
+Tom Lane wrote:
+> Gaetano and a couple of other people did experiments that seemed to show
+> it was useful. I think we'd want to change the shape of the knob per
+> later suggestions (sleep 10 ms every N blocks, instead of N ms every
+> block) but it did seem that there was useful bang for little buck there.
+
+
+ I thought it was "sleep N ms every M blocks".
+
+Have we seen any numbers? Anything at all? Something that gives us a
+clue by what factor one has to multiply the total time a "VACUUM
+ANALYZE" takes, to get what effect in return?
+
+
+I have some time on sunday to do some testing. Is there a patch that I can
+apply that implements either of the two options? (sleep 10ms every M blocks
+or sleep N ms every M blocks).
+
+
+I know Tom posted the original patch that sleept N ms every 1 block (where N
+is > 10 due to OS limitations). Jan can you post a patch that has just the
+sleep code in it? Or should it be easy enough for me to cull out of the
+larger patch you posted?
+
+
+Sorry for the delay, had to finish some other concept yesterday (will be published soon).
+
+The attached patch adds
+
+ vacuum_group_delay_size = 10 (range 1-1000)
+ vacuum_group_delay_msec = 0 (range 0-1000)
+
+
+and does the sleeping via select(2). It does it only at the same places where Tom had done the usleep() in his hack, so I guess there is still some more to do besides the documentation, before it can be added to 7.4.1. But it should be enough to get some testing done.
+
+
+Jan
+
+--
+#======================================================================#
+# It's easier to get forgiveness for being wrong than for being right. #
+# Let's break this rule - forgive me. #
+#================================================== JanWieck ( at ) Yahoo ( dot ) com #
+
+Index: src/backend/access/nbtree/nbtree.c
+===================================================================
+RCS file: /home/pgsql/CvsRoot/pgsql-server/src/backend/access/nbtree/nbtree.c,v
+retrieving revision 1.106
+diff -c -b -r1.106 nbtree.c
+*** src/backend/access/nbtree/nbtree.c 2003/09/29 23:40:26 1.106
+--- src/backend/access/nbtree/nbtree.c 2003/11/09 23:39:36
+***************
+*** 27,32 ****
+--- 27,40 ----
+ #include "storage/smgr.h"
+
+
++ /*
++ * Variables for vacuum_group_delay option (in commands/vacuumlazy.c)
++ */
++ extern int vacuum_group_delay_size; /* vacuum N pages */
++ extern int vacuum_group_delay_msec; /* then sleep M msec */
++ extern int vacuum_group_delay_count;
++
++
+ /* Working state for btbuild and its callback */
+ typedef struct
+ {
+***************
+*** 610,615 ****
+--- 618,632 ----
+
+ CHECK_FOR_INTERRUPTS();
+
++ if (vacuum_group_delay_msec > 0)
++ {
++ if (++vacuum_group_delay_count >= vacuum_group_delay_size)
++ {
++ PG_DELAY(vacuum_group_delay_msec);
++ vacuum_group_delay_count = 0;
++ }
++ }
++
+ ndeletable = 0;
+ page = BufferGetPage(buf);
+ opaque = (BTPageOpaque) PageGetSpecialPointer(page);
+***************
+*** 736,741 ****
+--- 753,769 ----
+ Buffer buf;
+ Page page;
+ BTPageOpaque opaque;
++
++ CHECK_FOR_INTERRUPTS();
++
++ if (vacuum_group_delay_msec > 0)
++ {
++ if (++vacuum_group_delay_count >= vacuum_group_delay_size)
++ {
++ PG_DELAY(vacuum_group_delay_msec);
++ vacuum_group_delay_count = 0;
++ }
++ }
+
+ buf = _bt_getbuf(rel, blkno, BT_READ);
+ page = BufferGetPage(buf);
+Index: src/backend/commands/vacuumlazy.c
+===================================================================
+RCS file: /home/pgsql/CvsRoot/pgsql-server/src/backend/commands/vacuumlazy.c,v
+retrieving revision 1.32
+diff -c -b -r1.32 vacuumlazy.c
+*** src/backend/commands/vacuumlazy.c 2003/09/25 06:57:59 1.32
+--- src/backend/commands/vacuumlazy.c 2003/11/09 23:40:13
+***************
+*** 88,93 ****
+--- 88,100 ----
+ static TransactionId OldestXmin;
+ static TransactionId FreezeLimit;
+
++ /*
++ * Variables for vacuum_group_delay option (in commands/vacuumlazy.c)
++ */
++ int vacuum_group_delay_size = 10; /* vacuum N pages */
++ int vacuum_group_delay_msec = 0; /* then sleep M msec */
++ int vacuum_group_delay_count = 0;
++
+
+ /* non-export function prototypes */
+ static void lazy_scan_heap(Relation onerel, LVRelStats *vacrelstats,
+***************
+*** 228,233 ****
+--- 235,249 ----
+
+ CHECK_FOR_INTERRUPTS();
+
++ if (vacuum_group_delay_msec > 0)
++ {
++ if (++vacuum_group_delay_count >= vacuum_group_delay_size)
++ {
++ PG_DELAY(vacuum_group_delay_msec);
++ vacuum_group_delay_count = 0;
++ }
++ }
++
+ /*
+ * If we are close to overrunning the available space for
+ * dead-tuple TIDs, pause and do a cycle of vacuuming before we
+***************
+*** 469,474 ****
+--- 485,499 ----
+
+ CHECK_FOR_INTERRUPTS();
+
++ if (vacuum_group_delay_msec > 0)
++ {
++ if (++vacuum_group_delay_count >= vacuum_group_delay_size)
++ {
++ PG_DELAY(vacuum_group_delay_msec);
++ vacuum_group_delay_count = 0;
++ }
++ }
++
+ tblk = ItemPointerGetBlockNumber(&vacrelstats->dead_tuples[tupindex]);
+ buf = ReadBuffer(onerel, tblk);
+ LockBufferForCleanup(buf);
+***************
+*** 799,804 ****
+--- 824,838 ----
+ hastup;
+
+ CHECK_FOR_INTERRUPTS();
++
++ if (vacuum_group_delay_msec > 0)
++ {
++ if (++vacuum_group_delay_count >= vacuum_group_delay_size)
++ {
++ PG_DELAY(vacuum_group_delay_msec);
++ vacuum_group_delay_count = 0;
++ }
++ }
+
+ blkno--;
+
+Index: src/backend/utils/misc/guc.c
+===================================================================
+RCS file: /home/pgsql/CvsRoot/pgsql-server/src/backend/utils/misc/guc.c,v
+retrieving revision 1.164.2.1
+diff -c -b -r1.164.2.1 guc.c
+*** src/backend/utils/misc/guc.c 2003/11/07 21:27:50 1.164.2.1
+--- src/backend/utils/misc/guc.c 2003/11/09 23:27:49
+***************
+*** 73,78 ****
+--- 73,80 ----
+ extern int CommitDelay;
+ extern int CommitSiblings;
+ extern char *preload_libraries_string;
++ extern int vacuum_group_delay_size;
++ extern int vacuum_group_delay_msec;
+
+ #ifdef HAVE_SYSLOG
+ extern char *Syslog_facility;
+***************
+*** 1188,1193 ****
+--- 1190,1213 ----
+ },
+ &log_min_duration_statement,
+ -1, -1, INT_MAX / 1000, NULL, NULL
++ },
++
++ {
++ {"vacuum_group_delay_msec", PGC_USERSET, RESOURCES,
++ gettext_noop("Sets VACUUM's delay in milliseconds between processing groups of pages."),
++ NULL
++ },
++ &vacuum_group_delay_msec,
++ 0, 0, 1000, NULL, NULL
++ },
++
++ {
++ {"vacuum_group_delay_size", PGC_USERSET, RESOURCES,
++ gettext_noop("Sets VACUUM's group size for the vacuum_group_delay_msec option."),
++ NULL
++ },
++ &vacuum_group_delay_size,
++ 10, 1, 1000, NULL, NULL
+ },
+
+ /* End-of-list marker */
+Index: src/backend/utils/misc/postgresql.conf.sample
+===================================================================
+RCS file: /home/pgsql/CvsRoot/pgsql-server/src/backend/utils/misc/postgresql.conf.sample,v
+retrieving revision 1.92
+diff -c -b -r1.92 postgresql.conf.sample
+*** src/backend/utils/misc/postgresql.conf.sample 2003/10/08 03:49:38 1.92
+--- src/backend/utils/misc/postgresql.conf.sample 2003/11/09 23:04:21
+***************
+*** 69,74 ****
+--- 69,79 ----
+ #max_files_per_process = 1000 # min 25
+ #preload_libraries = ''
+
++ # - Vacuum napping -
++
++ #vacuum_group_delay_size = 10 # range 1-1000 pages ; vacuum this many pages
++ #vacuum_group_delay_msec = 0 # range 0-1000 msec ; then nap this long
++
+
+ #---------------------------------------------------------------------------
+ # WRITE AHEAD LOG
+Index: src/include/miscadmin.h
+===================================================================
+RCS file: /home/pgsql/CvsRoot/pgsql-server/src/include/miscadmin.h,v
+retrieving revision 1.134
+diff -c -b -r1.134 miscadmin.h
+*** src/include/miscadmin.h 2003/09/24 18:54:01 1.134
+--- src/include/miscadmin.h 2003/11/09 23:02:03
+***************
+*** 96,101 ****
+--- 96,111 ----
+ CritSectionCount--; \
+ } while(0)
+
++ /*
++ * Macro using select(2) to nap for milliseconds
++ */
++ #define PG_DELAY(_msec) \
++ { \
++ struct timeval _delay; \
++ _delay.tv_sec = (_msec) / 1000; \
++ _delay.tv_usec = ((_msec) % 1000) * 1000; \
++ (void) select(0, NULL, NULL, NULL, &_delay);\
++ }
+
+ /*****************************************************************************
+ * globals.h -- *
diff --git a/dev-db/postgresql/files/postgresql-8.0.4-gentoo.patch b/dev-db/postgresql/files/postgresql-8.0.4-gentoo.patch new file mode 100644 index 000000000000..7cac7ad65b3b --- /dev/null +++ b/dev-db/postgresql/files/postgresql-8.0.4-gentoo.patch @@ -0,0 +1,39 @@ +diff -Naru postgresql-8.0.3.org/src/interfaces/Makefile postgresql-8.0.3/src/interfaces/Makefile +--- postgresql-8.0.3.org/src/interfaces/Makefile 2004-04-20 01:33:51.000000000 +0100 ++++ postgresql-8.0.3/src/interfaces/Makefile 2005-05-09 21:59:15.000000000 +0100 +@@ -12,7 +12,7 @@ + top_builddir = ../.. + include $(top_builddir)/src/Makefile.global + +-DIRS := libpq ecpg ++DIRS := ecpg + + ALLDIRS := $(DIRS) + +diff -Naru postgresql-8.0.3.org/src/Makefile postgresql-8.0.3/src/Makefile +--- postgresql-8.0.3.org/src/Makefile 2005-01-13 18:23:21.000000000 +0000 ++++ postgresql-8.0.3/src/Makefile 2005-05-09 21:59:54.000000000 +0100 +@@ -18,7 +18,6 @@ + $(MAKE) -C timezone $@ + $(MAKE) -C backend $@ + $(MAKE) -C backend/utils/mb/conversion_procs $@ +- $(MAKE) -C include $@ + $(MAKE) -C interfaces $@ + $(MAKE) -C bin $@ + $(MAKE) -C pl $@ +@@ -47,7 +46,6 @@ + $(MAKE) -C port $@ + $(MAKE) -C timezone $@ + $(MAKE) -C backend $@ +- $(MAKE) -C include $@ + $(MAKE) -C interfaces $@ + $(MAKE) -C bin $@ + $(MAKE) -C pl $@ +@@ -61,7 +59,6 @@ + -$(MAKE) -C port $@ + -$(MAKE) -C timezone $@ + -$(MAKE) -C backend $@ +- -$(MAKE) -C include $@ + -$(MAKE) -C interfaces $@ + -$(MAKE) -C bin $@ + -$(MAKE) -C pl $@ diff --git a/dev-db/postgresql/files/postgresql-8.0.4-sh.patch b/dev-db/postgresql/files/postgresql-8.0.4-sh.patch new file mode 100644 index 000000000000..fc59d52af0e8 --- /dev/null +++ b/dev-db/postgresql/files/postgresql-8.0.4-sh.patch @@ -0,0 +1,34 @@ +--- src/include/storage/s_lock.h~ 2005-01-01 07:03:42.000000000 +0900 ++++ src/include/storage/s_lock.h 2005-08-17 23:09:19.000000000 +0900 +@@ -239,6 +239,31 @@ + #endif /* __s390__ || __s390x__ */ + + ++#if defined(__sh__) ++#define HAS_TEST_AND_SET ++ ++typedef unsigned char slock_t; ++ ++#define TAS(lock) tas(lock) ++ ++static __inline__ int ++tas(volatile slock_t *lock) ++{ ++ register int _res = 1; ++ ++ __asm__ __volatile__( ++ "tas.b @%1\n\t" ++ "movt %0\n\t" ++ "xor #1,%0" ++: "=z"(_res) ++: "r"(lock) ++: "t","memory"); ++ return _res; ++} ++ ++#endif /* __sh__ */ ++ ++ + #if defined(__sparc__) + #define HAS_TEST_AND_SET + diff --git a/dev-db/postgresql/files/postgresql.conf-7.4.9 b/dev-db/postgresql/files/postgresql.conf-7.4.9 new file mode 100644 index 000000000000..e8dab3e4c827 --- /dev/null +++ b/dev-db/postgresql/files/postgresql.conf-7.4.9 @@ -0,0 +1,14 @@ +# PostgreSQL's Database Directory +PGDATA=/var/lib/postgresql/data + +# Logfile path: (NOTE: This must be uid/gid owned by the value of $PGUSER!) +PGLOG=/var/lib/postgresql/data/postgresql.log + +# Run the PostgreSQL user as: +PGUSER=postgres + +# Extra options to run postmaster with. +# If you want to enable TCP/IP for PostgreSQL, add -i to the following: +# PGOPTS="-N 1024 -B 2048 -i" +PGOPTS="" + diff --git a/dev-db/postgresql/files/postgresql.conf-8.0.4 b/dev-db/postgresql/files/postgresql.conf-8.0.4 new file mode 100644 index 000000000000..e8dab3e4c827 --- /dev/null +++ b/dev-db/postgresql/files/postgresql.conf-8.0.4 @@ -0,0 +1,14 @@ +# PostgreSQL's Database Directory +PGDATA=/var/lib/postgresql/data + +# Logfile path: (NOTE: This must be uid/gid owned by the value of $PGUSER!) +PGLOG=/var/lib/postgresql/data/postgresql.log + +# Run the PostgreSQL user as: +PGUSER=postgres + +# Extra options to run postmaster with. +# If you want to enable TCP/IP for PostgreSQL, add -i to the following: +# PGOPTS="-N 1024 -B 2048 -i" +PGOPTS="" + diff --git a/dev-db/postgresql/files/postgresql.init-7.3.11 b/dev-db/postgresql/files/postgresql.init-7.3.11 new file mode 100644 index 000000000000..0930d133d050 --- /dev/null +++ b/dev-db/postgresql/files/postgresql.init-7.3.11 @@ -0,0 +1,63 @@ +#!/sbin/runscript +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/files/postgresql.init-7.3.11,v 1.1 2005/10/08 23:06:24 nakano Exp $ + +opts="${opts} reload" + +depend() { + use net +} + +checkconfig() { + if [ ! -d $PGDATA ]; then + eerror "directory not found: $PGDATA" + eerror "You should create PGDATA directory first." + return 1 + fi +} + +start() { + checkconfig || return 1 + + ebegin "Starting PostgreSQL" + if [ -f $PGDATA/postmaster.pid ]; then + rm $PGDATA/postmaster.pid + fi + su - $PGUSER -c "/usr/bin/pg_ctl start -D '$PGDATA' -s -l '$PGLOG' -o '$PGOPTS'" + + while : + do + cnt=$(($cnt + 1)) + if [ -f "$PGDATA/postmaster.pid" ]; then + ret=0 + break + fi + + if [ $cnt -eq 30 ]; then + eerror "Please see log file: $PGLOG" + ret=1 + break + fi + sleep 1 + done + eend $ret +} + +stop() { + ebegin "Stopping PostgreSQL" + su - $PGUSER -c "/usr/bin/pg_ctl stop -D '$PGDATA' -s -m fast" + eend $? +} + +svc_restart() { + ebegin "Restarting PostgreSQL" + su - $PGUSER -c "/usr/bin/pg_ctl restart -D '$PGDATA' -s -m fast -l '$PGLOG' -o '$PGOPTS'" + eend $? +} + +reload() { + ebegin "Reloading PostgreSQL configuration" + su - $PGUSER -c "/usr/bin/pg_ctl reload -D '$PGDATA' -s" + eend $? +} diff --git a/dev-db/postgresql/files/postgresql.init-7.4.9 b/dev-db/postgresql/files/postgresql.init-7.4.9 new file mode 100644 index 000000000000..7c0b57c3e76b --- /dev/null +++ b/dev-db/postgresql/files/postgresql.init-7.4.9 @@ -0,0 +1,63 @@ +#!/sbin/runscript +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/files/postgresql.init-7.4.9,v 1.1 2005/10/08 23:06:24 nakano Exp $ + +opts="${opts} reload" + +depend() { + use net +} + +checkconfig() { + if [ ! -d $PGDATA ]; then + eerror "directory not found: $PGDATA" + eerror "You should create PGDATA directory first." + return 1 + fi +} + +start() { + checkconfig || return 1 + + ebegin "Starting PostgreSQL" + if [ -f $PGDATA/postmaster.pid ]; then + rm $PGDATA/postmaster.pid + fi + su - $PGUSER -c "/usr/bin/pg_ctl start -D '$PGDATA' -s -l '$PGLOG' -o '$PGOPTS'" + + while : + do + cnt=$(($cnt + 1)) + if [ -f "$PGDATA/postmaster.pid" ]; then + ret=0 + break + fi + + if [ $cnt -eq 30 ]; then + eerror "Please see log file: $PGLOG" + ret=1 + break + fi + sleep 1 + done + eend $ret +} + +stop() { + ebegin "Stopping PostgreSQL" + su - $PGUSER -c "/usr/bin/pg_ctl stop -D '$PGDATA' -s -m fast" + eend $? +} + +svc_restart() { + ebegin "Restarting PostgreSQL" + su - $PGUSER -c "/usr/bin/pg_ctl restart -D '$PGDATA' -s -m fast -l '$PGLOG' -o '$PGOPTS'" + eend $? +} + +reload() { + ebegin "Reloading PostgreSQL configuration" + su - $PGUSER -c "/usr/bin/pg_ctl reload -D '$PGDATA' -s" + eend $? +} diff --git a/dev-db/postgresql/files/postgresql.init-8.0.4 b/dev-db/postgresql/files/postgresql.init-8.0.4 new file mode 100644 index 000000000000..ea0b8ed3b931 --- /dev/null +++ b/dev-db/postgresql/files/postgresql.init-8.0.4 @@ -0,0 +1,63 @@ +#!/sbin/runscript +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/files/postgresql.init-8.0.4,v 1.1 2005/10/08 23:06:24 nakano Exp $ + +opts="${opts} reload" + +depend() { + use net +} + +checkconfig() { + if [ ! -d $PGDATA ]; then + eerror "directory not found: $PGDATA" + eerror "You should create PGDATA directory first." + return 1 + fi +} + +start() { + checkconfig || return 1 + + ebegin "Starting PostgreSQL" + if [ -f $PGDATA/postmaster.pid ]; then + rm $PGDATA/postmaster.pid + fi + su - $PGUSER -c "/usr/bin/pg_ctl start -D '$PGDATA' -s -l '$PGLOG' -o '$PGOPTS'" + + while : + do + cnt=$(($cnt + 1)) + if [ -f "$PGDATA/postmaster.pid" ]; then + ret=0 + break + fi + + if [ $cnt -eq 30 ]; then + eerror "Please see log file: $PGLOG" + ret=1 + break + fi + sleep 1 + done + eend $ret +} + +stop() { + ebegin "Stopping PostgreSQL" + su - $PGUSER -c "/usr/bin/pg_ctl stop -D '$PGDATA' -s -m fast" + eend $? +} + +svc_restart() { + ebegin "Restarting PostgreSQL" + su - $PGUSER -c "/usr/bin/pg_ctl restart -D '$PGDATA' -s -m fast -l '$PGLOG' -o '$PGOPTS'" + eend $? +} + +reload() { + ebegin "Reloading PostgreSQL configuration" + su - $PGUSER -c "/usr/bin/pg_ctl reload -D '$PGDATA' -s" + eend $? +} diff --git a/dev-db/postgresql/postgresql-7.3.11.ebuild b/dev-db/postgresql/postgresql-7.3.11.ebuild new file mode 100644 index 000000000000..0216661b2680 --- /dev/null +++ b/dev-db/postgresql/postgresql-7.3.11.ebuild @@ -0,0 +1,239 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.3.11.ebuild,v 1.1 2005/10/08 23:06:23 nakano Exp $ + +inherit eutils gnuconfig flag-o-matic java-pkg + +DESCRIPTION="sophisticated Object-Relational DBMS" + +HOMEPAGE="http://www.postgresql.org/" +SRC_URI="mirror://postgresql/source/v${PV}/${PN}-base-${PV}.tar.bz2 + mirror://postgresql/source/v${PV}/${PN}-opt-${PV}.tar.bz2 + doc? ( mirror://postgresql/source/v${PV}/${PN}-docs-${PV}.tar.bz2 )" + +LICENSE="POSTGRESQL" +SLOT="0" +KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 ~hppa ~ia64 ~mips" +IUSE="doc java libg++ nls pam perl python readline ssl tcltk zlib threads selinux" + +DEPEND="virtual/libc + =dev-db/libpq-7.3.11* + sys-devel/autoconf + >=sys-libs/ncurses-5.2 + zlib? ( >=sys-libs/zlib-1.1.3 ) + readline? ( >=sys-libs/readline-4.1 ) + tcltk? ( >=dev-lang/tcl-8 >=dev-lang/tk-8.3.3-r1 ) + perl? ( >=dev-lang/perl-5.6.1-r2 ) + python? ( >=dev-lang/python-2.2 dev-python/egenix-mx-base ) + java? ( >=virtual/jdk-1.3 >=dev-java/ant-1.3 + dev-java/java-config ) + ssl? ( >=dev-libs/openssl-0.9.6-r1 ) + nls? ( sys-devel/gettext )" +# java dep workaround for portage bug +# x86? ( java? ( =dev-java/sun-jdk-1.3* >=dev-java/ant-1.3 ) ) +RDEPEND="virtual/libc + =dev-db/libpq-7.3.11* + zlib? ( >=sys-libs/zlib-1.1.3 ) + tcltk? ( >=dev-lang/tcl-8 ) + perl? ( >=dev-lang/perl-5.6.1-r2 ) + python? ( >=dev-lang/python-2.2 ) + java? ( >=virtual/jdk-1.3 ) + selinux? ( sec-policy/selinux-postgresql ) + ssl? ( >=dev-libs/openssl-0.9.6-r1 )" + +PG_DIR="/var/lib/postgresql" + +pkg_setup() { + if [ -f ${PG_DIR}/data/PG_VERSION ] ; then + PG_MAJOR=`cat ${PG_DIR}/data/PG_VERSION | cut -f1 -d.` + PG_MINOR=`cat ${PG_DIR}/data/PG_VERSION | cut -f2 -d.` + if [ ${PG_MAJOR} -lt 7 ] || [ ${PG_MAJOR} -eq 7 -a ${PG_MINOR} -lt 3 ] ; then + eerror "Postgres ${PV} cannot upgrade your existing databases, you must" + eerror "use pg_dump to export your existing databases to a file, and then" + eerror "pg_restore to import them when you have upgraded completely." + eerror "You must remove your entire database directory to continue." + eerror "(database directory = ${PG_DIR})." + exit 1 + fi + fi +} + +check_java_config() { + JDKHOME="`java-config --jdk-home`" + if [[ -z "${JDKHOME}" || ! -d "${JDKHOME}" ]]; then + NOJDKERROR="You need to use java-config to set your JVM to a JDK!" + eerror "${NOJDKERROR}" + die "${NOJDKERROR}" + fi +} + +src_unpack() { + unpack ${A} || die + epatch ${FILESDIR}/${P}-gentoo.patch +} + +src_compile() { + filter-flags -ffast-math + + if use java; then + check_java_config + fi + + local myconf + use tcltk && myconf="--with-tcl" + use python && myconf="$myconf --with-python" + use perl && myconf="$myconf --with-perl" + use java && myconf="$myconf --with-java" + use ssl && myconf="$myconf --with-openssl" + use nls && myconf="$myconf --enable-nls" + use libg++ && myconf="$myconf --with-CXX" + use pam && myconf="$myconf --with-pam" + use readline || myconf="$myconf --without-readline" + use zlib || myconf="$myconf --without-zlib" + use threads && myconf="$myconf --enable-thread-safety" + + # these are the only working CFLAGS I could get on ppc, so locking them + # down, anything more aggressive fails (i.e. -mcpu or -Ox) + # Gerk - Nov 26, 2002 + use ppc && CFLAGS="-pipe -fsigned-char" + + # Detect mips systems properly + gnuconfig_update + + ./configure --prefix=/usr \ + --mandir=/usr/share/man \ + --host=${CHOST} \ + --docdir=/usr/share/doc/${PF} \ + --libdir=/usr/lib \ + --includedir=/usr/include/postgresql/pgsql \ + --enable-depend \ + --with-gnu-ld \ + --with-maxbackends=1024 \ + $myconf || die + + make || die + cd contrib + make || die +} + +src_install() { + if use perl; then + mv ${S}/src/pl/plperl/Makefile ${S}/src/pl/plperl/Makefile_orig + sed -e "s:(INST_DYNAMIC) /usr/lib:(INST_DYNAMIC) ${D}/usr/lib:" \ + ${S}/src/pl/plperl/Makefile_orig > ${S}/src/pl/plperl/Makefile + mv ${S}/src/pl/plperl/GNUmakefile ${S}/src/pl/plperl/GNUmakefile_orig + sed -e "s:\$(DESTDIR)\$(plperl_installdir):\$(plperl_installdir):" \ + ${S}/src/pl/plperl/GNUmakefile_orig > ${S}/src/pl/plperl/GNUmakefile + fi + + make DESTDIR=${D} includedir_server=/usr/include/postgresql/server includedir_internal=/usr/include/postgresql/internal LIBDIR=${D}/usr/lib install || die + make DESTDIR=${D} includedir_server=/usr/include/postgresql/server includedir_internal=/usr/include/postgresql/internal install-all-headers || die + cd ${S}/contrib + make DESTDIR=${D} LIBDIR=${D}/usr/lib install || die + cd ${S} + dodoc COPYRIGHT HISTORY INSTALL README register.txt + dodoc contrib/adddepend/* + + if use java; then + # we need to remove jar file after dojar; otherwise two same jar + # file are installed. + java-pkg_dojar ${D}/usr/share/postgresql/java/postgresql.jar + rm ${D}/usr/share/postgresql/java/postgresql.jar + fi + + # backward compatibility + for i in ${D}/usr/include/postgresql/pgsql/* + do + ln -s ${i} ${D}/usr/include/ + done + + cd ${S}/doc + dodoc FAQ* README.* TODO bug.template + if use doc; then + cd ${S}/doc + docinto FAQ_html || die + dodoc src/FAQ/* || die + docinto sgml || die + dodoc src/sgml/*.{sgml,dsl} || die + docinto sgml/ref || die + dodoc src/sgml/ref/*.sgml || die + docinto TODO.detail || die + dodoc TODO.detail/* || die + fi + + cd ${S} + exeinto /etc/init.d/ + newexe ${FILESDIR}/postgresql.init-${PV} postgresql || die + + insinto /etc/conf.d/ + newins ${FILESDIR}/postgresql.conf postgresql || die + + keepdir /var/lib/postgresql +} + +pkg_postinst() { + einfo "Execute the following command" + einfo "ebuild /var/db/pkg/dev-db/${PF}/${PF}.ebuild config" + einfo "to setup the initial database environment." + einfo "" + einfo "Make sure the postgres user in /etc/passwd has an account setup with /bin/bash as the shell" +} + +pkg_config() { + einfo "Creating the data directory ..." + mkdir -p ${PG_DIR}/data + chown -Rf postgres:postgres ${PG_DIR} + chmod 700 ${PG_DIR}/data + + einfo "Initializing the database ..." + if [ -f ${PG_DIR}/data/PG_VERSION ] ; then + PG_MAJOR=`cat ${PG_DIR}/data/PG_VERSION | cut -f1 -d.` + PG_MINOR=`cat ${PG_DIR}/data/PG_VERSION | cut -f2 -d.` + if [ ${PG_MAJOR} -lt 7 ] || [ ${PG_MAJOR} -eq 7 -a ${PG_MINOR} -lt 3 ] ; then + eerror "Postgres ${PV} cannot upgrade your existing databases." + eerror "You must remove your entire database directory to continue." + eerror "(database directory = ${PG_DIR})." + exit 1 + else + einfon "A postgres data directory already exists from version "; cat ${PG_DIR}/data/PG_VERSION + einfo "Read the documentation to check how to upgrade to version ${PV}." + fi + else + # On hppa, postgresql need way more than the default sem index and shmmax + if [ "${ARCH}" = "hppa" ]; then + SEM_IDX_MIN=1024 + SHMMAX_MIN=100000000 + SEM_IDX=`sysctl kernel.sem | awk '{ print $6 }'` + if [ $SEM_IDX -lt ${SEM_IDX_MIN} ]; then + eerror "The last value of /proc/sys/kernel/sem is too low for postgresql to run" + eerror "Temporary setting this value to ${SEM_IDX_MIN} while creating the initial database." + cat /proc/sys/kernel/sem | sed -e "s/\t${SEM_IDX}/\t${SEM_IDX_MIN}/" > /proc/sys/kernel/sem + fi + fi + su postgres -c "/usr/bin/initdb --pgdata ${PG_DIR}/data" + + if [ "${ARCH}" = "hppa" ]; then + if [ ! `sysctl kernel.sem | awk '{ print $6 }'` -eq ${SEM_IDX} ] ; then + cat /proc/sys/kernel/sem | sed -e "s/\t${SEM_IDX_MIN}/\t${SEM_IDX}/" > /proc/sys/kernel/sem + ewarn "Restoring the sem idx value to the previous value" + ewarn "Please edit the last value of kernel.sem in /etc/sysctl.conf" + ewarn "and set it to at least ${SEM_IDX_MIN}" + fi + + if [ `sysctl kernel.shmmax | awk '{ print $3 }'` -lt ${SHMMAX_MIN} ]; then + eerror "The current value of /proc/sys/kernel/shmmax is too low" + eerror "for postgresql to run. Please edit /etc/sysctl.conf and set" + eerror "this value to at least ${SHMMAX_MIN}." + + fi + fi + + einfo "If you are upgrading from a pre-7.3 version of PostgreSQL, please read" + einfo "the README.adddepend file for information on how to properly migrate" + einfo "all serial columns, unique keys and foreign keys to this version." + + einfo "" + einfo "You can use /etc/init.d/postgresql script to run PostgreSQL instead of pg_ctl." + einfo "" + fi +} diff --git a/dev-db/postgresql/postgresql-7.4.9.ebuild b/dev-db/postgresql/postgresql-7.4.9.ebuild new file mode 100644 index 000000000000..2e6fa4c94534 --- /dev/null +++ b/dev-db/postgresql/postgresql-7.4.9.ebuild @@ -0,0 +1,308 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.4.9.ebuild,v 1.1 2005/10/08 23:06:23 nakano Exp $ + +inherit eutils gnuconfig flag-o-matic java-pkg multilib toolchain-funcs + +DESCRIPTION="sophisticated Object-Relational DBMS." +HOMEPAGE="http://www.postgresql.org/" +P_HIERPG="hier-Pg7.4-0.5.3" +SRC_URI="mirror://postgresql/source/v${PV}/${PN}-base-${PV}.tar.bz2 + mirror://postgresql/source/v${PV}/${PN}-opt-${PV}.tar.bz2 + doc? ( mirror://postgresql/source/v${PV}/${PN}-docs-${PV}.tar.bz2 ) + pg-hier? ( ftp://gborg.postgresql.org/pub/hierpg/stable/${P_HIERPG}.tar.gz )" + +LICENSE="POSTGRESQL" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" +IUSE="ssl nls java python tcltk perl libg++ pam readline zlib doc pg-hier pg-vacuumdelay pg-intdatetime threads xml2 selinux" + +DEPEND="virtual/libc + =dev-db/libpq-7.4.9* + sys-devel/autoconf + >=sys-libs/ncurses-5.2 + >=sys-devel/bison-1.875 + zlib? ( >=sys-libs/zlib-1.1.3 ) + readline? ( >=sys-libs/readline-4.1 ) + tcltk? ( >=dev-lang/tcl-8 >=dev-lang/tk-8.3.3-r1 ) + perl? ( >=dev-lang/perl-5.6.1-r2 ) + python? ( >=dev-lang/python-2.2 dev-python/egenix-mx-base ) + java? ( >=virtual/jdk-1.3 >=dev-java/ant-1.3 + dev-java/java-config ) + ssl? ( >=dev-libs/openssl-0.9.6-r1 ) + nls? ( sys-devel/gettext ) + xml2? ( dev-libs/libxml2 dev-libs/libxslt dev-util/pkgconfig )" +# java dep workaround for portage bug +# x86? ( java? ( =dev-java/sun-jdk-1.3* >=dev-java/ant-1.3 ) ) +RDEPEND="virtual/libc + =dev-db/libpq-7.4.9* + zlib? ( >=sys-libs/zlib-1.1.3 ) + tcltk? ( >=dev-lang/tcl-8 ) + perl? ( >=dev-lang/perl-5.6.1-r2 ) + python? ( >=dev-lang/python-2.2 ) + java? ( >=virtual/jdk-1.3 ) + selinux? ( sec-policy/selinux-postgresql ) + ssl? ( >=dev-libs/openssl-0.9.6-r1 ) + xml2? ( dev-libs/libxml2 dev-libs/libxslt )" + +PG_DIR="/var/lib/postgresql" +MAX_CONNECTIONS=1024 + +pkg_setup() { + if [ -f ${PG_DIR}/data/PG_VERSION ] ; then + PG_MAJOR=`cat ${PG_DIR}/data/PG_VERSION | cut -f1 -d.` + PG_MINOR=`cat ${PG_DIR}/data/PG_VERSION | cut -f2 -d.` + if [ ${PG_MAJOR} -lt 7 ] || [ ${PG_MAJOR} -eq 7 -a ${PG_MINOR} -lt 4 ] ; then + eerror "Postgres ${PV} cannot upgrade your existing databases, you must" + eerror "use pg_dump to export your existing databases to a file, and then" + eerror "pg_restore to import them when you have upgraded completely." + eerror "You must remove your entire database directory to continue." + eerror "(database directory = ${PG_DIR})." + exit 1 + fi + fi +} + +check_java_config() { + JDKHOME="`java-config --jdk-home`" + if [[ -z "${JDKHOME}" || ! -d "${JDKHOME}" ]]; then + NOJDKERROR="You need to use java-config to set your JVM to a JDK!" + eerror "${NOJDKERROR}" + die "${NOJDKERROR}" + fi +} + +src_unpack() { + unpack ${A} || die + epatch ${FILESDIR}/${P}-gentoo.patch + + if use pg-hier; then + cd ${S} || die + epatch ${WORKDIR}/${P_HIERPG}.diff + fi + + if use pg-vacuumdelay; then + cd ${S} || die + epatch ${FILESDIR}/${P}-vacuum-delay.patch + fi + + if [ "${ARCH}" = "hppa" ] + then + cd ${S} + epatch ${FILESDIR}/${P}-hppa-testandset.patch + fi +} + +src_compile() { + filter-flags -ffast-math + + if use java; then + check_java_config + fi + + local myconf + use tcltk && myconf="--with-tcl" + use python && myconf="$myconf --with-python" + use perl && myconf="$myconf --with-perl" + use java && myconf="$myconf --with-java" + use ssl && myconf="$myconf --with-openssl" + use nls && myconf="$myconf --enable-nls" + use libg++ && myconf="$myconf --with-CXX" + use pam && myconf="$myconf --with-pam" + use readline || myconf="$myconf --without-readline" + use zlib || myconf="$myconf --without-zlib" + use pg-intdatetime && myconf="$myconf --enable-integer-datetimes" + use threads && myconf="$myconf --enable-thread-safety" + + # these are the only working CFLAGS I could get on ppc, so locking them + # down, anything more aggressive fails (i.e. -mcpu or -Ox) + # Gerk - Nov 26, 2002 + use ppc && CFLAGS="-pipe -fsigned-char" + use xml2 && CFLAGS="${CFLAGS} $(pkg-config --cflags libxml-2.0)" + use xml2 && LIBS="${LIBS} $(pkg-config --libs libxml-2.0)" + + # Detect mips systems properly + gnuconfig_update + + ./configure --prefix=/usr \ + --mandir=/usr/share/man \ + --host=${CHOST} \ + --docdir=/usr/share/doc/${PF} \ + --libdir=/usr/$(get_libdir) \ + --includedir=/usr/include/postgresql/pgsql \ + --enable-depend \ + --with-gnu-ld \ + --with-maxbackends=${MAX_CONNECTIONS} \ + $myconf || die + + make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die + cd contrib + make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die + if use xml2; then + make -C xml LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die + fi +} + +src_install() { + if use perl; then + mv ${S}/src/pl/plperl/Makefile ${S}/src/pl/plperl/Makefile_orig + sed -e "s:(INST_DYNAMIC) /usr/lib:(INST_DYNAMIC) ${D}/usr/lib:" \ + ${S}/src/pl/plperl/Makefile_orig > ${S}/src/pl/plperl/Makefile + mv ${S}/src/pl/plperl/GNUmakefile ${S}/src/pl/plperl/GNUmakefile_orig + sed -e "s:\$(DESTDIR)\$(plperl_installdir):\$(plperl_installdir):" \ + ${S}/src/pl/plperl/GNUmakefile_orig > ${S}/src/pl/plperl/GNUmakefile + fi + + make DESTDIR=${D} includedir_server=/usr/include/postgresql/server includedir_internal=/usr/include/postgresql/internal LIBDIR=${D}/usr/lib install || die + make DESTDIR=${D} includedir_server=/usr/include/postgresql/server includedir_internal=/usr/include/postgresql/internal install-all-headers || die + cd ${S}/contrib + make DESTDIR=${D} LIBDIR=${D}/usr/lib install || die + if use xml2; then + make -C xml DESTDIR=${D} IBDIR=${D}/usr/lib install || die + fi + cd ${S} + if use pg-hier; then + dodoc ${WORKDIR}/README-${P_HIERPG}.html || die + fi + dodoc README HISTORY COPYRIGHT INSTALL + dodoc contrib/adddepend/* + + exeinto /usr/bin + + if use java; then + # we need to remove jar file after dojar; otherwise two same jar + # file are installed. + java-pkg_dojar ${D}/usr/share/postgresql/java/postgresql.jar || die + rm ${D}/usr/share/postgresql/java/postgresql.jar + java-pkg_dojar ${D}/usr/share/postgresql/java/postgresql-examples.jar || die + rm ${D}/usr/share/postgresql/java/postgresql-examples.jar + fi + + # backward compatibility + for i in ${D}/usr/include/postgresql/pgsql/* + do + ln -s ${i} ${D}/usr/include/ + done + + cd ${S}/doc + dodoc FAQ* README.* TODO bug.template + if use doc; then + cd ${S}/doc + docinto FAQ_html || die + dodoc src/FAQ/* || die + docinto sgml || die + dodoc src/sgml/*.{sgml,dsl} || die + docinto sgml/ref || die + dodoc src/sgml/ref/*.sgml || die + docinto TODO.detail || die + dodoc TODO.detail/* || die + fi + + cd ${S} + exeinto /etc/init.d/ + newexe ${FILESDIR}/postgresql.init-${PV} postgresql || die + newexe ${FILESDIR}/pg_autovacuum.init-${PV} pg_autovacuum || die + dosed "s:___DOCDIR___:/usr/share/doc/${PF}:" /etc/init.d/pg_autovacuum + + insinto /etc/conf.d/ + newins ${FILESDIR}/postgresql.conf-${PV} postgresql || die + newins ${FILESDIR}/pg_autovacuum.conf-${PV} pg_autovacuum || die +} + +pkg_postinst() { + einfo "Make sure the postgres user in /etc/passwd has an account setup with /bin/bash as the shell" + + if [ -f ${PG_DIR}/data/PG_VERSION ] ; then + PG_MAJOR=`cat ${PG_DIR}/data/PG_VERSION | cut -f1 -d.` + PG_MINOR=`cat ${PG_DIR}/data/PG_VERSION | cut -f2 -d.` + if [ ${PG_MAJOR} -lt 7 ] || [ ${PG_MAJOR} -eq 7 -a ${PG_MINOR} -eq 4 ] ; then + ewarn "" + ewarn "If you are upgrading from PostgreSQL 7.4 or 7.4.1, it is strongly recommended" + ewarn "that you read the release notes concerning changes to the system catalogs." + ewarn "You can run 7.4.2 without rerunning initdb, however you may still experience" + ewarn "random crashes due to an error in pg_statistic." + ewarn "" + ewarn "If you prefer not to re-initdb your installation, the release notes contain" + ewarn "a procedure for manually correcting the problem." + ewarn "" + fi + + if use pg-hier; then + ewarn "" + ewarn "REQUIRED!! After installing patched PostgreSQL by pg-hier" + ewarn "it is required to run 'initdb'. Without this Pg will fail " + ewarn "with error " + ewarn "ERROR: did not find '}' at end of input node. " + ewarn "" + fi + else + einfo "" + einfo "Execute the following command" + einfo "ebuild /var/db/pkg/dev-db/${PF}/${PF}.ebuild config" + einfo "to setup the initial database environment." + einfo "" + fi + + einfo "" + einfo "Python modules was removed from PostgreSQL package." + einfo "If you need it, please run \"emerge dev-db/pygresql\"." + einfo "" +} + +pkg_config() { + einfo "Creating the data directory ..." + mkdir -p ${PG_DIR}/data + chown -Rf postgres:postgres ${PG_DIR} + chmod 700 ${PG_DIR}/data + + einfo "Initializing the database ..." + if [ -f ${PG_DIR}/data/PG_VERSION ] ; then + PG_MAJOR=`cat ${PG_DIR}/data/PG_VERSION | cut -f1 -d.` + PG_MINOR=`cat ${PG_DIR}/data/PG_VERSION | cut -f2 -d.` + if [ ${PG_MAJOR} -lt 7 ] || [ ${PG_MAJOR} -eq 7 -a ${PG_MINOR} -lt 3 ] ; then + eerror "Postgres ${PV} cannot upgrade your existing databases." + eerror "You must remove your entire database directory to continue." + eerror "(database directory = ${PG_DIR})." + exit 1 + else + einfon "A postgres data directory already exists from version "; cat ${PG_DIR}/data/PG_VERSION + einfo "Read the documentation to check how to upgrade to version ${PV}." + fi + else + local SEM=`sysctl -n kernel.sem | cut -f-3` + local SEMMNI=`sysctl -n kernel.sem | cut -f4` + local SEMMNI_MIN=`expr \( ${MAX_CONNECTIONS} + 15 \) / 16` + local SHMMAX=`sysctl -n kernel.shmmax` + local SHMMAX_MIN=`expr 250000 + 30600 \* ${MAX_CONNECTIONS}` + + if [ ${SEMMNI} -lt ${SEMMNI_MIN} ]; then + eerror "The current value of SEMMNI is too low" + eerror "for postgresql to run ${MAX_CONNECTIONS} connections" + eerror "Temporary setting this value to ${SEMMNI_MIN} while creating the initial database." + echo ${SEM} ${SEMMNI_MIN} > /proc/sys/kernel/sem + fi + su postgres -c "/usr/bin/initdb --pgdata ${PG_DIR}/data" + + if [ ! `sysctl -n kernel.sem | cut -f4` -eq ${SEMMNI} ] ; then + echo ${SEM} ${SEMMNI} > /proc/sys/kernel/sem + ewarn "Restoring the SEMMNI value to the previous value" + ewarn "Please edit the last value of kernel.sem in /etc/sysctl.conf" + ewarn "and set it to at least ${SEMMNI_MIN}" + ewarn "" + ewarn " kernel.sem = ${SEM} ${SEMMNI_MIN}" + ewarn "" + fi + + if [ ${SHMMAX} -lt ${SHMMAX_MIN} ]; then + eerror "The current value of SHMMAX is too low for postgresql to run." + eerror "Please edit /etc/sysctl.conf and set this value to at least ${SHMMAX_MIN}." + eerror "" + eerror " kernel.shmmax = ${SHMMAX_MIN}" + eerror "" + + fi + einfo "" + einfo "You can use /etc/init.d/postgresql script to run PostgreSQL instead of pg_ctl." + einfo "" + fi +} diff --git a/dev-db/postgresql/postgresql-8.0.4.ebuild b/dev-db/postgresql/postgresql-8.0.4.ebuild new file mode 100644 index 000000000000..d4e9e8da24c0 --- /dev/null +++ b/dev-db/postgresql/postgresql-8.0.4.ebuild @@ -0,0 +1,227 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-8.0.4.ebuild,v 1.1 2005/10/08 23:06:23 nakano Exp $ + +inherit eutils gnuconfig flag-o-matic multilib toolchain-funcs + +DESCRIPTION="sophisticated Object-Relational DBMS." +HOMEPAGE="http://www.postgresql.org/" +P_HIERPG="hier-Pg8.0.1-0.5.4" +MY_PV=${PV/_/} +MY_P=${PN}-${MY_PV} +SRC_URI="mirror://postgresql/source/v${PV}/${PN}-base-${MY_PV}.tar.bz2 + mirror://postgresql/source/v${PV}/${PN}-opt-${MY_PV}.tar.bz2 + doc? ( mirror://postgresql/source/v${PV}/${PN}-docs-${MY_PV}.tar.bz2 ) + pg-hier? ( http://gppl.moonbone.ru/${P_HIERPG}.diff.gz )" + +LICENSE="POSTGRESQL" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="ssl nls python tcltk perl libg++ pam readline xml2 zlib doc selinux kerberos pg-intdatetime pg-hier" + +S=${WORKDIR}/${MY_P} +DEPEND="virtual/libc + =dev-db/libpq-8.0.4* + sys-devel/autoconf + >=sys-libs/ncurses-5.2 + >=sys-devel/bison-1.875 + zlib? ( >=sys-libs/zlib-1.1.3 ) + readline? ( >=sys-libs/readline-4.1 ) + tcltk? ( >=dev-lang/tcl-8 >=dev-lang/tk-8.3.3-r1 ) + perl? ( >=dev-lang/perl-5.6.1-r2 ) + python? ( >=dev-lang/python-2.2 dev-python/egenix-mx-base ) + ssl? ( >=dev-libs/openssl-0.9.6-r1 ) + xml2? ( dev-libs/libxml2 dev-libs/libxslt dev-util/pkgconfig ) + nls? ( sys-devel/gettext ) + kerberos? ( virtual/krb5 )" +RDEPEND="virtual/libc + =dev-db/libpq-8.0.4* + zlib? ( >=sys-libs/zlib-1.1.3 ) + tcltk? ( >=dev-lang/tcl-8 ) + perl? ( >=dev-lang/perl-5.6.1-r2 ) + python? ( >=dev-lang/python-2.2 ) + selinux? ( sec-policy/selinux-postgresql ) + ssl? ( >=dev-libs/openssl-0.9.6-r1 ) + xml2? ( dev-libs/libxml2 dev-libs/libxslt ) + kerberos? ( virtual/krb5 )" + +PG_DIR="/var/lib/postgresql" + +pkg_setup() { + if [ -f ${PG_DIR}/data/PG_VERSION ] ; then + PG_MAJOR=`cat ${PG_DIR}/data/PG_VERSION | cut -f1 -d.` + PG_MINOR=`cat ${PG_DIR}/data/PG_VERSION | cut -f2 -d.` + if [ ${PG_MAJOR} -lt 8 ] || [ ${PG_MAJOR} -eq 8 -a ${PG_MINOR} -lt 0 ] ; then + eerror "Postgres ${MY_PV} cannot upgrade your existing databases, you must" + eerror "use pg_dump to export your existing databases to a file, and then" + eerror "pg_restore to import them when you have upgraded completely." + eerror "You must remove your entire database directory to continue." + eerror "(database directory = ${PG_DIR})." + exit 1 + fi + fi +} + +src_unpack() { + unpack ${A} || die + cd ${S} + use pg-hier && epatch ${WORKDIR}/${P_HIERPG}.diff + epatch ${FILESDIR}/${P}-gentoo.patch + epatch ${FILESDIR}/${P}-sh.patch +} + +src_compile() { + filter-flags -ffast-math -feliminate-dwarf2-dups + + local myconf + use tcltk && myconf="--with-tcl" + use python && myconf="$myconf --with-python" + use perl && myconf="$myconf --with-perl" + use ssl && myconf="$myconf --with-openssl" + use nls && myconf="$myconf --enable-nls" + use libg++ && myconf="$myconf --with-CXX" + use pam && myconf="$myconf --with-pam" + use readline || myconf="$myconf --without-readline" + use zlib || myconf="$myconf --without-zlib" + use kerberos && myconf="$myconf --with-krb5" + use pg-intdatetime && myconf="$myconf --enable-integer-datetimes" + + # these are the only working CFLAGS I could get on ppc, so locking them + # down, anything more aggressive fails (i.e. -mcpu or -Ox) + # Gerk - Nov 26, 2002 + use ppc && CFLAGS="-pipe -fsigned-char" + + # Detect mips systems properly + gnuconfig_update + + ./configure --prefix=/usr \ + --mandir=/usr/share/man \ + --host=${CHOST} \ + --with-docdir=/usr/share/doc/${PF} \ + --libdir=/usr/$(get_libdir) \ + --enable-depend \ + --with-gnu-ld \ + $myconf || die + + make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die + cd contrib + make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die + if use xml2; then + cd xml2 + make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die + fi +} + +src_install() { + if use perl; then + mv ${S}/src/pl/plperl/Makefile ${S}/src/pl/plperl/Makefile_orig + sed -e "s:(INST_DYNAMIC) /usr/lib:(INST_DYNAMIC) ${D}/usr/lib:" \ + ${S}/src/pl/plperl/Makefile_orig > ${S}/src/pl/plperl/Makefile + mv ${S}/src/pl/plperl/GNUmakefile ${S}/src/pl/plperl/GNUmakefile_orig + sed -e "s:\$(DESTDIR)\$(plperl_installdir):\$(plperl_installdir):" \ + ${S}/src/pl/plperl/GNUmakefile_orig > ${S}/src/pl/plperl/GNUmakefile + fi + + make DESTDIR=${D} LIBDIR=${D}/usr/lib install || die +# make DESTDIR=${D} install-all-headers || die + cd ${S}/contrib + make DESTDIR=${D} LIBDIR=${D}/usr/lib install || die + if use xml2; then + cd ${S}/contrib/xml2 + make DESTDIR=${D} LIBDIR=${D}/usr/lib install || die + fi + cd ${S} + dodoc README HISTORY COPYRIGHT INSTALL + dodoc contrib/adddepend/* + + exeinto /usr/bin + + cd ${S}/doc + dodoc FAQ* README.* TODO bug.template + if use doc; then + cd ${S}/doc + docinto FAQ_html || die + dodoc src/FAQ/* || die + docinto sgml || die + dodoc src/sgml/*.{sgml,dsl} || die + docinto sgml/ref || die + dodoc src/sgml/ref/*.sgml || die + docinto TODO.detail || die + dodoc TODO.detail/* || die + fi + + cd ${S} + exeinto /etc/init.d/ + newexe ${FILESDIR}/postgresql.init-${PV} postgresql || die + newexe ${FILESDIR}/pg_autovacuum.init-${PV} pg_autovacuum || die + dosed "s:___DOCDIR___:/usr/share/doc/${PF}:" /etc/init.d/pg_autovacuum + + insinto /etc/conf.d/ + newins ${FILESDIR}/postgresql.conf-${PV} postgresql || die + newins ${FILESDIR}/pg_autovacuum.conf-${PV} pg_autovacuum || die + + rm ${D}/usr/include/postgres_ext.h +} + +pkg_postinst() { + einfo "Make sure the postgres user in /etc/passwd has an account setup with /bin/bash as the shell" + + if [ ! -f ${PG_DIR}/data/PG_VERSION ] ; then + einfo "" + einfo "Execute the following command" + einfo "ebuild /var/db/pkg/dev-db/${PF}/${PF}.ebuild config" + einfo "to setup the initial database environment." + einfo "" + fi +} + +pkg_config() { + einfo "Creating the data directory ..." + mkdir -p ${PG_DIR}/data + chown -Rf postgres:postgres ${PG_DIR} + chmod 700 ${PG_DIR}/data + + einfo "Initializing the database ..." + if [ -f ${PG_DIR}/data/PG_VERSION ] ; then + eerror "Postgres ${MY_PV} cannot upgrade your existing databases." + eerror "You must remove your entire database directory to continue." + eerror "(database directory = ${PG_DIR})." + exit 1 + else + local SEM=`sysctl -n kernel.sem | cut -f-3` + local SEMMNI=`sysctl -n kernel.sem | cut -f4` + local SEMMNI_MIN=`expr \( ${MAX_CONNECTIONS} + 15 \) / 16` + local SHMMAX=`sysctl -n kernel.shmmax` + local SHMMAX_MIN=`expr 250000 + 8200 \* 1000 + 14200 \* 100` + + if [ ${SEMMNI} -lt ${SEMMNI_MIN} ]; then + eerror "The current value of SEMMNI is too low" + eerror "for postgresql to run ${MAX_CONNECTIONS} connections" + eerror "Temporary setting this value to ${SEMMNI_MIN} while creating the initial database." + echo ${SEM} ${SEMMNI_MIN} > /proc/sys/kernel/sem + fi + su postgres -c "/usr/bin/initdb --pgdata ${PG_DIR}/data" + + if [ ! `sysctl -n kernel.sem | cut -f4` -eq ${SEMMNI} ] ; then + echo ${SEM} ${SEMMNI} > /proc/sys/kernel/sem + ewarn "Restoring the SEMMNI value to the previous value" + ewarn "Please edit the last value of kernel.sem in /etc/sysctl.conf" + ewarn "and set it to at least ${SEMMNI_MIN}" + ewarn "" + ewarn " kernel.sem = ${SEM} ${SEMMNI_MIN}" + ewarn "" + fi + + if [ ${SHMMAX} -lt ${SHMMAX_MIN} ]; then + eerror "The current value of SHMMAX is too low for postgresql to run." + eerror "Please edit /etc/sysctl.conf and set this value to at least ${SHMMAX_MIN}." + eerror "" + eerror " kernel.shmmax = ${SHMMAX_MIN}" + eerror "" + + fi + einfo "" + einfo "You can use /etc/init.d/postgresql script to run PostgreSQL instead of pg_ctl." + einfo "" + fi +} |