diff options
27 files changed, 1146 insertions, 67 deletions
diff --git a/dev-db/postgresql/ChangeLog b/dev-db/postgresql/ChangeLog index 091e219a051b..9d40a28ee91a 100644 --- a/dev-db/postgresql/ChangeLog +++ b/dev-db/postgresql/ChangeLog @@ -1,6 +1,81 @@ # ChangeLog for dev-db/postgresql # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.282 2006/07/16 12:12:07 dertobi123 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.283 2006/07/30 22:30:54 chtekk Exp $ + + 30 Jul 2006; Luca Longinotti <chtekk@gentoo.org> + +files/postgresql.conf-7.3, +files/postgresql.init-7.3, + -files/postgresql.init-7.3.6, -files/postgresql.init-7.3.9, + -files/postgresql-7.3.9-gentoo.patch, + -files/postgresql-7.3.9-securityfix.patch, -files/postgresql.init-7.3.11, + -files/postgresql-7.3.11-gentoo.patch, -files/postgresql.init-7.3.13, + -files/postgresql-7.3.13-gentoo.patch, -files/postgresql.init-7.3.14, + -files/postgresql-7.3.14-gentoo.patch, +files/postgresql-7.3-gentoo.patch, + +files/pg_autovacuum.conf-7.4, +files/pg_autovacuum.init-7.4, + +files/postgresql.conf-7.4, +files/postgresql.init-7.4, + -files/pg_autovacuum.conf-7.4.7, -files/pg_autovacuum.init-7.4.7, + -files/postgresql.conf-7.4.7, -files/postgresql.init-7.4.7, + -files/postgresql-7.4.7-gentoo.patch, + -files/postgresql-7.4.7-hppa-testandset.patch, + -files/postgresql-7.4.7-securityfix.patch, + -files/postgresql-7.4.7-vacuum-delay.patch, + -files/pg_autovacuum.conf-7.4.8, -files/pg_autovacuum.init-7.4.8, + -files/postgresql.conf-7.4.8, -files/postgresql.init-7.4.8, + -files/postgresql-7.4.8-gentoo.patch, + -files/postgresql-7.4.8-hppa-testandset.patch, + -files/postgresql-7.4.8-vacuum-delay.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-7.4.11, -files/pg_autovacuum.init-7.4.11, + -files/postgresql.conf-7.4.11, -files/postgresql.init-7.4.11, + -files/postgresql-7.4.11-gentoo.patch, + -files/postgresql-7.4.11-hppa-testandset.patch, + -files/postgresql-7.4.11-vacuum-delay.patch, + -files/pg_autovacuum.conf-7.4.12, -files/pg_autovacuum.init-7.4.12, + -files/postgresql.conf-7.4.12, -files/postgresql.init-7.4.12, + -files/postgresql-7.4.12-gentoo.patch, + -files/postgresql-7.4.12-hppa-testandset.patch, + -files/postgresql-7.4.12-vacuum-delay.patch, + +files/postgresql-7.4-gentoo.patch, + +files/postgresql-7.4-hppa-testandset.patch, + +files/postgresql-7.4-vacuum-delay.patch, +files/pg_autovacuum.conf-8.0, + +files/pg_autovacuum.init-8.0, +files/postgresql.conf-8.0, + +files/postgresql.init-8.0, -files/pg_autovacuum.conf-8.0.3, + -files/pg_autovacuum.init-8.0.3, -files/postgresql.conf-8.0.3, + -files/postgresql.init-8.0.3, -files/postgresql-8.0.3-gentoo.patch, + -files/postgresql-8.0.3-sh.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, -files/pg_autovacuum.conf-8.0.6, + -files/pg_autovacuum.init-8.0.6, -files/postgresql.conf-8.0.6, + -files/postgresql.init-8.0.6, -files/postgresql-8.0.6-gentoo.patch, + -files/postgresql-8.0.6-sh.patch, -files/pg_autovacuum.conf-8.0.7, + -files/pg_autovacuum.init-8.0.7, -files/postgresql.conf-8.0.7, + -files/postgresql.init-8.0.7, -files/postgresql-8.0.7-gentoo.patch, + -files/postgresql-8.0.7-sh.patch, +files/postgresql-8.0-gentoo.patch, + +files/postgresql-8.0-sh.patch, +files/postgresql.conf-8.1, + +files/postgresql.init-8.1, -files/postgresql.conf-8.1.2, + -files/postgresql.init-8.1.2, -files/postgresql-8.1.2-gentoo.patch, + -files/postgresql-8.1.2-sh.patch, -files/postgresql.conf-8.1.3, + -files/postgresql.init-8.1.3, -files/postgresql-8.1.3-gentoo.patch, + -files/postgresql-8.1.3-sh.patch, +files/postgresql-8.1-gentoo.patch, + +files/postgresql-8.1-sh.patch, -files/CAN-2005-1409-doc.patch, + -files/CAN-2005-1409.patch, -files/CAN-2005-1410.patch, + -files/postgresql.conf, metadata.xml, -postgresql-7.3.6-r2.ebuild, + -postgresql-7.3.9-r1.ebuild, postgresql-7.3.11.ebuild, + -postgresql-7.3.13.ebuild, -postgresql-7.3.14.ebuild, + postgresql-7.3.15-r1.ebuild, -postgresql-7.4.7-r1.ebuild, + -postgresql-7.4.7-r2.ebuild, -postgresql-7.4.8.ebuild, + -postgresql-7.4.9.ebuild, -postgresql-7.4.11.ebuild, + -postgresql-7.4.12.ebuild, postgresql-7.4.13.ebuild, + -postgresql-8.0.3.ebuild, -postgresql-8.0.4.ebuild, + -postgresql-8.0.6.ebuild, -postgresql-8.0.7.ebuild, + postgresql-8.0.8.ebuild, -postgresql-8.1.2.ebuild, + -postgresql-8.1.3.ebuild, -postgresql-8.1.3-r1.ebuild, + postgresql-8.1.4.ebuild: + Cleanup. 16 Jul 2006; Tobias Scherbaum <dertobi123@gentoo.org> postgresql-7.3.15-r1.ebuild: diff --git a/dev-db/postgresql/files/pg_autovacuum.conf-7.4 b/dev-db/postgresql/files/pg_autovacuum.conf-7.4 new file mode 100644 index 000000000000..f342ebfd2a47 --- /dev/null +++ b/dev-db/postgresql/files/pg_autovacuum.conf-7.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.conf-8.0 b/dev-db/postgresql/files/pg_autovacuum.conf-8.0 new file mode 100644 index 000000000000..f342ebfd2a47 --- /dev/null +++ b/dev-db/postgresql/files/pg_autovacuum.conf-8.0 @@ -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 b/dev-db/postgresql/files/pg_autovacuum.init-7.4 new file mode 100644 index 000000000000..812b8a8cf666 --- /dev/null +++ b/dev-db/postgresql/files/pg_autovacuum.init-7.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-7.4,v 1.1 2006/07/30 22:30:54 chtekk 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 b/dev-db/postgresql/files/pg_autovacuum.init-8.0 new file mode 100644 index 000000000000..2cef27845156 --- /dev/null +++ b/dev-db/postgresql/files/pg_autovacuum.init-8.0 @@ -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,v 1.1 2006/07/30 22:30:54 chtekk 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-gentoo.patch b/dev-db/postgresql/files/postgresql-7.3-gentoo.patch new file mode 100644 index 000000000000..3c0776ef2fde --- /dev/null +++ b/dev-db/postgresql/files/postgresql-7.3-gentoo.patch @@ -0,0 +1,51 @@ +diff -Naru postgresql-7.3.14.org/src/interfaces/Makefile postgresql-7.3.14/src/interfaces/Makefile +--- postgresql-7.3.14.org/src/interfaces/Makefile 2004-04-20 01:33:51.000000000 +0100 ++++ postgresql-7.3.14/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.14.org/src/Makefile postgresql-7.3.14/src/Makefile +--- postgresql-7.3.14.org/src/Makefile 2005-01-13 18:23:21.000000000 +0000 ++++ postgresql-7.3.14/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.14.org/configure postgresql-7.3.14/configure +--- postgresql-7.3.14.org/configure 2004-08-15 01:51:58.000000000 +0100 ++++ postgresql-7.3.14/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-gentoo.patch b/dev-db/postgresql/files/postgresql-7.4-gentoo.patch new file mode 100644 index 000000000000..536189faed33 --- /dev/null +++ b/dev-db/postgresql/files/postgresql-7.4-gentoo.patch @@ -0,0 +1,51 @@ +diff -Naru postgresql-7.4.12.org/configure postgresql-7.4.12/configure +--- postgresql-7.4.12.org/configure 2004-08-18 04:11:24.000000000 +0100 ++++ postgresql-7.4.12/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.12.org/src/interfaces/Makefile postgresql-7.4.12/src/interfaces/Makefile +--- postgresql-7.4.12.org/src/interfaces/Makefile 2004-04-20 01:33:51.000000000 +0100 ++++ postgresql-7.4.12/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.12.org/src/Makefile postgresql-7.4.12/src/Makefile +--- postgresql-7.4.12.org/src/Makefile 2005-01-13 18:23:21.000000000 +0000 ++++ postgresql-7.4.12/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-hppa-testandset.patch b/dev-db/postgresql/files/postgresql-7.4-hppa-testandset.patch new file mode 100644 index 000000000000..dc3313146d7a --- /dev/null +++ b/dev-db/postgresql/files/postgresql-7.4-hppa-testandset.patch @@ -0,0 +1,52 @@ +diff -urN postgresql-7.4.12.orig/src/include/port/linux.h postgresql-7.4.12/src/include/port/linux.h +--- postgresql-7.4.12.orig/src/include/port/linux.h 2003-10-26 01:41:10.000000000 +0000 ++++ postgresql-7.4.12/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.12.orig/src/include/storage/s_lock.h postgresql-7.4.12/src/include/storage/s_lock.h +--- postgresql-7.4.12.orig/src/include/storage/s_lock.h 2003-11-04 09:43:56.000000000 +0000 ++++ postgresql-7.4.12/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-vacuum-delay.patch b/dev-db/postgresql/files/postgresql-7.4-vacuum-delay.patch new file mode 100644 index 000000000000..e0f499859009 --- /dev/null +++ b/dev-db/postgresql/files/postgresql-7.4-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-gentoo.patch b/dev-db/postgresql/files/postgresql-8.0-gentoo.patch new file mode 100644 index 000000000000..d922fabed2e4 --- /dev/null +++ b/dev-db/postgresql/files/postgresql-8.0-gentoo.patch @@ -0,0 +1,39 @@ +diff -Naru postgresql-8.0.4.org/src/interfaces/Makefile postgresql-8.0.4/src/interfaces/Makefile +--- postgresql-8.0.4.org/src/interfaces/Makefile 2004-04-20 01:33:51.000000000 +0100 ++++ postgresql-8.0.4/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.4.org/src/Makefile postgresql-8.0.4/src/Makefile +--- postgresql-8.0.4.org/src/Makefile 2005-01-13 18:23:21.000000000 +0000 ++++ postgresql-8.0.4/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-sh.patch b/dev-db/postgresql/files/postgresql-8.0-sh.patch new file mode 100644 index 000000000000..fc59d52af0e8 --- /dev/null +++ b/dev-db/postgresql/files/postgresql-8.0-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-8.1-gentoo.patch b/dev-db/postgresql/files/postgresql-8.1-gentoo.patch new file mode 100644 index 000000000000..942617ae0d08 --- /dev/null +++ b/dev-db/postgresql/files/postgresql-8.1-gentoo.patch @@ -0,0 +1,39 @@ +diff -Naru postgresql-8.1.3.org/src/interfaces/Makefile postgresql-8.1.3/src/interfaces/Makefile +--- postgresql-8.1.3.org/src/interfaces/Makefile 2004-04-20 01:33:51.000000000 +0100 ++++ postgresql-8.1.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.1.3.org/src/Makefile postgresql-8.1.3/src/Makefile +--- postgresql-8.1.3.org/src/Makefile 2005-01-13 18:23:21.000000000 +0000 ++++ postgresql-8.1.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.1-sh.patch b/dev-db/postgresql/files/postgresql-8.1-sh.patch new file mode 100644 index 000000000000..fc59d52af0e8 --- /dev/null +++ b/dev-db/postgresql/files/postgresql-8.1-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.3 b/dev-db/postgresql/files/postgresql.conf-7.3 new file mode 100644 index 000000000000..e8dab3e4c827 --- /dev/null +++ b/dev-db/postgresql/files/postgresql.conf-7.3 @@ -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-7.4 b/dev-db/postgresql/files/postgresql.conf-7.4 new file mode 100644 index 000000000000..e8dab3e4c827 --- /dev/null +++ b/dev-db/postgresql/files/postgresql.conf-7.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.conf-8.0 b/dev-db/postgresql/files/postgresql.conf-8.0 new file mode 100644 index 000000000000..e8dab3e4c827 --- /dev/null +++ b/dev-db/postgresql/files/postgresql.conf-8.0 @@ -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.1 b/dev-db/postgresql/files/postgresql.conf-8.1 new file mode 100644 index 000000000000..e8dab3e4c827 --- /dev/null +++ b/dev-db/postgresql/files/postgresql.conf-8.1 @@ -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 b/dev-db/postgresql/files/postgresql.init-7.3 new file mode 100644 index 000000000000..82f32fd272e4 --- /dev/null +++ b/dev-db/postgresql/files/postgresql.init-7.3 @@ -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,v 1.1 2006/07/30 22:30:54 chtekk 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 b/dev-db/postgresql/files/postgresql.init-7.4 new file mode 100644 index 000000000000..e4b2022990b0 --- /dev/null +++ b/dev-db/postgresql/files/postgresql.init-7.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-7.4,v 1.4 2006/07/30 22:30:54 chtekk 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 b/dev-db/postgresql/files/postgresql.init-8.0 new file mode 100644 index 000000000000..c23ffa776e9f --- /dev/null +++ b/dev-db/postgresql/files/postgresql.init-8.0 @@ -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,v 1.1 2006/07/30 22:30:54 chtekk 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.1 b/dev-db/postgresql/files/postgresql.init-8.1 new file mode 100644 index 000000000000..fa1a0669b336 --- /dev/null +++ b/dev-db/postgresql/files/postgresql.init-8.1 @@ -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.1,v 1.1 2006/07/30 22:30:54 chtekk 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/metadata.xml b/dev-db/postgresql/metadata.xml index 309b51e9a965..d06e452b35af 100644 --- a/dev-db/postgresql/metadata.xml +++ b/dev-db/postgresql/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<herd>postgresql</herd> + <herd>postgresql</herd> </pkgmetadata> diff --git a/dev-db/postgresql/postgresql-7.3.11.ebuild b/dev-db/postgresql/postgresql-7.3.11.ebuild index 84ea2ad208a5..bccd08541faa 100644 --- a/dev-db/postgresql/postgresql-7.3.11.ebuild +++ b/dev-db/postgresql/postgresql-7.3.11.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 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.9 2006/02/19 20:57:42 kloeri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.3.11.ebuild,v 1.10 2006/07/30 22:30:54 chtekk Exp $ inherit eutils gnuconfig flag-o-matic java-pkg @@ -13,7 +13,7 @@ SRC_URI="mirror://postgresql/source/v${PV}/${PN}-base-${PV}.tar.bz2 LICENSE="POSTGRESQL" SLOT="0" -KEYWORDS="alpha ~amd64 arm hppa ia64 ~mips ppc s390 sh sparc x86" +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc s390 sh sparc x86" IUSE="doc java libg++ nls pam perl python readline ssl tcltk zlib threads selinux" DEPEND="virtual/libc @@ -72,8 +72,9 @@ check_java_config() { } src_unpack() { - unpack ${A} || die - epatch ${FILESDIR}/${P}-gentoo.patch + unpack ${A} + cd "${S}" + epatch "${FILESDIR}/${PN}-${PV%.*}-gentoo.patch" } src_compile() { @@ -164,12 +165,12 @@ src_install() { dodoc TODO.detail/* || die fi - cd ${S} + cd "${S}" exeinto /etc/init.d/ - newexe ${FILESDIR}/postgresql.init-${PV} postgresql || die + newexe "${FILESDIR}/postgresql.init-${PV%.*}" postgresql || die insinto /etc/conf.d/ - newins ${FILESDIR}/postgresql.conf postgresql || die + newins "${FILESDIR}/postgresql.conf-${PV%.*}" postgresql || die keepdir /var/lib/postgresql } diff --git a/dev-db/postgresql/postgresql-7.3.15-r1.ebuild b/dev-db/postgresql/postgresql-7.3.15-r1.ebuild index ed4e6c65f6ac..dca6e48fedc6 100644 --- a/dev-db/postgresql/postgresql-7.3.15-r1.ebuild +++ b/dev-db/postgresql/postgresql-7.3.15-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.3.15-r1.ebuild,v 1.2 2006/07/16 12:12:07 dertobi123 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.3.15-r1.ebuild,v 1.3 2006/07/30 22:30:54 chtekk Exp $ inherit eutils gnuconfig flag-o-matic java-pkg multilib @@ -13,7 +13,7 @@ SRC_URI="mirror://postgresql/source/v${PV}/${PN}-base-${PV}.tar.bz2 LICENSE="POSTGRESQL" SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 mips ppc ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 mips ppc ~s390 ~sh ~sparc ~x86" IUSE="doc java libg++ nls pam perl python readline ssl tcltk zlib threads selinux" DEPEND="virtual/libc @@ -43,9 +43,6 @@ RDEPEND="virtual/libc PG_DIR="/var/lib/postgresql" -# misc files -FILES_VER="7.3.14" - pkg_setup() { if [ -f ${PG_DIR}/data/PG_VERSION ] ; then PG_MAJOR=`cat ${PG_DIR}/data/PG_VERSION | cut -f1 -d.` @@ -75,11 +72,10 @@ check_java_config() { } src_unpack() { - unpack ${A} || die - cd ${S} || die - - epatch ${FILESDIR}/${PN}-${FILES_VER}-gentoo.patch - epatch ${FILESDIR}/${P}-cubeparse.patch + unpack ${A} + cd "${S}" + epatch "${FILESDIR}/${PN}-${PV%.*}-gentoo.patch" + epatch "${FILESDIR}/${PN}-${PV}-cubeparse.patch" } src_compile() { @@ -176,10 +172,10 @@ src_install() { cd ${S} exeinto /etc/init.d/ - newexe ${FILESDIR}/postgresql.init-${FILES_VER} postgresql || die + newexe "${FILESDIR}/postgresql.init-${PV%.*}" postgresql || die insinto /etc/conf.d/ - newins ${FILESDIR}/postgresql.conf postgresql || die + newins "${FILESDIR}/postgresql.conf-${PV%.*}" postgresql || die keepdir /var/lib/postgresql } diff --git a/dev-db/postgresql/postgresql-7.4.13.ebuild b/dev-db/postgresql/postgresql-7.4.13.ebuild index 6ca3f5a356bd..4acb5307cf6b 100644 --- a/dev-db/postgresql/postgresql-7.4.13.ebuild +++ b/dev-db/postgresql/postgresql-7.4.13.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.4.13.ebuild,v 1.10 2006/07/05 07:45:33 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.4.13.ebuild,v 1.11 2006/07/30 22:30:54 chtekk Exp $ inherit eutils gnuconfig flag-o-matic java-pkg multilib toolchain-funcs @@ -48,9 +48,6 @@ RDEPEND="virtual/libc PG_DIR="/var/lib/postgresql" MAX_CONNECTIONS=1024 -# misc files -FILES_VER="7.4.12" - pkg_setup() { if [ -f ${PG_DIR}/data/PG_VERSION ] ; then PG_MAJOR=`cat ${PG_DIR}/data/PG_VERSION | cut -f1 -d.` @@ -80,25 +77,21 @@ check_java_config() { } src_unpack() { - unpack ${A} || die - cd ${S} || die + unpack ${A} + cd "${S}" - epatch ${FILESDIR}/${PN}-${FILES_VER}-gentoo.patch + epatch "${FILESDIR}/${PN}-${PV%.*}-gentoo.patch" - if use pg-hier; then - cd ${S} || die - epatch ${WORKDIR}/${P_HIERPG}.diff + if use pg-hier ; then + epatch "${WORKDIR}/${P_HIERPG}.diff" fi - if use pg-vacuumdelay; then - cd ${S} || die - epatch ${FILESDIR}/${PN}-${FILES_VER}-vacuum-delay.patch + if use pg-vacuumdelay ; then + epatch "${FILESDIR}/${PN}-${PV%.*}-vacuum-delay.patch" fi - if [ "${ARCH}" = "hppa" ] - then - cd ${S} - epatch ${FILESDIR}/${PN}-${FILES_VER}-hppa-testandset.patch + if [[ "${ARCH}" = "hppa" ]] ; then + epatch "${FILESDIR}/${PN}-${PV%.*}-hppa-testandset.patch" fi } @@ -208,13 +201,13 @@ src_install() { cd ${S} exeinto /etc/init.d/ - newexe ${FILESDIR}/postgresql.init-${FILES_VER} postgresql || die - newexe ${FILESDIR}/pg_autovacuum.init-${FILES_VER} pg_autovacuum || die + 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-${FILES_VER} postgresql || die - newins ${FILESDIR}/pg_autovacuum.conf-${FILES_VER} pg_autovacuum || die + newins "${FILESDIR}/postgresql.conf-${PV%.*}" postgresql || die + newins "${FILESDIR}/pg_autovacuum.conf-${PV%.*}" pg_autovacuum || die } pkg_postinst() { diff --git a/dev-db/postgresql/postgresql-8.0.8.ebuild b/dev-db/postgresql/postgresql-8.0.8.ebuild index 445ec437397e..2f021462111d 100644 --- a/dev-db/postgresql/postgresql-8.0.8.ebuild +++ b/dev-db/postgresql/postgresql-8.0.8.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-8.0.8.ebuild,v 1.10 2006/07/05 07:45:33 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-8.0.8.ebuild,v 1.11 2006/07/30 22:30:54 chtekk Exp $ inherit eutils gnuconfig flag-o-matic multilib toolchain-funcs @@ -47,9 +47,6 @@ RDEPEND="virtual/libc PG_DIR="/var/lib/postgresql" -# misc files -FILES_VER="8.0.7" - pkg_setup() { if [ -f ${PG_DIR}/data/PG_VERSION ] ; then PG_MAJOR=`cat ${PG_DIR}/data/PG_VERSION | cut -f1 -d.` @@ -70,12 +67,12 @@ pkg_setup() { } src_unpack() { - unpack ${A} || die - cd ${S} - use pg-hier && epatch ${WORKDIR}/${P_HIERPG}.diff + unpack ${A} + cd "${S}" + use pg-hier && epatch "${WORKDIR}/${P_HIERPG}.diff" - epatch ${FILESDIR}/${PN}-${FILES_VER}-gentoo.patch - epatch ${FILESDIR}/${PN}-${FILES_VER}-sh.patch + epatch "${FILESDIR}/${PN}-${PV%.*}-gentoo.patch" + epatch "${FILESDIR}/${PN}-${PV%.*}-sh.patch" } src_compile() { @@ -159,13 +156,13 @@ src_install() { cd ${S} exeinto /etc/init.d/ - newexe ${FILESDIR}/postgresql.init-${FILES_VER} postgresql || die - newexe ${FILESDIR}/pg_autovacuum.init-${FILES_VER} pg_autovacuum || die + 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-${FILES_VER} postgresql || die - newins ${FILESDIR}/pg_autovacuum.conf-${FILES_VER} pg_autovacuum || die + newins "${FILESDIR}/postgresql.conf-${PV%.*}" postgresql || die + newins "${FILESDIR}/pg_autovacuum.conf-${PV%.*}" pg_autovacuum || die rm ${D}/usr/include/postgres_ext.h } diff --git a/dev-db/postgresql/postgresql-8.1.4.ebuild b/dev-db/postgresql/postgresql-8.1.4.ebuild index 9bf0eb8469ed..913afa5a336c 100644 --- a/dev-db/postgresql/postgresql-8.1.4.ebuild +++ b/dev-db/postgresql/postgresql-8.1.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-8.1.4.ebuild,v 1.2 2006/07/05 07:45:33 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-8.1.4.ebuild,v 1.3 2006/07/30 22:30:54 chtekk Exp $ inherit eutils gnuconfig flag-o-matic multilib toolchain-funcs @@ -45,9 +45,6 @@ RDEPEND="virtual/libc PG_DIR="/var/lib/postgresql" -# misc files -FILES_VER="8.1.3" - pkg_setup() { if [ -f ${PG_DIR}/data/PG_VERSION ] ; then PG_MAJOR=`cat ${PG_DIR}/data/PG_VERSION | cut -f1 -d.` @@ -68,12 +65,10 @@ pkg_setup() { } src_unpack() { - unpack ${A} || die - cd ${S} -# use pg-hier && epatch ${WORKDIR}/${P_HIERPG}.diff - - epatch ${FILESDIR}/${PN}-${FILES_VER}-gentoo.patch - epatch ${FILESDIR}/${PN}-${FILES_VER}-sh.patch + unpack ${A} + cd "${S}" + epatch "${FILESDIR}/${PN}-${PV%.*}-gentoo.patch" + epatch "${FILESDIR}/${PN}-${PV%.*}-sh.patch" } src_compile() { @@ -158,10 +153,10 @@ src_install() { cd ${S} exeinto /etc/init.d/ - newexe ${FILESDIR}/postgresql.init-${FILES_VER} postgresql || die + newexe "${FILESDIR}/postgresql.init-${PV%.*}" postgresql || die insinto /etc/conf.d/ - newins ${FILESDIR}/postgresql.conf-${FILES_VER} postgresql || die + newins "${FILESDIR}/postgresql.conf-${PV%.*}" postgresql || die rm ${D}/usr/include/postgres_ext.h } |